Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
PixelDroid
PixelDroid
Commits
7d78b03f
Commit
7d78b03f
authored
Dec 20, 2020
by
Matthieu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'next_release' into 'master'
Next release See merge request
!270
parents
94cb52e2
6c668633
Pipeline
#294
passed with stages
in 5 minutes and 26 seconds
Changes
4
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
9 additions
and
5 deletions
+9
-5
app/build.gradle
app/build.gradle
+2
-2
app/src/main/java/com/h/pixeldroid/db/AppDatabase.kt
app/src/main/java/com/h/pixeldroid/db/AppDatabase.kt
+1
-1
app/src/main/java/com/h/pixeldroid/di/DatabaseModule.kt
app/src/main/java/com/h/pixeldroid/di/DatabaseModule.kt
+4
-1
app/src/main/res/layout/activity_about.xml
app/src/main/res/layout/activity_about.xml
+2
-1
No files found.
app/build.gradle
View file @
7d78b03f
...
...
@@ -24,8 +24,8 @@ android {
applicationId
"com.h.pixeldroid"
minSdkVersion
23
targetSdkVersion
30
versionCode
6
versionName
"1.0.alpha
5
"
versionCode
7
versionName
"1.0.alpha
6
"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunnerArguments
clearPackageData:
'true'
...
...
app/src/main/java/com/h/pixeldroid/db/AppDatabase.kt
View file @
7d78b03f
...
...
@@ -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
()
{
...
...
app/src/main/java/com/h/pixeldroid/di/DatabaseModule.kt
View file @
7d78b03f
...
...
@@ -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
app/src/main/res/layout/activity_about.xml
View file @
7d78b03f
...
...
@@ -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"
>
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment