Skip to content

Commit 5f3dc18

Browse files
AndyScherzingerAndyScherzinger
authored
Merge pull request #2953 from nextcloud/style/noid/M3AboutFragments
Update about page for M3 coloring
2 parents 944a445 + b0e5c61 commit 5f3dc18

6 files changed

Lines changed: 107 additions & 55 deletions

File tree

‎app/src/main/java/it/niedermann/owncloud/notes/about/AboutFragmentContributingTab.java‎

Lines changed: 19 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10,26 +10,41 @@
1010
import static it.niedermann.owncloud.notes.shared.util.SupportUtil.setTextWithURL;
1111

1212
import android.os.Bundle;
13-
import android.text.method.LinkMovementMethod;
1413
import android.view.LayoutInflater;
1514
import android.view.View;
1615
import android.view.ViewGroup;
1716

1817
import androidx.annotation.NonNull;
1918
import androidx.fragment.app.Fragment;
2019

20+
import com.nextcloud.android.common.ui.theme.utils.ColorRole;
21+
2122
import it.niedermann.owncloud.notes.R;
23+
import it.niedermann.owncloud.notes.branding.BrandedFragment;
24+
import it.niedermann.owncloud.notes.branding.BrandingUtil;
2225
import it.niedermann.owncloud.notes.databinding.FragmentAboutContributionTabBinding;
23-
import it.niedermann.owncloud.notes.shared.util.SupportUtil;
2426

25-
public class AboutFragmentContributingTab extends Fragment {
27+
public class AboutFragmentContributingTab extends BrandedFragment {
28+
29+
private FragmentAboutContributionTabBinding binding;
2630

2731
@Override
2832
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
29-
final var binding = FragmentAboutContributionTabBinding.inflate(inflater, container, false);
33+
binding = FragmentAboutContributionTabBinding.inflate(inflater, container, false);
3034
setTextWithURL(binding.aboutSource, getResources(), R.string.about_source, R.string.url_source, R.string.url_source);
3135
setTextWithURL(binding.aboutIssues, getResources(), R.string.about_issues, R.string.url_issues, R.string.url_issues);
3236
setTextWithURL(binding.aboutTranslate, getResources(), R.string.about_translate, R.string.url_translations, R.string.url_translations);
3337
return binding.getRoot();
3438
}
39+
40+
@Override
41+
public void applyBrand(int color) {
42+
final var util = BrandingUtil.of(color, requireContext());
43+
util.platform.colorTextView(binding.aboutIssuesHeadline);
44+
util.platform.colorTextView(binding.aboutIssues, ColorRole.ON_SURFACE_VARIANT);
45+
util.platform.colorTextView(binding.aboutSourceHeadline);
46+
util.platform.colorTextView(binding.aboutSource, ColorRole.ON_SURFACE_VARIANT);
47+
util.platform.colorTextView(binding.aboutTranslateHeadline);
48+
util.platform.colorTextView(binding.aboutTranslate, ColorRole.ON_SURFACE_VARIANT);
49+
}
3550
}

‎app/src/main/java/it/niedermann/owncloud/notes/about/AboutFragmentCreditsTab.java‎

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,19 +19,41 @@
1919
import androidx.annotation.NonNull;
2020
import androidx.fragment.app.Fragment;
2121

22+
import com.nextcloud.android.common.ui.theme.utils.ColorRole;
23+
2224
import it.niedermann.owncloud.notes.BuildConfig;
2325
import it.niedermann.owncloud.notes.R;
26+
import it.niedermann.owncloud.notes.branding.BrandedFragment;
27+
import it.niedermann.owncloud.notes.branding.BrandingUtil;
2428
import it.niedermann.owncloud.notes.databinding.FragmentAboutCreditsTabBinding;
2529

