change close to down icon

2019-06-23 22:37:33 +05:30 · 2019-06-23 22:37:33 +05:30 · 7c00c1b39a
commit 7c00c1b39a
parent 14a113e73f
28 changed files with 69 additions and 65 deletions
--- a/app/src/main/res/layout-land/fragment_blur.xml
+++ b/app/src/main/res/layout-land/fragment_blur.xml
@ -84,8 +84,8 @@
                            android:id="@+id/playerToolbar"
                            style="@style/Toolbar"
                            android:layout_height="48dp"
-                            android:navigationIcon="@drawable/ic_close_white_24dp"
-                            app:navigationIcon="@drawable/ic_close_white_24dp" />
+                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
                    </FrameLayout>
                </LinearLayout>
            </LinearLayout>
--- a/app/src/main/res/layout-land/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout-land/fragment_card_blur_player.xml
@ -50,7 +50,7 @@
                    app:contentInsetLeft="0dp"
                    app:contentInsetStart="0dp"
                    app:contentInsetStartWithNavigation="0dp"
-                    app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
                    app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
                    app:titleMargin="0dp"
                    app:titleMarginStart="0dp"
--- a/app/src/main/res/layout-land/fragment_classic_player.xml
+++ b/app/src/main/res/layout-land/fragment_classic_player.xml
@ -18,7 +18,9 @@
        <androidx.appcompat.widget.Toolbar
            android:id="@+id/playerToolbar"
            style="@style/Toolbar"
-            android:background="@android:color/transparent" />
+            android:background="@android:color/transparent"
+            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />

        <RelativeLayout
            android:layout_width="match_parent"
@ -78,11 +80,11 @@
                        android:id="@+id/playingQueueCard"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
-                        sothree:cardCornerRadius="12dp"
                        android:layout_marginBottom="-8dp"
                        app:cardBackgroundColor="?cardBackgroundColor"
                        app:cardElevation="@dimen/card_elevation"
-                        app:cardUseCompatPadding="false">
+                        app:cardUseCompatPadding="false"
+                        sothree:cardCornerRadius="12dp">

                        <RelativeLayout
                            android:layout_width="match_parent"
--- a/app/src/main/res/layout-land/fragment_color_player.xml
+++ b/app/src/main/res/layout-land/fragment_color_player.xml
@ -43,9 +43,9 @@
                    <androidx.cardview.widget.CardView
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
+                        android:layout_margin="12dp"
                        app:cardCornerRadius="8dp"
                        app:cardElevation="8dp"
-                        android:layout_margin="12dp"
                        app:cardPreventCornerOverlap="false"
                        app:cardUseCompatPadding="true">

@ -119,8 +119,8 @@
                        <androidx.appcompat.widget.Toolbar
                            android:id="@+id/playerToolbar"
                            style="@style/Toolbar"
-                            android:navigationIcon="@drawable/ic_close_white_24dp"
-                            app:navigationIcon="@drawable/ic_close_white_24dp" />
+                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
                    </FrameLayout>
                </LinearLayout>
            </LinearLayout>
--- a/app/src/main/res/layout-land/fragment_flat_player.xml
+++ b/app/src/main/res/layout-land/fragment_flat_player.xml
@ -63,8 +63,8 @@
                        <androidx.appcompat.widget.Toolbar
                            android:id="@+id/playerToolbar"
                            style="@style/Toolbar"
-                            android:navigationIcon="@drawable/ic_close_white_24dp"
-                            app:navigationIcon="@drawable/ic_close_white_24dp" />
+                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
                    </FrameLayout>

                    <fragment
--- a/app/src/main/res/layout-land/fragment_material.xml
+++ b/app/src/main/res/layout-land/fragment_material.xml
@ -70,8 +70,8 @@
                            android:id="@+id/playerToolbar"
                            style="@style/Toolbar"
                            android:layout_gravity="bottom"
-                            android:navigationIcon="@drawable/ic_close_white_24dp"
-                            app:navigationIcon="@drawable/ic_close_white_24dp" />
+                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
                    </FrameLayout>
                </LinearLayout>
            </LinearLayout>
