Siklos/Metro
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix refactor code

Browse source
This commit is contained in:
Hemanth S 2020-05-07 12:27:24 +05:30
parent c3c5f7e829
commit 43bfc24ec5
21 changed files with 82 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
app/src/main/res/drawable-xxxhdpi/np_color.webp
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 101 KiB

After

Width:  |  Height:  |  Size: 102 KiB

Before After
Before After

5
app/src/main/res/drawable/ic_expand_less_white_24dp.xml Normal file
View file

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M12,8l-6,6 1.41,1.41L12,10.83l4.59,4.58L18,14z"/>
</vector>

1
app/src/main/res/layout-land/fragment_banner_home.xml
View file

@ -20,6 +20,7 @@
android:layout_height="match_parent"
android:layout_marginStart="@dimen/toolbar_margin_horizontal"
android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
android:overScrollMode="never"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<LinearLayout

1
app/src/main/res/layout-land/fragment_home.xml
View file

@ -20,6 +20,7 @@
android:layout_height="match_parent"
android:layout_marginStart="@dimen/toolbar_margin_horizontal"
android:layout_marginEnd="@dimen/toolbar_margin_horizontal"
android:overScrollMode="never"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<androidx.constraintlayout.widget.ConstraintLayout

52
app/src/main/res/layout/activity_main_content.xml
View file

@ -26,51 +26,29 @@
android:id="@+id/appBarLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:elevation="0dp"
app:elevation="0dp"
app:liftOnScroll="true">
<com.google.android.material.card.MaterialCardView
android:id="@+id/toolbarContainer"
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="12dp"
android:layout_marginEnd="12dp"
app:cardUseCompatPadding="true"
app:cardCornerRadius="8dp"
app:layout_scrollFlags="scroll|enterAlways">
<FrameLayout
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:background="?attr/colorSurface"
app:popupTheme="?attr/toolbarPopupTheme"
app:title="@string/app_name"
app:titleTextAppearance="@style/ToolbarTextAppearanceNormal.Library"
app:titleTextColor="?attr/colorControlNormal"
tools:ignore="UnusedAttribute" />
<androidx.appcompat.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height"
android:background="?attr/colorSurface"
app:popupTheme="?attr/toolbarPopupTheme"
app:titleTextAppearance="@style/TextViewHeadline6"
app:titleTextColor="?attr/colorControlNormal"
tools:ignore="UnusedAttribute">
<com.google.android.material.textview.MaterialTextView
android:id="@+id/appTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/app_name"
android:textAppearance="@style/TextViewHeadline6"
android:textColor="?attr/colorControlNormal" />
</androidx.appcompat.widget.Toolbar>
<ViewStub
android:id="@+id/cab_stub"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height" />
</FrameLayout>
</com.google.android.material.card.MaterialCardView>
<ViewStub
android:id="@+id/cab_stub"
android:layout_width="match_parent"
android:layout_height="@dimen/toolbar_height" />
</FrameLayout>
</com.google.android.material.appbar.AppBarLayout>
<FrameLayout

1
app/src/main/res/layout/fragment_banner_home.xml
View file

@ -15,6 +15,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/container"
android:overScrollMode="never"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">

16
app/src/main/res/layout/fragment_clasic_player.xml
View file

@ -53,7 +53,7 @@
android:orientation="vertical"
app:behavior_hideable="false"
app:cardCornerRadius="0dp"
app:layout_behavior="code.name.monkey.retromusic.CustomBottomSheetBehavior">
app:layout_behavior="code.name.monkey.retromusic.RetroBottomSheetBehavior">
<LinearLayout
android:layout_width="match_parent"
@ -61,11 +61,17 @@
android:background="?attr/colorSurface"
android:orientation="vertical">
<include
android:id="@+id/playerControlsContainer"
layout="@layout/fragment_classic_controls"
<com.google.android.material.card.MaterialCardView
android:layout_width="match_parent"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
app:cardCornerRadius="0dp">
<include
android:id="@+id/playerControlsContainer"
layout="@layout/fragment_classic_controls"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</com.google.android.material.card.MaterialCardView>
<LinearLayout
android:layout_width="match_parent"

1
app/src/main/res/layout/fragment_home.xml
View file

@ -17,6 +17,7 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
<androidx.constraintlayout.widget.ConstraintLayout

2
app/src/main/res/layout/sliding_music_panel_layout.xml
View file

@ -26,7 +26,7 @@
android:background="?attr/colorSurface"
app:behavior_hideable="false"
app:behavior_peekHeight="0dp"
app:layout_behavior="code.name.monkey.retromusic.CustomBottomSheetBehavior">
app:layout_behavior="code.name.monkey.retromusic.RetroBottomSheetBehavior">
<FrameLayout
android:id="@+id/playerFragmentContainer"

3
app/src/main/res/menu/menu_main.xml
View file

@ -22,6 +22,7 @@
android:id="@+id/action_grid_size"
android:icon="@drawable/ic_grid_size_white_24dp"
android:title="@string/action_grid_size"
android:orderInCategory="2"
app:showAsAction="ifRoom">
<menu>
<group
@ -58,6 +59,7 @@
android:id="@+id/action_layout_type"
android:icon="@drawable/ic_dashboard_white_24dp"
android:title="@string/grid_style_label"
android:orderInCategory="6"
app:showAsAction="ifRoom">
<menu>
<group
@ -85,6 +87,7 @@
</menu>
</item>
<item
android:orderInCategory="5"
android:id="@+id/action_sort_order"
android:icon="@drawable/ic_sort_white_24dp"
android:title="@string/action_sort_order"

1
app/src/main/res/values/ids.xml
View file

@ -2,6 +2,7 @@
<resources>
<item name="action_new_playlist" type="id" />
<item name="action_settings" type="id" />
<item name="action_mic" type="id" />
<item name="action_search" type="id" />
<item name="action_show_lyrics" type="id" />
<item name="action_genre" type="id" />

5
app/src/main/res/values/styles.xml
View file

@ -58,6 +58,11 @@
<item name="android:textSize">20sp</item>
<item name="android:letterSpacing">0.0125</item>
<item name="android:textColor">?android:attr/textColorPrimary</item>
<item name="android:fontFamily">@font/circular</item>
</style>
<style name="ToolbarTextAppearanceNormal.Library" parent="ToolbarTextAppearanceNormal">
<item name="android:textSize">24sp</item>
</style>
<style name="BigTitleTextAppearanceToolbar">

2
app/src/main/res/xml/pref_now_playing_screen.xml
View file

@ -66,7 +66,7 @@
<code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
android:layout="@layout/list_item_view_switch"
app:defaultValue="false"
app:icon="@drawable/ic_volume_up_white_24dp"
app:icon="@drawable/ic_expand_less_white_24dp"
app:key="expand_now_playing_panel"
app:summary="@string/pref_summary_expand_now_playing_panel"
app:title="@string/pref_title_expand_now_playing_panel" />