fix(theming): Improve color theming and general layouting

AndyScherzinger · AndyScherzinger · commit 47e11b9f2797 · 2026-01-08T16:00:37.000+01:00
Resolves #16245 Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java b/app/src/main/java/com/owncloud/android/ui/activity/EditorWebView.java
@@ -25,6 +25,7 @@
 import android.webkit.WebView;
 
 import com.google.android.material.snackbar.Snackbar;
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
 import com.nextcloud.client.account.User;
 import com.nextcloud.utils.extensions.IntentExtensionsKt;
 import com.owncloud.android.R;
@@ -130,6 +131,8 @@ protected void bindView() {
     protected void postOnCreate() {
         super.postOnCreate();
 
+        viewThemeUtils.platform.colorCircularProgressBar(binding.progressBar2, ColorRole.PRIMARY);
+
         getWebView().setWebChromeClient(new WebChromeClient() {
             final EditorWebView activity = EditorWebView.this;
 
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt b/app/src/main/java/com/owncloud/android/ui/activity/InternalTwoWaySyncActivity.kt
@@ -50,7 +50,7 @@ class InternalTwoWaySyncActivity :
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
 
-        internalTwoWaySyncAdapter = InternalTwoWaySyncAdapter(fileDataStorageManager, user.get(), this, this)
+        internalTwoWaySyncAdapter = InternalTwoWaySyncAdapter(fileDataStorageManager, user.get(), this, this, viewThemeUtils)
 
         binding = InternalTwoWaySyncLayoutBinding.inflate(layoutInflater)
         setContentView(binding.root)
@@ -163,6 +163,7 @@ class InternalTwoWaySyncActivity :
                 handleDurationSelected(durations[position].first.inWholeMinutes)
             }
         }
+        viewThemeUtils.material.colorTextInputLayout(binding.twoWaySyncIntervalLayout)
     }
 
     private fun handleDurationSelected(duration: Long) {
@@ -184,6 +185,7 @@ class InternalTwoWaySyncActivity :
                 backgroundJobManager.cancelTwoWaySyncJob()
             }
         }
