From 55f8800f8922273db4cc2541a3cef40d75eac90e Mon Sep 17 00:00:00 2001 From: Karim Abou Zeid Date: Tue, 22 Sep 2015 13:46:32 +0200 Subject: [PATCH] Fixed kabouzeid/phonograph-issue-tracker#29, toolbar text is white in about section while using light themes. --- .../kabouzeid/gramophone/ui/activities/AboutActivity.java | 8 ++++++++ .../main/java/com/kabouzeid/gramophone/util/ViewUtil.java | 3 +++ 2 files changed, 11 insertions(+) diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java index 25234000..c2d5b5be 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java +++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/AboutActivity.java @@ -8,6 +8,7 @@ import android.os.Bundle; import android.support.annotation.NonNull; import android.support.v7.widget.AppCompatButton; import android.support.v7.widget.Toolbar; +import android.view.Menu; import android.view.MenuItem; import android.view.View; import android.widget.ImageView; @@ -19,6 +20,7 @@ import com.kabouzeid.gramophone.dialogs.ChangelogDialog; import com.kabouzeid.gramophone.dialogs.DonationDialog; import com.kabouzeid.gramophone.ui.activities.base.AbsBaseActivity; import com.kabouzeid.gramophone.util.ColorUtil; +import com.kabouzeid.gramophone.util.ViewUtil; import butterknife.Bind; import butterknife.ButterKnife; @@ -238,4 +240,10 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen i.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); startActivity(i); } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + ViewUtil.setToolbarContentColorForBackground(this, toolbar, getThemeColorPrimary()); + return super.onCreateOptionsMenu(menu); + } } diff --git a/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java index 6736af16..9bd6fd47 100644 --- a/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java +++ b/app/src/main/java/com/kabouzeid/gramophone/util/ViewUtil.java @@ -146,6 +146,9 @@ public class ViewUtil { }); } + /** + * Call this in {@link android.app.Activity#onCreateOptionsMenu(Menu)} and everywhere where the toolbar color is changed. + */ public static void setToolbarContentColorForBackground(@NonNull Context context, @Nullable Toolbar toolbar, @ColorInt final int backgroundColor) { ViewUtil.setToolbarContentDark(context, toolbar, ColorUtil.useDarkTextColorOnBackground(backgroundColor)); }