26-
public class AboutFragmentCreditsTab extends Fragment {
30+
public class AboutFragmentCreditsTab extends BrandedFragment {
31+
32+
private FragmentAboutCreditsTabBinding binding;
2733

2834
@Override
2935
public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
30-
final var binding = FragmentAboutCreditsTabBinding.inflate(inflater, container, false);
36+
binding = FragmentAboutCreditsTabBinding.inflate(inflater, container, false);
3137
binding.aboutVersion.setText(getString(R.string.about_version, strong(BuildConfig.VERSION_NAME)));
3238
final var founderText = getString(R.string.about_developers_stefan, getString(R.string.about_developers_original_author));
3339
setTextWithURL(binding.aboutDevelopers, getResources(), R.string.about_developers, founderText, R.string.url_niedermann_it);
3440
setTextWithURL(binding.aboutTranslators, getResources(), R.string.about_translators_transifex, R.string.about_translators_transifex_label, R.string.url_translations);
3541
return binding.getRoot();
3642
}
43+
44+
@Override
45+
public void applyBrand(int color) {
46+
final var util = BrandingUtil.of(color, requireContext());
47+
util.platform.colorTextView(binding.aboutNotesHeadline, ColorRole.ON_SURFACE);
48+
util.platform.colorTextView(binding.aboutVersionHeadline);
49+
util.platform.colorTextView(binding.aboutVersion, ColorRole.ON_SURFACE_VARIANT);
50+
util.platform.colorTextView(binding.aboutDevelopersHeadline);
51+
util.platform.colorTextView(binding.aboutDevelopers, ColorRole.ON_SURFACE_VARIANT);
52+
util.platform.colorTextView(binding.aboutMaintainerHeadline);
53+
util.platform.colorTextView(binding.aboutMaintainer, ColorRole.ON_SURFACE_VARIANT);
54+
util.platform.colorTextView(binding.aboutTranslatorsHeadline);
55+
util.platform.colorTextView(binding.aboutTranslators, ColorRole.ON_SURFACE_VARIANT);
56+
util.platform.colorTextView(binding.aboutTestersHeadline);
57+
util.platform.colorTextView(binding.aboutTesters, ColorRole.ON_SURFACE_VARIANT);
58+
}
3759
}

‎app/src/main/java/it/niedermann/owncloud/notes/about/AboutFragmentLicenseTab.java‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
import androidx.annotation.NonNull;
2323
import androidx.core.graphics.drawable.DrawableCompat;
2424

25+
import com.nextcloud.android.common.ui.theme.utils.ColorRole;
26+
2527
import it.niedermann.android.util.ColorUtil;
2628
import it.niedermann.owncloud.notes.R;
2729
import it.niedermann.owncloud.notes.branding.BrandedFragment;
@@ -45,5 +47,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
4547
public void applyBrand(int color) {
4648
final var util = BrandingUtil.of(color, requireContext());
4749
util.material.colorMaterialButtonPrimaryFilled(binding.aboutAppLicenseButton);
50+
util.platform.colorTextView(binding.aboutAppLicenseHeadline);
51+
util.platform.colorTextView(binding.aboutAppLicense, ColorRole.ON_SURFACE_VARIANT);
52+
util.platform.colorTextView(binding.aboutIconsDisclaimerHeadline);
53+
util.platform.colorTextView(binding.aboutIconsDisclaimerMdiIcons, ColorRole.ON_SURFACE_VARIANT);
54+
util.platform.colorTextView(binding.aboutIconsDisclaimerAppIcon, ColorRole.ON_SURFACE_VARIANT);
4855
}
4956
}

‎app/src/main/res/layout/fragment_about_contribution_tab.xml‎

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
~ Nextcloud Notes - Android Client
44
~
5-
~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
5+
~ SPDX-FileCopyrightText: 2016-2025 Nextcloud GmbH and Nextcloud contributors
66
~ SPDX-License-Identifier: GPL-3.0-or-later
77
-->
88
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -16,45 +16,47 @@
1616
android:padding="@dimen/spacer_2x">
1717

1818
<TextView
19-
style="?android:attr/listSeparatorTextViewStyle"
19+
android:id="@+id/about_source_headline"
2020
android:layout_width="match_parent"
2121
android:layout_height="wrap_content"
22-
android:text="@string/about_source_title" />
22+
android:text="@string/about_source_title"
23+
android:textStyle="bold" />
2324

2425
<TextView
2526
android:id="@+id/about_source"
26-
style="?android:attr/editTextPreferenceStyle"
2727
android:layout_width="match_parent"
2828
android:layout_height="wrap_content"
29-
android:padding="10dp"
29+
android:paddingTop="@dimen/spacer_1x"
3030
android:text="@string/about_source" />
3131

3232
<TextView
33-
style="?android:attr/listSeparatorTextViewStyle"
33+
android:id="@+id/about_issues_headline"
3434
android:layout_width="match_parent"
3535
android:layout_height="wrap_content"
36-
android:text="@string/about_issues_title" />
36+
android:layout_marginTop="@dimen/spacer_2x"
37+
android:text="@string/about_issues_title"
38+
android:textStyle="bold" />
3739

