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 e21e597c..dc3bebd2 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
@@ -19,7 +19,7 @@ import code.name.monkey.retromusic.loaders.AlbumLoader
import code.name.monkey.retromusic.loaders.ArtistLoader
import code.name.monkey.retromusic.loaders.PlaylistSongsLoader
import code.name.monkey.retromusic.service.MusicService
-import code.name.monkey.retromusic.transform.AppRater
+import code.name.monkey.retromusic.util.AppRater
import code.name.monkey.retromusic.util.PreferenceUtil
import io.reactivex.disposables.CompositeDisposable
import java.util.*
diff --git a/app/src/main/java/code/name/monkey/retromusic/transform/AppRater.kt b/app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt
similarity index 96%
rename from app/src/main/java/code/name/monkey/retromusic/transform/AppRater.kt
rename to app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt
index e100a093..99903810 100644
--- a/app/src/main/java/code/name/monkey/retromusic/transform/AppRater.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/util/AppRater.kt
@@ -12,7 +12,7 @@
* See the GNU General Public License for more details.
*/
-package code.name.monkey.retromusic.transform
+package code.name.monkey.retromusic.util
import android.content.Context
import android.content.Intent
@@ -20,7 +20,6 @@ import android.content.SharedPreferences
import android.graphics.Color
import android.net.Uri
import code.name.monkey.retromusic.R
-import code.name.monkey.retromusic.util.PreferenceUtil
import com.afollestad.materialdialogs.LayoutMode
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.WhichButton
@@ -58,7 +57,7 @@ object AppRater {
// Wait at least n days before opening
if (launchCount >= LAUNCHES_UNTIL_PROMPT) {
if (System.currentTimeMillis() >= dateFirstLaunch + DAYS_UNTIL_PROMPT * 24 * 60 * 60 * 1000) {
- showRateDialog(context, editor)
+ showRateDialog(context, editor)
}
}
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
deleted file mode 100644
index 290c6055..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/IconImageView.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * 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.
- */
-
-package code.name.monkey.retromusic.views;
-
-import android.content.Context;
-import android.content.res.ColorStateList;
-import android.graphics.PorterDuff;
-import android.util.AttributeSet;
-
-import androidx.appcompat.widget.AppCompatImageView;
-
-import code.name.monkey.appthemehelper.util.ATHUtil;
-import code.name.monkey.retromusic.R;
-
-
-public class IconImageView extends AppCompatImageView {
- public IconImageView(Context context) {
- super(context);
- init(context);
- }
-
- public IconImageView(Context context, AttributeSet attrs) {
- super(context, attrs);
- init(context);
- }
-
- public IconImageView(Context context, AttributeSet attrs, int defStyleAttr) {
- super(context, attrs, defStyleAttr);
- init(context);
- }
-
- private void init(Context context) {
- if (context == null) return;
- 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/ListItemView.kt b/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt
index 19f97ae1..fdf5dc66 100644
--- a/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/views/ListItemView.kt
@@ -51,4 +51,4 @@ class ListItemView : FrameLayout {
}
typedArray.recycle()
}
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/RetroChip.kt b/app/src/main/java/code/name/monkey/retromusic/views/RetroChip.kt
deleted file mode 100644
index c9229e03..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/RetroChip.kt
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * 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.
- */
-
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.content.res.ColorStateList
-import android.util.AttributeSet
-import code.name.monkey.appthemehelper.ThemeStore
-import code.name.monkey.appthemehelper.util.ATHUtil
-import code.name.monkey.retromusic.R
-import com.google.android.material.chip.Chip
-
-class RetroChip @JvmOverloads constructor(
- context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0) :
- Chip(context, attrs, defStyleAttr) {
- init {
- chipBackgroundColor = ColorStateList.valueOf(ThemeStore.primaryColor(context))
- val iconColor = ATHUtil.resolveColor(context, R.attr.iconColor)
- val dividerColor = ATHUtil.resolveColor(context, R.attr.dividerColor)
- chipIcon?.setTintList(ColorStateList.valueOf(iconColor))
- setTextColor(iconColor)
- chipStrokeColor = ColorStateList.valueOf(dividerColor)
-
- }
-}
diff --git a/app/src/main/java/code/name/monkey/retromusic/views/TopCornerCardView.kt b/app/src/main/java/code/name/monkey/retromusic/views/TopCornerCardView.kt
deleted file mode 100644
index 8b261d23..00000000
--- a/app/src/main/java/code/name/monkey/retromusic/views/TopCornerCardView.kt
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * 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.
- */
-
-package code.name.monkey.retromusic.views
-
-import android.content.Context
-import android.util.AttributeSet
-import code.name.monkey.retromusic.util.PreferenceUtil
-import com.google.android.material.card.MaterialCardView
-import com.google.android.material.shape.CornerFamily
-import com.google.android.material.shape.MaterialShapeDrawable
-
-/**
- * Created by hemanths on 2019-10-11.
- */
-class TopCornerCardView @JvmOverloads constructor(
- context: Context, attrs: AttributeSet? = null, defStyleAttr: Int = 0
-) : MaterialCardView(context, attrs, defStyleAttr) {
- private val shapeDrawable = MaterialShapeDrawable()
-
- init {
- val cornerSize= PreferenceUtil.getInstance(context).dialogCorner
- val shapeModel = shapeDrawable.shapeAppearanceModel
- background = shapeDrawable
- shapeDrawable.shapeAppearanceModel = shapeModel.toBuilder()
- .setTopLeftCorner(CornerFamily.ROUNDED, cornerSize)
- .setBottomLeftCorner(CornerFamily.ROUNDED, cornerSize)
- .setBottomRightCorner(CornerFamily.ROUNDED, cornerSize)
- .setTopRightCorner(CornerFamily.ROUNDED, cornerSize)
- .build()
- }
-}
diff --git a/app/src/main/res/layout-xlarge/activity_user_info.xml b/app/src/main/res/layout-xlarge/activity_user_info.xml
index 3b0593cc..53eae780 100644
--- a/app/src/main/res/layout-xlarge/activity_user_info.xml
+++ b/app/src/main/res/layout-xlarge/activity_user_info.xml
@@ -58,12 +58,13 @@
android:layout_height="228dp"
android:background="@color/twenty_percent_black_overlay" />
-
-
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5ba325cd..166d986f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -218,13 +218,6 @@
- @font/circular
-
-