+        viewThemeUtils.material.colorMaterialSwitch(binding.twoWaySyncToggle)
     }
 
     private fun checkLayoutVisibilities(condition: Boolean) {
diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/InternalTwoWaySyncAdapter.kt b/app/src/main/java/com/owncloud/android/ui/adapter/InternalTwoWaySyncAdapter.kt
@@ -12,16 +12,19 @@ import android.content.Context
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.account.User
 import com.owncloud.android.databinding.InternalTwoWaySyncViewHolderBinding
 import com.owncloud.android.datamodel.FileDataStorageManager
 import com.owncloud.android.datamodel.OCFile
+import com.owncloud.android.utils.theme.ViewThemeUtils
 
 class InternalTwoWaySyncAdapter(
     private val dataStorageManager: FileDataStorageManager,
     private val user: User,
     val context: Context,
-    private val onUpdateListener: InternalTwoWaySyncAdapterOnUpdate
+    private val onUpdateListener: InternalTwoWaySyncAdapterOnUpdate,
+    private val viewThemeUtils: ViewThemeUtils
 ) : RecyclerView.Adapter<InternalTwoWaySyncViewHolder>() {
 
     interface InternalTwoWaySyncAdapterOnUpdate {
@@ -30,14 +33,11 @@ class InternalTwoWaySyncAdapter(
 
     var folders: List<OCFile> = dataStorageManager.getInternalTwoWaySyncFolders(user)
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InternalTwoWaySyncViewHolder =
-        InternalTwoWaySyncViewHolder(
-            InternalTwoWaySyncViewHolderBinding.inflate(
-                LayoutInflater.from(parent.context),
-                parent,
-                false
-            )
-        )
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): InternalTwoWaySyncViewHolder {
+        val binding = InternalTwoWaySyncViewHolderBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        viewThemeUtils.platform.colorImageView(binding.folderIcon, ColorRole.PRIMARY)
+        return InternalTwoWaySyncViewHolder(binding)
+    }
 
     override fun getItemCount(): Int = folders.size
 
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -276,6 +276,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
         if (getFile() != null && user != null) {
             viewThemeUtils.platform.themeHorizontalProgressBar(binding.progressBar);
+            viewThemeUtils.platform.themeCheckbox(binding.folderSyncButton);
             progressListener = new DownloadProgressListener(binding.progressBar);
             binding.cancelBtn.setOnClickListener(this);
             binding.favorite.setOnClickListener(this);
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
@@ -301,6 +301,8 @@ private void setupView() {
             binding.sharesListInternalShowAll.setText(textRes);
         });
 
+        viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.createLink);
+
         viewThemeUtils.material.colorMaterialTextButton(binding.sharesListExternalShowAll);
         binding.sharesListExternalShowAll.setOnClickListener(view -> {
             externalShareeListAdapter.toggleShowAll();
diff --git a/app/src/main/res/layout/file_details_fragment.xml b/app/src/main/res/layout/file_details_fragment.xml
@@ -198,6 +198,7 @@
             <TextView
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:textSize="@dimen/two_line_primary_text_size"
                 android:text="@string/sync" />
         </LinearLayout>
         
diff --git a/app/src/main/res/layout/file_details_sharing_fragment.xml b/app/src/main/res/layout/file_details_sharing_fragment.xml
@@ -172,8 +172,8 @@
                 style="@style/Widget.Material3.Button.OutlinedButton"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="@dimen/standard_double_margin"
-                android:layout_marginEnd="@dimen/standard_double_margin"
+                android:layout_marginStart="@dimen/standard_margin"
+                android:layout_marginEnd="@dimen/standard_margin"
                 app:icon="@drawable/file_link"
                 app:iconGravity="textStart"
                 android:text="@string/create_link" />
diff --git a/app/src/main/res/layout/internal_two_way_sync_layout.xml b/app/src/main/res/layout/internal_two_way_sync_layout.xml
@@ -22,21 +22,21 @@
 
         <com.google.android.material.materialswitch.MaterialSwitch
             android:id="@+id/twoWaySyncToggle"
-            android:text="@string/prefs_two_way_sync_switch_title"
-            android:textSize="@dimen/txt_size_16sp"
-            android:minHeight="48dp"
-            android:layout_marginHorizontal="@dimen/standard_half_padding"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/standard_margin"
             android:layout_marginTop="@dimen/alternate_margin"
             android:layout_marginBottom="@dimen/alternate_margin"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:minHeight="@dimen/minimum_size_for_touchable_area"
+            android:text="@string/prefs_two_way_sync_title"
+            android:textSize="@dimen/txt_size_16sp" />
 
         <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/two_way_sync_interval_layout"
-            android:layout_marginHorizontal="@dimen/standard_half_padding"
-            style="@style/Widget.Material3.TextInputLayout.FilledBox.ExposedDropdownMenu"
+            style="@style/Widget.Material3.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginHorizontal="@dimen/standard_margin"
             android:layout_marginBottom="@dimen/alternate_margin"
             android:hint="@string/prefs_two_way_sync_interval">
 
diff --git a/app/src/main/res/layout/internal_two_way_sync_view_holder.xml b/app/src/main/res/layout/internal_two_way_sync_view_holder.xml
@@ -2,36 +2,36 @@
 <!--
   ~ Nextcloud - Android Client
   ~
-  ~ SPDX-FileCopyrightText: 2024 Andy Scherzinger <info@andy-scherzinger.de>
+  ~ SPDX-FileCopyrightText: 2024-2026 Andy Scherzinger <info@andy-scherzinger.de>
   ~ SPDX-FileCopyrightText: 2024 Tobias Kaminsky <tobias@kaminsky.me>
   ~ SPDX-License-Identifier: AGPL-3.0-or-later
-  -->
+-->
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="@dimen/min_list_item_size"
-    android:orientation="horizontal"
-    android:paddingStart="@dimen/standard_half_padding"
-    android:paddingEnd="@dimen/standard_half_padding">
+    android:orientation="horizontal">
 
     <ImageView
+        android:id="@+id/folder_icon"
         android:layout_width="@dimen/file_icon_size"
         android:layout_height="@dimen/file_icon_size"
         android:layout_gravity="center_vertical"
+        android:layout_marginStart="@dimen/standard_margin"
+        android:layout_marginEnd="@dimen/standard_half_margin"
         android:contentDescription="@null"
         android:src="@drawable/folder" />
 
     <LinearLayout
         android:layout_width="0dp"
-        android:layout_weight="1"
         android:layout_height="@dimen/min_list_item_size"
-        android:layout_marginStart="@dimen/standard_half_margin"
+        android:layout_weight="1"
         android:gravity="center_vertical|start"
         android:orientation="vertical">
 
         <TextView
             android:id="@+id/name"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:ellipsize="middle"
             android:gravity="center_vertical"
@@ -97,10 +97,11 @@
 
     <ImageView
         android:id="@+id/unset"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="@dimen/minimum_size_for_touchable_area"
+        android:layout_height="@dimen/minimum_size_for_touchable_area"
         android:layout_gravity="center_vertical"
         android:contentDescription="@string/unset_internal_two_way_sync_description"
+        android:padding="@dimen/minimum_size_for_touchable_area_icon_padding"
         android:src="@drawable/ic_close" />
 
 </LinearLayout>
diff --git a/app/src/main/res/values/dims.xml b/app/src/main/res/values/dims.xml
@@ -142,6 +142,7 @@
     <dimen name="account_action_button_vertical_margin">10dp</dimen>
     <dimen name="online_status_item_height">60dp</dimen>
     <dimen name="minimum_size_for_touchable_area">48dp</dimen>
+    <dimen name="minimum_size_for_touchable_area_icon_padding">12dp</dimen>
     <dimen name="dialog_elevation">24dp</dimen>
     <dimen name="default_login_width">400dp</dimen>
     <dimen name="dialogBorderRadius">24dp</dimen>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -140,6 +140,7 @@
     <string name="prefs_value_theme_system">Follow system</string>
     <string name="prefs_theme_title">Theme</string>
     <string name="prefs_two_way_sync_switch_title">Enable two way sync</string>
+    <string name="prefs_two_way_sync_title">Two way sync</string>
     <string name="prefs_two_way_sync_interval">Interval</string>
 
     <plurals name="hours">

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ class InternalTwoWaySyncActivity :`
`50`	`50`	`override fun onCreate(savedInstanceState: Bundle?) {`
`51`	`51`	`super.onCreate(savedInstanceState)`
`52`	`52`
`53`		`- internalTwoWaySyncAdapter = InternalTwoWaySyncAdapter(fileDataStorageManager, user.get(), this, this)`
	`53`	`+ internalTwoWaySyncAdapter = InternalTwoWaySyncAdapter(fileDataStorageManager, user.get(), this, this, viewThemeUtils)`
`54`	`54`
`55`	`55`	`binding = InternalTwoWaySyncLayoutBinding.inflate(layoutInflater)`
`56`	`56`	`setContentView(binding.root)`
`@@ -163,6 +163,7 @@ class InternalTwoWaySyncActivity :`
`163`	`163`	`handleDurationSelected(durations[position].first.inWholeMinutes)`
`164`	`164`	`}`
`165`	`165`	`}`
	`166`	`+ viewThemeUtils.material.colorTextInputLayout(binding.twoWaySyncIntervalLayout)`
`166`	`167`	`}`
`167`	`168`
`168`	`169`	`private fun handleDurationSelected(duration: Long) {`
`@@ -184,6 +185,7 @@ class InternalTwoWaySyncActivity :`
`184`	`185`	`backgroundJobManager.cancelTwoWaySyncJob()`
`185`	`186`	`}`
`186`	`187`	`}`
	`188`	`+ viewThemeUtils.material.colorMaterialSwitch(binding.twoWaySyncToggle)`
`187`	`189`	`}`
`188`	`190`
`189`	`191`	`private fun checkLayoutVisibilities(condition: Boolean) {`