diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index def6e912..1b3277b3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -142,7 +142,7 @@ + android:label="@string/intro_label" /> 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 555bec17..e8adb1b3 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 @@ -59,6 +59,8 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen TextView appVersion; @Bind(R.id.changelog) LinearLayout changelog; + @Bind(R.id.intro) + LinearLayout intro; @Bind(R.id.licenses) LinearLayout licenses; @Bind(R.id.add_to_google_plus_circles) @@ -96,6 +98,8 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen ImageView iconInfo; @Bind(R.id.icon_changelog) ImageView iconChangelog; + @Bind(R.id.icon_intro) + ImageView iconIntro; @Bind(R.id.icon_licenses) ImageView iconLicenses; @Bind(R.id.icon_bug_report) @@ -153,6 +157,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen private void setUpOnClickListeners() { changelog.setOnClickListener(this); + intro.setOnClickListener(this); licenses.setOnClickListener(this); addToGooglePlusCircles.setOnClickListener(this); followOnTwitter.setOnClickListener(this); @@ -175,6 +180,7 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen int iconColor = ColorUtil.resolveColor(this, R.attr.icon_color); iconInfo.setColorFilter(iconColor); iconChangelog.setColorFilter(iconColor); + iconIntro.setColorFilter(iconColor); iconLicenses.setColorFilter(iconColor); iconBugReport.setColorFilter(iconColor); iconGooglePlusCommunity.setColorFilter(iconColor); @@ -212,6 +218,8 @@ public class AboutActivity extends AbsBaseActivity implements View.OnClickListen ChangelogDialog.create().show(getSupportFragmentManager(), "CHANGELOG_DIALOG"); } else if (v == licenses) { showLicenseDialog(); + } else if (v == intro) { + startActivity(new Intent(this, IntroActivity.class)); } else if (v == addToGooglePlusCircles) { openUrl(GOOGLE_PLUS); } else if (v == followOnTwitter) { diff --git a/app/src/main/res/drawable-hdpi/ic_book_open_variant_white_24dp.png b/app/src/main/res/drawable-hdpi/ic_book_open_variant_white_24dp.png new file mode 100644 index 00000000..e5d4e216 Binary files /dev/null and b/app/src/main/res/drawable-hdpi/ic_book_open_variant_white_24dp.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_book_open_variant_white_24dp.png b/app/src/main/res/drawable-mdpi/ic_book_open_variant_white_24dp.png new file mode 100644 index 00000000..89677e04 Binary files /dev/null and b/app/src/main/res/drawable-mdpi/ic_book_open_variant_white_24dp.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_book_open_variant_white_24dp.png b/app/src/main/res/drawable-xhdpi/ic_book_open_variant_white_24dp.png new file mode 100644 index 00000000..1b6b41c6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_book_open_variant_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_book_open_variant_white_24dp.png b/app/src/main/res/drawable-xxhdpi/ic_book_open_variant_white_24dp.png new file mode 100644 index 00000000..f2d1910b Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_book_open_variant_white_24dp.png differ diff --git a/app/src/main/res/drawable-xxxhdpi/ic_book_open_variant_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_book_open_variant_white_24dp.png new file mode 100644 index 00000000..6ed32ea6 Binary files /dev/null and b/app/src/main/res/drawable-xxxhdpi/ic_book_open_variant_white_24dp.png differ diff --git a/app/src/main/res/layout/card_about_app.xml b/app/src/main/res/layout/card_about_app.xml index f224d9cf..3f92f1e6 100644 --- a/app/src/main/res/layout/card_about_app.xml +++ b/app/src/main/res/layout/card_about_app.xml @@ -113,6 +113,37 @@ + + + + + + + + Loading products… Up next Now playing layout - Intro + Introduction Press back again to skip the intro. "Welcome to Phonograph, a beautiful and lightweight music player for Android. " Storage - You can swipe the card in the now playing screen up to reveal to full playing queue. - You can rearrange the playing queue by dragging a song from its track number. + Swipe the card in the now playing screen up to reveal the full playing queue. + Rearrange the playing queue by dragging a song from its track number. The storage permission is required for Phonograph to read your music library.