Removed unsed libs

app/src/main/java/code/name/monkey/retromusic/App.kt

@@ -44,12 +44,6 @@ class App : MultiDexApplication() {
         if (VersionUtils.hasNougatMR())
             DynamicShortcutManager(this).initDynamicShortcuts()
 
-
-        CalligraphyConfig.initDefault(CalligraphyConfig.Builder()
-                .setDefaultFont(R.font.circular_std_book)
-                .build()
-        )
-
         // automatically restores purchases
         billingProcessor = BillingProcessor(this, BuildConfig.GOOGLE_PLAY_LICENSING_KEY,
                 object : BillingProcessor.IBillingHandler {

app/src/main/java/code/name/monkey/retromusic/activities/base/AbsThemeActivity.kt

@@ -1,5 +1,6 @@
 package code.name.monkey.retromusic.activities.base
 
+import android.content.Context
 import android.graphics.Color
 import android.graphics.drawable.Drawable
 import android.os.Bundle
@@ -16,6 +17,8 @@ import code.name.monkey.appthemehelper.util.*
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.util.PreferenceUtil
 import code.name.monkey.retromusic.util.RetroUtil
+import uk.co.chrisjenx.calligraphy.CalligraphyContextWrapper
+import uk.co.chrisjenx.calligraphy.CalligraphyTypefaceSpan
 
 abstract class AbsThemeActivity : ATHActivity(), Runnable {
 

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

@@ -15,12 +15,10 @@
 package code.name.monkey.retromusic.dialogs
 
 import android.app.Dialog
-import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import androidx.fragment.app.DialogFragment
-import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.retromusic.R
 import code.name.monkey.retromusic.activities.MainActivity
 import code.name.monkey.retromusic.util.NavigationUtil
@@ -38,6 +36,7 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
             R.id.actionFolders -> mainActivity.selectedFragment(R.id.action_folder)
             R.id.actionLibrary -> mainActivity.selectedFragment(PreferenceUtil.getInstance().lastPage)
             R.id.actionSettings -> NavigationUtil.goToSettings(mainActivity)
+            R.id.actionRate -> NavigationUtil.goToPlayStore(mainActivity)
         }
         materialDialog.dismiss()
     }
@@ -45,11 +44,13 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
     private lateinit var actionSettings: OptionMenuItemView
     private lateinit var actionLibrary: OptionMenuItemView
     private lateinit var actionFolders: OptionMenuItemView
+    private lateinit var actionRate: OptionMenuItemView
     private lateinit var materialDialog: MaterialDialog
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val layout = LayoutInflater.from(context).inflate(R.layout.fragment_main_options, null)
         actionSettings = layout.findViewById(R.id.actionSettings)
+        actionRate = layout.findViewById(R.id.actionRate)
         actionLibrary = layout.findViewById(R.id.actionLibrary)
         actionFolders = layout.findViewById(R.id.actionFolders)
 
@@ -60,9 +61,11 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
         }
 
         actionSettings.setOnClickListener(this)
+        actionRate.setOnClickListener(this)
         actionLibrary.setOnClickListener(this)
         actionFolders.setOnClickListener(this)
 
+
         materialDialog = MaterialDialog(activity!!, BottomSheet())
                 .show {
                     icon(R.mipmap.ic_launcher_round)
@@ -72,11 +75,8 @@ class OptionsSheetDialogFragment : DialogFragment(), View.OnClickListener {
         return materialDialog
     }
 
-
     companion object {
 
-        private const val TAG: String = "MainOptionsBottomSheetD"
-
         private const val WHICH_ONE = "which_one"
         @JvmField
         var LIBRARY: Int = 0

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

@@ -1,7 +1,6 @@
 package code.name.monkey.retromusic.fragments.mainactivity.folders;
 
 import android.app.Dialog;
-import android.app.ProgressDialog;
 import android.content.Context;
 import android.media.MediaScannerConnection;
 import android.os.Bundle;
@@ -27,6 +26,7 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.afollestad.materialcab.MaterialCab;
 import com.google.android.material.appbar.AppBarLayout;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;
 import com.simplecityapps.recyclerview_fastscroll.views.FastScrollRecyclerView;
 
@@ -64,7 +64,6 @@ import code.name.monkey.retromusic.model.Song;
 import code.name.monkey.retromusic.util.FileUtil;
 import code.name.monkey.retromusic.util.PreferenceUtil;
 import code.name.monkey.retromusic.util.RetroColorUtil;
-import code.name.monkey.retromusic.util.RetroUtil;
 import code.name.monkey.retromusic.util.ViewUtil;
 import code.name.monkey.retromusic.views.BreadCrumbLayout;
 
@@ -729,14 +728,13 @@ public class FoldersFragment extends AbsMainActivityFragment implements
 
         @Override
         protected Dialog createDialog(@NonNull Context context) {
-            ProgressDialog dialog = new ProgressDialog(context);
-            dialog.setIndeterminate(true);
-            dialog.setTitle(R.string.listing_files);
-            dialog.setCancelable(false);
-            dialog.setProgressStyle(ProgressDialog.STYLE_HORIZONTAL);
-            dialog.setOnCancelListener(dialog1 -> cancel(false));
-            dialog.setOnDismissListener(dialog1 -> cancel(false));
-            return dialog;
+            return new MaterialAlertDialogBuilder(context)
+                    .setTitle(R.string.listing_files)
+                    .setCancelable(false)
+                    .setView(R.layout.loading)
+                    .setOnCancelListener(dialog -> cancel(false))
+                    .setOnDismissListener(dialog -> cancel(false))
+                    .create();
         }
     }
 }

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

@@ -56,6 +56,9 @@ public class OptionMenuItemView extends FrameLayout {
         int accentColor = ThemeStore.Companion.accentColor(context);
         setBackground(ContextCompat.getDrawable(context, R.drawable.menu_item_background));
 
+        setClickable(true);
+        setFocusable(true);
+
         inflate(context, R.layout.item_option_menu, this);
 
         setBackgroundTintList(ColorStateList.valueOf(ColorUtil.INSTANCE.adjustAlpha(accentColor, 0.22f)));