diff --git a/app/build.gradle b/app/build.gradle index 1301858db..db4680260 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,7 +24,7 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 410 + versionCode 411 versionName '3.4.950' multiDexEnabled true diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 02ad241b9..b58c71e0b 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -68,7 +68,3 @@ -obfuscationdictionary build/obfuscation-dictionary.txt -classobfuscationdictionary build/class-dictionary.txt -packageobfuscationdictionary build/package-dictionary.txt - -# Move all classes and packages into the root package. --repackageclasses '' --flattenpackagehierarchy \ No newline at end of file diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt index 16c625573..20e50ebda 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt @@ -191,6 +191,7 @@ class SkuDetailsAdapter( 4 -> R.drawable.ic_fast_food_meal_white_24dp 5 -> R.drawable.ic_popcorn_white_24dp 6 -> R.drawable.ic_card_giftcard_white_24dp + 7 -> R.drawable.ic_food_croissant_white_24dp else -> R.drawable.ic_card_giftcard_white_24dp } } diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt index d1e4c7ded..5907d3660 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/ContributorAdapter.kt @@ -10,6 +10,7 @@ import code.name.monkey.retromusic.R import code.name.monkey.retromusic.model.Contributor import code.name.monkey.retromusic.util.RetroUtil.openUrl import code.name.monkey.retromusic.views.CircularImageView +import code.name.monkey.retromusic.views.RetroShapeableImageView import com.bumptech.glide.Glide class ContributorAdapter( @@ -62,14 +63,17 @@ class ContributorAdapter( inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) { val title: TextView = itemView.findViewById(R.id.title) val text: TextView = itemView.findViewById(R.id.text) - val image: CircularImageView = itemView.findViewById(R.id.icon) + val image: RetroShapeableImageView = itemView.findViewById(R.id.icon) internal fun bindData(contributor: Contributor) { title.text = contributor.name text.text = contributor.summary - Glide.with(image.context).load(contributor.profileImage) + Glide.with(image.context) + .load(contributor.profileImage) .error(R.drawable.ic_account_white_24dp) - .placeholder(R.drawable.ic_account_white_24dp).dontAnimate().into(image) + .placeholder(R.drawable.ic_account_white_24dp) + .dontAnimate() + .into(image) } } } diff --git a/app/src/main/res/drawable/ic_beer_white_24dp.xml b/app/src/main/res/drawable/ic_beer_white_24dp.xml index 347dc731d..a364706ab 100644 --- a/app/src/main/res/drawable/ic_beer_white_24dp.xml +++ b/app/src/main/res/drawable/ic_beer_white_24dp.xml @@ -1,24 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> - - - - - + android:fillColor="@color/md_white_1000" + android:pathData="M9.5 3C7.56 3 5.85 4.24 5.23 6.08C3.36 6.44 2 8.09 2 10C2 12.21 3.79 14 6 14V22H17V20H20C20.55 20 21 19.55 21 19V11C21 10.45 20.55 10 20 10H18V8C18 5.79 16.21 4 14 4H12.32C11.5 3.35 10.53 3 9.5 3M9.5 5C10.29 5 11.03 5.37 11.5 6H14C15.11 6 16 6.9 16 8H12C10 8 9.32 9.13 8.5 10.63C7.68 12.13 6 12 6 12C4.89 12 4 11.11 4 10C4 8.9 4.89 8 6 8H7V7.5C7 6.12 8.12 5 9.5 5M17 12H19V18H17Z" /> diff --git a/app/src/main/res/drawable/ic_fast_food_meal_white_24dp.xml b/app/src/main/res/drawable/ic_fast_food_meal_white_24dp.xml index 4598c484b..65573286f 100644 --- a/app/src/main/res/drawable/ic_fast_food_meal_white_24dp.xml +++ b/app/src/main/res/drawable/ic_fast_food_meal_white_24dp.xml @@ -1,30 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + - - - - - - - + android:fillColor="@color/md_white_1000" + android:pathData="M15.5,21L14,8H16.23L15.1,3.46L16.84,3L18.09,8H22L20.5,21H15.5M5,11H10A3,3 0 0,1 13,14H2A3,3 0 0,1 5,11M13,18A3,3 0 0,1 10,21H5A3,3 0 0,1 2,18H13M3,15H8L9.5,16.5L11,15H12A1,1 0 0,1 13,16A1,1 0 0,1 12,17H3A1,1 0 0,1 2,16A1,1 0 0,1 3,15Z" /> diff --git a/app/src/main/res/drawable/ic_food_croissant_white_24dp.xml b/app/src/main/res/drawable/ic_food_croissant_white_24dp.xml new file mode 100644 index 000000000..5428c56a9 --- /dev/null +++ b/app/src/main/res/drawable/ic_food_croissant_white_24dp.xml @@ -0,0 +1,10 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_popcorn_white_24dp.xml b/app/src/main/res/drawable/ic_popcorn_white_24dp.xml index 5f0f93fde..1dcf7c62b 100644 --- a/app/src/main/res/drawable/ic_popcorn_white_24dp.xml +++ b/app/src/main/res/drawable/ic_popcorn_white_24dp.xml @@ -1,5 +1,9 @@ - - - + + diff --git a/app/src/main/res/drawable/ic_take_away_coffe_white_24dp.xml b/app/src/main/res/drawable/ic_take_away_coffe_white_24dp.xml index 93f951c6b..67ae9d911 100644 --- a/app/src/main/res/drawable/ic_take_away_coffe_white_24dp.xml +++ b/app/src/main/res/drawable/ic_take_away_coffe_white_24dp.xml @@ -1,12 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> - - + android:fillColor="@color/md_white_1000" + android:pathData="M3 3V11A4 4 0 0 0 7 15H11A4 4 0 0 0 15 11V10H17C18.11 10 19 9.11 19 8V5C19 3.9 18.11 3 17 3H3M5 5H13V11A2 2 0 0 1 11 13H7A2 2 0 0 1 5 11V5M15 5H17V8H15V5M16.67 13.83L15.26 15.24L17 17H3V19H17L15.26 20.76L16.67 22.17L20.84 18L16.67 13.83Z" /> + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_take_away_white_24dp.xml b/app/src/main/res/drawable/ic_take_away_white_24dp.xml index efe7c722b..67318ebf3 100644 --- a/app/src/main/res/drawable/ic_take_away_white_24dp.xml +++ b/app/src/main/res/drawable/ic_take_away_white_24dp.xml @@ -1,9 +1,9 @@ + android:viewportWidth="24" + android:viewportHeight="24"> + android:fillColor="@color/md_white_1000" + android:pathData="M15 11V20A2 2 0 0 1 13 22H11A2 2 0 0 1 9 20V11A2 2 0 0 1 9.6 9.58C11.1 7.89 11 4 11 4H10V2H14V4H13S12.9 7.89 14.4 9.58A2 2 0 0 1 15 11Z" /> diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml index 47910c125..0bb2697c7 100644 --- a/app/src/main/res/layout/activity_donation.xml +++ b/app/src/main/res/layout/activity_donation.xml @@ -4,7 +4,8 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/root" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:background="?attr/colorSurface"> diff --git a/app/src/main/res/layout/item_donation_option.xml b/app/src/main/res/layout/item_donation_option.xml index 03cf1cfbc..d0177c468 100644 --- a/app/src/main/res/layout/item_donation_option.xml +++ b/app/src/main/res/layout/item_donation_option.xml @@ -39,7 +39,7 @@ android:layout_height="match_parent" android:scaleType="centerInside" app:srcCompat="@drawable/ic_github_circle_white_24dp" - app:tint="?colorOnBackground" /> + app:tint="?attr/colorControlNormal" /> diff --git a/app/src/main/res/values/donottranslate.xml b/app/src/main/res/values/donottranslate.xml index 7bcd51415..d723a8957 100755 --- a/app/src/main/res/values/donottranslate.xml +++ b/app/src/main/res/values/donottranslate.xml @@ -8,6 +8,7 @@ code_name_monkey_donate_5 code_name_monkey_donate_6 code_name_monkey_donate_7 + code_name_monkey_donate_8 Retro Music diff --git a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt index 8bde58b45..27a72c3b0 100755 --- a/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt +++ b/appthemehelper/src/main/java/code/name/monkey/appthemehelper/ATH.kt @@ -31,9 +31,11 @@ object ATH { val decorView = activity.window.decorView val systemUiVisibility = decorView.systemUiVisibility if (enabled) { - decorView.systemUiVisibility = systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR + decorView.systemUiVisibility = + systemUiVisibility or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR } else { - decorView.systemUiVisibility = systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() + decorView.systemUiVisibility = + systemUiVisibility and View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR.inv() } } } @@ -93,7 +95,17 @@ object ATH { // Task description requires fully opaque color colorFinal = ColorUtil.stripAlpha(colorFinal) // Sets color of entry in the system recents page - activity.setTaskDescription(ActivityManager.TaskDescription(activity.title as String?, null, colorFinal)) + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) { + activity.setTaskDescription( + ActivityManager.TaskDescription( + activity.title as String?, + -1, + colorFinal + ) + ) + } else { + activity.setTaskDescription(ActivityManager.TaskDescription(activity.title as String?)) + } } } diff --git a/build.gradle b/build.gradle index 2e0c7e9ac..b2535470b 100644 --- a/build.gradle +++ b/build.gradle @@ -13,7 +13,7 @@ buildscript { classpath 'com.android.tools.build:gradle:3.6.0' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath 'com.android.tools.build:bundletool:0.9.0' - classpath "gradle.plugin.ru.cleverpumpkin.proguard-dictionaries-generator:plugin:1.0.7" + classpath "gradle.plugin.ru.cleverpumpkin.proguard-dictionaries-generator:plugin:1.0.8" } } diff --git a/fonts/build.gradle b/fonts/build.gradle index c0ef81675..e8096ab59 100644 --- a/fonts/build.gradle +++ b/fonts/build.gradle @@ -17,7 +17,6 @@ apply plugin: 'kotlin-android' apply plugin: 'kotlin-android-extensions' android { compileSdkVersion 29 - buildToolsVersion "29.0.2" defaultConfig { minSdkVersion 21 diff --git a/gradle.properties b/gradle.properties index 4e2b3ea73..a09e1510d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,10 @@ org.gradle.daemon=true org.gradle.parallel=true jvmArgs='-Xmx2048m' android.useAndroidX=true +android.enabelR8=true android.enableR8.fullMode=false android.enableJetifier=true android.debug.obsoleteApi=true android.enableBuildCache=true +android.jetifier.blacklist = butterknife.*\\.jar kotlin.code.style=official \ No newline at end of file