mirror of
https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git
synced 2025-01-23 16:34:44 +01:00
Change project structures.
This commit is contained in:
parent
47832e1e91
commit
3227e43fc4
@ -10,7 +10,7 @@ import java.io.IOException;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import Account.Account;
|
import ml.docilealligator.infinityforreddit.Account.Account;
|
||||||
import okhttp3.Authenticator;
|
import okhttp3.Authenticator;
|
||||||
import okhttp3.Headers;
|
import okhttp3.Headers;
|
||||||
import okhttp3.Request;
|
import okhttp3.Request;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package Account;
|
package ml.docilealligator.infinityforreddit.Account;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.room.ColumnInfo;
|
import androidx.room.ColumnInfo;
|
@ -1,4 +1,4 @@
|
|||||||
package Account;
|
package ml.docilealligator.infinityforreddit.Account;
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData;
|
import androidx.lifecycle.LiveData;
|
||||||
import androidx.room.Dao;
|
import androidx.room.Dao;
|
@ -1,4 +1,4 @@
|
|||||||
package Account;
|
package ml.docilealligator.infinityforreddit.Account;
|
||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package Account;
|
package ml.docilealligator.infinityforreddit.Account;
|
||||||
|
|
||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
|
|
@ -15,7 +15,7 @@ import com.bumptech.glide.request.RequestOptions;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import Account.Account;
|
import ml.docilealligator.infinityforreddit.Account.Account;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
||||||
|
@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit;
|
|||||||
|
|
||||||
import javax.inject.Singleton;
|
import javax.inject.Singleton;
|
||||||
|
|
||||||
import Settings.MainPreferenceFragment;
|
import ml.docilealligator.infinityforreddit.Settings.MainPreferenceFragment;
|
||||||
import Settings.NotificationPreferenceFragment;
|
import ml.docilealligator.infinityforreddit.Settings.NotificationPreferenceFragment;
|
||||||
import dagger.Component;
|
import dagger.Component;
|
||||||
|
|
||||||
@Singleton
|
@Singleton
|
||||||
|
@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit;
|
|||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
||||||
import SubscribedUserDatabase.SubscribedUserDao;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
|
||||||
import SubscribedUserDatabase.SubscribedUserData;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
|
||||||
|
|
||||||
public class CheckIsFollowingUserAsyncTask extends AsyncTask<Void, Void, Void> {
|
public class CheckIsFollowingUserAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
private SubscribedUserDao subscribedUserDao;
|
private SubscribedUserDao subscribedUserDao;
|
||||||
|
@ -2,7 +2,7 @@ package ml.docilealligator.infinityforreddit;
|
|||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditData;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData;
|
||||||
|
|
||||||
class CheckIsSubscribedToSubredditAsyncTask extends AsyncTask<Void, Void, Void> {
|
class CheckIsSubscribedToSubredditAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
|
|
||||||
|
@ -39,7 +39,7 @@ import com.santalu.aspectratioimageview.AspectRatioImageView;
|
|||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
import java.util.Locale;
|
import java.util.Locale;
|
||||||
|
|
||||||
import CustomView.AspectRatioGifImageView;
|
import ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import io.noties.markwon.AbstractMarkwonPlugin;
|
import io.noties.markwon.AbstractMarkwonPlugin;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package CustomView;
|
package ml.docilealligator.infinityforreddit.CustomView;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.res.TypedArray;
|
import android.content.res.TypedArray;
|
@ -1,12 +1,10 @@
|
|||||||
package ml.docilealligator.infinityforreddit;
|
package ml.docilealligator.infinityforreddit;
|
||||||
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import retrofit2.Call;
|
import retrofit2.Call;
|
||||||
import retrofit2.Callback;
|
import retrofit2.Callback;
|
||||||
import retrofit2.Response;
|
import retrofit2.Response;
|
||||||
|
@ -1,14 +1,12 @@
|
|||||||
package ml.docilealligator.infinityforreddit;
|
package ml.docilealligator.infinityforreddit;
|
||||||
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditData;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData;
|
||||||
import SubscribedUserDatabase.SubscribedUserData;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
|
||||||
import retrofit2.Call;
|
import retrofit2.Call;
|
||||||
import retrofit2.Callback;
|
import retrofit2.Callback;
|
||||||
import retrofit2.Response;
|
import retrofit2.Response;
|
||||||
|
@ -1,12 +1,10 @@
|
|||||||
package ml.docilealligator.infinityforreddit;
|
package ml.docilealligator.infinityforreddit;
|
||||||
|
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import User.UserData;
|
import ml.docilealligator.infinityforreddit.User.UserData;
|
||||||
import retrofit2.Call;
|
import retrofit2.Call;
|
||||||
import retrofit2.Callback;
|
import retrofit2.Callback;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
@ -22,7 +22,7 @@ import com.bumptech.glide.RequestManager;
|
|||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
import SubscribedUserDatabase.SubscribedUserViewModel;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserViewModel;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ import com.bumptech.glide.request.RequestOptions;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import SubscribedUserDatabase.SubscribedUserData;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
|
||||||
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
||||||
import pl.droidsonroids.gif.GifImageView;
|
import pl.droidsonroids.gif.GifImageView;
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit;
|
|||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
||||||
import Account.Account;
|
import ml.docilealligator.infinityforreddit.Account.Account;
|
||||||
import Account.AccountDao;
|
import ml.docilealligator.infinityforreddit.Account.AccountDao;
|
||||||
|
|
||||||
class GetCurrentAccountAsyncTask extends AsyncTask<Void, Void, Void> {
|
class GetCurrentAccountAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
|
|
||||||
|
@ -6,12 +6,12 @@ import androidx.annotation.Nullable;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditDao;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditDao;
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditDao;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditDao;
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditData;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData;
|
||||||
import SubscribedUserDatabase.SubscribedUserDao;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
|
||||||
import SubscribedUserDatabase.SubscribedUserData;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
|
||||||
|
|
||||||
class InsertSubscribedThingsAsyncTask extends AsyncTask<Void, Void, Void> {
|
class InsertSubscribedThingsAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
|
|
||||||
|
@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit;
|
|||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
||||||
import User.UserData;
|
import ml.docilealligator.infinityforreddit.User.UserData;
|
||||||
import User.UserDao;
|
import ml.docilealligator.infinityforreddit.User.UserDao;
|
||||||
|
|
||||||
public class InsertUserDataAsyncTask extends AsyncTask<Void, Void, Void> {
|
public class InsertUserDataAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
private UserDao userDao;
|
private UserDao userDao;
|
||||||
|
@ -4,8 +4,8 @@ import android.os.AsyncTask;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditDao;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditDao;
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
|
||||||
class LoadSubredditIconAsyncTask extends AsyncTask<Void, Void, Void> {
|
class LoadSubredditIconAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
|
@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit;
|
|||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
||||||
import User.UserData;
|
import ml.docilealligator.infinityforreddit.User.UserData;
|
||||||
import User.UserDao;
|
import ml.docilealligator.infinityforreddit.User.UserDao;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
|
||||||
public class LoadUserDataAsyncTask extends AsyncTask<Void, Void, Void> {
|
public class LoadUserDataAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
|
@ -57,11 +57,11 @@ import java.util.concurrent.TimeUnit;
|
|||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.inject.Named;
|
import javax.inject.Named;
|
||||||
|
|
||||||
import Account.Account;
|
import ml.docilealligator.infinityforreddit.Account.Account;
|
||||||
import Account.AccountViewModel;
|
import ml.docilealligator.infinityforreddit.Account.AccountViewModel;
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditData;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData;
|
||||||
import SubscribedUserDatabase.SubscribedUserData;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
||||||
|
@ -2,8 +2,8 @@ package ml.docilealligator.infinityforreddit;
|
|||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
||||||
import Account.Account;
|
import ml.docilealligator.infinityforreddit.Account.Account;
|
||||||
import Account.AccountDao;
|
import ml.docilealligator.infinityforreddit.Account.AccountDao;
|
||||||
|
|
||||||
class ParseAndInsertNewAccountAsyncTask extends AsyncTask<Void, Void, Void> {
|
class ParseAndInsertNewAccountAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
|
|
||||||
|
@ -8,7 +8,7 @@ import org.json.JSONObject;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
|
|
||||||
class ParseSubredditData {
|
class ParseSubredditData {
|
||||||
interface ParseSubredditDataListener {
|
interface ParseSubredditDataListener {
|
||||||
|
@ -8,9 +8,9 @@ import org.json.JSONObject;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditData;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData;
|
||||||
import SubscribedUserDatabase.SubscribedUserData;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
|
||||||
|
|
||||||
class ParseSubscribedThing {
|
class ParseSubscribedThing {
|
||||||
interface ParseSubscribedSubredditsListener {
|
interface ParseSubscribedSubredditsListener {
|
||||||
|
@ -8,7 +8,7 @@ import org.json.JSONObject;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import User.UserData;
|
import ml.docilealligator.infinityforreddit.User.UserData;
|
||||||
|
|
||||||
public class ParseUserData {
|
public class ParseUserData {
|
||||||
interface ParseUserDataListener {
|
interface ParseUserDataListener {
|
||||||
|
@ -38,8 +38,8 @@ import com.libRG.CustomTextView;
|
|||||||
|
|
||||||
import org.greenrobot.eventbus.EventBus;
|
import org.greenrobot.eventbus.EventBus;
|
||||||
|
|
||||||
import CustomView.AspectRatioGifImageView;
|
import ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView;
|
||||||
import User.UserDao;
|
import ml.docilealligator.infinityforreddit.User.UserDao;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import jp.wasabeef.glide.transformations.BlurTransformation;
|
import jp.wasabeef.glide.transformations.BlurTransformation;
|
||||||
|
@ -5,7 +5,6 @@ import android.content.Context;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.content.SharedPreferences;
|
import android.content.SharedPreferences;
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
import android.util.Log;
|
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.core.app.NotificationCompat;
|
import androidx.core.app.NotificationCompat;
|
||||||
@ -26,7 +25,7 @@ import java.util.Map;
|
|||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.inject.Named;
|
import javax.inject.Named;
|
||||||
|
|
||||||
import Account.Account;
|
import ml.docilealligator.infinityforreddit.Account.Account;
|
||||||
import retrofit2.Call;
|
import retrofit2.Call;
|
||||||
import retrofit2.Response;
|
import retrofit2.Response;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
@ -6,16 +6,16 @@ import androidx.room.Database;
|
|||||||
import androidx.room.Room;
|
import androidx.room.Room;
|
||||||
import androidx.room.RoomDatabase;
|
import androidx.room.RoomDatabase;
|
||||||
|
|
||||||
import Account.Account;
|
import ml.docilealligator.infinityforreddit.Account.Account;
|
||||||
import Account.AccountDao;
|
import ml.docilealligator.infinityforreddit.Account.AccountDao;
|
||||||
import SubredditDatabase.SubredditDao;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditDao;
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditDao;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditDao;
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditData;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData;
|
||||||
import SubscribedUserDatabase.SubscribedUserDao;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
|
||||||
import SubscribedUserDatabase.SubscribedUserData;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
|
||||||
import User.UserDao;
|
import ml.docilealligator.infinityforreddit.User.UserDao;
|
||||||
import User.UserData;
|
import ml.docilealligator.infinityforreddit.User.UserData;
|
||||||
|
|
||||||
@Database(entities = {Account.class, SubredditData.class, SubscribedSubredditData.class, UserData.class, SubscribedUserData.class}, version = 1)
|
@Database(entities = {Account.class, SubredditData.class, SubscribedSubredditData.class, UserData.class, SubscribedUserData.class}, version = 1)
|
||||||
public abstract class RedditDataRoomDatabase extends RoomDatabase {
|
public abstract class RedditDataRoomDatabase extends RoomDatabase {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package Settings;
|
package ml.docilealligator.infinityforreddit.Settings;
|
||||||
|
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
@ -1,4 +1,4 @@
|
|||||||
package Settings;
|
package ml.docilealligator.infinityforreddit.Settings;
|
||||||
|
|
||||||
import android.net.Uri;
|
import android.net.Uri;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package Settings;
|
package ml.docilealligator.infinityforreddit.Settings;
|
||||||
|
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
@ -1,4 +1,4 @@
|
|||||||
package Settings;
|
package ml.docilealligator.infinityforreddit.Settings;
|
||||||
|
|
||||||
import android.content.Context;
|
import android.content.Context;
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
@ -1,4 +1,4 @@
|
|||||||
package Settings;
|
package ml.docilealligator.infinityforreddit.Settings;
|
||||||
|
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
@ -1,4 +1,4 @@
|
|||||||
package Settings;
|
package ml.docilealligator.infinityforreddit.Settings;
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
@ -1,4 +1,4 @@
|
|||||||
package Settings;
|
package ml.docilealligator.infinityforreddit.Settings;
|
||||||
|
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
@ -1,4 +1,4 @@
|
|||||||
package Settings;
|
package ml.docilealligator.infinityforreddit.Settings;
|
||||||
|
|
||||||
|
|
||||||
import android.app.Activity;
|
import android.app.Activity;
|
@ -19,8 +19,8 @@ import androidx.preference.PreferenceFragmentCompat;
|
|||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
import Settings.AboutPreferenceFragment;
|
import ml.docilealligator.infinityforreddit.Settings.AboutPreferenceFragment;
|
||||||
import Settings.MainPreferenceFragment;
|
import ml.docilealligator.infinityforreddit.Settings.MainPreferenceFragment;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
|
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package SubredditDatabase;
|
package ml.docilealligator.infinityforreddit.SubredditDatabase;
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData;
|
import androidx.lifecycle.LiveData;
|
||||||
import androidx.room.Dao;
|
import androidx.room.Dao;
|
@ -1,4 +1,4 @@
|
|||||||
package SubredditDatabase;
|
package ml.docilealligator.infinityforreddit.SubredditDatabase;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.room.ColumnInfo;
|
import androidx.room.ColumnInfo;
|
@ -1,4 +1,4 @@
|
|||||||
package SubredditDatabase;
|
package ml.docilealligator.infinityforreddit.SubredditDatabase;
|
||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package SubredditDatabase;
|
package ml.docilealligator.infinityforreddit.SubredditDatabase;
|
||||||
|
|
||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
import androidx.lifecycle.AndroidViewModel;
|
import androidx.lifecycle.AndroidViewModel;
|
@ -6,7 +6,7 @@ import androidx.paging.PageKeyedDataSource;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
|
||||||
public class SubredditListingDataSource extends PageKeyedDataSource<String, SubredditData> {
|
public class SubredditListingDataSource extends PageKeyedDataSource<String, SubredditData> {
|
||||||
|
@ -20,7 +20,7 @@ import com.bumptech.glide.Glide;
|
|||||||
import com.bumptech.glide.RequestManager;
|
import com.bumptech.glide.RequestManager;
|
||||||
import com.bumptech.glide.request.RequestOptions;
|
import com.bumptech.glide.request.RequestOptions;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
||||||
|
@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModelProvider;
|
|||||||
import androidx.paging.LivePagedListBuilder;
|
import androidx.paging.LivePagedListBuilder;
|
||||||
import androidx.paging.PagedList;
|
import androidx.paging.PagedList;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
|
||||||
public class SubredditListingViewModel extends ViewModel {
|
public class SubredditListingViewModel extends ViewModel {
|
||||||
|
@ -31,9 +31,9 @@ import java.util.ArrayList;
|
|||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.inject.Named;
|
import javax.inject.Named;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditData;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData;
|
||||||
import SubscribedUserDatabase.SubscribedUserData;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
@ -7,8 +7,8 @@ import androidx.annotation.NonNull;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditData;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData;
|
||||||
import retrofit2.Call;
|
import retrofit2.Call;
|
||||||
import retrofit2.Callback;
|
import retrofit2.Callback;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package SubscribedSubredditDatabase;
|
package ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase;
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData;
|
import androidx.lifecycle.LiveData;
|
||||||
import androidx.room.Dao;
|
import androidx.room.Dao;
|
@ -1,4 +1,4 @@
|
|||||||
package SubscribedSubredditDatabase;
|
package ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase;
|
||||||
|
|
||||||
import androidx.room.ColumnInfo;
|
import androidx.room.ColumnInfo;
|
||||||
import androidx.room.Entity;
|
import androidx.room.Entity;
|
||||||
@ -6,7 +6,7 @@ import androidx.room.ForeignKey;
|
|||||||
import androidx.room.PrimaryKey;
|
import androidx.room.PrimaryKey;
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
|
|
||||||
import Account.Account;
|
import ml.docilealligator.infinityforreddit.Account.Account;
|
||||||
|
|
||||||
@Entity(tableName = "subscribed_subreddits", foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "username",
|
@Entity(tableName = "subscribed_subreddits", foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "username",
|
||||||
childColumns = "username", onDelete = ForeignKey.CASCADE))
|
childColumns = "username", onDelete = ForeignKey.CASCADE))
|
@ -1,4 +1,4 @@
|
|||||||
package SubscribedSubredditDatabase;
|
package ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase;
|
||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package SubscribedSubredditDatabase;
|
package ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase;
|
||||||
|
|
||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
|
|
@ -23,7 +23,7 @@ import com.bumptech.glide.RequestManager;
|
|||||||
|
|
||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
|
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditViewModel;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditViewModel;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
|
|
||||||
|
@ -16,7 +16,7 @@ import com.bumptech.glide.request.RequestOptions;
|
|||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditData;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData;
|
||||||
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
||||||
import pl.droidsonroids.gif.GifImageView;
|
import pl.droidsonroids.gif.GifImageView;
|
||||||
|
|
||||||
|
@ -31,9 +31,9 @@ import java.util.ArrayList;
|
|||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.inject.Named;
|
import javax.inject.Named;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import SubscribedSubredditDatabase.SubscribedSubredditData;
|
import ml.docilealligator.infinityforreddit.SubscribedSubredditDatabase.SubscribedSubredditData;
|
||||||
import SubscribedUserDatabase.SubscribedUserData;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package SubscribedUserDatabase;
|
package ml.docilealligator.infinityforreddit.SubscribedUserDatabase;
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData;
|
import androidx.lifecycle.LiveData;
|
||||||
import androidx.room.Dao;
|
import androidx.room.Dao;
|
@ -1,4 +1,4 @@
|
|||||||
package SubscribedUserDatabase;
|
package ml.docilealligator.infinityforreddit.SubscribedUserDatabase;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.room.ColumnInfo;
|
import androidx.room.ColumnInfo;
|
||||||
@ -6,7 +6,7 @@ import androidx.room.Entity;
|
|||||||
import androidx.room.ForeignKey;
|
import androidx.room.ForeignKey;
|
||||||
import androidx.room.PrimaryKey;
|
import androidx.room.PrimaryKey;
|
||||||
|
|
||||||
import Account.Account;
|
import ml.docilealligator.infinityforreddit.Account.Account;
|
||||||
|
|
||||||
@Entity(tableName = "subscribed_users", foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "username",
|
@Entity(tableName = "subscribed_users", foreignKeys = @ForeignKey(entity = Account.class, parentColumns = "username",
|
||||||
childColumns = "username", onDelete = ForeignKey.CASCADE))
|
childColumns = "username", onDelete = ForeignKey.CASCADE))
|
@ -1,4 +1,4 @@
|
|||||||
package SubscribedUserDatabase;
|
package ml.docilealligator.infinityforreddit.SubscribedUserDatabase;
|
||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package SubscribedUserDatabase;
|
package ml.docilealligator.infinityforreddit.SubscribedUserDatabase;
|
||||||
|
|
||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
|
|
@ -2,7 +2,7 @@ package ml.docilealligator.infinityforreddit;
|
|||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
||||||
import Account.Account;
|
import ml.docilealligator.infinityforreddit.Account.Account;
|
||||||
|
|
||||||
class SwitchAccountAsyncTask extends AsyncTask<Void, Void, Void> {
|
class SwitchAccountAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
interface SwitchAccountAsyncTaskListener {
|
interface SwitchAccountAsyncTaskListener {
|
||||||
|
@ -2,7 +2,7 @@ package ml.docilealligator.infinityforreddit;
|
|||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
||||||
import Account.AccountDao;
|
import ml.docilealligator.infinityforreddit.Account.AccountDao;
|
||||||
|
|
||||||
class SwitchToAnonymousAccountAsyncTask extends AsyncTask<Void, Void, Void> {
|
class SwitchToAnonymousAccountAsyncTask extends AsyncTask<Void, Void, Void> {
|
||||||
interface SwitchToAnonymousAccountAsyncTaskListener {
|
interface SwitchToAnonymousAccountAsyncTaskListener {
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
package User;
|
package ml.docilealligator.infinityforreddit.User;
|
||||||
|
|
||||||
import androidx.lifecycle.LiveData;
|
import androidx.lifecycle.LiveData;
|
||||||
import androidx.room.Dao;
|
import androidx.room.Dao;
|
@ -1,4 +1,4 @@
|
|||||||
package User;
|
package ml.docilealligator.infinityforreddit.User;
|
||||||
|
|
||||||
import androidx.annotation.NonNull;
|
import androidx.annotation.NonNull;
|
||||||
import androidx.room.ColumnInfo;
|
import androidx.room.ColumnInfo;
|
@ -1,4 +1,4 @@
|
|||||||
package User;
|
package ml.docilealligator.infinityforreddit.User;
|
||||||
|
|
||||||
import android.os.AsyncTask;
|
import android.os.AsyncTask;
|
||||||
|
|
@ -1,4 +1,4 @@
|
|||||||
package User;
|
package ml.docilealligator.infinityforreddit.User;
|
||||||
|
|
||||||
import android.app.Application;
|
import android.app.Application;
|
||||||
import androidx.lifecycle.AndroidViewModel;
|
import androidx.lifecycle.AndroidViewModel;
|
@ -7,9 +7,9 @@ import androidx.annotation.NonNull;
|
|||||||
import java.util.HashMap;
|
import java.util.HashMap;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
import SubscribedUserDatabase.SubscribedUserDao;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
|
||||||
import SubscribedUserDatabase.SubscribedUserData;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserData;
|
||||||
import User.UserData;
|
import ml.docilealligator.infinityforreddit.User.UserData;
|
||||||
import retrofit2.Call;
|
import retrofit2.Call;
|
||||||
import retrofit2.Callback;
|
import retrofit2.Callback;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
@ -6,7 +6,7 @@ import androidx.paging.PageKeyedDataSource;
|
|||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
|
||||||
import User.UserData;
|
import ml.docilealligator.infinityforreddit.User.UserData;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
|
||||||
public class UserListingDataSource extends PageKeyedDataSource<String, UserData> {
|
public class UserListingDataSource extends PageKeyedDataSource<String, UserData> {
|
||||||
@ -63,7 +63,7 @@ public class UserListingDataSource extends PageKeyedDataSource<String, UserData>
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onFetchUserListingDataFailed() {
|
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
|
@Override
|
||||||
public void onFetchUserListingDataFailed() {
|
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"));
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -21,8 +21,8 @@ import com.bumptech.glide.Glide;
|
|||||||
import com.bumptech.glide.RequestManager;
|
import com.bumptech.glide.RequestManager;
|
||||||
import com.bumptech.glide.request.RequestOptions;
|
import com.bumptech.glide.request.RequestOptions;
|
||||||
|
|
||||||
import SubscribedUserDatabase.SubscribedUserDao;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
|
||||||
import User.UserData;
|
import ml.docilealligator.infinityforreddit.User.UserData;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
||||||
|
@ -9,7 +9,7 @@ import androidx.lifecycle.ViewModelProvider;
|
|||||||
import androidx.paging.LivePagedListBuilder;
|
import androidx.paging.LivePagedListBuilder;
|
||||||
import androidx.paging.PagedList;
|
import androidx.paging.PagedList;
|
||||||
|
|
||||||
import User.UserData;
|
import ml.docilealligator.infinityforreddit.User.UserData;
|
||||||
import retrofit2.Retrofit;
|
import retrofit2.Retrofit;
|
||||||
|
|
||||||
public class UserListingViewModel extends ViewModel {
|
public class UserListingViewModel extends ViewModel {
|
||||||
|
@ -39,9 +39,9 @@ import org.greenrobot.eventbus.Subscribe;
|
|||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.inject.Named;
|
import javax.inject.Named;
|
||||||
|
|
||||||
import SubredditDatabase.SubredditDao;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditDao;
|
||||||
import SubredditDatabase.SubredditData;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditData;
|
||||||
import SubredditDatabase.SubredditViewModel;
|
import ml.docilealligator.infinityforreddit.SubredditDatabase.SubredditViewModel;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
||||||
|
@ -43,10 +43,10 @@ import org.greenrobot.eventbus.Subscribe;
|
|||||||
import javax.inject.Inject;
|
import javax.inject.Inject;
|
||||||
import javax.inject.Named;
|
import javax.inject.Named;
|
||||||
|
|
||||||
import SubscribedUserDatabase.SubscribedUserDao;
|
import ml.docilealligator.infinityforreddit.SubscribedUserDatabase.SubscribedUserDao;
|
||||||
import User.UserDao;
|
import ml.docilealligator.infinityforreddit.User.UserDao;
|
||||||
import User.UserData;
|
import ml.docilealligator.infinityforreddit.User.UserData;
|
||||||
import User.UserViewModel;
|
import ml.docilealligator.infinityforreddit.User.UserViewModel;
|
||||||
import butterknife.BindView;
|
import butterknife.BindView;
|
||||||
import butterknife.ButterKnife;
|
import butterknife.ButterKnife;
|
||||||
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
import jp.wasabeef.glide.transformations.RoundedCornersTransformation;
|
||||||
|
@ -3,4 +3,4 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:id="@+id/recycler_view_acknowledgement_fragment"
|
android:id="@+id/recycler_view_acknowledgement_fragment"
|
||||||
tools:context="Settings.AcknowledgementFragment"/>
|
tools:context="ml.docilealligator.infinityforreddit.Settings.AcknowledgementFragment"/>
|
||||||
|
@ -29,7 +29,7 @@
|
|||||||
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post"
|
app:layout_constraintEnd_toStartOf="@id/stickied_post_image_view_item_post"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
<CustomView.AspectRatioGifImageView
|
<ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
|
||||||
android:id="@+id/icon_gif_image_view_item_post"
|
android:id="@+id/icon_gif_image_view_item_post"
|
||||||
android:layout_width="24dp"
|
android:layout_width="24dp"
|
||||||
android:layout_height="24dp"
|
android:layout_height="24dp"
|
||||||
@ -249,7 +249,7 @@
|
|||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_centerInParent="true" />
|
android:layout_centerInParent="true" />
|
||||||
|
|
||||||
<CustomView.AspectRatioGifImageView
|
<ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
|
||||||
android:id="@+id/image_view_best_post_item"
|
android:id="@+id/image_view_best_post_item"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
@ -22,7 +22,7 @@
|
|||||||
app:layout_constraintEnd_toStartOf="@id/post_time_text_view_item_post_detail"
|
app:layout_constraintEnd_toStartOf="@id/post_time_text_view_item_post_detail"
|
||||||
app:layout_constraintTop_toTopOf="parent">
|
app:layout_constraintTop_toTopOf="parent">
|
||||||
|
|
||||||
<CustomView.AspectRatioGifImageView
|
<ml.docilealligator.infinityforreddit.CustomView.AspectRatioGifImageView
|
||||||
android:id="@+id/icon_gif_image_view_item_post_detail"
|
android:id="@+id/icon_gif_image_view_item_post_detail"
|
||||||
android:layout_width="24dp"
|
android:layout_width="24dp"
|
||||||
android:layout_height="24dp"
|
android:layout_height="24dp"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user