From 91f02e89f27f99df3be37cc0f40c02ad4352a40c Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Wed, 30 Dec 2015 17:18:33 +0100
Subject: [PATCH] Added link to the Into activity in the about section. Typos.

---
 app/src/main/AndroidManifest.xml              |   2 +-
 .../ui/activities/AboutActivity.java          |   8 +++++
 .../ic_book_open_variant_white_24dp.png       | Bin 0 -> 418 bytes
 .../ic_book_open_variant_white_24dp.png       | Bin 0 -> 248 bytes
 .../ic_book_open_variant_white_24dp.png       | Bin 0 -> 394 bytes
 .../ic_book_open_variant_white_24dp.png       | Bin 0 -> 575 bytes
 .../ic_book_open_variant_white_24dp.png       | Bin 0 -> 754 bytes
 app/src/main/res/layout/card_about_app.xml    |  31 ++++++++++++++++++
 app/src/main/res/values/strings.xml           |   6 ++--
 9 files changed, 43 insertions(+), 4 deletions(-)
 create mode 100644 app/src/main/res/drawable-hdpi/ic_book_open_variant_white_24dp.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_book_open_variant_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_book_open_variant_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_book_open_variant_white_24dp.png
 create mode 100644 app/src/main/res/drawable-xxxhdpi/ic_book_open_variant_white_24dp.png

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 @@
 
         <activity
             android:name=".ui.activities.IntroActivity"
