diff --git a/app/src/main/assets/changelog.html b/app/src/main/assets/changelog.html index 7e375eb2..709a8ea0 100644 --- a/app/src/main/assets/changelog.html +++ b/app/src/main/assets/changelog.html @@ -29,6 +29,7 @@
  1. NEW: Fade album covers in the now playing screen in.
  2. +
  3. FIX: Crash when opening the about section.

Version 0.9.45

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 034fa603..25234000 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 @@ -10,6 +10,7 @@ import android.support.v7.widget.AppCompatButton; import android.support.v7.widget.Toolbar; import android.view.MenuItem; import android.view.View; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -17,6 +18,7 @@ import com.kabouzeid.gramophone.R; 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 butterknife.Bind; import butterknife.ButterKnife; @@ -24,6 +26,7 @@ import butterknife.ButterKnife; /** * @author Karim Abou Zeid (kabouzeid) */ +@SuppressWarnings("FieldCanBeLocal") public class AboutActivity extends AbsBaseActivity implements View.OnClickListener { private static String GOOGLE_PLUS = "https://google.com/+KarimAbouZeid23697"; @@ -83,6 +86,31 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen @Bind(R.id.aleksandar_tesic_google_plus) AppCompatButton aleksandarTesicGooglePlus; + @Bind(R.id.icon_info) + ImageView iconInfo; + @Bind(R.id.icon_changelog) + ImageView iconChangelog; + @Bind(R.id.icon_bug_report) + ImageView iconBugReport; + @Bind(R.id.icon_google_plus_community) + ImageView iconGooglePlusCommunity; + @Bind(R.id.icon_flag) + ImageView iconFlag; + @Bind(R.id.icon_rate) + ImageView iconRate; + @Bind(R.id.icon_donate) + ImageView iconDonate; + @Bind(R.id.icon_author) + ImageView iconAuthor; + @Bind(R.id.icon_google_plus) + ImageView iconGooglePlus; + @Bind(R.id.icon_twitter) + ImageView iconTwitter; + @Bind(R.id.icon_github) + ImageView iconGithub; + @Bind(R.id.icon_website) + ImageView iconWebsite; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -100,6 +128,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen private void setUpViews() { setUpToolbar(); setUpAppVersion(); + setUpIconTint(); setUpOnClickListeners(); } @@ -133,6 +162,21 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen aleksandarTesicGooglePlus.setOnClickListener(this); } + private void setUpIconTint() { + iconInfo.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + iconChangelog.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + iconBugReport.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + iconGooglePlusCommunity.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + iconFlag.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + iconRate.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + iconDonate.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + iconAuthor.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + iconGooglePlus.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + iconTwitter.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + iconGithub.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + iconWebsite.setColorFilter(ColorUtil.resolveColor(this, android.R.attr.textColorSecondary)); + } + @Override public boolean onOptionsItemSelected(@NonNull MenuItem item) { if (item.getItemId() == android.R.id.home) { diff --git a/app/src/main/res/layout/card_about_app.xml b/app/src/main/res/layout/card_about_app.xml index e2cc76cd..146db894 100644 --- a/app/src/main/res/layout/card_about_app.xml +++ b/app/src/main/res/layout/card_about_app.xml @@ -49,11 +49,12 @@ android:paddingLeft="16dp" android:paddingRight="16dp"> - + tools:ignore="ContentDescription" /> - + tools:ignore="ContentDescription" /> - + tools:ignore="ContentDescription" /> - + tools:ignore="ContentDescription" /> - + tools:ignore="ContentDescription" /> - + tools:ignore="ContentDescription" /> - + tools:ignore="ContentDescription" /> @@ -36,11 +37,12 @@ android:paddingLeft="16dp" android:paddingRight="16dp"> - + android:id="@+id/icon_bug_report" + tools:ignore="ContentDescription" /> - + android:id="@+id/icon_google_plus_community" + tools:ignore="ContentDescription" /> - + android:id="@+id/icon_flag" + tools:ignore="ContentDescription" /> - + android:id="@+id/icon_rate" + tools:ignore="ContentDescription" /> - + android:id="@+id/icon_donate" + tools:ignore="ContentDescription" /> -