nyancrimew
/
PlayerAndroid
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix dialog color

main
h4h13 2019-07-31 14:39:29 +05:30
parent da640ceff8
commit 9d9d709a85
27 changed files with 126 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/assets/retro-changelog.html
View File

File diff suppressed because one or more lines are too long

8
app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt
View File

@ -293,14 +293,6 @@ class MainActivity : AbsSlidingMusicPanelActivity(), SharedPreferences.OnSharedP
}
}
override fun onOptionsItemSelected(item: MenuItem): Boolean {
if (item.itemId == android.R.id.home) {
OptionsSheetDialogFragment.newInstance().show(supportFragmentManager, "Main_Menu")
}
return super.onOptionsItemSelected(item)
}
companion object {
const val APP_INTRO_REQUEST = 2323
const val HOME = 0

45
app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt
View File

@ -15,24 +15,20 @@
package code.name.monkey.retromusic.dialogs
import android.app.Dialog
import android.content.Intent
import android.graphics.drawable.ColorDrawable
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import androidx.cardview.widget.CardView
import androidx.core.app.ShareCompat
import androidx.fragment.app.DialogFragment
import code.name.monkey.appthemehelper.ThemeStore
import code.name.monkey.retromusic.App
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.activities.MainActivity
import code.name.monkey.retromusic.activities.bugreport.BugReportActivity
import code.name.monkey.retromusic.util.NavigationUtil
import code.name.monkey.retromusic.util.PreferenceUtil
import code.name.monkey.retromusic.views.OptionMenuItemView
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.bottomsheets.BottomSheet
import com.afollestad.materialdialogs.customview.customView
import kotlinx.android.synthetic.main.fragment_main_settings.*
class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
@ -46,21 +42,9 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
materialDialog.dismiss()
}
private fun prepareBugReport() {
startActivity(Intent(activity, BugReportActivity::class.java))
}
private fun shareApp() {
ShareCompat.IntentBuilder.from(activity)
.setType("text/plain")
.setChooserTitle(R.string.action_share)
.setText(String.format(getString(R.string.app_share), activity!!.packageName))
.startChooser()
}
private lateinit var actionSettings: View
private lateinit var actionLibrary: View
private lateinit var actionFolders: View
private lateinit var actionSettings: OptionMenuItemView
private lateinit var actionLibrary: OptionMenuItemView
private lateinit var actionFolders: OptionMenuItemView
private lateinit var materialDialog: MaterialDialog
override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
@ -69,24 +53,39 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
actionLibrary = layout.findViewById(R.id.actionLibrary)
actionFolders = layout.findViewById(R.id.actionFolders)
when (arguments?.getInt(WHICH_ONE)) {
LIBRARY -> actionLibrary.isSelected = true
FOLDER -> actionFolders.isSelected = true
}
actionSettings.setOnClickListener(this)
actionLibrary.setOnClickListener(this)
actionFolders.setOnClickListener(this)
materialDialog = MaterialDialog(activity!!, BottomSheet())
.show {
icon(R.mipmap.ic_launcher_round)
title(R.string.app_name)
customView(view = layout, scrollable = true)
}
return materialDialog
}
companion object {
private const val TAG: String = "MainOptionsBottomSheetD"
fun newInstance(selected_id: Int): OptionsSheetDialogFragment {
private const val WHICH_ONE = "which_one"
@JvmField
var LIBRARY: Int = 0
@JvmField
var FOLDER: Int = 1
fun newInstance(selectedId: Int): OptionsSheetDialogFragment {
val bundle = Bundle()
bundle.putInt("selected_id", selected_id)
bundle.putInt(WHICH_ONE, selectedId)
val fragment = OptionsSheetDialogFragment()
fragment.arguments = bundle
return fragment

4
app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt
View File

@ -48,7 +48,7 @@ abstract class AbsMainActivityFragment : AbsMusicServiceFragment() {
}
}
protected fun showMainMenu() {
OptionsSheetDialogFragment.newInstance().show(childFragmentManager, "Main_Menu")
protected fun showMainMenu(option: Int) {
OptionsSheetDialogFragment.newInstance(option).show(childFragmentManager, "Main_Menu")
}
}

2
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java
View File

@ -35,6 +35,7 @@ import code.name.monkey.appthemehelper.util.TintHelper;
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.dialogs.CreatePlaylistDialog;
import code.name.monkey.retromusic.dialogs.OptionsSheetDialogFragment;
import code.name.monkey.retromusic.fragments.base.AbsLibraryPagerRecyclerViewCustomGridSizeFragment;
import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment;
import code.name.monkey.retromusic.helper.SortOrder;
@ -160,6 +161,7 @@ public class LibraryFragment extends AbsMainActivityFragment implements CabHolde
appBarLayout.addOnOffsetChangedListener((appBarLayout, verticalOffset) ->
getMainActivity().setLightStatusbar(!ATHUtil.INSTANCE.isWindowBackgroundDark(getContext())));
getMainActivity().setSupportActionBar(toolbar);
toolbar.setNavigationOnClickListener(v -> showMainMenu(OptionsSheetDialogFragment.LIBRARY));
}
private Fragment getCurrentFragment() {

5
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java
View File

@ -49,6 +49,7 @@ import code.name.monkey.appthemehelper.util.TintHelper;
import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper;
import code.name.monkey.retromusic.R;
import code.name.monkey.retromusic.adapter.SongFileAdapter;
import code.name.monkey.retromusic.dialogs.OptionsSheetDialogFragment;
import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment;
import code.name.monkey.retromusic.helper.MusicPlayerRemote;
import code.name.monkey.retromusic.helper.menu.SongMenuHelper;
@ -231,8 +232,8 @@ public class FoldersFragment extends AbsMainActivityFragment implements
appBarLayout.setBackgroundColor(primaryColor);
toolbar.setBackgroundColor(RetroColorUtil.toolbarColor(getMainActivity()));
toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp);
toolbar.setOnClickListener(v -> {
showMainMenu();
toolbar.setNavigationOnClickListener(v -> {
showMainMenu(OptionsSheetDialogFragment.FOLDER);
});
breadCrumbs.setActivatedContentColor(ToolbarContentTintHelper.toolbarTitleColor(getActivity(), ColorUtil.INSTANCE.darkenColor(primaryColor)));
breadCrumbs.setDeactivatedContentColor(ToolbarContentTintHelper.toolbarSubtitleColor(getActivity(),

3
app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt
View File

@ -17,6 +17,7 @@ import code.name.monkey.retromusic.Constants
import code.name.monkey.retromusic.Constants.USER_BANNER
import code.name.monkey.retromusic.R
import code.name.monkey.retromusic.adapter.HomeAdapter
import code.name.monkey.retromusic.dialogs.OptionsSheetDialogFragment
import code.name.monkey.retromusic.extensions.hide
import code.name.monkey.retromusic.extensions.show
import code.name.monkey.retromusic.fragments.base.AbsMainActivityFragment
@ -155,8 +156,10 @@ class BannerHomeFragment : AbsMainActivityFragment(), MainActivityFragmentCallba
val pairImageView = Pair.create<View, String>(toolbarContainer, resources.getString(R.string.transition_toolbar))
NavigationUtil.goToSearch(activity!!, pairImageView)
}
}
mainActivity.setSupportActionBar(toolbar)
toolbar.setNavigationOnClickListener { v -> showMainMenu(OptionsSheetDialogFragment.LIBRARY) }
}
override fun handleBackPress(): Boolean {

9
app/src/main/java/code/name/monkey/retromusic/views/IconImageView.java
View File

@ -15,15 +15,17 @@
package code.name.monkey.retromusic.views;
import android.content.Context;
import android.content.res.ColorStateList;
import android.graphics.PorterDuff;
import android.util.AttributeSet;
import code.name.monkey.appthemehelper.util.ATHUtil;
import androidx.appcompat.widget.AppCompatImageView;
import code.name.monkey.appthemehelper.util.ATHUtil;
import code.name.monkey.retromusic.R;
public class IconImageView extends androidx.appcompat.widget.AppCompatImageView {
public class IconImageView extends AppCompatImageView {
public IconImageView(Context context) {
super(context);
init(context);
@ -41,6 +43,7 @@ public class IconImageView extends androidx.appcompat.widget.AppCompatImageView
private void init(Context context) {
if (context == null) return;
setColorFilter(ATHUtil.INSTANCE.resolveColor(context, R.attr.iconColor), PorterDuff.Mode.SRC_IN);
setImageTintList(ColorStateList.valueOf(ATHUtil.INSTANCE.resolveColor(context, R.attr.iconColor)));
//setColorFilter(ATHUtil.INSTANCE.resolveColor(context, R.attr.iconColor), PorterDuff.Mode.SRC_IN);
}
}

28
app/src/main/java/code/name/monkey/retromusic/views/OptionMenuItemView.java
View File

@ -24,10 +24,10 @@ import android.widget.TextView;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.content.ContextCompat;
import code.name.monkey.appthemehelper.ThemeStore;
import code.name.monkey.appthemehelper.util.ATHUtil;
import code.name.monkey.appthemehelper.util.ColorUtil;
import code.name.monkey.appthemehelper.util.MaterialValueHelper;
import code.name.monkey.retromusic.R;
/**
@ -35,6 +35,9 @@ import code.name.monkey.retromusic.R;
*/
public class OptionMenuItemView extends FrameLayout {
TextView textView;
IconImageView iconImageView;
public OptionMenuItemView(@NonNull Context context) {
this(context, null);
}
@ -49,13 +52,16 @@ public class OptionMenuItemView extends FrameLayout {
public OptionMenuItemView(@NonNull Context context, @Nullable AttributeSet attrs, int defStyleAttr, int defStyleRes) {
super(context, attrs, defStyleAttr, defStyleRes);
int accentColor = ThemeStore.Companion.accentColor(context);
setBackground(ContextCompat.getDrawable(context, R.drawable.menu_item_background));
inflate(context, R.layout.item_option_menu, this);
setBackgroundTintList(ColorStateList.valueOf(ThemeStore.Companion.accentColor(context)));
setBackgroundTintList(ColorStateList.valueOf(ColorUtil.INSTANCE.adjustAlpha(accentColor, 0.22f)));
TextView textView = findViewById(R.id.title);
textView.setTextColor(MaterialValueHelper.INSTANCE.getPrimaryTextColor(context, ColorUtil.INSTANCE.isColorLight(ThemeStore.Companion.primaryColor(context))));
IconImageView iconImageView = findViewById(R.id.icon);
textView = findViewById(R.id.title);
iconImageView = findViewById(R.id.icon);
TypedArray attributes = context.obtainStyledAttributes(attrs, R.styleable.OptionMenuItemView, 0, 0);
@ -67,4 +73,14 @@ public class OptionMenuItemView extends FrameLayout {
attributes.recycle();
}
@Override
public void setSelected(boolean selected) {
super.setSelected(selected);
if (selected) {
int accentColor = ThemeStore.Companion.accentColor(getContext());
textView.setTextColor(accentColor);
iconImageView.setImageTintList(ColorStateList.valueOf(accentColor));
}
}
}

22
app/src/main/res/drawable/menu_item_background.xml Normal file
View File

@ -0,0 +1,22 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2019 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.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_selected="true">
<shape>
<corners android:bottomRightRadius="30dp" android:topRightRadius="30dp" />
<solid android:color="@color/md_red_400" />
</shape>
</item>
<item android:drawable="@android:color/transparent" android:state_selected="false" />
</selector>

10
app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
View File

@ -19,7 +19,7 @@
android:paddingStart="12dp"
android:paddingEnd="12dp">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/songCurrentProgress"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@ -28,12 +28,12 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/songTotalTime"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@ -42,7 +42,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -53,10 +53,10 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:progressDrawable="@drawable/color_progress_seek"
android:layout_toLeftOf="@id/songTotalTime"
android:layout_toRightOf="@id/songCurrentProgress"
android:maxHeight="2dp"
android:progressDrawable="@drawable/color_progress_seek"
android:splitTrack="false"
tools:ignore="RtlHardcoded,UnusedAttribute"
tools:progress="20" />

6
app/src/main/res/layout/fragment_blur_player_playback_controls.xml
View File

@ -69,8 +69,8 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="28dp"
android:paddingStart="12dp"
android:layout_marginTop="12dp"
android:paddingStart="12dp"
android:paddingEnd="12dp">
<androidx.appcompat.widget.AppCompatSeekBar
@ -96,7 +96,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -110,7 +110,7 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />

4
app/src/main/res/layout/fragment_card_player_playback_controls.xml
View File

@ -22,7 +22,7 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -34,7 +34,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />

8
app/src/main/res/layout/fragment_classic_player_playback_controls.xml
View File

@ -12,7 +12,7 @@
android:layout_height="@dimen/progress_container_height"
android:background="@color/twenty_percent_black_overlay">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/playerSongCurrentProgress"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@ -21,12 +21,12 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/playerSongTotalTime"
android:layout_width="wrap_content"
android:layout_height="match_parent"
@ -35,7 +35,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />

6
app/src/main/res/layout/fragment_color_player_playback_controls.xml
View File

@ -24,7 +24,7 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -38,7 +38,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -51,8 +51,8 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/songTotalTime"
android:layout_toRightOf="@id/songCurrentProgress"
android:progressDrawable="@drawable/color_progress_seek"
android:maxHeight="2dp"
android:progressDrawable="@drawable/color_progress_seek"
tools:ignore="RtlHardcoded,UnusedAttribute"
tools:progress="20" />
</RelativeLayout>

4
app/src/main/res/layout/fragment_fit_playback_controls.xml
View File

@ -21,7 +21,7 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -33,7 +33,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />

4
app/src/main/res/layout/fragment_flat_player_playback_controls.xml
View File

@ -25,7 +25,7 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -39,7 +39,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />

6
app/src/main/res/layout/fragment_full_player_controls.xml
View File

@ -80,7 +80,6 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/songCurrentProgress"
style="@style/TextAppearance.MaterialComponents.Body1"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
@ -88,6 +87,7 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry"
@ -95,7 +95,6 @@
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/songTotalTime"
style="@style/TextAppearance.MaterialComponents.Body1"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentRight="true"
@ -103,6 +102,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry"
@ -115,9 +115,9 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/songTotalTime"
android:progressDrawable="@drawable/color_progress_seek"
android:layout_toRightOf="@id/songCurrentProgress"
android:maxHeight="3dp"
android:progressDrawable="@drawable/color_progress_seek"
android:splitTrack="false"
tools:ignore="RtlHardcoded,UnusedAttribute"
tools:progress="20" />

4
app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
View File

@ -66,7 +66,7 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -80,7 +80,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />

2
app/src/main/res/layout/fragment_main_options.xml
View File

@ -5,6 +5,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="0dp"
android:paddingEnd="16dp"
tools:ignore="MissingPrefix">
<code.name.monkey.retromusic.views.OptionMenuItemView

4
app/src/main/res/layout/fragment_material_playback_controls.xml
View File

@ -24,7 +24,7 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -38,7 +38,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />

6
app/src/main/res/layout/fragment_plain_controls_fragment.xml
View File

@ -21,7 +21,7 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -35,7 +35,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -47,9 +47,9 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@id/songTotalTime"
android:progressDrawable="@drawable/color_progress_seek"
android:layout_toRightOf="@id/songCurrentProgress"
android:maxHeight="2dp"
android:progressDrawable="@drawable/color_progress_seek"
android:splitTrack="false"
tools:ignore="RtlHardcoded,UnusedAttribute"
tools:progress="20" />

4
app/src/main/res/layout/fragment_player_playback_controls.xml
View File

@ -38,7 +38,7 @@
android:gravity="center_vertical|right|end"
android:paddingRight="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />
@ -52,7 +52,7 @@
android:gravity="center_vertical|left|end"
android:paddingLeft="8dp"
android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:textColorSecondary"
android:textSize="12sp"
tools:ignore="RtlHardcoded,RtlSymmetry" />

2
app/src/main/res/layout/fragment_simple_controls_fragment.xml
View File

@ -52,7 +52,7 @@
android:layout_weight="1"
android:gravity="center"
android:paddingTop="4dp"
android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp"
android:textStyle="bold"

2
app/src/main/res/layout/item_option_menu.xml
View File

@ -32,7 +32,7 @@
android:padding="14dp"
app:srcCompat="@drawable/ic_folder_white_24dp" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/title"
android:layout_width="match_parent"
android:layout_height="wrap_content"

8
app/src/main/res/layout/player_time.xml
View File

@ -10,28 +10,28 @@
tools:showIn="@layout/fragment_player_playback_controls">
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/songCurrentProgress"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp"
android:textStyle="bold"
tools:text="22.00" />
<TextView
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/songTotalTime"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="0"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:textAppearance="@style/TextAppearance.MaterialComponents.Overline"
android:textColor="?android:attr/textColorSecondary"
android:textSize="12sp"
android:textStyle="bold"
tools:text="22.00" />
</LinearLayout>

3
app/src/main/res/values/styles_parents.xml
View File

@ -56,6 +56,7 @@
<item name="md_font_body">@font/circular</item>
<item name="md_font_button">@font/circular</item>
<item name="md_color_button_text">@color/md_white_1000</item>
<item name="md_background_color">@color/dark_color</item>
<item name="android:windowActionBarOverlay">true</item>
<item name="windowActionBarOverlay">true</item>
@ -111,7 +112,7 @@
<item name="dividerColor">@color/dark_color</item>
<item name="defaultFooterColor">@color/md_grey_800</item>
<item name="cardBackgroundColor">@color/black_color</item>
<item name="md_background_color">@color/card_black_color</item>
<item name="md_background_color">@color/black_color</item>
<item name="android:windowBackground">@color/black_color</item>
<item name="colorPrimary">@color/black_color</item>