-            android:label="@string/intro_activity" />
+            android:label="@string/intro_label" />
     </application>
 
 </manifest>
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 0000000000000000000000000000000000000000..e5d4e216acba9fefab12b1cb19262a80e208b2f1
GIT binary patch
literal 418
zcmeAS@N?(olHy`uVBq!ia0y~yU{C>J4mJh`hKCF@W-u@?uqAoByD)&kPv_nB3=9mM
z1s;*b3=9k&VC;4>+YTgHR^XTp(hJ5F?9%-V42-&-E{-7)hu=;!^kX&@aJ?^J#n-&R
ztJ!06hw&T5jE8J5cOHJmqoT=hQ9)|UBOT4~`AX9aw6o`?h_Q0oXKwv=!}!;%!jB6B
zH2xT`k)B|}w$8Xx_ri>uR;3!5TyvNg`^+^ru70^!@nziZVD(S0Z9hG~`$ssvUE6cB
z#~Gd#Hmv@|x~xIEvKwVjitLzLBKRo$;eIx$ZHwP-Iz9QvGUH8^&+?{9I6qzaUTWq{
z-G)$+sMZ??EA9&%sNRyd=V+V2md<N$4~DXdm}s~L2!^nTIv#&^p7Yer{*6m^yWDv!
zQN7mP?}AE=r;2XFdA~Ks5-$}s6@?rK-ZGzY`n)F1$@YwSMwJ_r?=Yk*-fP=zcU<Cg
zPFnxDWq$<rZ%_VHs-mlG=$&u-UYe<b!S2wnuPg3qiZtk7`TJ|u!8)ZQps@CI^>bP0
Hl+XkK3-F@z

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..89677e0421ede9f25ef1d5f700f93de88d3d4aa6
GIT binary patch
literal 248
zcmeAS@N?(olHy`uVBq!ia0y~yV2}V|4mJh`h6m-gKNuJo*pj^6T^PXNr}OT51_lPs
z0*}aI1_lNXFm^kcZ3hx8D{xE)=>_8opQXzf7#Ny8T^vI^j=!C9koSNB4>NDE0$b9b
zzJOirzaI)-bjVbRJG)oFu<Xd;hR^yI&r~8?)@`vC^=9x4Te#YI;g_DMfENrC7-bGU
zV3;6!_m((sny1dpef#2tBAyA({>Z?8LnPs?(pl{<$0n!hF?d?q`?}^Hsaw!^&DCjD
j*~KDt-hFSkcFPExUt(g?JbU@Q1;_`Uu6{1-oD!M<757oe

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..1b6b41c6670eff9f1bbb264578cc210bbc18e068
GIT binary patch
literal 394
zcmeAS@N?(olHy`uVBq!ia0y~yU@!n-4mJh`hH$2z?F<YIY)RhkE(~Ds(|LD20|NtR
zfk$L90|SEx7`vU!wgU;46*#7Y^n&rZcRk?@42+_lE{-7?_ukI1=4&<(a7n++uJWp&
zZBAQu;e<PC;T$WKTe*Ftx;k#0Fq`jdxZWgfuYa5dn}8FC;t}~nHExs4C%tt#TXxI%
znOOhTEvk)9-^CkN&$Lbds>kq-Vb-KYX<~1_hSa$SN-@+X?A6b$3)K0RaFmzfKt|fv
zHTR?)LhoceVOzB1+=J`?j8FDGNlu(1e|g^LYtQq;8d98#I85v(_{b@mH@>{9r*PqI
zVcjS53C7JT+6?b+7UiZT_c@&Uxtl}g=Rdjq7o8_Im<xSyW4h;YK$^2cnK57Gf$ydR
z7k36^#qWOV#L#xLiu<V(<Hj4!TXzc7885gHRke8M&H%mW=T3P!Q@Ja>*PLtJ!@8=$
g;o~1}#UuYeF_uf%^7lVld>Ry{p00i_>zopr0Lc8A+5i9m

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..f2d1910b120fe9afe0b1f132c3c81187e72c5b32
GIT binary patch
literal 575
zcmeAS@N?(olHy`uVBq!ia0y~yVDJE84mJh`hS0a0-5D4d*pj^6T^PXNr}OT51_lPs
z0*}aIkTNiKJDF_<5-cllOa}{q%s5y1ft7)Q@sy{FV@SoVx3|vv$~X!f{a9bf;GN;w
zAaUVcFK-iz0>hEcm@_8@Z*W?$KbbA4>A<Apu{%bN{rtgACc$UVZU0(#{oc!0RhN9^
zw;ebG0dMvTsoGCk()VgFWB&pE2hlEj#IM=2<TZFd;IVkO<Y&j0{|lLa-OhiYq%?2x
zt>p*&6Rv(`TqY-QfVn_UaQCcT?g#V}Zn}S*)WBDjwdab^j=YHd%a#{-^~wqyxH>Pp
zS>m@S^9`3Hp1ya*6D~%7W?dg4c=bl|{AAB;&v@0hA$j4po2PwwDZOU(XZ|RMOJ0|P
z9WDGPg#}yxS724qRn3(?bki&A@5Fhz4p;A$^D^G;t^KEYC+Yt87-^T)(QCS+9WF6d
ztc<kl?C@nb{bu+71*326f6YBflb<yR@o79HnYgI6py^<9{a&wK(@R#{7q>4h<y)Qp
zZndr5Qs4f`GXisdCHv0{d?It>+M4=<#$EFQ&s4Y>Zd_Q$w=r{V?dRCD8fC7^XEn}E
zVw)2<N0--Ru|>92f?MIWRqws#e!cNrdhQZeXNSFa6VgCnZ4JYh4!5879FmJc3Bl9V
K&t;ucLK6UYhwzF3

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..6ed32ea6c0504dfa1e93715059ba0041bc6a8fa9
GIT binary patch
literal 754
zcmeAS@N?(olHy`uVBq!ia0y~yU`POA4mJh`hDS5XEf^RW*pj^6T^PXNr}OT51_lPs
z0*}aI1_lNXFm^kcZ3hx8D{xE)=>_A8+c&>3Ffi46x;TbZ+<JS*Fi+S~;^@c!DjL2b
zeGM;oh1v~7k9TNrunMs&@(Q_5NnWDV?y%{yyG)}->%=pQZ<w+&RhHZCzTfk=?(3U(
z=AUi8?YO~z1_k8AFWo2Zap{DqEz|b{x&>2%cHMrOHYx2ubON6ZyWepgyQNpEeSiC9
zcx8LeSDnkV;`5TdWwxmY_cBWh9azEn|F-T2wWVJ+zkbAQZZiLu=hwT8?!n>~7i4z4
zG5j~F;i&wgX|fC(*y5H>nHK%3nz4qtPr2*Pby<e9P4mhn%Ka`p;tvdFU|4V5tLc`@
zXmi?RnZ(U{<}zD$Z>y!2>(6JNd%s!sc?EmS#W_pf1$*^dUo(I8$69p4XPG@uBi$$6
z^N!-Rn6&;@_U3n=G@r-&Fiv`A>m1=J^;Dv20^^qRdtV41IJ)nw{T>F-<CDZ>#p)F^
zw<Kr0`x#!$<)yi{@im|G`r8{rSEw~yyY7?R6&THMALNX}|IB=Ee{Ox-u=g=TlVw8!
zpTZ1gj%QS2`WM|dI9#0+`knjL>Mv=s`y2ER9QR#4Yn{Hwip<E*oE67gtoOd>mRicb
z;p6i7fawfR>Kt$GjKAP^fv;g(yugMVM(<SLiJNeJ=hixK?<@DJm)aZ;7%fg4q?s(<
zzFKnjl3-6`Pk9yHYLgc~=BHM#pE)be<=RxPH{vA|LIU<LXkO~{i&a)f^pd{D_N;yK
z-?zpGgx;Eb#%y<4<eZSu^f1r#1O2*(=PjEew<z1x7z%#h&NoP0SRU~CNeL+Jdb;|#
JtaD0e0sx1_JdOYW

literal 0
HcmV?d00001

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 @@
 
         </LinearLayout>
 
+        <LinearLayout
+            android:id="@+id/intro"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:background="?rect_selector"
+            android:clickable="true"
+            android:gravity="center_vertical"
+            android:minHeight="@dimen/md_listitem_height"
+            android:orientation="horizontal"
+            android:paddingLeft="16dp"
+            android:paddingRight="16dp">
+
+            <ImageView
+                android:id="@+id/icon_intro"
+                android:layout_width="24dp"
+                android:layout_height="24dp"
+                android:src="@drawable/ic_book_open_variant_white_24dp"
+                tools:ignore="ContentDescription" />
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="32dp"
+                android:layout_marginStart="32dp"
+                android:paddingBottom="8dp"
+                android:paddingTop="8dp"
+                android:text="@string/intro_label"
+                android:textAppearance="@style/TextAppearance.AppCompat.Subhead" />
+
+        </LinearLayout>
+
         <LinearLayout
             android:id="@+id/licenses"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e66fe4e2..e6443c6d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -214,11 +214,11 @@
     <string name="loading_products">Loading products…</string>
     <string name="up_next">Up next</string>
     <string name="pref_title_now_playing_layout">Now playing layout</string>
-    <string name="intro_activity">Intro</string>
+    <string name="intro_label">Introduction</string>
     <string name="press_back_again_to_exit_intro">Press back again to skip the intro.</string>
     <string name="welcome_to_phonograph">"Welcome to Phonograph, a beautiful and lightweight music player for Android. "</string>
     <string name="label_storage">Storage</string>
-    <string name="open_playing_queue_instruction">You can swipe the card in the now playing screen up to reveal to full playing queue.</string>
-    <string name="rearrange_playing_queue_instruction">You can rearrange the playing queue by dragging a song from its track number.</string>
+    <string name="open_playing_queue_instruction">Swipe the card in the now playing screen up to reveal the full playing queue.</string>
+    <string name="rearrange_playing_queue_instruction">Rearrange the playing queue by dragging a song from its track number.</string>
     <string name="storage_permission_explaination">The storage permission is required for Phonograph to read your music library.</string>
 </resources>