diff --git a/app/build.gradle b/app/build.gradle index 1c4eaa06..efc6af29 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,8 +13,8 @@ android { applicationId "xyz.quaver.pupil" minSdkVersion 16 targetSdkVersion 29 - versionCode 30 - versionName "4.1" + versionCode 31 + versionName "4.2" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" multiDexEnabled true vectorDrawables.useSupportLibrary = true @@ -26,7 +26,7 @@ android { } buildTypes.each { it.buildConfigField('boolean', 'PRERELEASE', 'false') - it.buildConfigField('boolean', 'CENSOR', 'false') + it.buildConfigField('boolean', 'CENSOR', 'true') } } kotlinOptions { @@ -55,12 +55,12 @@ dependencies { implementation 'androidx.lifecycle:lifecycle-extensions:2.1.0' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.1.0' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation "androidx.biometric:biometric:1.0.0-rc02" + implementation "androidx.biometric:biometric:1.0.0" implementation 'com.android.support:multidex:1.0.3' implementation "com.daimajia.swipelayout:library:1.2.0@aar" - implementation 'com.google.android.material:material:1.2.0-alpha01' + implementation 'com.google.android.material:material:1.2.0-alpha02' implementation 'com.google.firebase:firebase-core:17.2.1' - implementation 'com.google.firebase:firebase-perf:19.0.1' + implementation 'com.google.firebase:firebase-perf:19.0.2' implementation 'com.crashlytics.sdk.android:crashlytics:2.10.1' implementation 'com.github.arimorty:floatingsearchview:2.1.1' implementation 'com.github.clans:fab:1.6.4' diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt index 37d3ee0b..b070a21b 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/GalleryBlockAdapter.kt @@ -95,6 +95,7 @@ class GalleryBlockAdapter(private val glide: RequestManager, private val galleri if (BuildConfig.CENSOR) override(5, 8) } + .fitCenter() .into(galleryblock_thumbnail) } diff --git a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt index db85c79d..759f7523 100644 --- a/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt +++ b/app/src/main/java/xyz/quaver/pupil/adapters/ThumbnailAdapter.kt @@ -39,6 +39,7 @@ class ThumbnailAdapter(private val glide: RequestManager, private val thumbnails if (BuildConfig.CENSOR) override(5, 8) } + .fitCenter() .into(holder.view) } diff --git a/app/src/main/res/xml/root_preferences.xml b/app/src/main/res/xml/root_preferences.xml index 3af7023a..26738748 100644 --- a/app/src/main/res/xml/root_preferences.xml +++ b/app/src/main/res/xml/root_preferences.xml @@ -73,6 +73,7 @@ app:key="nomedia" app:title="@string/settings_nomedia_title" app:summary="@string/settings_nomedia_title"/> +