Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -1013,16 +1013,19 @@ class MainFileListFragment : Fragment(),
toggleFabVisibility(true)
if (!currentFolder.hasAddFilePermission) {
binding.fabUpload.isVisible = false
binding.fabTakePhoto.isVisible = false
binding.fabNewfile.isVisible = false
} else if (!currentFolder.hasAddSubdirectoriesPermission) {
binding.fabMkdir.isVisible = false
}
registerFabMainListener()
registerFabUploadListener()
registerFabTakePhotoListener()
registerFabMkDirListener()
registerFabNewShortcutListener()
binding.apply {
fabUpload.isFocusable = false
fabTakePhoto.isFocusable = false
fabMkdir.isFocusable = false
fabNewfile.isFocusable = false
fabNewshortcut.isFocusable = false
Expand All @@ -1041,6 +1044,7 @@ class MainFileListFragment : Fragment(),
private fun toggleFabVisibility(shouldBeShown: Boolean) {
binding.fabMain.isVisible = shouldBeShown
binding.fabUpload.isVisible = shouldBeShown
binding.fabTakePhoto.isVisible = shouldBeShown
binding.fabMkdir.isVisible = shouldBeShown
}

Expand All @@ -1049,6 +1053,7 @@ class MainFileListFragment : Fragment(),
fabMain.findViewById<View>(R.id.fab_expand_menu_button).setOnClickListener {
fabMain.toggle()
fabUpload.isFocusable = isFabExpanded()
fabTakePhoto.isFocusable = isFabExpanded()
fabMkdir.isFocusable = isFabExpanded()
fabNewfile.isFocusable = isFabExpanded()
fabNewshortcut.isFocusable = isFabExpanded()
Expand All @@ -1072,6 +1077,16 @@ class MainFileListFragment : Fragment(),
}
}

/**
* Registers [android.view.View.OnClickListener] on the 'Take a photo' mini FAB for the linked action.
*/
private fun registerFabTakePhotoListener() {
binding.fabTakePhoto.setOnClickListener {
uploadActions?.uploadFromCamera()
collapseFab()
}
}

/**
* Registers [android.view.View.OnClickListener] on the 'New folder' mini FAB for the linked action.
*/
Expand Down Expand Up @@ -1108,6 +1123,7 @@ class MainFileListFragment : Fragment(),
binding.apply {
fabMain.collapse()
fabUpload.isFocusable = false
fabTakePhoto.isFocusable = false
fabMkdir.isFocusable = false
fabNewfile.isFocusable = false
fabNewshortcut.isFocusable = false
Expand Down
9 changes: 9 additions & 0 deletions opencloudApp/src/main/res/drawable/ic_action_take_photo.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M12,15.2c1.8,0 3.2,-1.4 3.2,-3.2s-1.4,-3.2 -3.2,-3.2 -3.2,1.4 -3.2,3.2 1.4,3.2 3.2,3.2zM9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
</vector>
11 changes: 11 additions & 0 deletions opencloudApp/src/main/res/layout/main_file_list_fragment.xml
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,17 @@
fab:fab_size="mini"
fab:fab_title="@string/actionbar_upload" />

<com.getbase.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_take_photo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/fab_take_photo"
fab:fab_colorNormal="@color/primary_button_background_color"
fab:fab_colorPressed="@color/opencloud_petrol"
fab:fab_icon="@drawable/ic_action_take_photo"
fab:fab_size="mini"
fab:fab_title="@string/fab_take_photo" />

<com.getbase.floatingactionbutton.FloatingActionButton
android:id="@+id/fab_mkdir"
android:layout_width="wrap_content"
Expand Down
1 change: 1 addition & 0 deletions opencloudApp/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
<string name="actionbar_sort_title">Sort by</string>
<string name="fab_new_file">New document</string>
<string name="fab_new_shortcut">New shortcut</string>
<string name="fab_take_photo">Take a photo</string>
<string name="drawer_item_all_files">All files</string>
<string name="drawer_item_only_available_offline">Available offline</string>
<string name="drawer_item_shared_by_link_files">Shared by link</string>
Expand Down