Spike/issue 103/prepare for beta release (#104)

Issue-103 - added new logo and fixed final issues

app/build.gradle

@@ -15,8 +15,8 @@ android {
         applicationId "com.github.goldy1992.mp3player"
         minSdkVersion MARSHMALLOW
         targetSdkVersion OREO
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         javaCompileOptions {
             annotationProcessorOptions {
@@ -31,8 +31,7 @@ android {
 
     buildTypes {
         release {
-            testCoverageEnabled = true
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
@@ -46,12 +45,12 @@ android {
         full {
             applicationIdSuffix ".full"
             versionNameSuffix "-full"
-            resValue "string", "app_name", "MP3 Player"
+            resValue "string", "app_name", "Music Player"
         }
         automation {
             applicationIdSuffix ".automation"
             versionNameSuffix "-automation"
-            resValue "string", "app_name", "Test Mp3 Player"
+            resValue "string", "app_name", "Test Music Player"
 
         }
     }
@@ -146,7 +145,6 @@ dependencies {
     implementation group: 'org.apache.commons', name: 'commons-lang3', version: COMMONS_LANG_VERSION
     implementation group: 'org.apache.commons', name: 'commons-collections4', version: COMMONS_COLLECTIONS4_VERSION
     implementation group: 'com.google.guava', name: 'guava', version: GOOGLE_GUAVA_VERSION
-    implementation group: 'androidx.test', name: 'core', version: TEST_CORE_VERSION
     implementation group: 'com.google.android.exoplayer', name: 'exoplayer-core', version: EXO_PLAYER_VERSION
     implementation group: 'com.google.android.exoplayer', name: 'exoplayer-ui', version: EXO_PLAYER_VERSION
     implementation group: 'com.google.android.exoplayer', name: 'extension-mediasession', version: EXO_PLAYER_VERSION

app/proguard-rules.pro

@@ -23,3 +23,11 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+-assumenosideeffects class android.util.Log {
+  public static *** v(...);
+  public static *** d(...);
+  public static *** i(...);
+  public static *** w(...);
+  public static *** e(...);
+}

app/src/main/AndroidManifest.xml

@@ -13,7 +13,7 @@
         android:name=".MikesMp3Player"
         android:allowBackup="true"
         android:fullBackupContent="true"
-        android:icon="@mipmap/my_app_icon"
+        android:icon="@mipmap/headphone_icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.Orange">

app/src/main/java/com/github/goldy1992/mp3player/client/views/fragments/SearchFragment.java

@@ -20,6 +20,7 @@
 import androidx.annotation.VisibleForTesting;
 import androidx.appcompat.widget.SearchView;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 
 import com.github.goldy1992.mp3player.LogTagger;
 import com.github.goldy1992.mp3player.R;
@@ -83,7 +84,10 @@ public void onClickOnLayout(View view) {
     public void onFocusChange(View v, boolean queryTextFocused) {
         Log.i("tag", "focus changed: has focus: " + queryTextFocused);
         if (!queryTextFocused) {
-            getFragmentManager().popBackStack();
+            FragmentManager fragmentManager = getFragmentManager();
+            if (null != fragmentManager && !fragmentManager.isDestroyed()) {
+                fragmentManager.popBackStack();
+            }
         }
     }
     @Override

app/src/main/res/layout/nav_header.xml

@@ -2,17 +2,26 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="192dp"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:padding="16dp"
     android:theme="@style/ThemeOverlay.AppCompat.Light"
     android:orientation="vertical"
-    android:gravity="bottom"
+    android:gravity="center"
     android:background="?themeColorPrimary">
 
+    <ImageView
+        android:id="@+id/imageView"
+        android:layout_width="match_parent"
+        android:contentDescription="@string/LOGO_DESCRIPTION"
+        android:layout_height="wrap_content"
+        app:srcCompat="@mipmap/headphone_icon" />
 
     <TextView
+        android:paddingTop="@dimen/default_gap"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
-        />
+        android:text="@string/menu"
+        android:textAlignment="center"
+        android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
 
 </LinearLayout>

app/src/main/res/layout/splash_screen.xml

@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:contentDescription="@string/LOGO_DESCRIPTION"
         android:layout_height="wrap_content"
-        app:srcCompat="@mipmap/my_app_icon" />
+        app:srcCompat="@mipmap/headphone_icon" />
     <View
         android:layout_width="match_parent"
         android:layout_height="10dp"

app/src/main/res/menu/themes_menu.xml

@@ -6,10 +6,10 @@
     <group android:checkableBehavior="single" android:menuCategory="container"
         android:orderInCategory="1">
 
-        <item android:id="@+id/action_settings"
-            android:orderInCategory="1"
-            android:title="@string/action_settings"
-            app:showAsAction="never" />
+<!--        <item android:id="@+id/action_settings"-->
+<!--            android:orderInCategory="1"-->
+<!--            android:title="@string/action_settings"-->
+<!--            app:showAsAction="never" />-->
 
         <item android:id="@+id/themes_menu_item"
             android:title="Themes"

app/src/main/res/mipmap-anydpi-v26/headphone_icon.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/headphone_icon_background"/>
+    <foreground android:drawable="@mipmap/headphone_icon_foreground"/>
+</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/headphone_icon_round.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/headphone_icon_background"/>
+    <foreground android:drawable="@mipmap/headphone_icon_foreground"/>
+</adaptive-icon>

app/src/main/res/values/headphone_icon_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="headphone_icon_background">#FFFFFF</color>
+</resources>

app/src/main/res/values/strings.xml

@@ -13,14 +13,15 @@
     <string name="PLAYBACK_SPEED_DEFAULT_VALUE">1.00x</string>
     <string name="SEARCH_BUTTON_DESCRIPT">Search for an audio track</string>
     <string name="LOGO_DESCRIPTION">The title logo</string>
-    <string name="APP_TITLE">Mike\'s MP3 Player</string>
+    <string name="APP_TITLE">Music Player</string>
     <string name="APP_TITLE_H1"><![CDATA[<h1>Mike\'s MP3 Player</h1>]]></string>
     <string name="FOLDER_NAME">%1$s</string>
     <string name="FOLDER_PATH"></string>
     <string name="NO_MEDIA_FOUND">No audio tracks found on your device.</string>
     <string name="search_hint">Search media</string>
     <string name="notification_channel_name">channel_name</string>
     <string name="channel_description">channel description</string>
+    <string name="menu">Menu</string>
     <!-- THEME NAMES !-->
     <string name="THEME_BLUE">Blue</string>
     <string name="THEME_ORANGE">Orange</string>

app/src/test/resources/AndroidManifest.xml

@@ -6,7 +6,7 @@
         android:name=".MikesMp3Player"
         android:allowBackup="true"
         android:fullBackupContent="true"
-        android:icon="@mipmap/my_app_icon"
+        android:icon="@mipmap/headphone_icon"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.Orange" />