Removed extra actions
This commit is contained in:
parent
05b3c18848
commit
d2284f410d
12 changed files with 29 additions and 218 deletions
|
@ -1,18 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
~ Copyright (c) 2020 Hemanth Savarala.
|
||||
~
|
||||
~ Licensed under the GNU General Public License v3
|
||||
~
|
||||
~ This is free software: you can redistribute it and/or modify it under
|
||||
~ the terms of the GNU General Public License as published by
|
||||
~ the Free Software Foundation either version 3 of the License, or (at your option) any later version.
|
||||
~
|
||||
~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
~ See the GNU General Public License for more details.
|
||||
-->
|
||||
|
||||
<shape xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<corners android:radius="16dp" />
|
||||
<solid android:color="?attr/colorSurface" />
|
||||
</shape>
|
|
@ -14,44 +14,33 @@
|
|||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:paddingStart="16dp"
|
||||
android:paddingEnd="0dp">
|
||||
android:paddingStart="8dp"
|
||||
android:paddingEnd="8dp">
|
||||
|
||||
<com.google.android.material.textview.MaterialTextView
|
||||
android:id="@+id/songCount"
|
||||
android:layout_width="match_parent"
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/playAction"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_weight="1"
|
||||
android:textAppearance="@style/TextViewSubtitle1"
|
||||
android:textStyle="bold" />
|
||||
android:text="@string/action_play_all"
|
||||
app:backgroundTint="?attr/colorSurface"
|
||||
app:icon="@drawable/ic_play_arrow_white_24dp" />
|
||||
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
<com.google.android.material.button.MaterialButton
|
||||
android:id="@+id/shuffleAction"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0"
|
||||
android:background="?attr/roundSelector"
|
||||
android:padding="16dp"
|
||||
app:srcCompat="@drawable/ic_shuffle_white_24dp"
|
||||
app:tint="?attr/colorControlNormal"
|
||||
tools:tint="@color/black_color" />
|
||||
|
||||
<androidx.appcompat.widget.AppCompatImageView
|
||||
android:id="@+id/sortAction"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_weight="0"
|
||||
android:background="?attr/roundSelector"
|
||||
android:padding="16dp"
|
||||
app:srcCompat="@drawable/ic_sort_white_24dp"
|
||||
app:tint="?attr/colorControlNormal"
|
||||
tools:tint="@color/black_color" />
|
||||
|
||||
android:layout_marginStart="4dp"
|
||||
android:layout_marginEnd="4dp"
|
||||
android:layout_weight="1"
|
||||
android:text="@string/shuffle"
|
||||
app:backgroundTint="?attr/colorSurface"
|
||||
app:icon="@drawable/ic_shuffle_white_24dp" />
|
||||
|
||||
</LinearLayout>
|
|
@ -1,28 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
~ Copyright (c) 2020 Hemanth Savarala.
|
||||
~
|
||||
~ Licensed under the GNU General Public License v3
|
||||
~
|
||||
~ This is free software: you can redistribute it and/or modify it under
|
||||
~ the terms of the GNU General Public License as published by
|
||||
~ the Free Software Foundation either version 3 of the License, or (at your option) any later version.
|
||||
~
|
||||
~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
~ See the GNU General Public License for more details.
|
||||
-->
|
||||
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:id="@+id/action_grid_size_1"
|
||||
android:title="@string/grid_size_1" />
|
||||
<item
|
||||
android:id="@+id/action_grid_size_2"
|
||||
android:title="@string/grid_size_2" />
|
||||
<item
|
||||
android:id="@+id/action_grid_size_3"
|
||||
android:title="@string/grid_size_3" />
|
||||
<item
|
||||
android:id="@+id/action_grid_size_4"
|
||||
android:title="@string/grid_size_4" />
|
||||
</menu>
|
|
@ -1,37 +0,0 @@
|
|||
<?xml version="1.0" encoding="utf-8"?><!--
|
||||
~ Copyright (c) 2020 Hemanth Savarala.
|
||||
~
|
||||
~ Licensed under the GNU General Public License v3
|
||||
~
|
||||
~ This is free software: you can redistribute it and/or modify it under
|
||||
~ the terms of the GNU General Public License as published by
|
||||
~ the Free Software Foundation either version 3 of the License, or (at your option) any later version.
|
||||
~
|
||||
~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
|
||||
~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
|
||||
~ See the GNU General Public License for more details.
|
||||
-->
|
||||
|
||||
<menu xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<item
|
||||
android:id="@+id/action_song_sort_order_asc"
|
||||
android:title="@string/sort_order_a_z" />
|
||||
<item
|
||||
android:id="@+id/action_song_sort_order_desc"
|
||||
android:title="@string/sort_order_z_a" />
|
||||
<item
|
||||
android:id="@+id/action_song_sort_order_artist"
|
||||
android:title="@string/sort_order_artist" />
|
||||
<item
|
||||
android:id="@+id/action_song_sort_order_album"
|
||||
android:title="@string/sort_order_album" />
|
||||
<item
|
||||
android:id="@+id/action_song_sort_order_date"
|
||||
android:title="@string/sort_order_date" />
|
||||
<item
|
||||
android:id="@+id/action_song_sort_order_year"
|
||||
android:title="@string/sort_order_year" />
|
||||
<item
|
||||
android:id="@+id/action_song_sort_order_composer"
|
||||
android:title="@string/sort_order_composer" />
|
||||
</menu>
|
|
@ -34,7 +34,6 @@
|
|||
<item name="android:windowLightNavigationBar">false</item>
|
||||
<!--Manual setting colors-->
|
||||
<item name="colorSurface">@color/darkColorSurface</item>
|
||||
<item name="popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
<item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
|
||||
</style>
|
||||
</resources>
|
|
@ -34,6 +34,5 @@
|
|||
<!--Manual setting colors-->
|
||||
<item name="colorPrimary">@color/darkColorPrimary</item>
|
||||
<item name="colorSurface">@color/darkColorSurface</item>
|
||||
<item name="popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
</style>
|
||||
</resources>
|
|
@ -31,8 +31,7 @@
|
|||
<item name="rectSelector">@drawable/rect_selector</item>
|
||||
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
|
||||
<item name="android:windowLightNavigationBar">true</item>
|
||||
<item name="popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
<item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
|
||||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
|
||||
|
@ -57,8 +56,7 @@
|
|||
<item name="android:windowLightNavigationBar">false</item>
|
||||
<!--Manual setting colors-->
|
||||
<item name="colorSurface">@color/darkColorSurface</item>
|
||||
<item name="popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
<item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
|
||||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
|
@ -80,7 +78,6 @@
|
|||
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
|
||||
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
|
||||
<item name="android:windowLightNavigationBar">false</item>
|
||||
<item name="popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
<item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
|
||||
</style>
|
||||
</resources>
|
|
@ -827,8 +827,4 @@
|
|||
<string name="retro_music_player">Retro Music Player</string>
|
||||
<string name="pro">Pro</string>
|
||||
<string name="free">Free</string>
|
||||
<plurals name="songCount">
|
||||
<item quantity="one">%d Song</item>
|
||||
<item quantity="other">%d Songs</item>
|
||||
</plurals>
|
||||
</resources>
|
||||
|
|
|
@ -183,9 +183,4 @@
|
|||
<item name="android:windowBackground">@drawable/splash</item>
|
||||
<item name="android:statusBarColor">@android:color/transparent</item>
|
||||
</style>
|
||||
|
||||
<style name="RetroPopupTheme">
|
||||
<item name="android:popupBackground">@drawable/popup_background</item>
|
||||
<item name="android:popupElevation">4dp</item>
|
||||
</style>
|
||||
</resources>
|
||||
|
|
|
@ -17,8 +17,7 @@
|
|||
<item name="roundSelector">@drawable/round_selector</item>
|
||||
<item name="rectSelector">@drawable/rect_selector</item>
|
||||
<item name="android:actionOverflowButtonStyle">@style/Widget.ActionButton.Overflow</item>
|
||||
<item name="popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
<item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
|
||||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base" parent="Theme.MaterialComponents.NoActionBar">
|
||||
|
@ -43,8 +42,7 @@
|
|||
|
||||
<!--Manual setting colors-->
|
||||
<item name="colorSurface">@color/darkColorSurface</item>
|
||||
<item name="popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
<item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
|
||||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Black" parent="Theme.MaterialComponents.NoActionBar">
|
||||
|
@ -65,8 +63,7 @@
|
|||
<item name="colorOnBackground">@color/blackColorSurface</item>
|
||||
<item name="toolbarPopupTheme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="mcab_popup_theme">@style/ThemeOverlay.AppCompat.Dark</item>
|
||||
<item name="popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
<item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
|
||||
</style>
|
||||
|
||||
<style name="Theme.RetroMusic.Base.Light" parent="Theme.MaterialComponents.Light.NoActionBar">
|
||||
|
@ -87,8 +84,7 @@
|
|||
<item name="windowActionBar">false</item>
|
||||
<item name="materialAlertDialogTheme">@style/MaterialAlertDialogTheme</item>
|
||||
<item name="materialButtonStyle">@style/MaterialButtonTheme</item>
|
||||
<item name="popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
<item name="android:popupMenuStyle">@style/RetroPopupTheme</item>
|
||||
|
||||
</style>
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue