Merge pull request #2953 from nextcloud/style/noid/M3AboutFragments

AndyScherzinger · web-flow · commit 5f3dc1869df0 · 2025-12-11T15:14:18.000+01:00
Update about page for M3 coloring
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/about/AboutFragmentContributingTab.java b/app/src/main/java/it/niedermann/owncloud/notes/about/AboutFragmentContributingTab.java
@@ -10,26 +10,41 @@
 import static it.niedermann.owncloud.notes.shared.util.SupportUtil.setTextWithURL;
 
 import android.os.Bundle;
-import android.text.method.LinkMovementMethod;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
+
 import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.branding.BrandedFragment;
+import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.FragmentAboutContributionTabBinding;
-import it.niedermann.owncloud.notes.shared.util.SupportUtil;
 
-public class AboutFragmentContributingTab extends Fragment {
+public class AboutFragmentContributingTab extends BrandedFragment {
+
+    private FragmentAboutContributionTabBinding binding;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        final var binding = FragmentAboutContributionTabBinding.inflate(inflater, container, false);
+        binding = FragmentAboutContributionTabBinding.inflate(inflater, container, false);
         setTextWithURL(binding.aboutSource, getResources(), R.string.about_source, R.string.url_source, R.string.url_source);
         setTextWithURL(binding.aboutIssues, getResources(), R.string.about_issues, R.string.url_issues, R.string.url_issues);
         setTextWithURL(binding.aboutTranslate, getResources(), R.string.about_translate, R.string.url_translations, R.string.url_translations);
         return binding.getRoot();
     }
+
+    @Override
+    public void applyBrand(int color) {
+        final var util = BrandingUtil.of(color, requireContext());
+        util.platform.colorTextView(binding.aboutIssuesHeadline);
+        util.platform.colorTextView(binding.aboutIssues, ColorRole.ON_SURFACE_VARIANT);
+        util.platform.colorTextView(binding.aboutSourceHeadline);
+        util.platform.colorTextView(binding.aboutSource, ColorRole.ON_SURFACE_VARIANT);
+        util.platform.colorTextView(binding.aboutTranslateHeadline);
+        util.platform.colorTextView(binding.aboutTranslate, ColorRole.ON_SURFACE_VARIANT);
+    }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/about/AboutFragmentCreditsTab.java b/app/src/main/java/it/niedermann/owncloud/notes/about/AboutFragmentCreditsTab.java
@@ -19,19 +19,41 @@
 import androidx.annotation.NonNull;
 import androidx.fragment.app.Fragment;
 
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
+
 import it.niedermann.owncloud.notes.BuildConfig;
 import it.niedermann.owncloud.notes.R;
+import it.niedermann.owncloud.notes.branding.BrandedFragment;
+import it.niedermann.owncloud.notes.branding.BrandingUtil;
 import it.niedermann.owncloud.notes.databinding.FragmentAboutCreditsTabBinding;
 
-public class AboutFragmentCreditsTab extends Fragment {
+public class AboutFragmentCreditsTab extends BrandedFragment {
+
+    private FragmentAboutCreditsTabBinding binding;
 
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        final var binding = FragmentAboutCreditsTabBinding.inflate(inflater, container, false);
+        binding = FragmentAboutCreditsTabBinding.inflate(inflater, container, false);
         binding.aboutVersion.setText(getString(R.string.about_version, strong(BuildConfig.VERSION_NAME)));
         final var founderText = getString(R.string.about_developers_stefan, getString(R.string.about_developers_original_author));
         setTextWithURL(binding.aboutDevelopers, getResources(), R.string.about_developers, founderText, R.string.url_niedermann_it);
         setTextWithURL(binding.aboutTranslators, getResources(), R.string.about_translators_transifex, R.string.about_translators_transifex_label, R.string.url_translations);
         return binding.getRoot();
     }
+
+    @Override
+    public void applyBrand(int color) {
+        final var util = BrandingUtil.of(color, requireContext());
+        util.platform.colorTextView(binding.aboutNotesHeadline, ColorRole.ON_SURFACE);
+        util.platform.colorTextView(binding.aboutVersionHeadline);
+        util.platform.colorTextView(binding.aboutVersion, ColorRole.ON_SURFACE_VARIANT);
+        util.platform.colorTextView(binding.aboutDevelopersHeadline);
+        util.platform.colorTextView(binding.aboutDevelopers, ColorRole.ON_SURFACE_VARIANT);
+        util.platform.colorTextView(binding.aboutMaintainerHeadline);
+        util.platform.colorTextView(binding.aboutMaintainer, ColorRole.ON_SURFACE_VARIANT);
+        util.platform.colorTextView(binding.aboutTranslatorsHeadline);
+        util.platform.colorTextView(binding.aboutTranslators, ColorRole.ON_SURFACE_VARIANT);
+        util.platform.colorTextView(binding.aboutTestersHeadline);
+        util.platform.colorTextView(binding.aboutTesters, ColorRole.ON_SURFACE_VARIANT);
+    }
 }
diff --git a/app/src/main/java/it/niedermann/owncloud/notes/about/AboutFragmentLicenseTab.java b/app/src/main/java/it/niedermann/owncloud/notes/about/AboutFragmentLicenseTab.java
@@ -22,6 +22,8 @@
 import androidx.annotation.NonNull;
 import androidx.core.graphics.drawable.DrawableCompat;
 
+import com.nextcloud.android.common.ui.theme.utils.ColorRole;
+
 import it.niedermann.android.util.ColorUtil;
 import it.niedermann.owncloud.notes.R;
 import it.niedermann.owncloud.notes.branding.BrandedFragment;
@@ -45,5 +47,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
     public void applyBrand(int color) {
         final var util = BrandingUtil.of(color, requireContext());
         util.material.colorMaterialButtonPrimaryFilled(binding.aboutAppLicenseButton);
+        util.platform.colorTextView(binding.aboutAppLicenseHeadline);
+        util.platform.colorTextView(binding.aboutAppLicense, ColorRole.ON_SURFACE_VARIANT);
+        util.platform.colorTextView(binding.aboutIconsDisclaimerHeadline);
+        util.platform.colorTextView(binding.aboutIconsDisclaimerMdiIcons, ColorRole.ON_SURFACE_VARIANT);
+        util.platform.colorTextView(binding.aboutIconsDisclaimerAppIcon, ColorRole.ON_SURFACE_VARIANT);
     }
 }
diff --git a/app/src/main/res/layout/fragment_about_contribution_tab.xml b/app/src/main/res/layout/fragment_about_contribution_tab.xml
@@ -2,7 +2,7 @@
 <!--
  ~ Nextcloud Notes - Android Client
  ~
- ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ ~ SPDX-FileCopyrightText: 2016-2025 Nextcloud GmbH and Nextcloud contributors
  ~ SPDX-License-Identifier: GPL-3.0-or-later
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -16,45 +16,47 @@
         android:padding="@dimen/spacer_2x">
 
         <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
+            android:id="@+id/about_source_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/about_source_title" />
+            android:text="@string/about_source_title"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/about_source"
-            style="?android:attr/editTextPreferenceStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:paddingTop="@dimen/spacer_1x"
             android:text="@string/about_source" />
 
         <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
+            android:id="@+id/about_issues_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/about_issues_title" />
+            android:layout_marginTop="@dimen/spacer_2x"
+            android:text="@string/about_issues_title"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/about_issues"
-            style="?android:attr/editTextPreferenceStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:paddingTop="@dimen/spacer_1x"
             android:text="@string/about_issues" />
 
         <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
+            android:id="@+id/about_translate_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/about_translate_title" />
+            android:layout_marginTop="@dimen/spacer_2x"
+            android:text="@string/about_translate_title"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/about_translate"
-            style="?android:attr/editTextPreferenceStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:paddingTop="@dimen/spacer_1x"
             android:text="@string/about_translate" />
     </LinearLayout>
-</ScrollView>
+</ScrollView>
diff --git a/app/src/main/res/layout/fragment_about_credits_tab.xml b/app/src/main/res/layout/fragment_about_credits_tab.xml
@@ -2,7 +2,7 @@
 <!--
  ~ Nextcloud Notes - Android Client
  ~
- ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ ~ SPDX-FileCopyrightText: 2016-2025 Nextcloud GmbH and Nextcloud contributors
  ~ SPDX-License-Identifier: GPL-3.0-or-later
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -17,83 +17,87 @@
         android:padding="@dimen/spacer_2x">
 
         <TextView
+            android:id="@+id/about_notes_headline"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginVertical="30dp"
+            android:layout_marginVertical="@dimen/spacer_3x"
             android:text="@string/app_name"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="@color/fg_default_low"
             android:textSize="26sp"
             app:drawableTopCompat="@mipmap/ic_launcher" />
 
         <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
+            android:id="@+id/about_version_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/about_version_title" />
+            android:text="@string/about_version_title"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/about_version"
-            style="?android:attr/editTextPreferenceStyle"
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:paddingTop="@dimen/spacer_1x"
             android:text="@string/about_version" />
 
         <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
+            android:id="@+id/about_maintainer_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/about_maintainer_title" />
+            android:layout_marginTop="@dimen/spacer_2x"
+            android:text="@string/about_maintainer_title"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/about_maintainer"
-            style="?android:attr/editTextPreferenceStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:paddingTop="@dimen/spacer_1x"
             android:text="@string/about_maintainer" />
 
         <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
+            android:id="@+id/about_developers_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/about_developers_title" />
+            android:layout_marginTop="@dimen/spacer_2x"
+            android:text="@string/about_developers_title"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/about_developers"
-            style="?android:attr/editTextPreferenceStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:paddingTop="@dimen/spacer_1x"
             android:text="@string/about_developers" />
 
         <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
+            android:id="@+id/about_translators_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/about_translators_title" />
+            android:layout_marginTop="@dimen/spacer_2x"
+            android:text="@string/about_translators_title"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/about_translators"
-            style="?android:attr/editTextPreferenceStyle"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:paddingTop="@dimen/spacer_1x"
             android:text="@string/about_translators_transifex" />
 
         <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
+            android:id="@+id/about_testers_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/about_testers_title" />
+            android:layout_marginTop="@dimen/spacer_2x"
+            android:text="@string/about_testers_title"
+            android:textStyle="bold" />
 
         <TextView
-            style="?android:attr/editTextPreferenceStyle"
+            android:id="@+id/about_testers"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:paddingTop="@dimen/spacer_1x"
             android:text="@string/about_testers" />
     </LinearLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/fragment_about_license_tab.xml b/app/src/main/res/layout/fragment_about_license_tab.xml
@@ -2,7 +2,7 @@
 <!--
  ~ Nextcloud Notes - Android Client
  ~
- ~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
+ ~ SPDX-FileCopyrightText: 2016-2025 Nextcloud GmbH and Nextcloud contributors
  ~ SPDX-License-Identifier: GPL-3.0-or-later
 -->
 <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -17,16 +17,17 @@
         android:padding="@dimen/spacer_2x">
 
         <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
+            android:id="@+id/about_app_license_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="@string/about_app_license_title" />
+            android:text="@string/about_app_license_title"
+            android:textStyle="bold" />
 
         <TextView
-            style="?android:attr/editTextPreferenceStyle"
+            android:id="@+id/about_app_license"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:paddingVertical="@dimen/spacer_1x"
             android:text="@string/about_app_license" />
 
         <com.google.android.material.button.MaterialButton
@@ -38,24 +39,25 @@
             app:backgroundTint="@color/defaultBrand" />
 
         <TextView
-            style="?android:attr/listSeparatorTextViewStyle"
+            android:id="@+id/about_icons_disclaimer_headline"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/spacer_2x"
-            android:text="@string/about_icons_disclaimer_title" />
+            android:text="@string/about_icons_disclaimer_title"
+            android:textStyle="bold" />
 
         <TextView
             android:id="@+id/about_icons_disclaimer_app_icon"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:paddingTop="@dimen/spacer_1x"
             android:text="@string/about_icons_disclaimer_app_icon" />
 
         <TextView
             android:id="@+id/about_icons_disclaimer_mdi_icons"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:padding="10dp"
+            android:paddingTop="@dimen/spacer_1x"
             android:text="@string/about_icons_disclaimer_mdi_icons" />
     </LinearLayout>
-</ScrollView>
+</ScrollView>