--- a/app/src/main/res/layout-land/fragment_plain_player.xml
+++ b/app/src/main/res/layout-land/fragment_plain_player.xml
@ -105,8 +105,8 @@
                        <androidx.appcompat.widget.Toolbar
                            android:id="@+id/playerToolbar"
                            style="@style/Toolbar"
-                            android:navigationIcon="@drawable/ic_close_white_24dp"
-                            app:navigationIcon="@drawable/ic_close_white_24dp" />
+                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
                    </FrameLayout>
                </LinearLayout>

--- a/app/src/main/res/layout-land/fragment_player.xml
+++ b/app/src/main/res/layout-land/fragment_player.xml
@ -67,8 +67,8 @@
                        <androidx.appcompat.widget.Toolbar
                            android:id="@+id/playerToolbar"
                            style="@style/Toolbar"
-                            android:navigationIcon="@drawable/ic_close_white_24dp"
-                            app:navigationIcon="@drawable/ic_close_white_24dp" />
+                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"  />
                    </FrameLayout>

                    <fragment
--- a/app/src/main/res/layout-land/fragment_simple_player.xml
+++ b/app/src/main/res/layout-land/fragment_simple_player.xml
@ -73,8 +73,8 @@
                        <androidx.appcompat.widget.Toolbar
                            android:id="@+id/playerToolbar"
                            style="@style/Toolbar"
-                            android:navigationIcon="@drawable/ic_close_white_24dp"
-                            app:navigationIcon="@drawable/ic_close_white_24dp" />
+                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
                    </FrameLayout>
                </LinearLayout>
            </LinearLayout>
--- a/app/src/main/res/layout-xlarge-land/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_blur.xml
@ -73,10 +73,10 @@
        android:id="@+id/playerToolbar"
        style="@style/Toolbar"
        android:layout_height="48dp"
-        android:navigationIcon="@drawable/ic_close_white_24dp"
+        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintEnd_toEndOf="parent"
        app:layout_constraintStart_toStartOf="parent"
-        app:navigationIcon="@drawable/ic_close_white_24dp" />
+        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />

 </androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/layout-xlarge-land/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_player.xml
@ -66,7 +66,8 @@
                    android:id="@+id/playerToolbar"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
            </FrameLayout>
        </LinearLayout>
    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
--- a/app/src/main/res/layout-xlarge/fragment_blur.xml
+++ b/app/src/main/res/layout-xlarge/fragment_blur.xml
@ -81,8 +81,8 @@
                    android:id="@+id/playerToolbar"
                    style="@style/Toolbar"
                    android:layout_height="48dp"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"  />
            </FrameLayout>
        </LinearLayout>
    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
--- a/app/src/main/res/layout-xlarge/fragment_player.xml
+++ b/app/src/main/res/layout-xlarge/fragment_player.xml
@ -64,8 +64,8 @@
                <androidx.appcompat.widget.Toolbar
                    android:id="@+id/playerToolbar"
                    style="@style/Toolbar"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"  />
            </FrameLayout>
        </LinearLayout>
    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
--- a/app/src/main/res/layout/fragment_blur.xml
+++ b/app/src/main/res/layout/fragment_blur.xml
@ -75,8 +75,8 @@
                    android:id="@+id/playerToolbar"
                    style="@style/Toolbar"
                    android:layout_height="48dp"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
            </FrameLayout>
        </LinearLayout>
    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
--- a/app/src/main/res/layout/fragment_card_blur_player.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player.xml
@ -54,7 +54,7 @@
                        app:contentInsetLeft="0dp"
                        app:contentInsetStart="0dp"
                        app:contentInsetStartWithNavigation="0dp"
-                        app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
                        app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Caption"
                        app:titleMargin="0dp"
                        app:titleMarginStart="0dp"
--- a/app/src/main/res/layout/fragment_classic_player.xml
+++ b/app/src/main/res/layout/fragment_classic_player.xml
@ -76,7 +76,9 @@
                    <androidx.appcompat.widget.Toolbar
                        android:id="@+id/playerToolbar"
                        style="@style/Toolbar"
-                        android:background="@android:color/transparent" />
+                        android:background="@android:color/transparent"
+                        android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                        app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />

                </LinearLayout>
            </FrameLayout>
@ -100,9 +102,9 @@
                sothree:cardCornerRadius="12dp">

                <RelativeLayout
