From 15fe7947cb674200a937654338648a4d6ce146a9 Mon Sep 17 00:00:00 2001
From: Karim Abou Zeid <karim23697@gmail.com>
Date: Mon, 28 Mar 2016 13:07:54 +0200
Subject: [PATCH] Made the Intro a bit prettier.

---
 .../ui/activities/intro/AppIntroActivity.java | 33 ++++---------------
 .../res/drawable/ic_folder_white_144dp.xml    |  9 -----
 app/src/main/res/values/strings.xml           |  2 --
 3 files changed, 6 insertions(+), 38 deletions(-)
 delete mode 100644 app/src/main/res/drawable/ic_folder_white_144dp.xml

diff --git a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java
index 2f13f0db..f26dad9c 100644
--- a/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java
+++ b/app/src/main/java/com/kabouzeid/gramophone/ui/activities/intro/AppIntroActivity.java
@@ -1,8 +1,5 @@
 package com.kabouzeid.gramophone.ui.activities.intro;
 
-import android.Manifest;
-import android.content.pm.PackageManager;
-import android.os.Build;
 import android.os.Bundle;
 
 import com.heinrichreimersoftware.materialintro.app.IntroActivity;
@@ -21,40 +18,22 @@ public class AppIntroActivity extends IntroActivity {
                 .title(R.string.app_name)
                 .description(R.string.welcome_to_phonograph)
                 .image(R.drawable.icon_web)
-                .background(R.color.md_blue_grey_500)
-                .backgroundDark(R.color.md_blue_grey_600)
+                .background(R.color.md_amber_500)
+                .backgroundDark(R.color.md_amber_600)
                 .build());
         addSlide(new PhonographSimpleSlide.Builder()
                 .title(R.string.label_playing_queue)
                 .description(R.string.open_playing_queue_instruction)
                 .image(R.drawable.tutorial_queue_swipe_up)
-                .background(R.color.md_purple_500)
-                .backgroundDark(R.color.md_purple_600)
+                .background(R.color.md_deep_purple_500)
+                .backgroundDark(R.color.md_deep_purple_600)
                 .build());
         addSlide(new PhonographSimpleSlide.Builder()
                 .title(R.string.label_playing_queue)
                 .description(R.string.rearrange_playing_queue_instruction)
                 .image(R.drawable.tutorial_rearrange_queue)
-                .background(R.color.md_deep_purple_500)
-                .backgroundDark(R.color.md_deep_purple_600)
+                .background(R.color.md_indigo_500)
+                .backgroundDark(R.color.md_indigo_600)
                 .build());
-
-        if (!hasExternalStoragePermission()) {
-            addSlide(new PhonographSimpleSlide.Builder()
-                    .title(R.string.label_storage)
-                    .description(R.string.storage_permission_explaination)
-                    .image(R.drawable.ic_folder_white_144dp)
-                    .background(R.color.md_indigo_500)
-                    .backgroundDark(R.color.md_indigo_600)
-                    .build());
-        }
-    }
-
-    private boolean hasExternalStoragePermission() {
-        //noinspection SimplifiableIfStatement
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
-            return checkSelfPermission(Manifest.permission.READ_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED && checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED;
-        }
-        return true;
     }
 }
diff --git a/app/src/main/res/drawable/ic_folder_white_144dp.xml b/app/src/main/res/drawable/ic_folder_white_144dp.xml
deleted file mode 100644
index 3929ff61..00000000
--- a/app/src/main/res/drawable/ic_folder_white_144dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="144dp"
-    android:height="144dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M10,4H4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V8c0,-1.1 -0.9,-2 -2,-2h-8l-2,-2z" />
-</vector>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 8df03601..49492342 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -231,10 +231,8 @@
     <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">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">Phonograph will ask you to grant the external storage permission now. The permission is required in order to read your music library.</string>
     <string name="library">Library</string>
     <string name="folders">Folders</string>
     <string name="saved_playlist_to">Saved playlist to %s.</string>