Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'next_release' into 'master' 

Next release

See merge request pixeldroid/PixelDroid!270
This commit is contained in:
Matthieu 2020-12-20 14:38:08 +01:00
parent 94cb52e25c 6c66863305
commit 7d78b03ff2
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -24,8 +24,8 @@ android {
applicationId "com.h.pixeldroid" applicationId "com.h.pixeldroid"
minSdkVersion 23 minSdkVersion 23
targetSdkVersion 30 targetSdkVersion 30
versionCode 6 versionCode 7
versionName "1.0.alpha5" versionName "1.0.alpha6"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments clearPackageData: 'true' testInstrumentationRunnerArguments clearPackageData: 'true'

2
app/src/main/java/com/h/pixeldroid/db/AppDatabase.kt
View File

@ -20,7 +20,7 @@ import com.h.pixeldroid.objects.Notification
PublicFeedStatusDatabaseEntity::class, PublicFeedStatusDatabaseEntity::class,
Notification::class Notification::class
], ],
version = 1 version = 2
) )
@TypeConverters(Converters::class) @TypeConverters(Converters::class)
abstract class AppDatabase : RoomDatabase() { abstract class AppDatabase : RoomDatabase() {

5
app/src/main/java/com/h/pixeldroid/di/DatabaseModule.kt
View File

@ -16,6 +16,9 @@ class DatabaseModule(private val context: Context) {
return Room.databaseBuilder( return Room.databaseBuilder(
context, context,
AppDatabase::class.java, "pixeldroid" AppDatabase::class.java, "pixeldroid"
).allowMainThreadQueries().build() ).allowMainThreadQueries()
//TODO remove this for 1.0 release
.fallbackToDestructiveMigration()
.build()
} }
} }

3
app/src/main/res/layout/activity_about.xml
View File

@ -4,7 +4,8 @@
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:fadeScrollbars="false">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"