diff options
Diffstat (limited to '')
73 files changed, 122 insertions, 129 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AccessTokenAuthenticator.java b/app/src/main/java/ml/docilealligator/infinityforreddit/AccessTokenAuthenticator.java index ff9ae1f5..96a1af0d 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/AccessTokenAuthenticator.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/AccessTokenAuthenticator.java @@ -10,7 +10,7 @@ import java.io.IOException; import java.util.HashMap; import java.util.Map; -import Account.Account; +import ml.docilealligator.infinityforreddit.Account.Account; import okhttp3.Authenticator; import okhttp3.Headers; import okhttp3.Request; diff --git a/app/src/main/java/Account/Account.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Account/Account.java index 4ae15741..4cb202b5 100644 --- a/app/src/main/java/Account/Account.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Account/Account.java @@ -1,4 +1,4 @@ -package Account; +package ml.docilealligator.infinityforreddit.Account; import androidx.annotation.NonNull; import androidx.room.ColumnInfo; diff --git a/app/src/main/java/Account/AccountDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountDao.java index 67caf71d..be3dcd9d 100644 --- a/app/src/main/java/Account/AccountDao.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountDao.java @@ -1,4 +1,4 @@ -package Account; +package ml.docilealligator.infinityforreddit.Account; import androidx.lifecycle.LiveData; import androidx.room.Dao; diff --git a/app/src/main/java/Account/AccountRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountRepository.java index 573f00f8..69ad4088 100644 --- a/app/src/main/java/Account/AccountRepository.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountRepository.java @@ -1,4 +1,4 @@ -package Account; +package ml.docilealligator.infinityforreddit.Account; import android.os.AsyncTask; diff --git a/app/src/main/java/Account/AccountViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountViewModel.java index 53fb0013..55e805e8 100644 --- a/app/src/main/java/Account/AccountViewModel.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Account/AccountViewModel.java @@ -1,4 +1,4 @@ -package Account; +package ml.docilealligator.infinityforreddit.Account; import android.app.Application; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AccountRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/AccountRecyclerViewAdapter.java index 373c0849..b731be27 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/AccountRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/AccountRecyclerViewAdapter.java @@ -15,7 +15,7 @@ import com.bumptech.glide.request.RequestOptions; import java.util.List; -import Account.Account; +import ml.docilealligator.infinityforreddit.Account.Account; import butterknife.BindView; import butterknife.ButterKnife; import jp.wasabeef.glide.transformations.RoundedCornersTransformation; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java b/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java index 1c134841..0dffadd8 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/AppComponent.java @@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit; import javax.inject.Singleton; -import Settings.MainPreferenceFragment; -import Settings.NotificationPreferenceFragment; +import ml.docilealligator.infinityforreddit.Settings.MainPreferenceFragment; +import ml.docilealligator.infinityforreddit.Settings.NotificationPreferenceFragment; import dagger.Component; @Singleton diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CheckIsFollowingUserAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CheckIsFollowingUserAsyncTask.java index cc4f75af..b823db11 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/CheckIsFollowingUserAsyncTask.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CheckIsFollowingUserAsyncTask.java @@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit; import android.os.AsyncTask; -import SubscribedUserDatabase.SubscribedUserDao; -import SubscribedUserDatabase.SubscribedUserData; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData; public class CheckIsFollowingUserAsyncTask extends AsyncTask<Void, Void, Void> { private SubscribedUserDao subscribedUserDao; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CheckIsSubscribedToSubredditAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CheckIsSubscribedToSubredditAsyncTask.java index a1936ae0..a1f304e9 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/CheckIsSubscribedToSubredditAsyncTask.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CheckIsSubscribedToSubredditAsyncTask.java @@ -2,7 +2,7 @@ package ml.docilealligator.infinityforreddit; import android.os.AsyncTask; -import SubscribedSubredditDatabase.SubscribedSubredditData; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData; class CheckIsSubscribedToSubredditAsyncTask extends AsyncTask<Void, Void, Void> { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java index 897b2e86..85b4d230 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CommentAndPostRecyclerViewAdapter.java @@ -39,7 +39,7 @@ import com.santalu.aspectratioimageview.AspectRatioImageView; import java.util.ArrayList; import java.util.Locale; -import CustomView.AspectRatioGifImageView; +import ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView; import butterknife.BindView; import butterknife.ButterKnife; import io.noties.markwon.AbstractMarkwonPlugin; diff --git a/app/src/main/java/CustomView/AspectRatioGifImageView.java b/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/AspectRatioGifImageView.java index f1b907c4..565ad200 100644 --- a/app/src/main/java/CustomView/AspectRatioGifImageView.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/CustomView/AspectRatioGifImageView.java @@ -1,4 +1,4 @@ -package CustomView; +package ml.docilealligator.infinityforreddit.CustomView; import android.content.Context; import android.content.res.TypedArray; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubredditData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubredditData.java index 11416e32..696a2dd6 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubredditData.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubredditData.java @@ -1,12 +1,10 @@ package ml.docilealligator.infinityforreddit; -import android.util.Log; - import androidx.annotation.NonNull; import java.util.ArrayList; -import SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubscribedThing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubscribedThing.java index 4500196a..d1a6977b 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubscribedThing.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchSubscribedThing.java @@ -1,14 +1,12 @@ package ml.docilealligator.infinityforreddit; -import android.util.Log; - import androidx.annotation.NonNull; import java.util.ArrayList; -import SubredditDatabase.SubredditData; -import SubscribedSubredditDatabase.SubscribedSubredditData; -import SubscribedUserDatabase.SubscribedUserData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Response; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchUserData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchUserData.java index 38c76536..e910e531 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/FetchUserData.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FetchUserData.java @@ -1,12 +1,10 @@ package ml.docilealligator.infinityforreddit; -import android.util.Log; - import androidx.annotation.NonNull; import java.util.ArrayList; -import User.UserData; +import ml.docilealligator.infinityforreddit.User.UserData; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Retrofit; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersListingFragment.java index 83a30838..cabbe6ed 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersListingFragment.java @@ -22,7 +22,7 @@ import com.bumptech.glide.RequestManager; import javax.inject.Inject; -import SubscribedUserDatabase.SubscribedUserViewModel; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserViewModel; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersRecyclerViewAdapter.java index 6f83527b..44d02068 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/FollowedUsersRecyclerViewAdapter.java @@ -16,7 +16,7 @@ import com.bumptech.glide.request.RequestOptions; import java.util.List; -import SubscribedUserDatabase.SubscribedUserData; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData; import jp.wasabeef.glide.transformations.RoundedCornersTransformation; import pl.droidsonroids.gif.GifImageView; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/GetCurrentAccountAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/GetCurrentAccountAsyncTask.java index ad740f92..752c596a 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/GetCurrentAccountAsyncTask.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/GetCurrentAccountAsyncTask.java @@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit; import android.os.AsyncTask; -import Account.Account; -import Account.AccountDao; +import ml.docilealligator.infinityforreddit.Account.Account; +import ml.docilealligator.infinityforreddit.Account.AccountDao; class GetCurrentAccountAsyncTask extends AsyncTask<Void, Void, Void> { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/InsertSubscribedThingsAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/InsertSubscribedThingsAsyncTask.java index 22b79e85..2cb1e45e 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/InsertSubscribedThingsAsyncTask.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/InsertSubscribedThingsAsyncTask.java @@ -6,12 +6,12 @@ import androidx.annotation.Nullable; import java.util.List; -import SubredditDatabase.SubredditDao; -import SubredditDatabase.SubredditData; -import SubscribedSubredditDatabase.SubscribedSubredditDao; -import SubscribedSubredditDatabase.SubscribedSubredditData; -import SubscribedUserDatabase.SubscribedUserDao; -import SubscribedUserDatabase.SubscribedUserData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditDao; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditDao; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData; class InsertSubscribedThingsAsyncTask extends AsyncTask<Void, Void, Void> { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/InsertUserDataAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/InsertUserDataAsyncTask.java index 6db03920..90ea800b 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/InsertUserDataAsyncTask.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/InsertUserDataAsyncTask.java @@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit; import android.os.AsyncTask; -import User.UserData; -import User.UserDao; +import ml.docilealligator.infinityforreddit.User.UserData; +import ml.docilealligator.infinityforreddit.User.UserDao; public class InsertUserDataAsyncTask extends AsyncTask<Void, Void, Void> { private UserDao userDao; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/LoadSubredditIconAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/LoadSubredditIconAsyncTask.java index c35c9f3f..0e8f384c 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/LoadSubredditIconAsyncTask.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/LoadSubredditIconAsyncTask.java @@ -4,8 +4,8 @@ import android.os.AsyncTask; import java.util.ArrayList; -import SubredditDatabase.SubredditDao; -import SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditDao; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; import retrofit2.Retrofit; class LoadSubredditIconAsyncTask extends AsyncTask<Void, Void, Void> { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/LoadUserDataAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/LoadUserDataAsyncTask.java index 8ef07e73..b9dddf1d 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/LoadUserDataAsyncTask.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/LoadUserDataAsyncTask.java @@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit; import android.os.AsyncTask; -import User.UserData; -import User.UserDao; +import ml.docilealligator.infinityforreddit.User.UserData; +import ml.docilealligator.infinityforreddit.User.UserDao; import retrofit2.Retrofit; public class LoadUserDataAsyncTask extends AsyncTask<Void, Void, Void> { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java index 5e3d4c54..dd18b59e 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/MainActivity.java @@ -57,11 +57,11 @@ import java.util.concurrent.TimeUnit; import javax.inject.Inject; import javax.inject.Named; -import Account.Account; -import Account.AccountViewModel; -import SubredditDatabase.SubredditData; -import SubscribedSubredditDatabase.SubscribedSubredditData; -import SubscribedUserDatabase.SubscribedUserData; +import ml.docilealligator.infinityforreddit.Account.Account; +import ml.docilealligator.infinityforreddit.Account.AccountViewModel; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData; import butterknife.BindView; import butterknife.ButterKnife; import jp.wasabeef.glide.transformations.RoundedCornersTransformation; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseAndInsertNewAccountAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseAndInsertNewAccountAsyncTask.java index f5a99d5d..48f15207 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseAndInsertNewAccountAsyncTask.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseAndInsertNewAccountAsyncTask.java @@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit; import android.os.AsyncTask; -import Account.Account; -import Account.AccountDao; +import ml.docilealligator.infinityforreddit.Account.Account; +import ml.docilealligator.infinityforreddit.Account.AccountDao; class ParseAndInsertNewAccountAsyncTask extends AsyncTask<Void, Void, Void> { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubredditData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubredditData.java index ccded2ec..70079aa5 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubredditData.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubredditData.java @@ -8,7 +8,7 @@ import org.json.JSONObject; import java.util.ArrayList; -import SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; class ParseSubredditData { interface ParseSubredditDataListener { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java index b02b646a..cac5242f 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseSubscribedThing.java @@ -8,9 +8,9 @@ import org.json.JSONObject; import java.util.ArrayList; -import SubredditDatabase.SubredditData; -import SubscribedSubredditDatabase.SubscribedSubredditData; -import SubscribedUserDatabase.SubscribedUserData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData; class ParseSubscribedThing { interface ParseSubscribedSubredditsListener { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java index 8b9e225b..f99fd33a 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ParseUserData.java @@ -8,7 +8,7 @@ import org.json.JSONObject; import java.util.ArrayList; -import User.UserData; +import ml.docilealligator.infinityforreddit.User.UserData; public class ParseUserData { interface ParseUserDataListener { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java index 7b8d3fec..f6dc6970 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PostRecyclerViewAdapter.java @@ -38,8 +38,8 @@ import com.libRG.CustomTextView; import org.greenrobot.eventbus.EventBus; -import CustomView.AspectRatioGifImageView; -import User.UserDao; +import ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView; +import ml.docilealligator.infinityforreddit.User.UserDao; import butterknife.BindView; import butterknife.ButterKnife; import jp.wasabeef.glide.transformations.BlurTransformation; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/PullNotificationWorker.java b/app/src/main/java/ml/docilealligator/infinityforreddit/PullNotificationWorker.java index ef0281f5..7fcb5088 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/PullNotificationWorker.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/PullNotificationWorker.java @@ -5,7 +5,6 @@ import android.content.Context; import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; -import android.util.Log; import androidx.annotation.NonNull; import androidx.core.app.NotificationCompat; @@ -26,7 +25,7 @@ import java.util.Map; import javax.inject.Inject; import javax.inject.Named; -import Account.Account; +import ml.docilealligator.infinityforreddit.Account.Account; import retrofit2.Call; import retrofit2.Response; import retrofit2.Retrofit; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java index 4ba61434..3b65103e 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditDataRoomDatabase.java @@ -6,16 +6,16 @@ import androidx.room.Database; import androidx.room.Room; import androidx.room.RoomDatabase; -import Account.Account; -import Account.AccountDao; -import SubredditDatabase.SubredditDao; -import SubredditDatabase.SubredditData; -import SubscribedSubredditDatabase.SubscribedSubredditDao; -import SubscribedSubredditDatabase.SubscribedSubredditData; -import SubscribedUserDatabase.SubscribedUserDao; -import SubscribedUserDatabase.SubscribedUserData; -import User.UserDao; -import User.UserData; +import ml.docilealligator.infinityforreddit.Account.Account; +import ml.docilealligator.infinityforreddit.Account.AccountDao; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditDao; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditDao; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData; +import ml.docilealligator.infinityforreddit.User.UserDao; +import ml.docilealligator.infinityforreddit.User.UserData; @Database(entities = {Account.class, SubredditData.class, SubscribedSubredditData.class, UserData.class, SubscribedUserData.class}, version = 1) public abstract class RedditDataRoomDatabase extends RoomDatabase { diff --git a/app/src/main/java/Settings/AboutPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AboutPreferenceFragment.java index f2ba0518..03b904d3 100644 --- a/app/src/main/java/Settings/AboutPreferenceFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AboutPreferenceFragment.java @@ -1,4 +1,4 @@ -package Settings; +package ml.docilealligator.infinityforreddit.Settings; import android.app.Activity; diff --git a/app/src/main/java/Settings/Acknowledgement.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/Acknowledgement.java index 26a5a064..9291b53c 100644 --- a/app/src/main/java/Settings/Acknowledgement.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/Acknowledgement.java @@ -1,4 +1,4 @@ -package Settings; +package ml.docilealligator.infinityforreddit.Settings; import android.net.Uri; diff --git a/app/src/main/java/Settings/AcknowledgementFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AcknowledgementFragment.java index 7a19a0a5..4f730d85 100644 --- a/app/src/main/java/Settings/AcknowledgementFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AcknowledgementFragment.java @@ -1,4 +1,4 @@ -package Settings; +package ml.docilealligator.infinityforreddit.Settings; import android.app.Activity; diff --git a/app/src/main/java/Settings/AcknowledgementRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AcknowledgementRecyclerViewAdapter.java index 81286903..6c3975ab 100644 --- a/app/src/main/java/Settings/AcknowledgementRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/AcknowledgementRecyclerViewAdapter.java @@ -1,4 +1,4 @@ -package Settings; +package ml.docilealligator.infinityforreddit.Settings; import android.content.Context; import android.content.Intent; diff --git a/app/src/main/java/Settings/CreditsPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/CreditsPreferenceFragment.java index 55fb3363..bbd98d13 100644 --- a/app/src/main/java/Settings/CreditsPreferenceFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/CreditsPreferenceFragment.java @@ -1,4 +1,4 @@ -package Settings; +package ml.docilealligator.infinityforreddit.Settings; import android.app.Activity; diff --git a/app/src/main/java/Settings/FontSizePreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/FontSizePreferenceFragment.java index 41000a5a..c1f89842 100644 --- a/app/src/main/java/Settings/FontSizePreferenceFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/FontSizePreferenceFragment.java @@ -1,4 +1,4 @@ -package Settings; +package ml.docilealligator.infinityforreddit.Settings; import android.app.Activity; import android.os.Bundle; diff --git a/app/src/main/java/Settings/MainPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/MainPreferenceFragment.java index 8e3b7d99..7f72da36 100644 --- a/app/src/main/java/Settings/MainPreferenceFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/MainPreferenceFragment.java @@ -1,4 +1,4 @@ -package Settings; +package ml.docilealligator.infinityforreddit.Settings; import android.app.Activity; diff --git a/app/src/main/java/Settings/NotificationPreferenceFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/NotificationPreferenceFragment.java index 4d9051fe..51d895bd 100644 --- a/app/src/main/java/Settings/NotificationPreferenceFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/Settings/NotificationPreferenceFragment.java @@ -1,4 +1,4 @@ -package Settings; +package ml.docilealligator.infinityforreddit.Settings; import android.app.Activity; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SettingsActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SettingsActivity.java index 4f91157d..cf84d82f 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SettingsActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SettingsActivity.java @@ -19,8 +19,8 @@ import androidx.preference.PreferenceFragmentCompat; import javax.inject.Inject; -import Settings.AboutPreferenceFragment; -import Settings.MainPreferenceFragment; +import ml.docilealligator.infinityforreddit.Settings.AboutPreferenceFragment; +import ml.docilealligator.infinityforreddit.Settings.MainPreferenceFragment; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/SubredditDatabase/SubredditDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditDatabase/SubredditDao.java index b99b8baf..bb058295 100644 --- a/app/src/main/java/SubredditDatabase/SubredditDao.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditDatabase/SubredditDao.java @@ -1,4 +1,4 @@ -package SubredditDatabase; +package ml.docilealligator.infinityforreddit.SubredditDatabase; import androidx.lifecycle.LiveData; import androidx.room.Dao; diff --git a/app/src/main/java/SubredditDatabase/SubredditData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditDatabase/SubredditData.java index e1275809..2bca8963 100644 --- a/app/src/main/java/SubredditDatabase/SubredditData.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditDatabase/SubredditData.java @@ -1,4 +1,4 @@ -package SubredditDatabase; +package ml.docilealligator.infinityforreddit.SubredditDatabase; import androidx.annotation.NonNull; import androidx.room.ColumnInfo; diff --git a/app/src/main/java/SubredditDatabase/SubredditRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditDatabase/SubredditRepository.java index 2c66ad4b..2978fdca 100644 --- a/app/src/main/java/SubredditDatabase/SubredditRepository.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditDatabase/SubredditRepository.java @@ -1,4 +1,4 @@ -package SubredditDatabase; +package ml.docilealligator.infinityforreddit.SubredditDatabase; import android.os.AsyncTask; diff --git a/app/src/main/java/SubredditDatabase/SubredditViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditDatabase/SubredditViewModel.java index dc0247d2..7a5db908 100644 --- a/app/src/main/java/SubredditDatabase/SubredditViewModel.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditDatabase/SubredditViewModel.java @@ -1,4 +1,4 @@ -package SubredditDatabase; +package ml.docilealligator.infinityforreddit.SubredditDatabase; import android.app.Application; import androidx.lifecycle.AndroidViewModel; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingDataSource.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingDataSource.java index c3dd6c1c..aa534e34 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingDataSource.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingDataSource.java @@ -6,7 +6,7 @@ import androidx.paging.PageKeyedDataSource; import java.util.ArrayList; -import SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; import retrofit2.Retrofit; public class SubredditListingDataSource extends PageKeyedDataSource<String, SubredditData> { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingRecyclerViewAdapter.java index b5eb208c..e3669e72 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingRecyclerViewAdapter.java @@ -20,7 +20,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.RequestManager; import com.bumptech.glide.request.RequestOptions; -import SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; import butterknife.BindView; import butterknife.ButterKnife; import jp.wasabeef.glide.transformations.RoundedCornersTransformation; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingViewModel.java index 1412bd22..4c721763 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingViewModel.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditListingViewModel.java @@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModelProvider; import androidx.paging.LivePagedListBuilder; import androidx.paging.PagedList; -import SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; import retrofit2.Retrofit; public class SubredditListingViewModel extends ViewModel { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditSelectionActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditSelectionActivity.java index 2103994a..16054228 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditSelectionActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditSelectionActivity.java @@ -31,9 +31,9 @@ import java.util.ArrayList; import javax.inject.Inject; import javax.inject.Named; -import SubredditDatabase.SubredditData; -import SubscribedSubredditDatabase.SubscribedSubredditData; -import SubscribedUserDatabase.SubscribedUserData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData; import butterknife.BindView; import butterknife.ButterKnife; import retrofit2.Retrofit; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditSubscription.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditSubscription.java index 2cc01113..349c6aed 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditSubscription.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubredditSubscription.java @@ -7,8 +7,8 @@ import androidx.annotation.NonNull; import java.util.HashMap; import java.util.Map; -import SubredditDatabase.SubredditData; -import SubscribedSubredditDatabase.SubscribedSubredditData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Retrofit; diff --git a/app/src/main/java/SubscribedSubredditDatabase/SubscribedSubredditDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditDatabase/SubscribedSubredditDao.java index 6ddaf835..6caf7703 100644 --- a/app/src/main/java/SubscribedSubredditDatabase/SubscribedSubredditDao.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditDatabase/SubscribedSubredditDao.java @@ -1,4 +1,4 @@ -package SubscribedSubredditDatabase; +package ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase; import androidx.lifecycle.LiveData; import androidx.room.Dao; diff --git a/app/src/main/java/SubscribedSubredditDatabase/SubscribedSubredditData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditDatabase/SubscribedSubredditData.java index bf2a87b8..36128826 100644 --- a/app/src/main/java/SubscribedSubredditDatabase/SubscribedSubredditData.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditDatabase/SubscribedSubredditData.java @@ -1,4 +1,4 @@ -package SubscribedSubredditDatabase; +package ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase; import androidx.room.ColumnInfo; import androidx.room.Entity; @@ -6,7 +6,7 @@ import androidx.room.ForeignKey; import androidx.room.PrimaryKey; import androidx.annotation.NonNull; -import Account.Account; +import ml.docilealligator.infinityforreddit.Account.Account; @Entity(tableName = "subscribed_subreddits", foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "username", childColumns = "username", onDelete = ForeignKey.CASCADE)) diff --git a/app/src/main/java/SubscribedSubredditDatabase/SubscribedSubredditRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditDatabase/SubscribedSubredditRepository.java index 1cbf8824..f10f93b8 100644 --- a/app/src/main/java/SubscribedSubredditDatabase/SubscribedSubredditRepository.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditDatabase/SubscribedSubredditRepository.java @@ -1,4 +1,4 @@ -package SubscribedSubredditDatabase; +package ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase; import android.os.AsyncTask; diff --git a/app/src/main/java/SubscribedSubredditDatabase/SubscribedSubredditViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditDatabase/SubscribedSubredditViewModel.java index d062f9d9..c1965641 100644 --- a/app/src/main/java/SubscribedSubredditDatabase/SubscribedSubredditViewModel.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditDatabase/SubscribedSubredditViewModel.java @@ -1,4 +1,4 @@ -package SubscribedSubredditDatabase; +package ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase; import android.app.Application; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsListingFragment.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsListingFragment.java index 150cd509..d5954501 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsListingFragment.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsListingFragment.java @@ -23,7 +23,7 @@ import com.bumptech.glide.RequestManager; import javax.inject.Inject; -import SubscribedSubredditDatabase.SubscribedSubredditViewModel; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditViewModel; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsRecyclerViewAdapter.java index e3cc97b6..897b811d 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedSubredditsRecyclerViewAdapter.java @@ -16,7 +16,7 @@ import com.bumptech.glide.request.RequestOptions; import java.util.List; -import SubscribedSubredditDatabase.SubscribedSubredditData; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData; import jp.wasabeef.glide.transformations.RoundedCornersTransformation; import pl.droidsonroids.gif.GifImageView; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedThingListingActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedThingListingActivity.java index eb569eaa..f45b5f32 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedThingListingActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedThingListingActivity.java @@ -31,9 +31,9 @@ import java.util.ArrayList; import javax.inject.Inject; import javax.inject.Named; -import SubredditDatabase.SubredditData; -import SubscribedSubredditDatabase.SubscribedSubredditData; -import SubscribedUserDatabase.SubscribedUserData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData; import butterknife.BindView; import butterknife.ButterKnife; import retrofit2.Retrofit; diff --git a/app/src/main/java/SubscribedUserDatabase/SubscribedUserDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserDao.java index 513a1ea4..4143e7c7 100644 --- a/app/src/main/java/SubscribedUserDatabase/SubscribedUserDao.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserDao.java @@ -1,4 +1,4 @@ -package SubscribedUserDatabase; +package ml.docilealligator.infinityforreddit.SubscribedUserDatabase; import androidx.lifecycle.LiveData; import androidx.room.Dao; diff --git a/app/src/main/java/SubscribedUserDatabase/SubscribedUserData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserData.java index 8ea89e04..0af2416a 100644 --- a/app/src/main/java/SubscribedUserDatabase/SubscribedUserData.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserData.java @@ -1,4 +1,4 @@ -package SubscribedUserDatabase; +package ml.docilealligator.infinityforreddit.SubscribedUserDatabase; import androidx.annotation.NonNull; import androidx.room.ColumnInfo; @@ -6,7 +6,7 @@ import androidx.room.Entity; import androidx.room.ForeignKey; import androidx.room.PrimaryKey; -import Account.Account; +import ml.docilealligator.infinityforreddit.Account.Account; @Entity(tableName = "subscribed_users", foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "username", childColumns = "username", onDelete = ForeignKey.CASCADE)) diff --git a/app/src/main/java/SubscribedUserDatabase/SubscribedUserRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserRepository.java index eb588958..7d295037 100644 --- a/app/src/main/java/SubscribedUserDatabase/SubscribedUserRepository.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserRepository.java @@ -1,4 +1,4 @@ -package SubscribedUserDatabase; +package ml.docilealligator.infinityforreddit.SubscribedUserDatabase; import android.os.AsyncTask; diff --git a/app/src/main/java/SubscribedUserDatabase/SubscribedUserViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserViewModel.java index 387c918c..b659fbc5 100644 --- a/app/src/main/java/SubscribedUserDatabase/SubscribedUserViewModel.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SubscribedUserDatabase/SubscribedUserViewModel.java @@ -1,4 +1,4 @@ -package SubscribedUserDatabase; +package ml.docilealligator.infinityforreddit.SubscribedUserDatabase; import android.app.Application; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SwitchAccountAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SwitchAccountAsyncTask.java index 516d0b55..65801464 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SwitchAccountAsyncTask.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SwitchAccountAsyncTask.java @@ -2,7 +2,7 @@ package ml.docilealligator.infinityforreddit; import android.os.AsyncTask; -import Account.Account; +import ml.docilealligator.infinityforreddit.Account.Account; class SwitchAccountAsyncTask extends AsyncTask<Void, Void, Void> { interface SwitchAccountAsyncTaskListener { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/SwitchToAnonymousAccountAsyncTask.java b/app/src/main/java/ml/docilealligator/infinityforreddit/SwitchToAnonymousAccountAsyncTask.java index af65d5f8..588131dd 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/SwitchToAnonymousAccountAsyncTask.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/SwitchToAnonymousAccountAsyncTask.java @@ -2,7 +2,7 @@ package ml.docilealligator.infinityforreddit; import android.os.AsyncTask; -import Account.AccountDao; +import ml.docilealligator.infinityforreddit.Account.AccountDao; class SwitchToAnonymousAccountAsyncTask extends AsyncTask<Void, Void, Void> { interface SwitchToAnonymousAccountAsyncTaskListener { diff --git a/app/src/main/java/User/UserDao.java b/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserDao.java index 2bf7b824..b7221c26 100644 --- a/app/src/main/java/User/UserDao.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserDao.java @@ -1,4 +1,4 @@ -package User; +package ml.docilealligator.infinityforreddit.User; import androidx.lifecycle.LiveData; import androidx.room.Dao; diff --git a/app/src/main/java/User/UserData.java b/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserData.java index b3f71029..f207685e 100644 --- a/app/src/main/java/User/UserData.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserData.java @@ -1,4 +1,4 @@ -package User; +package ml.docilealligator.infinityforreddit.User; import androidx.annotation.NonNull; import androidx.room.ColumnInfo; diff --git a/app/src/main/java/User/UserRepository.java b/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserRepository.java index d781a694..af0b5bb4 100644 --- a/app/src/main/java/User/UserRepository.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserRepository.java @@ -1,4 +1,4 @@ -package User; +package ml.docilealligator.infinityforreddit.User; import android.os.AsyncTask; diff --git a/app/src/main/java/User/UserViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserViewModel.java index 2c746cad..5f5a51e6 100644 --- a/app/src/main/java/User/UserViewModel.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/User/UserViewModel.java @@ -1,4 +1,4 @@ -package User; +package ml.docilealligator.infinityforreddit.User; import android.app.Application; import androidx.lifecycle.AndroidViewModel; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/UserFollowing.java b/app/src/main/java/ml/docilealligator/infinityforreddit/UserFollowing.java index 1b25c415..201e2ce0 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/UserFollowing.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/UserFollowing.java @@ -7,9 +7,9 @@ import androidx.annotation.NonNull; import java.util.HashMap; import java.util.Map; -import SubscribedUserDatabase.SubscribedUserDao; -import SubscribedUserDatabase.SubscribedUserData; -import User.UserData; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData; +import ml.docilealligator.infinityforreddit.User.UserData; import retrofit2.Call; import retrofit2.Callback; import retrofit2.Retrofit; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingDataSource.java b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingDataSource.java index bcad2452..ac2eb0ae 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingDataSource.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingDataSource.java @@ -6,7 +6,7 @@ import androidx.paging.PageKeyedDataSource; import java.util.ArrayList; -import User.UserData; +import ml.docilealligator.infinityforreddit.User.UserData; import retrofit2.Retrofit; public class UserListingDataSource extends PageKeyedDataSource<String, UserData> { @@ -63,7 +63,7 @@ public class UserListingDataSource extends PageKeyedDataSource<String, UserData> @Override public void onFetchUserListingDataFailed() { - initialLoadStateLiveData.postValue(new NetworkState(NetworkState.Status.FAILED, "Error retrieving User list")); + initialLoadStateLiveData.postValue(new NetworkState(NetworkState.Status.FAILED, "Error retrieving ml.docilealligator.infinityforreddit.User list")); } }); } @@ -92,7 +92,7 @@ public class UserListingDataSource extends PageKeyedDataSource<String, UserData> @Override public void onFetchUserListingDataFailed() { - paginationNetworkStateLiveData.postValue(new NetworkState(NetworkState.Status.FAILED, "Error retrieving User list")); + paginationNetworkStateLiveData.postValue(new NetworkState(NetworkState.Status.FAILED, "Error retrieving ml.docilealligator.infinityforreddit.User list")); } }); } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingRecyclerViewAdapter.java index 415a6b41..2a8f53df 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingRecyclerViewAdapter.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingRecyclerViewAdapter.java @@ -21,8 +21,8 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.RequestManager; import com.bumptech.glide.request.RequestOptions; -import SubscribedUserDatabase.SubscribedUserDao; -import User.UserData; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao; +import ml.docilealligator.infinityforreddit.User.UserData; import butterknife.BindView; import butterknife.ButterKnife; import jp.wasabeef.glide.transformations.RoundedCornersTransformation; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingViewModel.java b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingViewModel.java index d25463e5..03c72ec2 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingViewModel.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/UserListingViewModel.java @@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModelProvider; import androidx.paging.LivePagedListBuilder; import androidx.paging.PagedList; -import User.UserData; +import ml.docilealligator.infinityforreddit.User.UserData; import retrofit2.Retrofit; public class UserListingViewModel extends ViewModel { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java index ba24aae8..24a292a2 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewSubredditDetailActivity.java @@ -39,9 +39,9 @@ import org.greenrobot.eventbus.Subscribe; import javax.inject.Inject; import javax.inject.Named; -import SubredditDatabase.SubredditDao; -import SubredditDatabase.SubredditData; -import SubredditDatabase.SubredditViewModel; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditDao; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData; +import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditViewModel; import butterknife.BindView; import butterknife.ButterKnife; import jp.wasabeef.glide.transformations.RoundedCornersTransformation; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java index fae233fb..32657fd7 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/ViewUserDetailActivity.java @@ -43,10 +43,10 @@ import org.greenrobot.eventbus.Subscribe; import javax.inject.Inject; import javax.inject.Named; -import SubscribedUserDatabase.SubscribedUserDao; -import User.UserDao; -import User.UserData; -import User.UserViewModel; +import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao; +import ml.docilealligator.infinityforreddit.User.UserDao; +import ml.docilealligator.infinityforreddit.User.UserData; +import ml.docilealligator.infinityforreddit.User.UserViewModel; import butterknife.BindView; import butterknife.ButterKnife; import jp.wasabeef.glide.transformations.RoundedCornersTransformation; diff --git a/app/src/main/res/layout/fragment_acknowledgement.xml b/app/src/main/res/layout/fragment_acknowledgement.xml index 5f164c83..b6d17db9 100644 --- a/app/src/main/res/layout/fragment_acknowledgement.xml +++ b/app/src/main/res/layout/fragment_acknowledgement.xml @@ -3,4 +3,4 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:id="@+id/recycler_view_acknowledgement_fragment" - tools:context="Settings.AcknowledgementFragment"/> + tools:context="ml.docilealligator.infinityforreddit.Settings.AcknowledgementFragment"/> diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml index 624331a6..cc7cc163 100644 --- a/app/src/main/res/layout/item_post.xml +++ b/app/src/main/res/layout/item_post.xml @@ -29,7 +29,7 @@ app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post" app:layout_constraintTop_toTopOf="parent"> - <CustomView.AspectRatioGifImageView + <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView android:id="@+id/icon_gif_image_view_item_post" android:layout_width="24dp" android:layout_height="24dp" @@ -249,7 +249,7 @@ android:layout_height="wrap_content" android:layout_centerInParent="true" /> - <CustomView.AspectRatioGifImageView + <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView android:id="@+id/image_view_best_post_item" android:layout_width="match_parent" android:layout_height="wrap_content" diff --git a/app/src/main/res/layout/item_post_detail.xml b/app/src/main/res/layout/item_post_detail.xml index d0647265..fe0a2e5b 100644 --- a/app/src/main/res/layout/item_post_detail.xml +++ b/app/src/main/res/layout/item_post_detail.xml @@ -22,7 +22,7 @@ app:layout_constraintEnd_toStartOf="@id/post_time_text_view_item_post_detail" app:layout_constraintTop_toTopOf="parent"> - <CustomView.AspectRatioGifImageView + <ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView android:id="@+id/icon_gif_image_view_item_post_detail" android:layout_width="24dp" android:layout_height="24dp" |