diff --git a/app/build.gradle b/app/build.gradle index 6af42245..e72fe87c 100644 --- 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 diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html index 3b590b89..4c86d4d4 100644 --- a/app/src/main/assets/retro-changelog.html +++ b/app/src/main/assets/retro-changelog.html @@ -57,7 +57,7 @@ -
April 28, 2020
+
April 30, 2020

v3.5.110

Beta version

What's New

diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/AboutActivity.kt index 361dadf1..6f51e696 100644 --- 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) } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java b/app/src/main/java/code/name/monkey/retromusic/activities/MainActivity.java index 4a69df15..7ef63a87 100644 --- 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(); diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/PurchaseActivity.kt index f2a5ee8e..20f18749 100644 --- 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() { diff --git 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 index 243bcc41..7c3260e6 100644 --- 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() } } } \ No newline at end of file diff --git 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 index b0e0887f..9a5d7e40 100644 --- 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() } } } \ No newline at end of file diff --git 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 index 41ad32ac..e737a1a1 100644 --- 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() } } } \ No newline at end of file diff --git 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 index 554f2c81..71d8df24 100644 --- 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> + var playlists = MutableLiveData>() 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() } } } \ No newline at end of file diff --git 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 index ff220761..3a15ff2f 100644 --- 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() } } } \ No newline at end of file diff --git a/app/src/main/res/drawable/shadow_pro.xml b/app/src/main/res/drawable/shadow_pro.xml new file mode 100644 index 00000000..a7c0a9ef --- /dev/null +++ b/app/src/main/res/drawable/shadow_pro.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_pro_version.xml b/app/src/main/res/layout/activity_pro_version.xml index 6fccf43d..f3ae45b2 100644 --- a/app/src/main/res/layout/activity_pro_version.xml +++ b/app/src/main/res/layout/activity_pro_version.xml @@ -1,217 +1,225 @@ - + + - - - - - - + android:layout_height="wrap_content" + android:background="@android:color/transparent" + android:elevation="0dp" + app:elevation="0dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/status_bar"> - + - - + + + + android:gravity="center_vertical" + android:orientation="horizontal"> - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:padding="16dp" + android:text="@string/black_theme_name" + android:textAppearance="@style/TextViewSubtitle1" + android:textColor="@color/md_white_1000" /> - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1b104003..99906097 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -850,6 +850,7 @@ Select language Translators The people who helped translate this app + Try Retro Music Premium Song