From c15ae78b08f6b865b9f8b77a17edfb1eff07da5b Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 11 Mar 2019 17:14:30 +0100 Subject: Move to AndroidX --- app/build.gradle | 30 +++++++++++----------- .../nextcloud/deck/ExampleInstrumentedTest.java | 4 +-- .../it/niedermann/nextcloud/deck/ColorUtil.java | 2 +- .../nextcloud/deck/model/AccessControl.java | 6 ++--- .../niedermann/nextcloud/deck/model/Account.java | 10 ++++---- .../nextcloud/deck/model/Attachment.java | 2 +- .../it/niedermann/nextcloud/deck/model/Board.java | 6 ++--- .../it/niedermann/nextcloud/deck/model/Card.java | 6 ++--- .../nextcloud/deck/model/JoinBoardWithLabel.java | 8 +++--- .../deck/model/JoinBoardWithPermission.java | 8 +++--- .../nextcloud/deck/model/JoinBoardWithUser.java | 8 +++--- .../nextcloud/deck/model/JoinCardWithLabel.java | 8 +++--- .../nextcloud/deck/model/JoinCardWithUser.java | 8 +++--- .../it/niedermann/nextcloud/deck/model/Label.java | 2 +- .../nextcloud/deck/model/Permission.java | 4 +-- .../it/niedermann/nextcloud/deck/model/Stack.java | 6 ++--- .../it/niedermann/nextcloud/deck/model/User.java | 6 ++--- .../nextcloud/deck/model/full/FullBoard.java | 6 ++--- .../nextcloud/deck/model/full/FullCard.java | 6 ++--- .../nextcloud/deck/model/full/FullStack.java | 6 ++--- .../model/interfaces/AbstractRemoteEntity.java | 10 ++++---- .../deck/model/interfaces/IRemoteEntity.java | 2 +- .../deck/persistence/sync/SyncManager.java | 2 +- .../sync/adapters/db/DataBaseAdapter.java | 2 +- .../sync/adapters/db/DateTypeConverter.java | 2 +- .../persistence/sync/adapters/db/DeckDatabase.java | 8 +++--- .../sync/adapters/db/dao/AccessControlDao.java | 6 ++--- .../sync/adapters/db/dao/AccountDao.java | 6 ++--- .../sync/adapters/db/dao/AttachmentDao.java | 6 ++--- .../persistence/sync/adapters/db/dao/BoardDao.java | 8 +++--- .../persistence/sync/adapters/db/dao/CardDao.java | 8 +++--- .../sync/adapters/db/dao/GenericDao.java | 6 ++--- .../adapters/db/dao/JoinBoardWithLabelDao.java | 4 +-- .../db/dao/JoinBoardWithPermissionDao.java | 4 +-- .../sync/adapters/db/dao/JoinBoardWithUserDao.java | 4 +-- .../sync/adapters/db/dao/JoinCardWithLabelDao.java | 4 +-- .../sync/adapters/db/dao/JoinCardWithUserDao.java | 4 +-- .../persistence/sync/adapters/db/dao/LabelDao.java | 6 ++--- .../sync/adapters/db/dao/PermissionDao.java | 2 +- .../persistence/sync/adapters/db/dao/StackDao.java | 8 +++--- .../persistence/sync/adapters/db/dao/UserDao.java | 6 ++--- .../sync/adapters/db/util/LiveDataHelper.java | 10 ++++---- .../nextcloud/deck/ui/AboutActivity.java | 12 ++++----- .../niedermann/nextcloud/deck/ui/EditActivity.java | 6 ++--- .../niedermann/nextcloud/deck/ui/MainActivity.java | 24 ++++++++--------- .../ui/about/AboutFragmentContributingTab.java | 2 +- .../deck/ui/about/AboutFragmentCreditsTab.java | 2 +- .../deck/ui/about/AboutFragmentLicenseTab.java | 2 +- .../deck/ui/card/CardActivityFragment.java | 4 +-- .../nextcloud/deck/ui/card/CardAdapter.java | 16 ++++++------ .../deck/ui/card/CardAttachmentsFragment.java | 4 +-- .../deck/ui/card/CardDetailsFragment.java | 14 +++++----- .../deck/ui/card/CardItemTouchHelper.java | 9 +++---- .../nextcloud/deck/ui/card/CardTabAdapter.java | 6 ++--- .../deck/ui/card/UserAutoCompleteAdapter.java | 7 +++-- .../deck/ui/helper/dnd/CrossTabDragAndDrop.java | 4 +-- .../deck/ui/login/LoginDialogFragment.java | 6 ++--- .../nextcloud/deck/ui/stack/StackAdapter.java | 8 +++--- .../nextcloud/deck/ui/stack/StackFragment.java | 12 ++++----- .../ui/widget/DelayedAutoCompleteTextView.java | 4 +-- app/src/main/res/layout/activity_about.xml | 4 +-- app/src/main/res/layout/activity_edit.xml | 4 +-- app/src/main/res/layout/activity_main.xml | 28 ++++++++++---------- app/src/main/res/layout/fragment_card.xml | 6 ++--- .../res/layout/fragment_card_edit_tab_details.xml | 2 +- app/src/main/res/layout/fragment_stack.xml | 6 ++--- 66 files changed, 223 insertions(+), 229 deletions(-) (limited to 'app') diff --git a/app/build.gradle b/app/build.gradle index 3b54f9f9c..0acd27f76 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { targetSdkVersion 28 versionCode 1 versionName "1.0" - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" vectorDrawables.useSupportLibrary = true javaCompileOptions { annotationProcessorOptions { @@ -35,27 +35,27 @@ dependencies { implementation 'io.reactivex.rxjava2:rxandroid:2.0.1' implementation 'com.squareup.retrofit2:adapter-rxjava2:2.3.0' implementation 'com.google.code.gson:gson:2.8.5' - implementation 'com.squareup.retrofit2:retrofit:2.4.0' + implementation 'com.squareup.retrofit2:retrofit:2.5.0' implementation 'com.squareup.retrofit2:converter-gson:2.3.0' - implementation 'com.jakewharton:butterknife:8.8.1' - annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' + implementation 'com.jakewharton:butterknife:10.1.0' + annotationProcessor 'com.jakewharton:butterknife-compiler:10.1.0' implementation 'com.github.bumptech.glide:glide:4.9.0' annotationProcessor 'com.github.bumptech.glide:compiler:4.9.0' implementation fileTree(include: ['*.jar'], dir: 'libs') - implementation 'com.android.support:appcompat-v7:28.0.0' - implementation 'com.android.support:design:28.0.0' - implementation 'com.android.support.constraint:constraint-layout:1.1.3' - implementation 'com.android.support:support-v4:28.0.0' + implementation 'androidx.appcompat:appcompat:1.0.2' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + androidTestImplementation 'androidx.test:runner:1.1.1' + androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.1' // Room components - implementation "android.arch.persistence.room:runtime:$rootProject.roomVersion" - annotationProcessor "android.arch.persistence.room:compiler:$rootProject.roomVersion" - androidTestImplementation "android.arch.persistence.room:testing:$rootProject.roomVersion" + implementation "androidx.room:room-runtime:$rootProject.roomVersion" + annotationProcessor "androidx.room:room-compiler:$rootProject.roomVersion" + androidTestImplementation "androidx.room:room-testing:$rootProject.roomVersion" // Lifecycle components - implementation "android.arch.lifecycle:extensions:$rootProject.archLifecycleVersion" - annotationProcessor "android.arch.lifecycle:compiler:$rootProject.archLifecycleVersion" + implementation "androidx.lifecycle:lifecycle-extensions:$rootProject.archLifecycleVersion" + annotationProcessor "androidx.lifecycle:lifecycle-compiler:$rootProject.archLifecycleVersion" } \ No newline at end of file diff --git a/app/src/androidTest/java/it/niedermann/nextcloud/deck/ExampleInstrumentedTest.java b/app/src/androidTest/java/it/niedermann/nextcloud/deck/ExampleInstrumentedTest.java index b8a827120..da95d9b20 100644 --- a/app/src/androidTest/java/it/niedermann/nextcloud/deck/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/it/niedermann/nextcloud/deck/ExampleInstrumentedTest.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck; import android.content.Context; -import android.support.test.InstrumentationRegistry; -import android.support.test.runner.AndroidJUnit4; +import androidx.test.InstrumentationRegistry; +import androidx.test.runner.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ColorUtil.java b/app/src/main/java/it/niedermann/nextcloud/deck/ColorUtil.java index c4c74bc93..7da582b21 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ColorUtil.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ColorUtil.java @@ -1,7 +1,7 @@ package it.niedermann.nextcloud.deck; import android.graphics.Color; -import android.support.annotation.ColorInt; +import androidx.annotation.ColorInt; /** * Helper implementation to deal with color related functionality. diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/AccessControl.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/AccessControl.java index 087162f6d..78e2eb50c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/AccessControl.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/AccessControl.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Index; +import androidx.room.Entity; +import androidx.room.Ignore; +import androidx.room.Index; import it.niedermann.nextcloud.deck.model.interfaces.AbstractRemoteEntity; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java index 99258b1df..a636562b0 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Account.java @@ -1,10 +1,10 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Index; -import android.arch.persistence.room.PrimaryKey; -import android.support.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.Ignore; +import androidx.room.Index; +import androidx.room.PrimaryKey; +import androidx.annotation.NonNull; import java.io.Serializable; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Attachment.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Attachment.java index f5b74acdc..c44081284 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Attachment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Attachment.java @@ -1,6 +1,6 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; +import androidx.room.Entity; import java.util.Date; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java index 18c8e9145..cc926703b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Board.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.ForeignKey; -import android.arch.persistence.room.Index; +import androidx.room.Entity; +import androidx.room.ForeignKey; +import androidx.room.Index; import java.util.Date; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java index f0168eff3..4435d7713 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Card.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.Index; -import android.support.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.Index; +import androidx.annotation.NonNull; import java.util.Date; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithLabel.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithLabel.java index c2caac45f..3bab18160 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithLabel.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithLabel.java @@ -1,9 +1,9 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.ForeignKey; -import android.arch.persistence.room.Index; -import android.support.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.ForeignKey; +import androidx.room.Index; +import androidx.annotation.NonNull; @Entity( primaryKeys = {"labelId", "boardId"}, diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithPermission.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithPermission.java index 3530f8b97..d3d4f9b72 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithPermission.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithPermission.java @@ -1,9 +1,9 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.ForeignKey; -import android.arch.persistence.room.Index; -import android.support.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.ForeignKey; +import androidx.room.Index; +import androidx.annotation.NonNull; @Entity( primaryKeys = {"permissionId", "boardId"}, diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithUser.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithUser.java index 71e74c120..09167a2d2 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithUser.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinBoardWithUser.java @@ -1,9 +1,9 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.ForeignKey; -import android.arch.persistence.room.Index; -import android.support.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.ForeignKey; +import androidx.room.Index; +import androidx.annotation.NonNull; @Entity( primaryKeys = {"userId", "boardId"}, diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithLabel.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithLabel.java index 7b7e50116..e827fa320 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithLabel.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithLabel.java @@ -1,9 +1,9 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.ForeignKey; -import android.arch.persistence.room.Index; -import android.support.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.ForeignKey; +import androidx.room.Index; +import androidx.annotation.NonNull; @Entity( primaryKeys = {"labelId", "cardId"}, diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithUser.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithUser.java index 457ccc187..7ea4e2706 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithUser.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/JoinCardWithUser.java @@ -1,9 +1,9 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.ForeignKey; -import android.arch.persistence.room.Index; -import android.support.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.ForeignKey; +import androidx.room.Index; +import androidx.annotation.NonNull; @Entity( primaryKeys = {"userId", "cardId"}, diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java index a0b1fcbd5..51bfe039d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Label.java @@ -1,6 +1,6 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; +import androidx.room.Entity; import it.niedermann.nextcloud.deck.model.interfaces.AbstractRemoteEntity; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java index 8407bb4a5..6f742152d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Permission.java @@ -1,7 +1,7 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.PrimaryKey; +import androidx.room.Entity; +import androidx.room.PrimaryKey; import it.niedermann.nextcloud.deck.model.enums.PermissionType; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java index 60ba7e972..18d3dcb5b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/Stack.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.Index; -import android.support.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.Index; +import androidx.annotation.NonNull; import java.util.Date; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java index 71b231421..30edce5c4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/User.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.model; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Index; +import androidx.room.Entity; +import androidx.room.Ignore; +import androidx.room.Index; import it.niedermann.nextcloud.deck.model.interfaces.AbstractRemoteEntity; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullBoard.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullBoard.java index d5f43fa54..efa94780b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullBoard.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullBoard.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.model.full; -import android.arch.persistence.room.Embedded; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Relation; +import androidx.room.Embedded; +import androidx.room.Ignore; +import androidx.room.Relation; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java index 122ab64b6..df49f2a65 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullCard.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.model.full; -import android.arch.persistence.room.Embedded; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Relation; +import androidx.room.Embedded; +import androidx.room.Ignore; +import androidx.room.Relation; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullStack.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullStack.java index f699eb32f..eddbafce4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullStack.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/full/FullStack.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.model.full; -import android.arch.persistence.room.Embedded; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Relation; +import androidx.room.Embedded; +import androidx.room.Ignore; +import androidx.room.Relation; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/AbstractRemoteEntity.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/AbstractRemoteEntity.java index 25b55044f..cafe1c48a 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/AbstractRemoteEntity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/AbstractRemoteEntity.java @@ -1,10 +1,10 @@ package it.niedermann.nextcloud.deck.model.interfaces; -import android.arch.persistence.room.Entity; -import android.arch.persistence.room.Ignore; -import android.arch.persistence.room.Index; -import android.arch.persistence.room.PrimaryKey; -import android.support.annotation.NonNull; +import androidx.room.Entity; +import androidx.room.Ignore; +import androidx.room.Index; +import androidx.room.PrimaryKey; +import androidx.annotation.NonNull; import java.util.Date; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/IRemoteEntity.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/IRemoteEntity.java index 49b8a990e..a5cf78607 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/IRemoteEntity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/interfaces/IRemoteEntity.java @@ -1,6 +1,6 @@ package it.niedermann.nextcloud.deck.model.interfaces; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import java.util.Date; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java index 58cdacd1c..390c2adb9 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/SyncManager.java @@ -1,7 +1,7 @@ package it.niedermann.nextcloud.deck.persistence.sync; import android.app.Activity; -import android.arch.lifecycle.LiveData; +import androidx.lifecycle.LiveData; import android.content.Context; import android.content.SharedPreferences; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java index 030075706..9cbc23688 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DataBaseAdapter.java @@ -1,6 +1,6 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db; -import android.arch.lifecycle.LiveData; +import androidx.lifecycle.LiveData; import android.content.Context; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DateTypeConverter.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DateTypeConverter.java index 5605fe383..6b198a502 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DateTypeConverter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DateTypeConverter.java @@ -1,6 +1,6 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db; -import android.arch.persistence.room.TypeConverter; +import androidx.room.TypeConverter; import java.util.Date; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java index 4ba3c7a26..c34681162 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/DeckDatabase.java @@ -1,9 +1,9 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db; -import android.arch.persistence.room.Database; -import android.arch.persistence.room.Room; -import android.arch.persistence.room.RoomDatabase; -import android.arch.persistence.room.TypeConverters; +import androidx.room.Database; +import androidx.room.Room; +import androidx.room.RoomDatabase; +import androidx.room.TypeConverters; import android.content.Context; import it.niedermann.nextcloud.deck.model.AccessControl; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccessControlDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccessControlDao.java index 692732637..faa65c8f1 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccessControlDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccessControlDao.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Query; import it.niedermann.nextcloud.deck.model.AccessControl; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccountDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccountDao.java index 7e7a6d8a6..e81373c8a 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccountDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AccountDao.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Query; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AttachmentDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AttachmentDao.java index 921c6ce3c..6c56429be 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AttachmentDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/AttachmentDao.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Query; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java index 8a53188bf..25fa42a69 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/BoardDao.java @@ -1,9 +1,9 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Transaction; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Query; +import androidx.room.Transaction; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java index 6ba8e3e76..0b8e4a907 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/CardDao.java @@ -1,9 +1,9 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Transaction; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Query; +import androidx.room.Transaction; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/GenericDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/GenericDao.java index 7a96ac0c1..97e62226d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/GenericDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/GenericDao.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.persistence.room.Delete; -import android.arch.persistence.room.Insert; -import android.arch.persistence.room.Update; +import androidx.room.Delete; +import androidx.room.Insert; +import androidx.room.Update; public interface GenericDao { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithLabelDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithLabelDao.java index 990ccd89b..df8812f5b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithLabelDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithLabelDao.java @@ -1,7 +1,7 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; +import androidx.room.Dao; +import androidx.room.Query; import it.niedermann.nextcloud.deck.model.JoinBoardWithLabel; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithPermissionDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithPermissionDao.java index f4def3c2f..28989d190 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithPermissionDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithPermissionDao.java @@ -1,7 +1,7 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; +import androidx.room.Dao; +import androidx.room.Query; import it.niedermann.nextcloud.deck.model.JoinBoardWithPermission; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithUserDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithUserDao.java index 488b61e35..b1663e52c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithUserDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinBoardWithUserDao.java @@ -1,7 +1,7 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; +import androidx.room.Dao; +import androidx.room.Query; import it.niedermann.nextcloud.deck.model.JoinBoardWithUser; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinCardWithLabelDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinCardWithLabelDao.java index 6dd01c5a2..c9a3a80bd 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinCardWithLabelDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinCardWithLabelDao.java @@ -1,7 +1,7 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; +import androidx.room.Dao; +import androidx.room.Query; import it.niedermann.nextcloud.deck.model.JoinCardWithLabel; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinCardWithUserDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinCardWithUserDao.java index 5316ef787..ab0e18122 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinCardWithUserDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/JoinCardWithUserDao.java @@ -1,7 +1,7 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; +import androidx.room.Dao; +import androidx.room.Query; import it.niedermann.nextcloud.deck.model.JoinCardWithUser; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/LabelDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/LabelDao.java index 01f43b689..ab409cefc 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/LabelDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/LabelDao.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Query; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/PermissionDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/PermissionDao.java index e7ae48edf..7b6444ab3 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/PermissionDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/PermissionDao.java @@ -1,6 +1,6 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.persistence.room.Dao; +import androidx.room.Dao; import it.niedermann.nextcloud.deck.model.Permission; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java index 0a97a8368..f26e12264 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/StackDao.java @@ -1,9 +1,9 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; -import android.arch.persistence.room.Transaction; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Query; +import androidx.room.Transaction; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java index 431ab45d1..18ae2b45e 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/dao/UserDao.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.dao; -import android.arch.lifecycle.LiveData; -import android.arch.persistence.room.Dao; -import android.arch.persistence.room.Query; +import androidx.lifecycle.LiveData; +import androidx.room.Dao; +import androidx.room.Query; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/LiveDataHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/LiveDataHelper.java index dfed27367..dd85b6e87 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/LiveDataHelper.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/persistence/sync/adapters/db/util/LiveDataHelper.java @@ -1,10 +1,10 @@ package it.niedermann.nextcloud.deck.persistence.sync.adapters.db.util; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.MediatorLiveData; -import android.arch.lifecycle.MutableLiveData; -import android.arch.lifecycle.Observer; -import android.support.annotation.Nullable; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MediatorLiveData; +import androidx.lifecycle.MutableLiveData; +import androidx.lifecycle.Observer; +import androidx.annotation.Nullable; public class LiveDataHelper { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java index 3a47cd78c..8fc0aa29e 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/AboutActivity.java @@ -1,12 +1,12 @@ package it.niedermann.nextcloud.deck.ui; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.tabs.TabLayout; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java index 7079537c0..67ae8a51e 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java @@ -1,9 +1,9 @@ package it.niedermann.nextcloud.deck.ui; import android.os.Bundle; -import android.support.design.widget.TabLayout; -import android.support.v4.view.ViewPager; -import android.support.v7.app.AppCompatActivity; +import com.google.android.material.tabs.TabLayout; +import androidx.viewpager.widget.ViewPager; +import androidx.appcompat.app.AppCompatActivity; import android.widget.EditText; import android.widget.TextView; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java index 6c6ccf163..292e1d756 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java @@ -4,18 +4,18 @@ import android.content.Intent; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.widget.FloatingActionButton; -import android.support.design.widget.NavigationView; -import android.support.design.widget.Snackbar; -import android.support.design.widget.TabLayout; -import android.support.v4.graphics.drawable.DrawableCompat; -import android.support.v4.view.GravityCompat; -import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; -import android.support.v7.app.ActionBarDrawerToggle; -import android.support.v7.app.AppCompatActivity; -import android.support.v7.widget.Toolbar; +import androidx.annotation.NonNull; +import com.google.android.material.floatingactionbutton.FloatingActionButton; +import com.google.android.material.navigation.NavigationView; +import com.google.android.material.snackbar.Snackbar; +import com.google.android.material.tabs.TabLayout; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.core.view.GravityCompat; +import androidx.viewpager.widget.ViewPager; +import androidx.drawerlayout.widget.DrawerLayout; +import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.Toolbar; import android.view.Menu; import android.view.MenuItem; import android.view.SubMenu; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentContributingTab.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentContributingTab.java index 7b4e195a0..823a6aa5d 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentContributingTab.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentContributingTab.java @@ -1,7 +1,7 @@ package it.niedermann.nextcloud.deck.ui.about; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java index 81e4dabdf..8cf2c8867 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentCreditsTab.java @@ -1,7 +1,7 @@ package it.niedermann.nextcloud.deck.ui.about; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java index 6f5371b56..7d9b42450 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/about/AboutFragmentLicenseTab.java @@ -3,7 +3,7 @@ package it.niedermann.nextcloud.deck.ui.about; import android.content.Intent; import android.net.Uri; import android.os.Bundle; -import android.support.v4.app.Fragment; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityFragment.java index c9b6b0426..d8fb95a3b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardActivityFragment.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.ui.card; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java index a83fe8ab0..cd59e9d6b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAdapter.java @@ -5,14 +5,14 @@ import android.content.Context; import android.content.Intent; import android.content.res.ColorStateList; import android.graphics.Color; -import android.os.Build; -import android.support.annotation.ColorRes; -import android.support.annotation.DrawableRes; -import android.support.annotation.NonNull; -import android.support.design.card.MaterialCardView; -import android.support.design.chip.Chip; -import android.support.design.chip.ChipGroup; -import android.support.v7.widget.RecyclerView; + +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.NonNull; +import com.google.android.material.card.MaterialCardView; +import com.google.android.material.chip.Chip; +import com.google.android.material.chip.ChipGroup; +import androidx.recyclerview.widget.RecyclerView; import android.util.Log; import android.view.LayoutInflater; import android.view.View; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAttachmentsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAttachmentsFragment.java index 19a16586d..d55235bae 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAttachmentsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardAttachmentsFragment.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.ui.card; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java index f1918fd09..ffa1ec430 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java @@ -2,23 +2,21 @@ package it.niedermann.nextcloud.deck.ui.card; import android.app.DatePickerDialog; import android.app.TimePickerDialog; -import android.content.Context; import android.content.res.ColorStateList; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.design.chip.Chip; -import android.support.design.chip.ChipGroup; -import android.support.v4.app.Fragment; -import android.support.v4.graphics.ColorUtils; -import android.support.v4.graphics.drawable.DrawableCompat; +import androidx.annotation.NonNull; +import com.google.android.material.chip.Chip; +import com.google.android.material.chip.ChipGroup; +import androidx.fragment.app.Fragment; +import androidx.core.graphics.ColorUtils; +import androidx.core.graphics.drawable.DrawableCompat; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.AdapterView; import android.widget.DatePicker; import android.widget.EditText; import android.widget.ImageView; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardItemTouchHelper.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardItemTouchHelper.java index 08cefb66e..184351e77 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardItemTouchHelper.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardItemTouchHelper.java @@ -1,11 +1,8 @@ package it.niedermann.nextcloud.deck.ui.card; -import android.support.annotation.NonNull; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; -import android.util.Log; - -import java.util.List; +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; public class CardItemTouchHelper extends ItemTouchHelper { public CardItemTouchHelper(CardAdapter adapter) { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java index 739eb3b19..3c91101e4 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardTabAdapter.java @@ -1,8 +1,8 @@ package it.niedermann.nextcloud.deck.ui.card; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; public class CardTabAdapter extends FragmentStatePagerAdapter { private CardDetailsFragment detailsFragment; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java index dfd9284be..541ff5672 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java @@ -1,10 +1,10 @@ package it.niedermann.nextcloud.deck.ui.card; -import android.arch.lifecycle.LifecycleOwner; -import android.arch.lifecycle.LiveData; +import androidx.lifecycle.LifecycleOwner; +import androidx.lifecycle.LiveData; import android.content.Context; import android.net.Uri; -import android.support.annotation.NonNull; +import androidx.annotation.NonNull; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -12,7 +12,6 @@ import android.widget.BaseAdapter; import android.widget.Filter; import android.widget.Filterable; import android.widget.ImageView; -import android.widget.LinearLayout; import android.widget.TextView; import com.bumptech.glide.Glide; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java index d64819ad9..a57b40f23 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/helper/dnd/CrossTabDragAndDrop.java @@ -2,8 +2,8 @@ package it.niedermann.nextcloud.deck.ui.helper.dnd; import android.app.Activity; import android.graphics.Point; -import android.support.v4.view.ViewPager; -import android.support.v7.widget.RecyclerView; +import androidx.viewpager.widget.ViewPager; +import androidx.recyclerview.widget.RecyclerView; import android.view.DragEvent; import android.view.View; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/login/LoginDialogFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/login/LoginDialogFragment.java index 86b14559e..5704a4049 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/login/LoginDialogFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/login/LoginDialogFragment.java @@ -3,9 +3,9 @@ package it.niedermann.nextcloud.deck.ui.login; import android.app.Dialog; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.annotation.Nullable; -import android.support.v4.app.DialogFragment; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; +import androidx.fragment.app.DialogFragment; import android.util.Log; import com.nextcloud.android.sso.AccountImporter; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java index bd686d5eb..9766df3b0 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackAdapter.java @@ -1,9 +1,9 @@ package it.niedermann.nextcloud.deck.ui.stack; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; +import androidx.fragment.app.FragmentStatePagerAdapter; import java.util.ArrayList; import java.util.List; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java index aea339573..6d682cd39 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/stack/StackFragment.java @@ -1,12 +1,12 @@ package it.niedermann.nextcloud.deck.ui.stack; import android.os.Bundle; -import android.support.annotation.NonNull; -import android.support.v4.app.Fragment; -import android.support.v4.widget.SwipeRefreshLayout; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.support.v7.widget.helper.ItemTouchHelper; +import androidx.annotation.NonNull; +import androidx.fragment.app.Fragment; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; +import androidx.recyclerview.widget.ItemTouchHelper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/DelayedAutoCompleteTextView.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/DelayedAutoCompleteTextView.java index 4d68dab8c..9dcb61787 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/DelayedAutoCompleteTextView.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/widget/DelayedAutoCompleteTextView.java @@ -12,9 +12,9 @@ import android.widget.ProgressBar; * https://makovkastar.github.io/blog/2014/04/12/android-autocompletetextview-with-suggestions-from-a-web-service/ * by Alex Melnykov */ -public class DelayedAutoCompleteTextView extends android.support.v7.widget.AppCompatAutoCompleteTextView { +public class DelayedAutoCompleteTextView extends androidx.appcompat.widget.AppCompatAutoCompleteTextView { private static final int MESSAGE_TEXT_CHANGED = 100; - private static final int DEFAULT_AUTOCOMPLETE_DELAY = 500; + private static final int DEFAULT_AUTOCOMPLETE_DELAY = 10; private int mAutoCompleteDelay = DEFAULT_AUTOCOMPLETE_DELAY; private ProgressBar mLoadingIndicator; diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index 00f694eff..78e17475d 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -4,12 +4,12 @@ android:layout_height="match_parent" android:orientation="vertical"> - - diff --git a/app/src/main/res/layout/activity_edit.xml b/app/src/main/res/layout/activity_edit.xml index 0a1afb66a..087f77915 100644 --- a/app/src/main/res/layout/activity_edit.xml +++ b/app/src/main/res/layout/activity_edit.xml @@ -25,14 +25,14 @@ android:layout_marginRight="19dp" tools:text="Modified: 12 days ago Created: 12 days ago"/> - - diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index e05f336d6..2653e10e5 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - - - - + - - - + - - + - + app:headerLayout="@layout/nav_header_main"> - + diff --git a/app/src/main/res/layout/fragment_card.xml b/app/src/main/res/layout/fragment_card.xml index d5f4c5e3d..04aba37ec 100644 --- a/app/src/main/res/layout/fragment_card.xml +++ b/app/src/main/res/layout/fragment_card.xml @@ -1,5 +1,5 @@ - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_card_edit_tab_details.xml b/app/src/main/res/layout/fragment_card_edit_tab_details.xml index 550fbf7ad..8bb5c938e 100644 --- a/app/src/main/res/layout/fragment_card_edit_tab_details.xml +++ b/app/src/main/res/layout/fragment_card_edit_tab_details.xml @@ -61,7 +61,7 @@ android:hint="@string/label_labels" /> - - - - + \ No newline at end of file -- cgit v1.2.3 From 5efef3a31ad620657efca1ff5268d434418d2438 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 11 Mar 2019 18:04:14 +0100 Subject: run LiveData oberserve on UI thread --- app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'app') diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java index 292e1d756..c5fdae8bb 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/MainActivity.java @@ -150,7 +150,9 @@ public class MainActivity extends AppCompatActivity MainActivity.this.syncManager.synchronize(new IResponseCallback(this.account) { @Override public void onResponse(Boolean response) { - syncManager.getBoards(this.account.getId()).observe(MainActivity.this, MainActivity.this::buildSidenavMenu); + runOnUiThread(() -> { + syncManager.getBoards(this.account.getId()).observe(MainActivity.this, MainActivity.this::buildSidenavMenu); + }); } @Override -- cgit v1.2.3 From 785143550b3486007d46da88f9a8477aee8589a9 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Mon, 11 Mar 2019 18:29:18 +0100 Subject: fix yet another LiveData UI Thread --- .../deck/ui/card/UserAutoCompleteAdapter.java | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) (limited to 'app') diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java index 541ff5672..b86fbea1b 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/UserAutoCompleteAdapter.java @@ -1,5 +1,6 @@ package it.niedermann.nextcloud.deck.ui.card; +import androidx.fragment.app.Fragment; import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LiveData; import android.content.Context; @@ -97,15 +98,17 @@ public class UserAutoCompleteAdapter extends BaseAdapter implements Filterable { protected FilterResults performFiltering(CharSequence constraint) { FilterResults filterResults = new FilterResults(); if (constraint != null) { - LiveDataHelper.onlyIfChanged( - syncManager.searchUserByUidOrDisplayName(accountId, constraint.toString()) - ) - .observe(owner, (List users) -> { - if (users != null) { - filterResults.values = users; - filterResults.count = users.size(); - } - }); + ((Fragment)owner).getActivity().runOnUiThread(() -> { + LiveDataHelper.onlyIfChanged( + syncManager.searchUserByUidOrDisplayName(accountId, constraint.toString()) + ) + .observe(owner, (List users) -> { + if (users != null) { + filterResults.values = users; + filterResults.count = users.size(); + } + }); + }); } return filterResults; } -- cgit v1.2.3