aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/java/User
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2019-02-21 09:24:23 +0000
committerAlex Ning <chineseperson5@gmail.com>2019-02-21 09:24:23 +0000
commit82d97cf73208f3f187b965fca4460f68af33f6b7 (patch)
tree76da6482a83ebc3d09b6a8f0353d057f200ddfde /app/src/main/java/User
parent2b0228ab476426531f0f064e80e3cf2019081569 (diff)
downloadinfinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar
infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar.gz
infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar.bz2
infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar.lz
infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar.xz
infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.tar.zst
infinity-for-reddit-82d97cf73208f3f187b965fca4460f68af33f6b7.zip
Migrate to AndroidX
Diffstat (limited to 'app/src/main/java/User')
-rw-r--r--app/src/main/java/User/UserDao.java10
-rw-r--r--app/src/main/java/User/UserData.java6
-rw-r--r--app/src/main/java/User/UserRepository.java2
-rw-r--r--app/src/main/java/User/UserRoomDatabase.java6
-rw-r--r--app/src/main/java/User/UserViewModel.java12
5 files changed, 17 insertions, 19 deletions
diff --git a/app/src/main/java/User/UserDao.java b/app/src/main/java/User/UserDao.java
index 4ce2536b..2bf7b824 100644
--- a/app/src/main/java/User/UserDao.java
+++ b/app/src/main/java/User/UserDao.java
@@ -1,10 +1,10 @@
package User;
-import android.arch.lifecycle.LiveData;
-import android.arch.persistence.room.Dao;
-import android.arch.persistence.room.Insert;
-import android.arch.persistence.room.OnConflictStrategy;
-import android.arch.persistence.room.Query;
+import androidx.lifecycle.LiveData;
+import androidx.room.Dao;
+import androidx.room.Insert;
+import androidx.room.OnConflictStrategy;
+import androidx.room.Query;
@Dao
public interface UserDao {
diff --git a/app/src/main/java/User/UserData.java b/app/src/main/java/User/UserData.java
index a3b15b0e..c334c289 100644
--- a/app/src/main/java/User/UserData.java
+++ b/app/src/main/java/User/UserData.java
@@ -1,8 +1,8 @@
package User;
-import android.arch.persistence.room.ColumnInfo;
-import android.arch.persistence.room.Entity;
-import android.support.annotation.NonNull;
+import androidx.room.ColumnInfo;
+import androidx.room.Entity;
+import androidx.annotation.NonNull;
import SubscribedUserDatabase.SubscribedUserData;
diff --git a/app/src/main/java/User/UserRepository.java b/app/src/main/java/User/UserRepository.java
index d505db2b..b9e36ea4 100644
--- a/app/src/main/java/User/UserRepository.java
+++ b/app/src/main/java/User/UserRepository.java
@@ -1,7 +1,7 @@
package User;
import android.app.Application;
-import android.arch.lifecycle.LiveData;
+import androidx.lifecycle.LiveData;
import android.os.AsyncTask;
public class UserRepository {
diff --git a/app/src/main/java/User/UserRoomDatabase.java b/app/src/main/java/User/UserRoomDatabase.java
index 288400a6..7faa7e2c 100644
--- a/app/src/main/java/User/UserRoomDatabase.java
+++ b/app/src/main/java/User/UserRoomDatabase.java
@@ -1,8 +1,8 @@
package User;
-import android.arch.persistence.room.Database;
-import android.arch.persistence.room.Room;
-import android.arch.persistence.room.RoomDatabase;
+import androidx.room.Database;
+import androidx.room.Room;
+import androidx.room.RoomDatabase;
import android.content.Context;
@Database(entities = {UserData.class}, version = 1)
diff --git a/app/src/main/java/User/UserViewModel.java b/app/src/main/java/User/UserViewModel.java
index a006e253..aab98645 100644
--- a/app/src/main/java/User/UserViewModel.java
+++ b/app/src/main/java/User/UserViewModel.java
@@ -1,13 +1,11 @@
package User;
import android.app.Application;
-import android.arch.lifecycle.AndroidViewModel;
-import android.arch.lifecycle.LiveData;
-import android.arch.lifecycle.ViewModel;
-import android.arch.lifecycle.ViewModelProvider;
-import android.support.annotation.NonNull;
-
-import SubredditDatabase.SubredditViewModel;
+import androidx.lifecycle.AndroidViewModel;
+import androidx.lifecycle.LiveData;
+import androidx.lifecycle.ViewModel;
+import androidx.lifecycle.ViewModelProvider;
+import androidx.annotation.NonNull;
public class UserViewModel extends AndroidViewModel {
private UserRepository mSubredditRepository;