Sharing theming updated.

nextmcloud · May 15, 2023 · 67d617f · 67d617f
1 parent 28e324d
commit 67d617f
Show file tree

Hide file tree

Showing 13 changed files with 172 additions and 37 deletions.
diff --git a/app/src/main/java/com/nmc/android/utils/CheckableThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/CheckableThemeUtils.kt
@@ -0,0 +1,86 @@
+package com.nmc.android.utils
+
+import android.content.res.ColorStateList
+import androidx.appcompat.widget.AppCompatCheckBox
+import androidx.appcompat.widget.SwitchCompat
+import androidx.core.graphics.drawable.DrawableCompat
+import androidx.core.widget.CompoundButtonCompat
+import com.owncloud.android.MainApp
+import com.owncloud.android.R
+
+object CheckableThemeUtils {
+    @JvmStatic
+    fun tintCheckbox(vararg checkBoxes: AppCompatCheckBox) {
+        for (checkBox in checkBoxes) {
+            val checkEnabled = MainApp.getAppContext().resources.getColor(R.color.checkbox_checked_enabled)
+            val checkDisabled = MainApp.getAppContext().resources.getColor(R.color.checkbox_checked_disabled)
+            val uncheckEnabled = MainApp.getAppContext().resources.getColor(R.color.checkbox_unchecked_enabled)
+            val uncheckDisabled = MainApp.getAppContext().resources.getColor(R.color.checkbox_unchecked_disabled)
+
+            val states = arrayOf(
+                intArrayOf(android.R.attr.state_enabled, android.R.attr.state_checked),
+                intArrayOf(-android.R.attr.state_enabled, android.R.attr.state_checked),
+                intArrayOf(android.R.attr.state_enabled, -android.R.attr.state_checked),
+                intArrayOf(-android.R.attr.state_enabled, -android.R.attr.state_checked)
+            )
+            val colors = intArrayOf(
+                checkEnabled,
+                checkDisabled,
+                uncheckEnabled,
+                uncheckDisabled
+            )
+            val checkColorStateList = ColorStateList(states, colors)
+            CompoundButtonCompat.setButtonTintList(checkBox, checkColorStateList)
+        }
+    }
+
+    @JvmStatic
+    @JvmOverloads
+    fun tintSwitch(switchView: SwitchCompat, color: Int = 0, colorText: Boolean = false) {
+        if (colorText) {
+            switchView.setTextColor(color)
+        }
+        val thumbColorCheckedEnabled = MainApp.getAppContext().resources.getColor(R.color.switch_thumb_checked_enabled)
+        val thumbColorUncheckedEnabled =
+            MainApp.getAppContext().resources.getColor(R.color.switch_thumb_unchecked_enabled)
+        val thumbColorCheckedDisabled =
+            MainApp.getAppContext().resources.getColor(R.color.switch_thumb_checked_disabled)
+        val thumbColorUncheckedDisabled =
+            MainApp.getAppContext().resources.getColor(R.color.switch_thumb_unchecked_disabled)
+
+        val states = arrayOf(
+            intArrayOf(android.R.attr.state_enabled, android.R.attr.state_checked),
+            intArrayOf(-android.R.attr.state_enabled, android.R.attr.state_checked),
+            intArrayOf(android.R.attr.state_enabled, -android.R.attr.state_checked),
+            intArrayOf(-android.R.attr.state_enabled, -android.R.attr.state_checked)
+        )
+        val thumbColors = intArrayOf(
+            thumbColorCheckedEnabled,
+            thumbColorCheckedDisabled,
+            thumbColorUncheckedEnabled,
+            thumbColorUncheckedDisabled
+        )
+        val thumbColorStateList = ColorStateList(states, thumbColors)
+        val trackColorCheckedEnabled = MainApp.getAppContext().resources.getColor(R.color.switch_track_checked_enabled)
+        val trackColorUncheckedEnabled =
+            MainApp.getAppContext().resources.getColor(R.color.switch_track_unchecked_enabled)
+        val trackColorCheckedDisabled =
+            MainApp.getAppContext().resources.getColor(R.color.switch_track_checked_disabled)
+        val trackColorUncheckedDisabled =
+            MainApp.getAppContext().resources.getColor(R.color.switch_track_unchecked_disabled)
+
+        val trackColors = intArrayOf(
+            trackColorCheckedEnabled,
+            trackColorCheckedDisabled,
+            trackColorUncheckedEnabled,
+            trackColorUncheckedDisabled
+        )
+        val trackColorStateList = ColorStateList(states, trackColors)
+
+        // setting the thumb color
+        DrawableCompat.setTintList(switchView.thumbDrawable, thumbColorStateList)
+
+        // setting the track color
+        DrawableCompat.setTintList(switchView.trackDrawable, trackColorStateList)
+    }
+}
diff --git a/app/src/main/java/com/nmc/android/utils/SearchViewThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/SearchViewThemeUtils.kt
@@ -0,0 +1,22 @@
+package com.nmc.android.utils
+
+import android.content.Context
+import android.widget.ImageView
+import androidx.appcompat.widget.SearchView
+import com.owncloud.android.R
+
+object SearchViewThemeUtils {
+    fun themeSearchView(context: Context, searchView: SearchView) {
+        val fontColor = context.resources.getColor(R.color.fontAppbar, null)
+        val editText: SearchView.SearchAutoComplete = searchView.findViewById(R.id.search_src_text)
+        editText.textSize = 16F
+        editText.setTextColor(fontColor)
+        editText.highlightColor = context.resources.getColor(R.color.search_et_highlight_color, null)
+        editText.setHintTextColor(context.resources.getColor(R.color.fontSecondaryAppbar, null))
+        val closeButton: ImageView = searchView.findViewById(R.id.search_close_btn)
+        closeButton.setColorFilter(fontColor)
+        val searchButton: ImageView = searchView.findViewById(R.id.search_button)
+        searchButton.setImageResource(R.drawable.ic_search)
+        searchButton.setColorFilter(fontColor)
+    }
+}
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.java b/app/src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.java
@@ -82,7 +82,6 @@ public void bind(OCShare publicShare, ShareeListAdapterListener listener) {
                 }
             }
 
