From deb21ccb907580fba6116ec6bd0a06455ba8384c Mon Sep 17 00:00:00 2001 From: Matthieu <24-artectrex@users.noreply.shinice.net> Date: Sun, 20 Dec 2020 11:49:35 +0100 Subject: [PATCH 1/2] Don't hide scrollbar in about activity --- app/src/main/res/layout/activity_about.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 2cad6403..9c826928 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -4,7 +4,8 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:fadeScrollbars="false"> Date: Sun, 20 Dec 2020 14:31:48 +0100 Subject: [PATCH 2/2] Update version number --- app/build.gradle | 4 ++-- app/src/main/java/com/h/pixeldroid/db/AppDatabase.kt | 2 +- app/src/main/java/com/h/pixeldroid/di/DatabaseModule.kt | 5 ++++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index b1efe33c..56ad35bf 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -24,8 +24,8 @@ android { applicationId "com.h.pixeldroid" minSdkVersion 23 targetSdkVersion 30 - versionCode 6 - versionName "1.0.alpha5" + versionCode 7 + versionName "1.0.alpha6" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunnerArguments clearPackageData: 'true' diff --git a/app/src/main/java/com/h/pixeldroid/db/AppDatabase.kt b/app/src/main/java/com/h/pixeldroid/db/AppDatabase.kt index 7f687397..de554851 100644 --- a/app/src/main/java/com/h/pixeldroid/db/AppDatabase.kt +++ b/app/src/main/java/com/h/pixeldroid/db/AppDatabase.kt @@ -20,7 +20,7 @@ import com.h.pixeldroid.objects.Notification PublicFeedStatusDatabaseEntity::class, Notification::class ], - version = 1 + version = 2 ) @TypeConverters(Converters::class) abstract class AppDatabase : RoomDatabase() { diff --git a/app/src/main/java/com/h/pixeldroid/di/DatabaseModule.kt b/app/src/main/java/com/h/pixeldroid/di/DatabaseModule.kt index 507f6d5c..314091c5 100644 --- a/app/src/main/java/com/h/pixeldroid/di/DatabaseModule.kt +++ b/app/src/main/java/com/h/pixeldroid/di/DatabaseModule.kt @@ -16,6 +16,9 @@ class DatabaseModule(private val context: Context) { return Room.databaseBuilder( context, AppDatabase::class.java, "pixeldroid" - ).allowMainThreadQueries().build() + ).allowMainThreadQueries() + //TODO remove this for 1.0 release + .fallbackToDestructiveMigration() + .build() } } \ No newline at end of file