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 index 25b136954..408b65783 100644 --- 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,7 +10,6 @@ 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; @@ -18,18 +17,34 @@ 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); + } } \ No newline at end of file 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 index c0789268a..8cca2ce05 100644 --- 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 index a69f15387..5dc1b2f41 100644 --- 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); } } \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_about_contribution_tab.xml b/app/src/main/res/layout/fragment_about_contribution_tab.xml index 32e1da341..1baf02564 100644 --- 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 @@ + android:text="@string/about_source_title" + android:textStyle="bold" /> + android:layout_marginTop="@dimen/spacer_2x" + android:text="@string/about_issues_title" + android:textStyle="bold" /> + android:layout_marginTop="@dimen/spacer_2x" + android:text="@string/about_translate_title" + android:textStyle="bold" /> - \ No newline at end of file + diff --git a/app/src/main/res/layout/fragment_about_credits_tab.xml b/app/src/main/res/layout/fragment_about_credits_tab.xml index 9c1929836..5353aedb2 100644 --- 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 @@ + android:text="@string/about_version_title" + android:textStyle="bold" /> + android:layout_marginTop="@dimen/spacer_2x" + android:text="@string/about_maintainer_title" + android:textStyle="bold" /> + android:layout_marginTop="@dimen/spacer_2x" + android:text="@string/about_developers_title" + android:textStyle="bold" /> + android:layout_marginTop="@dimen/spacer_2x" + android:text="@string/about_translators_title" + android:textStyle="bold" /> + android:layout_marginTop="@dimen/spacer_2x" + android:text="@string/about_testers_title" + android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fragment_about_license_tab.xml b/app/src/main/res/layout/fragment_about_license_tab.xml index b7480f89b..d9f664079 100644 --- 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 @@ + android:text="@string/about_app_license_title" + android:textStyle="bold" /> + android:text="@string/about_icons_disclaimer_title" + android:textStyle="bold" /> - \ No newline at end of file +