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

Merge branch 'dev' of https://github.com/h4h13/RetroMusicPlayer into dev

Browse source 
 Conflicts:
	app/src/main/java/io/github/muntashirakon/music/Constants.kt
	app/src/main/java/io/github/muntashirakon/music/adapter/GenreAdapter.kt
	app/src/main/java/io/github/muntashirakon/music/adapter/HomeAdapter.kt
	app/src/main/java/io/github/muntashirakon/music/adapter/SearchAdapter.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/LibraryViewModel.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsPlayerFragment.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/base/AbsRecyclerViewFragment.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenreDetailsFragment.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/genres/GenresFragment.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/home/HomeFragment.kt
	app/src/main/java/io/github/muntashirakon/music/fragments/search/SearchFragment.kt
	app/src/main/java/io/github/muntashirakon/music/interfaces/IGenreClickListener.kt
	app/src/main/java/io/github/muntashirakon/music/interfaces/IHomeClickListener.kt
	app/src/main/java/io/github/muntashirakon/music/preferences/AlbumCoverStylePreferenceDialog.kt
	app/src/main/java/io/github/muntashirakon/music/preferences/NowPlayingScreenPreferenceDialog.kt
	app/src/main/java/io/github/muntashirakon/music/service/notification/PlayingNotificationImpl.kt
	app/src/main/java/io/github/muntashirakon/music/util/MusicUtil.kt
	app/src/main/java/io/github/muntashirakon/music/util/PreferenceUtil.kt
	app/src/main/res/layout/activity_donation.xml
	app/src/main/res/layout/activity_pro_version.xml
	app/src/main/res/layout/card_other.xml
	app/src/main/res/layout/fragment_settings.xml
	app/src/main/res/layout/fragment_synced.xml
	app/src/main/res/layout/image.xml
	app/src/main/res/transition/change_bounds.xml
	appthemehelper/src/main/res/layout/ate_preference_custom.xml
This commit is contained in:
Muntashir Al-Islam 2020-11-07 07:34:17 +06:00
commit 2dea5c31ca
192 changed files with 10165 additions and 8185 deletions
Download patch file Download diff file Expand all files Collapse all files

72
appthemehelper/src/main/res/layout/ate_preference_custom.xml
View file

@ -1,72 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:baselineAligned="false"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
android:paddingEnd="?android:attr/scrollbarSize"
android:paddingRight="?android:attr/scrollbarSize"
tools:ignore="RtlSymmetry,UnusedAttribute">
<ImageView
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="@dimen/ate_preference_inset"
android:layout_marginLeft="@dimen/ate_preference_inset"
tools:ignore="ContentDescription"
tools:src="@drawable/icon_checkmark_white"
tools:tint="@color/md_black_1000" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="@dimen/ate_preference_inset"
android:layout_marginLeft="@dimen/ate_preference_inset"
android:layout_marginTop="12dip"
android:layout_marginEnd="6dip"
android:layout_marginRight="6dip"
android:layout_marginBottom="12dip"
android:layout_weight="1">
<com.google.android.material.textview.MaterialTextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
android:textColor="?android:attr/textColorPrimary"
tools:text="@tools:sample/lorem/random" />
<io.github.muntashirakon.music.views.BaselineGridTextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
android:layout_alignLeft="@android:id/title"
android:layout_marginTop="2dp"
android:maxLines="4"
tools:text="@tools:sample/lorem/random" />
</RelativeLayout>
<!-- Preference should place its actual preference widget here. -->
<code.name.monkey.appthemehelper.common.views.ATESwitch
android:id="@+id/switchWidget"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@null"
android:clickable="false"
android:focusable="false" />
</LinearLayout><!-- From: file:/home/jitpack/build/commons/src/main/res/layout/md_preference_custom.xml -->

76
appthemehelper/src/main/res/layout/ate_preference_custom_support.xml
View file

@ -1,76 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:attr/selectableItemBackground"
android:baselineAligned="false"
android:gravity="center_vertical"
android:minHeight="?android:attr/listPreferredItemHeight"
android:orientation="horizontal"
android:paddingEnd="?android:attr/scrollbarSize"
android:paddingRight="?android:attr/scrollbarSize"
tools:ignore="RtlSymmetry,UnusedAttribute">
<ImageView
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginStart="@dimen/ate_preference_inset"
android:layout_marginLeft="@dimen/ate_preference_inset"
tools:ignore="ContentDescription"
tools:src="@drawable/icon_back_black" />
<RelativeLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="start|center_vertical"
android:layout_marginStart="32dp"
android:layout_marginLeft="@dimen/ate_preference_inset"
android:layout_marginTop="12dip"
android:layout_marginEnd="6dip"
android:layout_marginRight="6dip"
android:layout_marginBottom="12dip"
android:layout_weight="1">
<com.google.android.material.textview.MaterialTextView
android:id="@android:id/title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:ellipsize="marquee"
android:fadingEdge="horizontal"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Subtitle1"
android:textColor="?android:attr/textColorPrimary"
tools:text="@tools:sample/lorem/random" />
<com.google.android.material.textview.MaterialTextView
android:id="@android:id/summary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@android:id/title"
android:layout_alignStart="@android:id/title"
android:layout_alignLeft="@android:id/title"
android:layout_marginTop="2dp"
android:maxLines="4"
android:textColor="?android:attr/textColorSecondary"
tools:text="I have one solution for you.you can change font size for specific preference by managing layout file." />
</RelativeLayout>
<!-- Preference should place its actual preference widget here. -->
<LinearLayout
android:id="@android:id/widget_frame"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="end|center_vertical"
android:gravity="center_vertical"
android:orientation="vertical" />
</LinearLayout><!-- From: file:/home/jitpack/build/commons/src/main/res/layout/md_preference_custom.xml -->

23
appthemehelper/src/main/res/layout/ate_preference_list.xml
View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/dialogTitle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="16dp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Headline6" />
<View
android:layout_width="match_parent"
android:layout_height="2dp" />
<ListView
android:id="@android:id/list"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>

2
appthemehelper/src/main/res/values-large/dimens.xml
View file

@ -1,6 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<dimen name="ate_preference_inset">28dp</dimen>
</resources>

11
appthemehelper/src/main/res/values/colors_material_design.xml
View file

@ -20,12 +20,9 @@
<color name="md_deep_purple_A200">#7C4DFF</color>
<color name="md_blue_100">#BBDEFB</color>
<color name="md_blue_500">#2196F3</color>
<color name="md_blue_A200">#448AFF</color>
<color name="md_blue_A400">#2979FF</color>
<color name="md_green_A200">#69F0AE</color>
<color name="md_green_A700">#00C853</color>
<color name="md_green_500">#4CAF50</color>
@ -34,17 +31,9 @@
<color name="md_grey_400">#BDBDBD</color>
<color name="md_grey_500">#9E9E9E</color>
<color name="md_grey_800">#424242</color>
<color name="md_grey_900">#212121</color>
<color name="md_black_1000">#000000</color>
<color name="md_white_1000">#FFFFFF</color>
<color name="md_white_semi_transparent">#40FFFFFF</color>
<color name="md_green_100">#C8E6C9</color>
<color name="md_light_green_100">#DCEDC8</color>
<color name="md_indigo_100">#C5CAE9</color>
<color name="md_purple_100">#E1BEE7</color>
<color name="md_deep_purple_100">#D1C4E9</color>
<color name="md_teal_A400">#1DE9B6</color>
<color name="md_deep_orange_A400">#FF3D00</color>

2
appthemehelper/src/main/res/values/dimens.xml
View file

@ -3,6 +3,4 @@
<dimen name="ate_circleview_border">1dp</dimen>
<dimen name="ate_preference_inset">16dp</dimen>
</resources>

5
appthemehelper/src/main/res/values/ids.xml
View file

@ -1,5 +1,2 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<item name="statusbarutil_fake_status_bar_view" type="id" />
<item name="statusbarutil_translucent_view" type="id" />
</resources>
<resources></resources>