-            viewThemeUtils.platform.colorImageViewBackgroundAndIcon(binding.icon);
         }
 
         String permissionName = SharingMenuHelper.getPermissionName(context, publicShare);

diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
@@ -43,6 +43,7 @@
 import com.nextcloud.client.di.Injectable;
 import com.nextcloud.client.network.ClientFactory;
 import com.nextcloud.utils.EditorUtils;
+import com.nmc.android.utils.SearchViewThemeUtils;
 import com.owncloud.android.R;
 import com.owncloud.android.databinding.FileDetailsSharingFragmentBinding;
 import com.owncloud.android.datamodel.FileDataStorageManager;
@@ -222,8 +223,7 @@ private void setUpSearchView() {
             binding.searchView,
             fileActivity.getComponentName());
 
-        // TODO: 04/27/23 Customize it later with theming changes
-        //ThemeToolbarUtils.themeSearchView(binding.searchView, requireContext());
+        SearchViewThemeUtils.INSTANCE.themeSearchView(requireContext(), binding.searchView);
 
         binding.searchView.setQueryHint(getResources().getString(R.string.share_search));
         binding.searchView.setVisibility(View.VISIBLE);

diff --git a/...rc/main/java/com/owncloud/android/ui/fragment/FileDetailSharingMenuBottomSheetDialog.java b/...rc/main/java/com/owncloud/android/ui/fragment/FileDetailSharingMenuBottomSheetDialog.java
@@ -62,14 +62,6 @@ protected void onCreate(Bundle savedInstanceState) {
             getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         }
 
-        viewThemeUtils.platform.themeDialog(binding.getRoot());
-
-        viewThemeUtils.platform.colorImageView(binding.menuIconAddAnotherLink);
-        viewThemeUtils.platform.colorImageView(binding.menuIconAdvancedPermissions);
-        viewThemeUtils.platform.colorImageView(binding.menuIconSendLink);
-        viewThemeUtils.platform.colorImageView(binding.menuIconUnshare);
-        viewThemeUtils.platform.colorImageView(binding.menuIconSendNewEmail);
-
         updateUI();
 
         setupClickListener();

diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
@@ -32,6 +32,7 @@ import android.view.ViewGroup
 import android.widget.RadioGroup
 import androidx.fragment.app.Fragment
 import com.nextcloud.client.di.Injectable
+import com.nmc.android.utils.CheckableThemeUtils
 import com.owncloud.android.R
 import com.owncloud.android.databinding.FileDetailsSharingProcessFragmentBinding
 import com.owncloud.android.datamodel.OCFile
@@ -218,7 +219,6 @@ class FileDetailsSharingProcessFragment :
             showShareProcessSecond()
         }
 
-        //  ThemeCheckableUtils.tintSwitch(binding.shareProcessHideDownloadCheckbox, 0)
         binding.shareProcessPermissionRadioGroup.setOnCheckedChangeListener(this)
         implementClickEvents()
         binding.shareProcessHideDownloadCheckbox.setOnCheckedChangeListener { _, isChecked ->
@@ -240,19 +240,11 @@ class FileDetailsSharingProcessFragment :
     }
 
     private fun themeView() {
-        viewThemeUtils.platform.colorPrimaryTextViewElement(binding.shareProcessAdvancePermissionTitle)
-
-        viewThemeUtils.platform.themeRadioButton(binding.shareProcessPermissionReadOnly)
-        viewThemeUtils.platform.themeRadioButton(binding.shareProcessPermissionUploadEditing)
-        viewThemeUtils.platform.themeRadioButton(binding.shareProcessPermissionFileDrop)
-
-        viewThemeUtils.androidx.colorSwitchCompat(binding.shareProcessSetPasswordSwitch)
-        viewThemeUtils.androidx.colorSwitchCompat(binding.shareProcessSetExpDateSwitch)
-        viewThemeUtils.androidx.colorSwitchCompat(binding.shareProcessHideDownloadCheckbox)
-        viewThemeUtils.androidx.colorSwitchCompat(binding.shareProcessChangeNameSwitch)
-
-        viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.shareProcessBtnNext)
-        viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.shareProcessBtnCancel)
+        CheckableThemeUtils.tintSwitch(binding.shareProcessSetPasswordSwitch)
+        CheckableThemeUtils.tintSwitch(binding.shareProcessSetExpDateSwitch)
+        CheckableThemeUtils.tintSwitch(binding.shareProcessHideDownloadCheckbox)
+        CheckableThemeUtils.tintSwitch(binding.shareProcessChangeNameSwitch)
+        CheckableThemeUtils.tintSwitch(binding.shareProcessDownloadLimitSwitch)
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {

diff --git a/.../main/java/com/owncloud/android/ui/fragment/QuickSharingPermissionsBottomSheetDialog.java b/.../main/java/com/owncloud/android/ui/fragment/QuickSharingPermissionsBottomSheetDialog.java
@@ -76,8 +76,6 @@ protected void onCreate(Bundle savedInstanceState) {
             getWindow().setLayout(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
         }
 
-        viewThemeUtils.platform.themeDialog(binding.getRoot());
-
         setUpRecyclerView();
         setOnShowListener(d ->
                               BottomSheetBehavior.from((View) binding.getRoot().getParent())

diff --git a/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml b/app/src/main/res/layout/file_details_sharing_menu_bottom_sheet_fragment.xml
@@ -24,6 +24,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/bottom_sheet_bg_color"
     android:orientation="vertical"
     android:paddingTop="@dimen/standard_padding">
 
@@ -63,7 +64,8 @@
     <LinearLayout
         android:id="@+id/menu_share_advanced_permissions"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/bottom_sheet_item_height"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/minimum_size_for_touchable_area"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/standard_padding"
@@ -95,7 +97,8 @@
     <LinearLayout
         android:id="@+id/menu_share_send_new_email"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/bottom_sheet_item_height"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/minimum_size_for_touchable_area"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/standard_padding"
@@ -127,7 +130,8 @@
     <LinearLayout
         android:id="@+id/menu_share_send_link"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/bottom_sheet_item_height"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/minimum_size_for_touchable_area"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/standard_padding"
@@ -161,7 +165,8 @@
     <LinearLayout
         android:id="@+id/menu_share_unshare"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/bottom_sheet_item_height"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/minimum_size_for_touchable_area"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/standard_padding"
@@ -193,7 +198,8 @@
     <LinearLayout
         android:id="@+id/menu_share_add_another_link"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/bottom_sheet_item_height"
+        android:layout_height="wrap_content"
+        android:minHeight="@dimen/minimum_size_for_touchable_area"
         android:background="?android:attr/selectableItemBackground"
         android:orientation="horizontal"
         android:paddingLeft="@dimen/standard_padding"

diff --git a/app/src/main/res/layout/item_quick_share_permissions.xml b/app/src/main/res/layout/item_quick_share_permissions.xml
@@ -21,8 +21,7 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/bottom_sheet_item_height"
-    android:background="?android:attr/selectableItemBackground"
+    android:layout_height="wrap_content"
     android:padding="@dimen/standard_padding">
 
     <ImageView
@@ -43,7 +42,7 @@
         android:layout_gravity="center_vertical"
         android:layout_marginStart="@dimen/standard_margin"
         android:text="@string/link_share_read_only"
-        android:textColor="@color/text_color"
+        android:textColor="@color/bottom_sheet_txt_color"
         android:textSize="@dimen/bottom_sheet_text_size"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml b/app/src/main/res/layout/quick_sharing_permissions_bottom_sheet_fragment.xml
@@ -22,6 +22,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/bottom_sheet_bg_color"
     android:paddingTop="@dimen/standard_padding"
     android:paddingBottom="@dimen/standard_padding"
     android:orientation="vertical">

diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
@@ -25,6 +25,9 @@
     <color name="disabled_text">#ff6F6F6F</color>
     <color name="secondary_text_color">#A5A5A5</color>
     <color name="list_divider_background">#222222</color>
+    <color name="list_icon_color">@color/grey_30</color>
+
+    <!-- Share Colors -->
     <color name="share_title_txt_color">#FFFFFF</color>
     <color name="share_subtitle_txt_color">@color/grey_30</color>
     <color name="share_info_txt_color">@color/grey_0</color>
@@ -34,7 +37,6 @@
     <color name="share_disabled_txt_color">@color/grey_60</color>
     <color name="share_txt_color">@color/grey_0</color>
     <color name="share_et_divider">#FFFFFF</color>
-    <color name="list_icon_color">@color/grey_30</color>
 
     <!-- Colors -->
     <color name="dark">#ffffff</color>
@@ -43,10 +45,22 @@
     <color name="grey_200">#818181</color>
     <color name="nc_grey">#222222</color>
     <color name="icon_on_nc_grey">#ffffff</color>
+
+    <!-- Bottom Sheet Colors -->
     <color name="bottom_sheet_bg_color">@color/grey_80</color>
     <color name="bottom_sheet_icon_color">@color/grey_30</color>
     <color name="bottom_sheet_txt_color">@color/grey_0</color>
 
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_checked_disabled">@color/grey_70</color>
+    <color name="switch_track_checked_disabled">@color/grey_60</color>
+    <color name="switch_thumb_unchecked_disabled">@color/grey_70</color>
+    <color name="switch_track_unchecked_disabled">@color/grey_60</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_disabled">@color/grey_70</color>
+    <color name="checkbox_unchecked_disabled">@color/grey_70</color>
+
     <!-- Multiselect backgrounds -->
     <color name="action_mode_background">@color/appbar</color>
     <color name="selected_item_background">#373535</color>

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -32,8 +32,11 @@
     <color name="dark_background_text_color">#EEEEEE</color>
     <color name="transparent">#00000000</color>
     <color name="secondary_text_color">#666666</color>
+    <color name="search_et_highlight_color">#77c4ff</color>
     <color name="list_icon_color">#191919</color>
     <color name="highlight_textColor_Warning">#e53935</color>
+
+    <!-- Share Colors -->
     <color name="share_title_txt_color">#191919</color>
     <color name="share_subtitle_txt_color">@color/grey_30</color>
     <color name="share_info_txt_color">#191919</color>
@@ -46,6 +49,7 @@
     <color name="share_warning_txt_color">#191919</color>
     <color name="sharing_warning_bg_color">#F6E5EB</color>
     <color name="sharing_warning_border_color">#C16F81</color>
+    <color name="share_color">#0D39DF</color>
 
     <!-- Colors -->
     <color name="standard_grey">#757575</color>
@@ -54,8 +58,10 @@
     <color name="grey_400">#BDBDBD</color>
     <color name="grey_600">#666666</color>
     <color name="grey_0">#F2F2F2</color>
+    <color name="grey_10">#E5E5E5</color>
     <color name="grey_30">#B2B2B2</color>
     <color name="grey_60">#666666</color>
+    <color name="grey_70">#4C4C4C</color>
     <color name="grey_80">#333333</color>
 
     <!-- standard material color definitions -->
@@ -75,6 +81,10 @@
     <color name="secondary_button_text_color">#000000</color>
     <color name="nc_grey">#ededed</color>
     <color name="icon_on_nc_grey">#000000</color>
+
+    <!-- Bottom Sheet Colors -->
+    <color name="bottom_sheet_bg_color">#FFFFFF</color>
+    <color name="bottom_sheet_icon_color">#191919</color>
     <color name="bottom_sheet_txt_color">#191919</color>
 
     <color name="process_dialog_background">#ffffff</color>
@@ -95,11 +105,26 @@
     <color name="bg_fallback_highlight">#616161</color>
     <color name="drawer_active_item_background">#80000000</color>
 
+    <!-- Switch Compat Colors -->
+    <color name="switch_thumb_checked_enabled">@color/primary</color>
+    <color name="switch_track_checked_enabled">#F399C7</color>
+    <color name="switch_thumb_checked_disabled">@color/grey_0</color>
+    <color name="switch_track_checked_disabled">@color/grey_0</color>
+    <color name="switch_thumb_unchecked_enabled">#FFFFFF</color>
+    <color name="switch_track_unchecked_enabled">@color/grey_30</color>
+    <color name="switch_thumb_unchecked_disabled">@color/grey_0</color>
+    <color name="switch_track_unchecked_disabled">@color/grey_0</color>
+
+    <!-- Checkbox Colors -->
+    <color name="checkbox_checked_enabled">@color/primary</color>
+    <color name="checkbox_unchecked_enabled">@color/grey_30</color>
+    <color name="checkbox_checked_disabled">@color/grey_30</color>
+    <color name="checkbox_unchecked_disabled">#CCCCCC</color>
+
     <!-- App bar -->
     <color name="appbar">@android:color/white</color>
     <color name="fontAppbar">#666666</color>
     <color name="white_trans_70">#B3FFFFFF</color>
     <color name="fontSecondaryAppbar">#A5A5A5</color>
-    <color name="share_color">#0D39DF</color>
     <color name="shared_with_me_color">#0099ff</color>
 </resources>
-Original file line number
+Diff line change
@@ Expand Up @@
                     }
                 }
-                viewThemeUtils.platform.colorImageViewBackgroundAndIcon(binding.icon);
             }
             String permissionName = SharingMenuHelper.getPermissionName(context, publicShare);
@@ Expand Down @@