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 c0c9f71a1..34be7380e 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 @@ -59,12 +59,11 @@ import com.google.android.play.core.appupdate.AppUpdateManagerFactory import com.google.android.play.core.install.InstallState import com.google.android.play.core.install.InstallStateUpdatedListener import com.google.android.play.core.install.model.AppUpdateType -import com.google.android.play.core.install.model.InstallStatus -import com.google.android.play.core.install.model.InstallStatus.* +import com.google.android.play.core.install.model.InstallStatus.DOWNLOADED +import com.google.android.play.core.install.model.InstallStatus.INSTALLED import com.google.android.play.core.install.model.UpdateAvailability import com.google.android.play.core.tasks.Task import kotlinx.android.synthetic.main.activity_main_content.* -import java.math.BigInteger import java.util.* class MainActivity : AbsSlidingMusicPanelActivity(), @@ -136,13 +135,13 @@ class MainActivity : AbsSlidingMusicPanelActivity(), appLaunched(this) setupToolbar() checkUpdate() + updateTabs() getBottomNavigationView().selectedItemId = PreferenceUtilKT.lastPage getBottomNavigationView().setOnNavigationItemSelectedListener { PreferenceUtilKT.lastPage = it.itemId selectedFragment(it.itemId) true } - updateTabs() } override fun onResume() { @@ -621,6 +620,7 @@ class MainActivity : AbsSlidingMusicPanelActivity(), supportFragmentManager.commit { replace(R.id.fragment_container, fragment, tag) } + currentFragment = fragment as MainActivityFragmentCallbacks } private fun selectedFragment(itemId: Int) { diff --git a/app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java b/app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java index f0581ce69..9742a1bde 100644 --- a/app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java +++ b/app/src/main/java/code/name/monkey/retromusic/glide/UserProfileGlideRequest.java @@ -1,6 +1,7 @@ package code.name.monkey.retromusic.glide; import android.graphics.Bitmap; +import android.graphics.drawable.Drawable; import androidx.annotation.NonNull; @@ -13,6 +14,8 @@ import com.bumptech.glide.signature.MediaStoreSignature; import java.io.File; +import code.name.monkey.appthemehelper.ThemeStore; +import code.name.monkey.appthemehelper.util.TintHelper; import code.name.monkey.retromusic.App; import code.name.monkey.retromusic.R; @@ -39,10 +42,12 @@ public class UserProfileGlideRequest { public static class Builder { private RequestManager requestManager; private File profile; + private Drawable error; private Builder(RequestManager requestManager, File profile) { this.requestManager = requestManager; this.profile = profile; + error = TintHelper.createTintedDrawable(App.Companion.getContext(), R.drawable.ic_account_white_24dp, ThemeStore.Companion.accentColor(App.Companion.getContext())); } public static Builder from(@NonNull RequestManager requestManager, File profile) { @@ -51,10 +56,9 @@ public class UserProfileGlideRequest { @NonNull public BitmapRequestBuilder build() { - //noinspection unchecked return createBaseRequest(requestManager, profile) .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) - .placeholder(DEFAULT_ERROR_IMAGE) + .error(error) .animate(DEFAULT_ANIMATION) .signature(createSignature(profile)); } @@ -68,10 +72,9 @@ public class UserProfileGlideRequest { } public BitmapRequestBuilder build() { - //noinspection unchecked return createBaseRequest(builder.requestManager, builder.profile) .diskCacheStrategy(DEFAULT_DISK_CACHE_STRATEGY) - .error(DEFAULT_ERROR_IMAGE) + .error(builder.error) .animate(DEFAULT_ANIMATION) .signature(createSignature(builder.profile)); } diff --git a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt index 32cdf55ee..314e089e2 100644 --- a/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt +++ b/app/src/main/java/code/name/monkey/retromusic/views/BottomNavigationBarTinted.kt @@ -37,7 +37,6 @@ class BottomNavigationBarTinted @JvmOverloads constructor( init { labelVisibilityMode = PreferenceUtilKT.tabTitleMode - selectedItemId = PreferenceUtilKT.lastPage val iconColor = ATHUtil.resolveColor(context, android.R.attr.colorControlNormal) val accentColor = ThemeStore.accentColor(context) diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index f1c0419ad..9189ab32d 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -36,6 +36,7 @@ diff --git a/app/src/main/res/layout/list_item_color_view.xml b/app/src/main/res/layout/list_item_color_view.xml index 1f13faab2..ab19660b1 100644 --- a/app/src/main/res/layout/list_item_color_view.xml +++ b/app/src/main/res/layout/list_item_color_view.xml @@ -58,7 +58,7 @@ app:layout_constraintEnd_toStartOf="@android:id/widget_frame" app:layout_constraintStart_toStartOf="@+id/guideline_front_margin" app:layout_constraintTop_toBottomOf="@android:id/title" - app:lineHeightHint="20sp" + android:textAppearance="@style/TextViewNormal" tools:maxLines="2" tools:text="@tools:sample/lorem/random" /> diff --git a/app/src/main/res/layout/list_item_view.xml b/app/src/main/res/layout/list_item_view.xml index 8a2222511..df7a98788 100644 --- a/app/src/main/res/layout/list_item_view.xml +++ b/app/src/main/res/layout/list_item_view.xml @@ -60,7 +60,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@+id/guideline_front_margin" app:layout_constraintTop_toBottomOf="@android:id/title" - app:lineHeightHint="20sp" + android:textAppearance="@style/TextViewNormal" tools:maxLines="2" tools:text="@tools:sample/lorem/random" /> diff --git a/app/src/main/res/layout/list_item_view_seekbar.xml b/app/src/main/res/layout/list_item_view_seekbar.xml index a20fb1c60..b22f4bc9a 100644 --- a/app/src/main/res/layout/list_item_view_seekbar.xml +++ b/app/src/main/res/layout/list_item_view_seekbar.xml @@ -58,7 +58,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="@+id/guideline_front_margin" app:layout_constraintTop_toBottomOf="@android:id/title" - app:lineHeightHint="20sp" + android:textAppearance="@style/TextViewNormal" tools:maxLines="2" tools:text="@tools:sample/lorem/random" /> @@ -71,6 +71,8 @@ diff --git a/app/src/main/res/layout/list_setting_item_view.xml b/app/src/main/res/layout/list_setting_item_view.xml index bd10afee8..96ea3f172 100644 --- a/app/src/main/res/layout/list_setting_item_view.xml +++ b/app/src/main/res/layout/list_setting_item_view.xml @@ -63,6 +63,7 @@ android:ellipsize="marquee" android:fadingEdge="horizontal" android:maxLines="2" + android:textAppearance="@style/TextViewNormal" android:textColor="?android:attr/textColorSecondary" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index eafddf295..a2cbd0469 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -133,9 +133,7 @@ @font/google_san - +