Skip to content

Use DirectEditing API also for RD #17075

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tobiasKaminsky wants to merge 1 commit into
base: master
Choose a base branch
from
+3 −97
Open

Use DirectEditing API also for RD #17075

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 3 additions & 43 deletions app/src/main/java/com/owncloud/android/ui/fragment/OCFileListBottomSheetDialog.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ class OCFileListBottomSheetDialog(
themeUtils.getDefaultDisplayNameForRootFolder(context)
)

checkTemplateVisibility()
// checkTemplateVisibility()
initCreatorContainer()

if (!deviceInfo.hasCamera(context)) {
Expand Down Expand Up @@ -126,23 +126,6 @@ class OCFileListBottomSheetDialog(
}
}

@Suppress("ComplexCondition")
private fun checkTemplateVisibility() {
val optionalCapability = fileActivity.capabilities
if (optionalCapability.isPresent) {
val capability = optionalCapability.get()
if (capability.richDocuments.isTrue &&
capability.richDocumentsDirectEditing.isTrue &&
capability.richDocumentsTemplatesAvailable.isTrue &&
!file.isEncrypted
) {
binding.menuNewDocument.visibility = View.VISIBLE
binding.menuNewSpreadsheet.visibility = View.VISIBLE
binding.menuNewPresentation.visibility = View.VISIBLE
}
}
}

@Suppress("DEPRECATION", "LongMethod", "MagicNumber")
private fun initCreatorContainer() {
val json = ArbitraryDataProviderImpl(context)
Expand Down Expand Up @@ -179,12 +162,7 @@ class OCFileListBottomSheetDialog(
gravity = Gravity.START or Gravity.CENTER_VERTICAL
setPaddingRelative(standardPadding, 0, standardPadding, 0)

val buttonText = String.format(
fileActivity.getString(R.string.editor_placeholder),
fileActivity.getString(R.string.create_new),
creator.name
)
text = buttonText
text = creator.name
setTextColor(ContextCompat.getColor(context, R.color.text_color))
textSize = 16f
isAllCaps = false
Expand All @@ -201,7 +179,7 @@ class OCFileListBottomSheetDialog(
iconTint = null

setOnClickListener {
actions.showTemplate(creator, buttonText)
actions.showTemplate(creator, creator.name)
dismiss()
}
}
Expand Down Expand Up @@ -275,21 +253,6 @@ class OCFileListBottomSheetDialog(
actions.uploadFiles()
dismiss()
}

menuNewDocument.setOnClickListener {
actions.newDocument()
dismiss()
}

menuNewSpreadsheet.setOnClickListener {
actions.newSpreadsheet()
dismiss()
}

menuNewPresentation.setOnClickListener {
actions.newPresentation()
dismiss()
}
}
}

Expand All @@ -305,9 +268,6 @@ class OCFileListBottomSheetDialog(
menuUploadFromApp.visibility = View.GONE
menuDirectCameraUpload.visibility = View.GONE
menuScanDocUpload.visibility = View.GONE
menuNewDocument.visibility = View.GONE
menuNewSpreadsheet.visibility = View.GONE
menuNewPresentation.visibility = View.GONE
creatorsContainer.visibility = View.GONE
}
}
Expand Down
54 changes: 0 additions & 54 deletions app/src/main/res/layout/file_list_actions_bottom_sheet_fragment.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,60 +149,6 @@
app:iconSize="@dimen/iconized_single_line_item_icon_size"
app:iconTint="@color/primary" />

<com.google.android.material.button.MaterialButton
android:id="@+id/menu_new_document"
style="@style/Widget.App.Button.BottomSheetItem"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_item_height"
android:contentDescription="@string/create_new_document"
android:gravity="start|center_vertical"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
android:text="@string/create_new_document"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size"
app:icon="@drawable/file_doc"
app:iconGravity="start"
app:iconPadding="@dimen/standard_padding"
app:iconSize="@dimen/iconized_single_line_item_icon_size"
app:iconTint="@null" />

<com.google.android.material.button.MaterialButton
android:id="@+id/menu_new_spreadsheet"
style="@style/Widget.App.Button.BottomSheetItem"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_item_height"
android:contentDescription="@string/create_new_spreadsheet"
android:gravity="start|center_vertical"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
android:text="@string/create_new_spreadsheet"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size"
app:icon="@drawable/file_xls"
app:iconGravity="start"
app:iconPadding="@dimen/standard_padding"
app:iconSize="@dimen/iconized_single_line_item_icon_size"
app:iconTint="@null" />

<com.google.android.material.button.MaterialButton
android:id="@+id/menu_new_presentation"
style="@style/Widget.App.Button.BottomSheetItem"
android:layout_width="match_parent"
android:layout_height="@dimen/bottom_sheet_item_height"
android:contentDescription="@string/create_new_presentation"
android:gravity="start|center_vertical"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
android:text="@string/create_new_presentation"
android:textColor="@color/text_color"
android:textSize="@dimen/bottom_sheet_text_size"
app:icon="@drawable/file_ppt"
app:iconGravity="start"
app:iconPadding="@dimen/standard_padding"
app:iconSize="@dimen/iconized_single_line_item_icon_size"
app:iconTint="@null" />

<LinearLayout
android:id="@+id/creators_container"
android:layout_width="match_parent"
Expand Down
Loading