Fix not showing empty state

2020-05-01 02:18:14 +05:30 · 2020-05-01 02:18:14 +05:30 · 69c76556a2
commit 69c76556a2
parent 911e18bf89
13 changed files with 234 additions and 205 deletions
--- a/app/build.gradle
+++ b/app/build.gradle
@ -24,7 +24,7 @@ android {
        vectorDrawables.useSupportLibrary = true

        applicationId "code.name.monkey.retromusic"
-        versionCode 420
+        versionCode 422
        versionName '3.5.110'

        multiDexEnabled true
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@ -57,7 +57,7 @@
 </head>

 <body>
-    <h5>April 28, 2020</h5>
+    <h5>April 30, 2020</h5>
    <h2>v3.5.110</h2>
    <span class="tag"><i>Beta version</i></span>
    <h3><span class="colorHeader">What's New</span></h3>
--- a/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt
@ -27,9 +27,7 @@ import code.name.monkey.retromusic.adapter.ContributorAdapter
 import code.name.monkey.retromusic.model.Contributor
 import code.name.monkey.retromusic.util.NavigationUtil
 import code.name.monkey.retromusic.util.PreferenceUtil
-import com.afollestad.materialdialogs.LayoutMode
 import com.afollestad.materialdialogs.MaterialDialog
-import com.afollestad.materialdialogs.bottomsheets.BottomSheet
 import com.afollestad.materialdialogs.list.listItems
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
@ -121,7 +119,7 @@ class AboutActivity : AbsBaseActivity(), View.OnClickListener {
            R.id.donateLink -> NavigationUtil.goToSupportDevelopment(this)
            R.id.instagramLink -> openUrl(APP_INSTAGRAM_LINK)
            R.id.twitterLink -> openUrl(APP_TWITTER_LINK)
-            R.id.changelog -> showChangeLogOptions()
+            R.id.changelog -> openUrl(TELEGRAM_CHANGE_LOG)
            R.id.openSource -> NavigationUtil.goToOpenSource(this)
            R.id.bugReportLink -> NavigationUtil.bugReport(this)
        }
--- a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java
@ -183,7 +183,7 @@ public class MainActivity extends AbsSlidingMusicPanelActivity
        mToolbar = findViewById(R.id.toolbar);
        mAppBarLayout = findViewById(R.id.appBarLayout);

-        checkShowChangelog();
+        //checkShowChangelog();
        AppRater.appLaunched(this);
        setupToolbar();
        checkUpdate();
--- a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt
@ -1,12 +1,14 @@
 package code.name.monkey.retromusic.activities

 import android.content.Intent
+import android.content.res.ColorStateList
+import android.graphics.Color
 import android.os.AsyncTask
 import android.os.Bundle
 import android.util.Log
 import android.view.MenuItem
 import android.widget.Toast
-import code.name.monkey.appthemehelper.util.ATHUtil
+import code.name.monkey.appthemehelper.ThemeStore
 import code.name.monkey.appthemehelper.util.MaterialUtil
 import code.name.monkey.retromusic.App
 import code.name.monkey.retromusic.BuildConfig
@ -26,18 +28,18 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
        setDrawUnderStatusBar()
        super.onCreate(savedInstanceState)
        setContentView(R.layout.activity_pro_version)
-        setStatusbarColorAuto()
-        setNavigationbarColorAuto()
-        setLightNavigationBar(true)
-        toolbar.setBackgroundColor(ATHUtil.resolveColor(this, R.attr.colorSurface))
-        setSupportActionBar(toolbar)
+        setStatusbarColor(Color.TRANSPARENT)
+        setLightStatusbar(false)
+        setNavigationbarColor(Color.BLACK)
+        setLightNavigationBar(false)
+        toolbar.navigationIcon?.setTint(Color.WHITE)
+        toolbar.setNavigationOnClickListener { onBackPressed() }

        restoreButton.isEnabled = false
        purchaseButton.isEnabled = false

        billingProcessor = BillingProcessor(this, BuildConfig.GOOGLE_PLAY_LICENSING_KEY, this)

-        MaterialUtil.setTint(restoreButton, false)
        MaterialUtil.setTint(purchaseButton, true)

        restoreButton.setOnClickListener {
@ -49,6 +51,8 @@ class PurchaseActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler {
        purchaseButton.setOnClickListener {
            billingProcessor.purchase(this@PurchaseActivity, App.PRO_VERSION_PRODUCT_ID)
        }
+        bannerContainer.backgroundTintList =
+            ColorStateList.valueOf(ThemeStore.accentColor(this))
    }

    private fun restorePurchase() {
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/albums/AlbumViewModel.kt
@ -20,6 +20,8 @@ class AlbumViewModel(application: Application) : AndroidViewModel(application) {
        val result = RepositoryImpl(getApplication()).allAlbums()
        if (result is Result.Success) {
            albums.value = result.data
+        }else {
+            albums.value = listOf()
        }
    }
 }
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/artists/ArtistViewModel.kt
@ -20,6 +20,8 @@ class ArtistViewModel(application: Application) : AndroidViewModel(application)
        val result = RepositoryImpl(getApplication()).allArtists()
        if (result is Result.Success) {
            artists.value = result.data
+        } else {
+            artists.value = listOf()
        }
    }
 }
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/genres/GenreViewModel.kt
@ -20,6 +20,8 @@ class GenreViewModel(application: Application) : AndroidViewModel(application) {
        val result = RepositoryImpl(getApplication()).allGenres()
        if (result is Success) {
            genres.value = result.data
+        }else {
+            genres.value = listOf()
        }
    }
 }
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/playlists/PlaylistViewModel.kt
@ -10,7 +10,7 @@ import code.name.monkey.retromusic.providers.RepositoryImpl
 import kotlinx.coroutines.launch

 class PlaylistViewModel(application: Application) : AndroidViewModel(application) {
-    lateinit var playlists: MutableLiveData<List<Playlist>>
+    var playlists = MutableLiveData<List<Playlist>>()

    init {
        loadPlaylist()
@ -19,7 +19,9 @@ class PlaylistViewModel(application: Application) : AndroidViewModel(application
    fun loadPlaylist() = viewModelScope.launch {
        val result = RepositoryImpl(getApplication()).allPlaylists()
        if (result is Result.Success) {
-            playlists = MutableLiveData(result.data)
+            playlists.value = result.data
+        } else {
+            playlists.value = listOf()
        }
    }
 }
--- a/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsViewModel.kt
+++ b/app/src/main/java/code/name/monkey/retromusic/fragments/songs/SongsViewModel.kt
@ -20,6 +20,8 @@ class SongsViewModel(application: Application) : AndroidViewModel(application) {
        val result = RepositoryImpl(getApplication()).allSongs()
        if (result is Success) {
            songs.value = result.data
+        } else {
+            songs.value = listOf()
        }
    }
 }
--- a/app/src/main/res/drawable/shadow_pro.xml
+++ b/app/src/main/res/drawable/shadow_pro.xml
@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <gradient
+        android:angle="315"
+        android:centerColor="@android:color/transparent"
+        android:endColor="@android:color/transparent"
+        android:startColor="@color/md_deep_purple_500" />
+</shape>
--- a/app/src/main/res/layout/activity_pro_version.xml
+++ b/app/src/main/res/layout/activity_pro_version.xml
@ -1,37 +1,42 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:app="http://schemas.android.com/apk/res-auto"
    xmlns:tools="http://schemas.android.com/tools"
    android:layout_width="match_parent"
+    android:background="@color/md_black_1000"
    android:layout_height="match_parent"
    android:orientation="vertical">

+    <View
+        android:id="@+id/bannerContainer"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:background="@drawable/shadow_pro"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
    <code.name.monkey.retromusic.views.StatusBarView
        android:id="@+id/status_bar"
        android:layout_width="match_parent"
        android:layout_height="0dp"
        android:background="?attr/colorSurface"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
        tools:ignore="UnusedAttribute" />

-
-    <androidx.coordinatorlayout.widget.CoordinatorLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="?attr/colorSurface">
-
    <com.google.android.material.appbar.AppBarLayout
        android:id="@+id/appBarLayout"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:background="@android:color/transparent"
        android:elevation="0dp"
-            app:elevation="0dp">
-
-            <com.google.android.material.appbar.CollapsingToolbarLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                app:layout_scrollFlags="scroll|enterAlways"
-                app:titleEnabled="false">
+        app:elevation="0dp"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/status_bar">


        <com.google.android.material.appbar.MaterialToolbar
@ -41,30 +46,21 @@
            app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp"
            app:title="@string/retro_music_pro"
            app:titleTextAppearance="@style/ToolbarTextAppearanceNormal"
+            app:titleTextColor="@color/md_white_1000"
            tools:ignore="UnusedAttribute" />

-            </com.google.android.material.appbar.CollapsingToolbarLayout>
    </com.google.android.material.appbar.AppBarLayout>


    <LinearLayout
+        android:id="@+id/cardContent"
        android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+        android:layout_height="0dp"
        android:orientation="vertical"
-            app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
-
-            <com.google.android.material.card.MaterialCardView
-                android:id="@+id/content"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_margin="4dp"
-                app:cardCornerRadius="8dp"
-                app:cardUseCompatPadding="true">
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:orientation="vertical">
+        app:layout_constraintBottom_toTopOf="@id/actions"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/appBarLayout">

        <LinearLayout
            android:layout_width="match_parent"
@ -77,14 +73,15 @@
                android:layout_height="wrap_content"
                android:padding="16dp"
                app:srcCompat="@drawable/ic_invert_colors_white_24dp"
-                            app:tint="?colorOnSurface" />
+                app:tint="@color/md_white_1000" />

            <com.google.android.material.textview.MaterialTextView
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:padding="16dp"
                android:text="@string/black_theme_name"
-                            android:textAppearance="@style/TextViewSubtitle1" />
+                android:textAppearance="@style/TextViewSubtitle1"
+                android:textColor="@color/md_white_1000" />
        </LinearLayout>

        <LinearLayout
@ -98,17 +95,17 @@
                android:layout_height="wrap_content"
                android:padding="16dp"
                app:srcCompat="@drawable/ic_theme_palette_white_24dp"
-                            app:tint="?colorOnSurface" />
+                app:tint="@color/md_white_1000" />

            <com.google.android.material.textview.MaterialTextView
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:padding="16dp"
                android:text="@string/now_playing_themes"
-                            android:textAppearance="@style/TextViewSubtitle1" />
+                android:textAppearance="@style/TextViewSubtitle1"
+                android:textColor="@color/md_white_1000" />
        </LinearLayout>

-
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
@ -120,14 +117,15 @@
                android:layout_height="wrap_content"
                android:padding="16dp"
                app:srcCompat="@drawable/ic_view_carousel_black_24dp"
-                            app:tint="?colorOnSurface" />
+                app:tint="@color/md_white_1000" />

            <com.google.android.material.textview.MaterialTextView
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:padding="16dp"
                android:text="@string/carousal_effect_on_now_playing_screen"
-                            android:textAppearance="@style/TextViewSubtitle1" />
+                android:textAppearance="@style/TextViewSubtitle1"
+                android:textColor="@color/md_white_1000" />
        </LinearLayout>

        <LinearLayout
@ -142,17 +140,17 @@
                android:layout_height="wrap_content"
                android:padding="16dp"
                app:srcCompat="@drawable/ic_rounded_corner"
-                            app:tint="?colorOnSurface" />
+                app:tint="@color/md_white_1000" />

            <com.google.android.material.textview.MaterialTextView
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:padding="16dp"
                android:text="@string/window_corner_edges"
-                            android:textAppearance="@style/TextViewSubtitle1" />
+                android:textAppearance="@style/TextViewSubtitle1"
+                android:textColor="@color/md_white_1000" />
        </LinearLayout>

-
        <LinearLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
@ -164,54 +162,64 @@
                android:layout_height="wrap_content"
                android:padding="16dp"
                app:srcCompat="@drawable/ic_favorite_white_24dp"
-                            app:tint="?colorOnSurface" />
+                app:tint="@color/md_white_1000" />

            <com.google.android.material.textview.MaterialTextView
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:padding="16dp"
                android:text="@string/support_development"
-                            android:textAppearance="@style/TextViewSubtitle1" />
+                android:textAppearance="@style/TextViewSubtitle1"
+                android:textColor="@color/md_white_1000" />
        </LinearLayout>

-
    </LinearLayout>
-            </com.google.android.material.card.MaterialCardView>

    <LinearLayout
        android:id="@+id/actions"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
-                android:orientation="horizontal">
+        android:orientation="vertical"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent">
+
+        <com.google.android.material.textview.MaterialTextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center"
+            android:padding="24dp"
+            android:text="@string/try_retro_music_premium"
+            android:textAppearance="@style/TextViewHeadline5"
+            android:textColor="@color/md_white_1000" />

        <com.google.android.material.button.MaterialButton
            android:id="@+id/restoreButton"
-                    style="@style/Widget.MaterialComponents.Button.OutlinedButton"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:layout_weight="1"
-                    android:paddingTop="14dp"
-                    android:paddingBottom="14dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:paddingVertical="16dp"
            android:text="@string/restore"
-                    android:textAllCaps="false"
-                    android:textColor="?colorOnBackground"
-                    app:strokeWidth="2dp" />
+            android:textAppearance="@style/TextViewHeadline6"
+            android:textColor="@color/md_black_1000"
+            app:backgroundTint="@color/md_white_1000"
+            app:cornerRadius="28dp" />


        <com.google.android.material.button.MaterialButton
            android:id="@+id/purchaseButton"
-                    style="@style/Widget.MaterialComponents.Button"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
-                    android:layout_margin="8dp"
-                    android:layout_weight="1"
-                    android:paddingTop="14dp"
-                    android:paddingBottom="14dp"
+            android:layout_marginStart="16dp"
+            android:layout_marginEnd="16dp"
+            android:paddingVertical="16dp"
            android:text="@string/purchase"
-                    android:textAllCaps="false" />
+            android:textAppearance="@style/TextViewHeadline6"
+            app:cornerRadius="28dp" />

    </LinearLayout>
-        </LinearLayout>
-    </androidx.coordinatorlayout.widget.CoordinatorLayout>
-</LinearLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@ -850,6 +850,7 @@
    <string name="pref_language_name">Select language</string>
    <string name="translators">Translators</string>
    <string name="translators_summary">The people who helped translate this app</string>
+    <string name="try_retro_music_premium">Try Retro Music Premium</string>

    <plurals name="albumSongs">
        <item quantity="one">Song</item>