Merge pull request #70 from lewismcgeary/higher_logo_resolution

add higher resolution logo fixes #65
lewismcgeary · Feb 6, 2016 · c692dc3 · c692dc3
2 parents e260fe5 + 7f40731
commit c692dc3
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/app/src/main/java/io/github/lewismcgeary/androidgameoflife/ExplainRulesActivity.java b/app/src/main/java/io/github/lewismcgeary/androidgameoflife/ExplainRulesActivity.java
@@ -15,7 +15,7 @@ public class ExplainRulesActivity extends AppIntro2 {
 
     @Override
     public void init(@Nullable Bundle savedInstanceState) {
-        CustomAppIntroFragment summaryFragment = CustomAppIntroFragment.newInstance(getString(R.string.rules_summary_title), getString(R.string.rules_summary_text), R.drawable.life_logo_no_shadow_96, ContextCompat.getColor(getApplicationContext(), R.color.rulesViewPagerBackground));
+        CustomAppIntroFragment summaryFragment = CustomAppIntroFragment.newInstance(getString(R.string.rules_summary_title), getString(R.string.rules_summary_text), R.drawable.life_logo_no_shadow_368, ContextCompat.getColor(getApplicationContext(), R.color.rulesViewPagerBackground));
         addSlide(summaryFragment);
         addSlide(AppIntroFragment.newInstance(getString(R.string.rules_fewer_than_two_title), getString(R.string.rules_fewer_than_two_text), R.drawable.rules_fewer_than_two_neighbours, ContextCompat.getColor(getApplicationContext(), R.color.rulesViewPagerBackground)));
         addSlide(AppIntroFragment.newInstance(getString(R.string.rules_two_or_three_title), getString(R.string.rules_two_or_three_text), R.drawable.rules_two_or_three_neighbours, ContextCompat.getColor(getApplicationContext(), R.color.rulesViewPagerBackground)));

diff --git a/app/src/main/res/drawable/life_logo_no_shadow_368.png b/app/src/main/res/drawable/life_logo_no_shadow_368.png
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -54,7 +54,7 @@
         app:layout_scrollFlags="scroll"
         app:layout_behavior="io.github.lewismcgeary.androidgameoflife.ShrinkingLogoBehavior"
         android:elevation="@dimen/tool_bar_elevation"
-        android:src="@drawable/life_logo_no_shadow_96"/>
+        android:src="@drawable/life_logo_no_shadow_368"/>
     <android.support.design.widget.FloatingActionButton
         android:id="@+id/start_reset_fab"
         android:transitionName="@string/fab_transition_name"