diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 20059a14..22f909aa 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -1 +1 @@ -

v3.2.220

v3.2.203

v3.2.135

v3.2.125

v3.2.120

v3.2.105

v3.2.100

v3.2.000

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

v3.1.240

v3.1.200

v3.0.570

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file +

v3.2.220

v3.2.203

v3.2.135

v3.2.125

v3.2.120

v3.2.105

v3.2.100

v3.2.000

v3.1.900

v3.1.850

v3.1.800

v3.1.700

v3.1.400

v3.1.300

v3.1.240

v3.1.200

v3.0.570

If you see entire app white or dark or black select same theme in settings to fix

FAQ's

*If you face any UI related issues you clear app data and cache, if its not working try to uninstall and install again.

\ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt index 8a70a830..6ebdb0e7 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.kt @@ -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 diff --git a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt index c171f687..2f288b57 100644 --- a/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/dialogs/OptionsSheetDialogFragment.kt @@ -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 diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt index 0765d7bd..bef06e3e 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/base/AbsMainActivityFragment.kt @@ -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") } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java index f2e205a4..2583599f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/LibraryFragment.java @@ -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() { diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java index 1d585627..1923f230 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/folders/FoldersFragment.java @@ -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(), diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt index 024f2e01..532f49a0 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/mainactivity/home/BannerHomeFragment.kt @@ -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(toolbarContainer, resources.getString(R.string.transition_toolbar)) NavigationUtil.goToSearch(activity!!, pairImageView) } + } mainActivity.setSupportActionBar(toolbar) + toolbar.setNavigationOnClickListener { v -> showMainMenu(OptionsSheetDialogFragment.LIBRARY) } } override fun handleBackPress(): Boolean { diff --git a/app/src/main/java/code/name/monkey/retromusic/views/IconImageView.java b/app/src/main/java/code/name/monkey/retromusic/views/IconImageView.java index a0ac4282..290c6055 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/IconImageView.java +++ b/app/src/main/java/code/name/monkey/retromusic/views/IconImageView.java @@ -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); } } diff --git a/app/src/main/java/code/name/monkey/retromusic/views/OptionMenuItemView.java b/app/src/main/java/code/name/monkey/retromusic/views/OptionMenuItemView.java index 3051585f..349d86bd 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/OptionMenuItemView.java +++ b/app/src/main/java/code/name/monkey/retromusic/views/OptionMenuItemView.java @@ -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)); + } + } } \ No newline at end of file diff --git a/app/src/main/res/drawable/menu_item_background.xml b/app/src/main/res/drawable/menu_item_background.xml new file mode 100644 index 00000000..e0eb4c3f --- /dev/null +++ b/app/src/main/res/drawable/menu_item_background.xml @@ -0,0 +1,22 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml index e6816be8..9576a335 100644 --- a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml @@ -19,7 +19,7 @@ android:paddingStart="12dp" android:paddingEnd="12dp"> - - @@ -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" /> diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml index 5e3b3cc2..b968aec8 100644 --- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml @@ -69,8 +69,8 @@ @@ -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" /> diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml index 76e10b24..3e981d0a 100644 --- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_classic_player_playback_controls.xml b/app/src/main/res/layout/fragment_classic_player_playback_controls.xml index fb4c8a33..a16be5b0 100644 --- a/app/src/main/res/layout/fragment_classic_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_classic_player_playback_controls.xml @@ -12,7 +12,7 @@ android:layout_height="@dimen/progress_container_height" android:background="@color/twenty_percent_black_overlay"> - - diff --git a/app/src/main/res/layout/fragment_color_player_playback_controls.xml b/app/src/main/res/layout/fragment_color_player_playback_controls.xml index 4a112160..94cf7da5 100644 --- a/app/src/main/res/layout/fragment_color_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_color_player_playback_controls.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_fit_playback_controls.xml b/app/src/main/res/layout/fragment_fit_playback_controls.xml index 9e6eb290..825ab5ed 100644 --- a/app/src/main/res/layout/fragment_fit_playback_controls.xml +++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml index b06dc9f8..14c861ce 100644 --- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_full_player_controls.xml b/app/src/main/res/layout/fragment_full_player_controls.xml index 0b71f1b9..642f2b27 100644 --- a/app/src/main/res/layout/fragment_full_player_controls.xml +++ b/app/src/main/res/layout/fragment_full_player_controls.xml @@ -80,7 +80,6 @@ diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml index 65b776e6..9140d27c 100644 --- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml +++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_main_options.xml b/app/src/main/res/layout/fragment_main_options.xml index 5360c466..8eb58e6b 100644 --- a/app/src/main/res/layout/fragment_main_options.xml +++ b/app/src/main/res/layout/fragment_main_options.xml @@ -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"> @@ -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" /> diff --git a/app/src/main/res/layout/fragment_plain_controls_fragment.xml b/app/src/main/res/layout/fragment_plain_controls_fragment.xml index 4740c84a..a03d4acf 100644 --- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml index 320b341b..7fa64266 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -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" /> diff --git a/app/src/main/res/layout/fragment_simple_controls_fragment.xml b/app/src/main/res/layout/fragment_simple_controls_fragment.xml index 19b3d695..c97c54b0 100644 --- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml +++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml @@ -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" diff --git a/app/src/main/res/layout/item_option_menu.xml b/app/src/main/res/layout/item_option_menu.xml index 60a8286d..eee36b35 100644 --- a/app/src/main/res/layout/item_option_menu.xml +++ b/app/src/main/res/layout/item_option_menu.xml @@ -32,7 +32,7 @@ android:padding="14dp" app:srcCompat="@drawable/ic_folder_white_24dp" /> - - - \ No newline at end of file diff --git a/app/src/main/res/values/styles_parents.xml b/app/src/main/res/values/styles_parents.xml index 9341c759..aacedbc3 100644 --- a/app/src/main/res/values/styles_parents.xml +++ b/app/src/main/res/values/styles_parents.xml @@ -56,6 +56,7 @@ @font/circular @font/circular @color/md_white_1000 + @color/dark_color true true @@ -111,7 +112,7 @@ @color/dark_color @color/md_grey_800 @color/black_color - @color/card_black_color + @color/black_color @color/black_color @color/black_color