-                    android:background="?cardBackgroundColor"
                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:background="?cardBackgroundColor">

                    <!--This is necessary for the drag sorting to work at the top-->
                    <View
--- a/app/src/main/res/layout/fragment_color_player.xml
+++ b/app/src/main/res/layout/fragment_color_player.xml
@ -115,8 +115,8 @@
                <androidx.appcompat.widget.Toolbar
                    android:id="@+id/playerToolbar"
                    style="@style/Toolbar"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />

            </FrameLayout>
        </LinearLayout>
--- a/app/src/main/res/layout/fragment_fit.xml
+++ b/app/src/main/res/layout/fragment_fit.xml
@ -48,8 +48,8 @@
                android:id="@+id/playerToolbar"
                style="@style/Toolbar"
                android:layout_gravity="bottom"
-                android:navigationIcon="@drawable/ic_close_white_24dp"
-                app:navigationIcon="@drawable/ic_close_white_24dp" />
+                android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />

        </FrameLayout>
    </LinearLayout>
--- a/app/src/main/res/layout/fragment_flat_player.xml
+++ b/app/src/main/res/layout/fragment_flat_player.xml
@ -40,8 +40,8 @@
                <androidx.appcompat.widget.Toolbar
                    android:id="@+id/playerToolbar"
                    style="@style/Toolbar"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"  />
            </FrameLayout>

            <code.name.monkey.retromusic.views.WidthFitSquareLayout
--- a/app/src/main/res/layout/fragment_full.xml
+++ b/app/src/main/res/layout/fragment_full.xml
@ -58,7 +58,8 @@
        <androidx.appcompat.widget.Toolbar
            android:id="@+id/playerToolbar"
            style="@style/Toolbar"
-            android:navigationIcon="@drawable/ic_close_white_24dp">
+            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp">

            <androidx.constraintlayout.widget.ConstraintLayout
                android:layout_width="match_parent"
--- a/app/src/main/res/layout/fragment_material.xml
+++ b/app/src/main/res/layout/fragment_material.xml
@ -60,8 +60,8 @@
                    android:id="@+id/playerToolbar"
                    style="@style/Toolbar"
                    android:layout_gravity="bottom"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"  />
            </FrameLayout>
        </LinearLayout>
    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
--- a/app/src/main/res/layout/fragment_plain_player.xml
+++ b/app/src/main/res/layout/fragment_plain_player.xml
@ -92,8 +92,8 @@
                <androidx.appcompat.widget.Toolbar
                    android:id="@+id/playerToolbar"
                    style="@style/Toolbar"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
            </FrameLayout>
        </LinearLayout>
    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@ -72,8 +72,8 @@
                    android:id="@+id/playerToolbar"
                    style="@style/Toolbar"
                    android:layout_gravity="bottom"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
            </FrameLayout>
        </LinearLayout>
    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
--- a/app/src/main/res/layout/fragment_simple_player.xml
+++ b/app/src/main/res/layout/fragment_simple_player.xml
@ -27,7 +27,6 @@
                <include layout="@layout/status_bar" />
            </FrameLayout>

-
            <code.name.monkey.retromusic.views.WidthFitSquareLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content">
@ -61,8 +60,8 @@
                <androidx.appcompat.widget.Toolbar
                    android:id="@+id/playerToolbar"
                    style="@style/Toolbar"
-                    android:navigationIcon="@drawable/ic_close_white_24dp"
-                    app:navigationIcon="@drawable/ic_close_white_24dp" />
+                    android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                    app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
            </FrameLayout>
        </LinearLayout>
    </code.name.monkey.retromusic.views.FitSystemWindowsLayout>
--- a/app/src/main/res/layout/fragment_tiny_player.xml
+++ b/app/src/main/res/layout/fragment_tiny_player.xml
@ -101,7 +101,8 @@
                        <androidx.appcompat.widget.Toolbar
                            android:id="@+id/playerToolbar"
                            style="@style/Toolbar"
-                            app:navigationIcon="@drawable/ic_close_white_24dp" />
+                            android:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp"
+                            app:navigationIcon="@drawable/ic_keyboard_arrow_down_black_24dp" />
                    </FrameLayout>
                </LinearLayout>