Use Text Button

Signed-off-by: alperozturk <alper_ozturk@proton.me>

app/src/main/java/com/owncloud/android/ui/fragment/GalleryFragmentBottomSheetDialog.kt

@@ -27,13 +27,14 @@ import android.view.ViewGroup
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.di.Injectable
+import com.owncloud.android.R
 import com.owncloud.android.databinding.FragmentGalleryBottomSheetBinding
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import javax.inject.Inject
 
 class GalleryFragmentBottomSheetDialog(
     private val actions: GalleryFragmentBottomSheetActions
-) : BottomSheetDialogFragment(), Injectable {
+) : BottomSheetDialogFragment(R.layout.fragment_gallery_bottom_sheet), Injectable {
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils
 
@@ -52,6 +53,8 @@ class GalleryFragmentBottomSheetDialog(
     }
 
     private fun setupLayout() {
+        viewThemeUtils.platform.colorViewBackground(binding.bottomSheet, ColorRole.SURFACE_VARIANT)
+
         listOf(
             binding.tickMarkShowImages,
             binding.tickMarkShowVideos,
@@ -64,7 +67,7 @@ class GalleryFragmentBottomSheetDialog(
             binding.btnHideVideos,
             binding.btnHideImages,
         ).forEach {
-            viewThemeUtils.material.colorMaterialButtonPrimaryTonal(it)
+            viewThemeUtils.material.colorMaterialButtonText(it)
         }
 
         when (currentMediaState) {
@@ -84,7 +87,7 @@ class GalleryFragmentBottomSheetDialog(
     }
 
     private fun setupClickListener() {
-        binding.hideImages.setOnClickListener {
+        binding.btnHideImages.setOnClickListener {
             currentMediaState = if (currentMediaState == MediaState.MEDIA_STATE_VIDEOS_ONLY) {
                 MediaState.MEDIA_STATE_DEFAULT
             } else {
@@ -93,7 +96,7 @@ class GalleryFragmentBottomSheetDialog(
             notifyStateChange()
             dismiss()
         }
-        binding.hideVideo.setOnClickListener {
+        binding.btnHideVideos.setOnClickListener {
             currentMediaState = if (currentMediaState == MediaState.MEDIA_STATE_PHOTOS_ONLY) {
                 MediaState.MEDIA_STATE_DEFAULT
             } else {
@@ -102,7 +105,7 @@ class GalleryFragmentBottomSheetDialog(
             notifyStateChange()
             dismiss()
         }
-        binding.selectMediaFolder.setOnClickListener {
+        binding.btnSelectMediaFolder.setOnClickListener {
             actions.selectMediaFolder()
             dismiss()
         }

app/src/main/res/layout/fragment_gallery_bottom_sheet.xml

@@ -33,6 +33,7 @@
         app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior">
 
         <LinearLayout
+            android:id="@+id/bottom_sheet"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="@dimen/standard_padding"
@@ -43,7 +44,6 @@
                 android:layout_height="wrap_content" />
 
             <LinearLayout
-                android:id="@+id/hideImages"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -51,12 +51,11 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btn_hide_images"
-                    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+                    style="@style/Widget.Material3.Button.IconButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/show_images"
-                    app:iconTint="@color/white"
-                    android:textColor="@color/white"
+                    app:iconPadding="@dimen/standard_half_padding"
                     android:textSize="@dimen/bottom_sheet_text_size"
                     app:icon="@drawable/ic_camera" />
 
@@ -79,7 +78,6 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/hideVideo"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -87,12 +85,11 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btn_hide_videos"
-                    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+                    style="@style/Widget.Material3.Button.IconButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/show_video"
-                    app:iconTint="@color/white"
-                    android:textColor="@color/white"
+                    app:iconPadding="@dimen/standard_half_padding"
                     android:textSize="@dimen/bottom_sheet_text_size"
                     app:icon="@drawable/ic_video_camera" />
 
@@ -114,7 +111,6 @@
             </LinearLayout>
 
             <LinearLayout
-                android:id="@+id/selectMediaFolder"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center"
@@ -122,12 +118,11 @@
 
                 <com.google.android.material.button.MaterialButton
                     android:id="@+id/btn_select_media_folder"
-                    style="@style/Widget.Material3.Button.IconButton.Filled.Tonal"
+                    style="@style/Widget.Material3.Button.IconButton"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
+                    app:iconPadding="@dimen/standard_half_padding"
                     android:text="@string/select_media_folder"
-                    app:iconTint="@color/white"
-                    android:textColor="@color/white"
                     android:textSize="@dimen/bottom_sheet_text_size"
                     app:icon="@drawable/nav_photos" />