vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-22 12:22:08 +01:00
Code Issues Releases Wiki Activity

Replaced setTextColor on Buttons with new ThemeHelper method

Browse source
This commit is contained in:
vanitasvitae 2016-11-08 16:21:06 +01:00
parent 1db57bd957
commit d0a541bc34
Signed by: vanitasvitae
GPG key ID: DCCFB3302C9E4615
3 changed files with 15 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/src/main/java/com/github/dfa/diaspora_android/activity/AboutActivity.java
View file

@ -192,10 +192,10 @@ public class AboutActivity extends ThemedActivity
protected void applyColorToViews() { protected void applyColorToViews() {
ThemeHelper.getInstance(getAppSettings()); ThemeHelper.getInstance(getAppSettings());
ThemeHelper.updateTextViewLinkColor(spreadText); ThemeHelper.updateTextViewLinkColor(spreadText);
contributeBtn.setTextColor(ThemeHelper.getAccentColor()); ThemeHelper.updateButtonTextColor(contributeBtn);
feedbackBtn.setTextColor(ThemeHelper.getAccentColor()); ThemeHelper.updateButtonTextColor(feedbackBtn);
spreadBtn.setTextColor(ThemeHelper.getAccentColor()); ThemeHelper.updateButtonTextColor(spreadBtn);
translateBtn.setTextColor(ThemeHelper.getAccentColor()); ThemeHelper.updateButtonTextColor(translateBtn);
} }
@Override @Override
@ -311,8 +311,8 @@ public class AboutActivity extends ThemedActivity
@Override @Override
protected void applyColorToViews() { protected void applyColorToViews() {
ThemeHelper.getInstance(getAppSettings()); ThemeHelper.getInstance(getAppSettings());
leafpicBtn.setTextColor(ThemeHelper.getAccentColor()); ThemeHelper.updateButtonTextColor(leafpicBtn);
licenseBtn.setTextColor(ThemeHelper.getAccentColor()); ThemeHelper.updateButtonTextColor(licenseBtn);
ThemeHelper.updateTextViewLinkColor(maintainers); ThemeHelper.updateTextViewLinkColor(maintainers);
ThemeHelper.updateTextViewLinkColor(thirdPartyLibs); ThemeHelper.updateTextViewLinkColor(thirdPartyLibs);
} }
@ -440,7 +440,7 @@ public class AboutActivity extends ThemedActivity
return new AboutFragment(); return new AboutFragment();
case 1: //License case 1: //License
return new LicenseFragment(); return new LicenseFragment();
case 3: //Debug case 2: //Debug
default: default:
return new DebugFragment(); return new DebugFragment();
} }

2
app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java
View file

@ -34,6 +34,7 @@ import android.support.customtabs.CustomTabsSession;
import android.support.design.widget.AppBarLayout; import android.support.design.widget.AppBarLayout;
import android.support.design.widget.NavigationView; import android.support.design.widget.NavigationView;
import android.support.design.widget.Snackbar; import android.support.design.widget.Snackbar;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.support.v4.content.LocalBroadcastManager; import android.support.v4.content.LocalBroadcastManager;
import android.support.v4.view.GravityCompat; 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); View layout = getLayoutInflater().inflate(R.layout.ui__dialog_search__people_tags, null, false);
final EditText input = (EditText) layout.findViewById(R.id.dialog_search__input); final EditText input = (EditText) layout.findViewById(R.id.dialog_search__input);
ThemeHelper.updateEditTextColor(input);
final DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() { final DialogInterface.OnClickListener clickListener = new DialogInterface.OnClickListener() {
@Override @Override
public void onClick(DialogInterface dialogInterface, int which) { public void onClick(DialogInterface dialogInterface, int which) {

6
app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java
View file

@ -171,4 +171,10 @@ public class ThemeHelper {
} }
} }
} }
public static void updateButtonTextColor(Button button) {
if (button != null) {
button.setTextColor(getAccentColor());
}
}
} }