From d0a541bc3407f530ab2a7e458ea4930ef20e0c30 Mon Sep 17 00:00:00 2001 From: vanitasvitae Date: Tue, 8 Nov 2016 16:21:06 +0100 Subject: [PATCH] Replaced setTextColor on Buttons with new ThemeHelper method --- .../diaspora_android/activity/AboutActivity.java | 14 +++++++------- .../diaspora_android/activity/MainActivity.java | 2 ++ .../dfa/diaspora_android/ui/theme/ThemeHelper.java | 6 ++++++ 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java index 056a4a2e..2a0f25eb 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java @@ -192,10 +192,10 @@ public class AboutActivity extends ThemedActivity protected void applyColorToViews() { ThemeHelper.getInstance(getAppSettings()); ThemeHelper.updateTextViewLinkColor(spreadText); - contributeBtn.setTextColor(ThemeHelper.getAccentColor()); - feedbackBtn.setTextColor(ThemeHelper.getAccentColor()); - spreadBtn.setTextColor(ThemeHelper.getAccentColor()); - translateBtn.setTextColor(ThemeHelper.getAccentColor()); + ThemeHelper.updateButtonTextColor(contributeBtn); + ThemeHelper.updateButtonTextColor(feedbackBtn); + ThemeHelper.updateButtonTextColor(spreadBtn); + ThemeHelper.updateButtonTextColor(translateBtn); } @Override @@ -311,8 +311,8 @@ public class AboutActivity extends ThemedActivity @Override protected void applyColorToViews() { ThemeHelper.getInstance(getAppSettings()); - leafpicBtn.setTextColor(ThemeHelper.getAccentColor()); - licenseBtn.setTextColor(ThemeHelper.getAccentColor()); + ThemeHelper.updateButtonTextColor(leafpicBtn); + ThemeHelper.updateButtonTextColor(licenseBtn); ThemeHelper.updateTextViewLinkColor(maintainers); ThemeHelper.updateTextViewLinkColor(thirdPartyLibs); } @@ -440,7 +440,7 @@ public class AboutActivity extends ThemedActivity return new AboutFragment(); case 1: //License return new LicenseFragment(); - case 3: //Debug + case 2: //Debug default: return new DebugFragment(); } diff --git a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java index c47f6b5c..b5fb2ac5 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java @@ -34,6 +34,7 @@ import android.support.customtabs.CustomTabsSession; import android.support.design.widget.AppBarLayout; import android.support.design.widget.NavigationView; import android.support.design.widget.Snackbar; +import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.content.LocalBroadcastManager; import android.support.v4.view.GravityCompat; @@ -763,6 +764,7 @@ public class MainActivity extends ThemedActivity View layout = getLayoutInflater().inflate(R.layout.ui__dialog_search__people_tags, null, false); final EditText input = (EditText) layout.findViewById(R.id.dialog_search__input); + ThemeHelper.updateEditTextColor(input); final DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialogInterface, int which) { diff --git a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java index cb8c95a5..4760168e 100644 --- a/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java +++ b/app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java @@ -171,4 +171,10 @@ public class ThemeHelper { } } } + + public static void updateButtonTextColor(Button button) { + if (button != null) { + button.setTextColor(getAccentColor()); + } + } }