3840
<TextView
3941
android:id="@+id/about_issues"
40-
style="?android:attr/editTextPreferenceStyle"
4142
android:layout_width="match_parent"
4243
android:layout_height="wrap_content"
43-
android:padding="10dp"
44+
android:paddingTop="@dimen/spacer_1x"
4445
android:text="@string/about_issues" />
4546

4647
<TextView
47-
style="?android:attr/listSeparatorTextViewStyle"
48+
android:id="@+id/about_translate_headline"
4849
android:layout_width="match_parent"
4950
android:layout_height="wrap_content"
50-
android:text="@string/about_translate_title" />
51+
android:layout_marginTop="@dimen/spacer_2x"
52+
android:text="@string/about_translate_title"
53+
android:textStyle="bold" />
5154

5255
<TextView
5356
android:id="@+id/about_translate"
54-
style="?android:attr/editTextPreferenceStyle"
5557
android:layout_width="match_parent"
5658
android:layout_height="wrap_content"
57-
android:padding="10dp"
59+
android:paddingTop="@dimen/spacer_1x"
5860
android:text="@string/about_translate" />
5961
</LinearLayout>
60-
</ScrollView>
62+
</ScrollView>

‎app/src/main/res/layout/fragment_about_credits_tab.xml‎

Lines changed: 29 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
~ Nextcloud Notes - Android Client
44
~
5-
~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
5+
~ SPDX-FileCopyrightText: 2016-2025 Nextcloud GmbH and Nextcloud contributors
66
~ SPDX-License-Identifier: GPL-3.0-or-later
77
-->
88
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -17,83 +17,87 @@
1717
android:padding="@dimen/spacer_2x">
1818

1919
<TextView
20+
android:id="@+id/about_notes_headline"
2021
android:layout_width="wrap_content"
2122
android:layout_height="wrap_content"
2223
android:layout_gravity="center"
23-
android:layout_marginVertical="30dp"
24+
android:layout_marginVertical="@dimen/spacer_3x"
2425
android:text="@string/app_name"
25-
android:textAppearance="?android:attr/textAppearanceMedium"
26-
android:textColor="@color/fg_default_low"
2726
android:textSize="26sp"
2827
app:drawableTopCompat="@mipmap/ic_launcher" />
2928

3029
<TextView
31-
style="?android:attr/listSeparatorTextViewStyle"
30+
android:id="@+id/about_version_headline"
3231
android:layout_width="match_parent"
3332
android:layout_height="wrap_content"
34-
android:text="@string/about_version_title" />
33+
android:text="@string/about_version_title"
34+
android:textStyle="bold" />
3535

3636
<TextView
3737
android:id="@+id/about_version"
38-
style="?android:attr/editTextPreferenceStyle"
39-
android:layout_width="wrap_content"
38+
android:layout_width="match_parent"
4039
android:layout_height="wrap_content"
41-
android:padding="10dp"
40+
android:paddingTop="@dimen/spacer_1x"
4241
android:text="@string/about_version" />
4342

4443
<TextView
45-
style="?android:attr/listSeparatorTextViewStyle"
44+
android:id="@+id/about_maintainer_headline"
4645
android:layout_width="match_parent"
4746
android:layout_height="wrap_content"
48-
android:text="@string/about_maintainer_title" />
47+
android:layout_marginTop="@dimen/spacer_2x"
48+
android:text="@string/about_maintainer_title"
49+
android:textStyle="bold" />
4950

5051
<TextView
5152
android:id="@+id/about_maintainer"
52-
style="?android:attr/editTextPreferenceStyle"
5353
android:layout_width="match_parent"
5454
android:layout_height="wrap_content"
55-
android:padding="10dp"
55+
android:paddingTop="@dimen/spacer_1x"
5656
android:text="@string/about_maintainer" />
5757

5858
<TextView
59-
style="?android:attr/listSeparatorTextViewStyle"
59+
android:id="@+id/about_developers_headline"
6060
android:layout_width="match_parent"
6161
android:layout_height="wrap_content"
62-
android:text="@string/about_developers_title" />
62+
android:layout_marginTop="@dimen/spacer_2x"
63+
android:text="@string/about_developers_title"
64+
android:textStyle="bold" />
6365

6466
<TextView
6567
android:id="@+id/about_developers"
66-
style="?android:attr/editTextPreferenceStyle"
6768
android:layout_width="match_parent"
6869
android:layout_height="wrap_content"
69-
android:padding="10dp"
70+
android:paddingTop="@dimen/spacer_1x"
7071
android:text="@string/about_developers" />
7172

