Skip to content

Commit 85643e8

Browse files
committed
feat: add set space icon option to the bottom sheet dialog
1 parent ebeb0fb commit 85643e8

6 files changed

Lines changed: 16 additions & 1 deletion

File tree

‎owncloudApp/src/main/java/com/owncloud/android/extensions/SpaceMenuOptionExt.kt‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ fun SpaceMenuOption.toStringResId() =
3030
SpaceMenuOption.DISABLE -> R.string.disable_space
3131
SpaceMenuOption.ENABLE -> R.string.enable_space
3232
SpaceMenuOption.DELETE -> R.string.delete_space
33+
SpaceMenuOption.SET_ICON -> R.string.set_space_icon
3334
}
3435

3536
fun SpaceMenuOption.toDrawableResId() =
@@ -39,4 +40,5 @@ fun SpaceMenuOption.toDrawableResId() =
3940
SpaceMenuOption.DISABLE -> R.drawable.ic_disable_space
4041
SpaceMenuOption.ENABLE -> R.drawable.ic_enable_space
4142
SpaceMenuOption.DELETE -> R.drawable.ic_action_delete_white
43+
SpaceMenuOption.SET_ICON -> R.drawable.ic_set_space_icon
4244
}

‎owncloudApp/src/main/java/com/owncloud/android/presentation/spaces/SpacesListFragment.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -428,6 +428,7 @@ class SpacesListFragment :
428428
}
429429
editSpaceImageLauncher.launch(action)
430430
}
431+
SpaceMenuOption.SET_ICON -> { }
431432
}
432433
}
433434
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="960"
5+
android:viewportHeight="960"
6+
android:tint="?attr/colorControlNormal">
7+
<path
8+
android:fillColor="@android:color/white"
9+
android:pathData="M480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480L480,480L480,480L480,480L480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480Q480,480 480,480ZM480,880Q397,880 324,848.5Q251,817 197,763Q143,709 111.5,636Q80,563 80,480Q80,397 111.5,324Q143,251 197,197Q251,143 324,111.5Q397,80 480,80Q523,80 563,88.5Q603,97 640,113L640,203Q605,183 564.5,171.5Q524,160 480,160Q347,160 253.5,253.5Q160,347 160,480Q160,613 253.5,706.5Q347,800 480,800Q613,800 706.5,706.5Q800,613 800,480Q800,448 793.5,418Q787,388 776,360L862,360Q871,389 875.5,418.5Q880,448 880,480Q880,563 848.5,636Q817,709 763,763Q709,817 636,848.5Q563,880 480,880ZM800,280L800,200L720,200L720,120L800,120L800,40L880,40L880,120L960,120L960,200L880,200L880,280L800,280ZM620,440Q645,440 662.5,422.5Q680,405 680,380Q680,355 662.5,337.5Q645,320 620,320Q595,320 577.5,337.5Q560,355 560,380Q560,405 577.5,422.5Q595,440 620,440ZM340,440Q365,440 382.5,422.5Q400,405 400,380Q400,355 382.5,337.5Q365,320 340,320Q315,320 297.5,337.5Q280,355 280,380Q280,405 297.5,422.5Q315,440 340,440ZM480,700Q548,700 603.5,661.5Q659,623 684,560L276,560Q301,623 356.5,661.5Q412,700 480,700Z"/>
10+
</vector>

‎owncloudApp/src/main/res/values/strings.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -870,6 +870,7 @@
870870
<string name="delete_space_dialog_message">If you delete the selected space, it can no longer be accessed and files will be deleted from the server.</string>
871871
<string name="delete_space_correctly">Space deleted correctly</string>
872872
<string name="delete_space_failed">Space could not be deleted</string>
873+
<string name="set_space_icon">Set space icon</string>
873874

874875
<string name="feedback_dialog_get_in_contact_description"><![CDATA[ Ask for help in our <a href=\"%1$s\"><b>forum</b></a> or contribute in our <a href=\"%2$s\"><b>GitHub repo</b></a>]]></string>
875876

‎owncloudDomain/src/main/java/com/owncloud/android/domain/spaces/model/SpaceMenuOption.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
package com.owncloud.android.domain.spaces.model
2222

2323
enum class SpaceMenuOption {
24-
EDIT, EDIT_IMAGE, DISABLE, ENABLE, DELETE
24+
EDIT, EDIT_IMAGE, DISABLE, ENABLE, DELETE, SET_ICON
2525
}

‎owncloudDomain/src/main/java/com/owncloud/android/domain/spaces/usecases/FilterSpaceMenuOptionsUseCase.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ class FilterSpaceMenuOptionsUseCase(
5151

5252
if (editImagePermission) {
5353
optionsToShow.add(SpaceMenuOption.EDIT_IMAGE)
54+
optionsToShow.add(SpaceMenuOption.SET_ICON)
5455
}
5556

5657
if (!currentSpace.isDisabled && deletePermission) {

0 commit comments

Comments
 (0)