7273
<TextView
73-
style="?android:attr/listSeparatorTextViewStyle"
74+
android:id="@+id/about_translators_headline"
7475
android:layout_width="match_parent"
7576
android:layout_height="wrap_content"
76-
android:text="@string/about_translators_title" />
77+
android:layout_marginTop="@dimen/spacer_2x"
78+
android:text="@string/about_translators_title"
79+
android:textStyle="bold" />
7780

7881
<TextView
7982
android:id="@+id/about_translators"
80-
style="?android:attr/editTextPreferenceStyle"
8183
android:layout_width="match_parent"
8284
android:layout_height="wrap_content"
83-
android:padding="10dp"
85+
android:paddingTop="@dimen/spacer_1x"
8486
android:text="@string/about_translators_transifex" />
8587

8688
<TextView
87-
style="?android:attr/listSeparatorTextViewStyle"
89+
android:id="@+id/about_testers_headline"
8890
android:layout_width="match_parent"
8991
android:layout_height="wrap_content"
90-
android:text="@string/about_testers_title" />
92+
android:layout_marginTop="@dimen/spacer_2x"
93+
android:text="@string/about_testers_title"
94+
android:textStyle="bold" />
9195

9296
<TextView
93-
style="?android:attr/editTextPreferenceStyle"
97+
android:id="@+id/about_testers"
9498
android:layout_width="match_parent"
9599
android:layout_height="wrap_content"
96-
android:padding="10dp"
100+
android:paddingTop="@dimen/spacer_1x"
97101
android:text="@string/about_testers" />
98102
</LinearLayout>
99103
</ScrollView>

‎app/src/main/res/layout/fragment_about_license_tab.xml‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<!--
33
~ Nextcloud Notes - Android Client
44
~
5-
~ SPDX-FileCopyrightText: 2016-2024 Nextcloud GmbH and Nextcloud contributors
5+
~ SPDX-FileCopyrightText: 2016-2025 Nextcloud GmbH and Nextcloud contributors
66
~ SPDX-License-Identifier: GPL-3.0-or-later
77
-->
88
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
@@ -17,16 +17,17 @@
1717
android:padding="@dimen/spacer_2x">
1818

1919
<TextView
20-
style="?android:attr/listSeparatorTextViewStyle"
20+
android:id="@+id/about_app_license_headline"
2121
android:layout_width="match_parent"
2222
android:layout_height="wrap_content"
23-
android:text="@string/about_app_license_title" />
23+
android:text="@string/about_app_license_title"
24+
android:textStyle="bold" />
2425

2526
<TextView
26-
style="?android:attr/editTextPreferenceStyle"
27+
android:id="@+id/about_app_license"
2728
android:layout_width="match_parent"
2829
android:layout_height="wrap_content"
29-
android:padding="10dp"
30+
android:paddingVertical="@dimen/spacer_1x"
3031
android:text="@string/about_app_license" />
3132

3233
<com.google.android.material.button.MaterialButton
@@ -38,24 +39,25 @@
3839
app:backgroundTint="@color/defaultBrand" />
3940

4041
<TextView
41-
style="?android:attr/listSeparatorTextViewStyle"
42+
android:id="@+id/about_icons_disclaimer_headline"
4243
android:layout_width="match_parent"
4344
android:layout_height="wrap_content"
4445
android:layout_marginTop="@dimen/spacer_2x"
45-
android:text="@string/about_icons_disclaimer_title" />
46+
android:text="@string/about_icons_disclaimer_title"
47+
android:textStyle="bold" />
4648

4749
<TextView
4850
android:id="@+id/about_icons_disclaimer_app_icon"
4951
android:layout_width="match_parent"
5052
android:layout_height="wrap_content"
51-
android:padding="10dp"
53+
android:paddingTop="@dimen/spacer_1x"
5254
android:text="@string/about_icons_disclaimer_app_icon" />
5355

5456
<TextView
5557
android:id="@+id/about_icons_disclaimer_mdi_icons"
5658
android:layout_width="match_parent"
5759
android:layout_height="wrap_content"
58-
android:padding="10dp"
60+
android:paddingTop="@dimen/spacer_1x"
5961
android:text="@string/about_icons_disclaimer_mdi_icons" />
6062
</LinearLayout>
61-
</ScrollView>
63+
</ScrollView>

0 commit comments

Comments
 (0)