mirror of
https://github.com/sudoxnym/habitica-android.git
synced 2026-07-31 19:20:34 +00:00
ApiClient & ApiClientImpl (renames) - lower field names
This commit is contained in:
Negue
parent
1087c31a31
commit
b7915fd0b6
45 changed files with 109 additions and 183 deletions
|
|
@ -11,7 +11,7 @@ import com.habitrpg.android.habitica.database.CheckListItemExcludeStrategy;
|
|||
import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
|
||||
import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiService;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.Server;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.AchievementResult;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
|
||||
|
|
@ -115,7 +115,7 @@ import rx.functions.Func1;
|
|||
import rx.schedulers.Schedulers;
|
||||
|
||||
|
||||
public class ApiClient implements Action1<Throwable>, IApiClient {
|
||||
public class ApiClientImpl implements Action1<Throwable>, ApiClient {
|
||||
private final GsonConverterFactory gsonConverter;
|
||||
private final HostConfig hostConfig;
|
||||
private final Retrofit retrofitAdapter;
|
||||
|
|
@ -123,7 +123,7 @@ public class ApiClient implements Action1<Throwable>, IApiClient {
|
|||
CrashlyticsProxy crashlyticsProxy;
|
||||
Context context;
|
||||
|
||||
// I think we don't need the ApiClient anymore we could just use ApiService
|
||||
// I think we don't need the ApiClientImpl anymore we could just use ApiService
|
||||
private final ApiService apiService;
|
||||
|
||||
final Observable.Transformer apiCallTransformer =
|
||||
|
|
@ -132,7 +132,7 @@ public class ApiClient implements Action1<Throwable>, IApiClient {
|
|||
@Override
|
||||
public Object call(HabitResponse habitResponse) {
|
||||
if (habitResponse.notifications != null) {
|
||||
PopupNotificationsManager popupNotificationsManager = PopupNotificationsManager.getInstance(ApiClient.this, context);
|
||||
PopupNotificationsManager popupNotificationsManager = PopupNotificationsManager.getInstance(com.habitrpg.android.habitica.ApiClientImpl.this, context);
|
||||
popupNotificationsManager.showNotificationDialog(habitResponse.notifications);
|
||||
}
|
||||
return habitResponse.getData();
|
||||
|
|
@ -146,7 +146,7 @@ public class ApiClient implements Action1<Throwable>, IApiClient {
|
|||
|
||||
//private OnHabitsAPIResult mResultListener;
|
||||
//private HostConfig mConfig;
|
||||
public ApiClient(GsonConverterFactory gsonConverter, HostConfig hostConfig, CrashlyticsProxy crashlyticsProxy, Context context) {
|
||||
public ApiClientImpl(GsonConverterFactory gsonConverter, HostConfig hostConfig, CrashlyticsProxy crashlyticsProxy, Context context) {
|
||||
this.gsonConverter = gsonConverter;
|
||||
this.hostConfig = hostConfig;
|
||||
this.context = context;
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.QuestBoss;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
|
||||
|
|
@ -16,10 +16,10 @@ import rx.Observable;
|
|||
|
||||
|
||||
public class ContentCache {
|
||||
private IApiClient apiClient;
|
||||
private ApiClient apiClient;
|
||||
|
||||
|
||||
public ContentCache(IApiClient apiClient) {
|
||||
public ContentCache(ApiClient apiClient) {
|
||||
this.apiClient = apiClient;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ import com.habitrpg.android.habitica.components.AppComponent;
|
|||
import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
|
||||
import com.habitrpg.android.habitica.ui.activities.IntroActivity;
|
||||
import com.habitrpg.android.habitica.ui.activities.LoginActivity;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
|
||||
import com.raizlabs.android.dbflow.config.FlowManager;
|
||||
import com.squareup.leakcanary.LeakCanary;
|
||||
|
|
@ -50,7 +50,7 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
|
|||
private static AppComponent component;
|
||||
public RefWatcher refWatcher;
|
||||
@Inject
|
||||
Lazy<IApiClient> lazyApiHelper;
|
||||
Lazy<ApiClient> lazyApiHelper;
|
||||
@Inject
|
||||
SharedPreferences sharedPrefs;
|
||||
@Inject
|
||||
|
|
@ -166,7 +166,7 @@ public abstract class HabiticaBaseApplication extends MultiDexApplication {
|
|||
int lastInstalledVersion = sharedPrefs.getInt("last_installed_version", 0);
|
||||
if (lastInstalledVersion < info.versionCode) {
|
||||
sharedPrefs.edit().putInt("last_installed_version", info.versionCode).apply();
|
||||
IApiClient apiClient = this.lazyApiHelper.get();
|
||||
ApiClient apiClient = this.lazyApiHelper.get();
|
||||
|
||||
apiClient.getContent()
|
||||
.subscribe(contentResult -> { }, throwable -> {});
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@ package com.habitrpg.android.habitica;
|
|||
|
||||
import com.habitrpg.android.habitica.events.UserSubscribedEvent;
|
||||
import com.habitrpg.android.habitica.helpers.PurchaseTypes;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.PurchaseValidationRequest;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionValidationRequest;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.Transaction;
|
||||
|
|
@ -31,11 +31,11 @@ import retrofit2.adapter.rxjava.HttpException;
|
|||
public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
|
||||
|
||||
private static final String PURCHASED_PRODUCTS_KEY = "PURCHASED_PRODUCTS";
|
||||
private final IApiClient apiClient;
|
||||
private final ApiClient apiClient;
|
||||
private Set<String> purchasedOrderList = new HashSet<>();
|
||||
private SharedPreferences preferences;
|
||||
|
||||
public HabiticaPurchaseVerifier(Context context, IApiClient apiClient) {
|
||||
public HabiticaPurchaseVerifier(Context context, ApiClient apiClient) {
|
||||
preferences = PreferenceManager.getDefaultSharedPreferences(context);
|
||||
|
||||
preferences.getStringSet(PURCHASED_PRODUCTS_KEY, purchasedOrderList);
|
||||
|
|
@ -78,7 +78,7 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
|
|||
}, throwable -> {
|
||||
if (throwable.getClass().equals(HttpException.class)) {
|
||||
HttpException error = (HttpException)throwable;
|
||||
ApiClient.ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
|
||||
com.habitrpg.android.habitica.ApiClientImpl.ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
|
||||
if (error.code() == 401) {
|
||||
if (res.message.equals("RECEIPT_ALREADY_USED")) {
|
||||
purchasedOrderList.add(purchase.orderId);
|
||||
|
|
@ -107,7 +107,7 @@ public class HabiticaPurchaseVerifier extends BasePurchaseVerifier {
|
|||
}, throwable -> {
|
||||
if (throwable.getClass().equals(HttpException.class)) {
|
||||
HttpException error = (HttpException) throwable;
|
||||
ApiClient.ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
|
||||
com.habitrpg.android.habitica.ApiClientImpl.ErrorResponse res = apiClient.getErrorResponse((HttpException) throwable);
|
||||
if (error.code() == 401) {
|
||||
if (res.message.equals("RECEIPT_ALREADY_USED")) {
|
||||
purchasedOrderList.add(purchase.orderId);
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.components;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.HabiticaBaseApplication;
|
||||
import com.habitrpg.android.habitica.helpers.RemindersManager;
|
||||
import com.habitrpg.android.habitica.helpers.SoundManager;
|
||||
|
|
@ -77,7 +77,6 @@ import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider;
|
|||
import com.habitrpg.android.habitica.widget.HabitButtonWidgetService;
|
||||
import com.habitrpg.android.habitica.widget.TaskListFactory;
|
||||
import com.habitrpg.android.habitica.widget.TaskListWidgetProvider;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
|
||||
import javax.inject.Singleton;
|
||||
|
||||
|
|
@ -209,7 +208,7 @@ public interface AppComponent {
|
|||
|
||||
void inject(ChallengeDetailActivity challengeDetailActivity);
|
||||
|
||||
void inject(IApiClient apiClient);
|
||||
void inject(ApiClient apiClient);
|
||||
|
||||
void inject(TaskListWidgetProvider taskListWidgetProvider);
|
||||
|
||||
|
|
|
|||
|
|
@ -2,14 +2,14 @@ package com.habitrpg.android.habitica.data.implementation;
|
|||
|
||||
import com.habitrpg.android.habitica.data.BaseRepository;
|
||||
import com.habitrpg.android.habitica.data.local.BaseLocalRepository;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
|
||||
public abstract class BaseRepositoryImpl<T extends BaseLocalRepository> implements BaseRepository {
|
||||
|
||||
protected final T localRepository;
|
||||
protected final IApiClient apiClient;
|
||||
protected final ApiClient apiClient;
|
||||
|
||||
public BaseRepositoryImpl(T localRepository, IApiClient apiClient) {
|
||||
public BaseRepositoryImpl(T localRepository, ApiClient apiClient) {
|
||||
this.localRepository = localRepository;
|
||||
this.apiClient = apiClient;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.data.implementation;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.data.TaskRepository;
|
||||
import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.TaskDirection;
|
||||
|
|
@ -16,7 +16,7 @@ import rx.Observable;
|
|||
|
||||
public class TaskRepositoryImpl extends BaseRepositoryImpl<TaskLocalRepository> implements TaskRepository {
|
||||
|
||||
public TaskRepositoryImpl(TaskLocalRepository localRepository, IApiClient apiClient) {
|
||||
public TaskRepositoryImpl(TaskLocalRepository localRepository, ApiClient apiClient) {
|
||||
super(localRepository, apiClient);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -10,16 +10,11 @@ import com.facebook.drawee.view.SimpleDraweeView;
|
|||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.Notification;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.notifications.Reward;
|
||||
|
||||
import android.content.Context;
|
||||
import android.support.v7.app.AlertDialog;
|
||||
import android.view.LayoutInflater;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
import android.widget.TextView;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
|
@ -32,18 +27,18 @@ import java.util.Map;
|
|||
public class PopupNotificationsManager {
|
||||
private static PopupNotificationsManager instance;
|
||||
private Map<String, Boolean> seenNotifications;
|
||||
private IApiClient apiClient;
|
||||
private ApiClient apiClient;
|
||||
private Context context;
|
||||
|
||||
// @TODO: A queue for displaying alert dialogues
|
||||
|
||||
private PopupNotificationsManager(IApiClient apiClient, Context context) {
|
||||
private PopupNotificationsManager(ApiClient apiClient, Context context) {
|
||||
this.apiClient = apiClient;
|
||||
this.seenNotifications = new HashMap<>();
|
||||
this.context = context.getApplicationContext();
|
||||
}
|
||||
|
||||
public static PopupNotificationsManager getInstance(IApiClient apiHelper, Context context) {
|
||||
public static PopupNotificationsManager getInstance(ApiClient apiHelper, Context context) {
|
||||
if (instance == null) {
|
||||
instance = new PopupNotificationsManager(apiHelper, context);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7,15 +7,10 @@ import android.preference.PreferenceManager;
|
|||
import com.google.firebase.iid.FirebaseInstanceId;
|
||||
import com.google.firebase.messaging.RemoteMessage;
|
||||
import com.habitrpg.android.habitica.HabiticaBaseApplication;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.PushDevice;
|
||||
|
||||
import android.content.Context;
|
||||
import android.content.SharedPreferences;
|
||||
import android.preference.PreferenceManager;
|
||||
|
||||
import java.util.HashMap;
|
||||
import java.util.Map;
|
||||
|
||||
|
|
@ -34,7 +29,7 @@ public class PushNotificationManager {
|
|||
private static final String DEVICE_TOKEN_PREFERENCE_KEY = "device-token-preference";
|
||||
private static PushNotificationManager instance = null;
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
|
||||
private String refreshedToken;
|
||||
private SharedPreferences sharedPreferences;
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ public class DailyCheckUseCase extends UseCase<DailyCheckUseCase.RequestValues,
|
|||
|
||||
@Override
|
||||
protected Observable<TaskDirectionData> buildUseCaseObservable(RequestValues requestValues) {
|
||||
return taskRepository.taskChecked(requestValues.task, requestValues.Up).doOnNext(res -> {
|
||||
return taskRepository.taskChecked(requestValues.task, requestValues.up).doOnNext(res -> {
|
||||
|
||||
soundManager.loadAndPlayAudio(SoundManager.SoundDaily);
|
||||
});
|
||||
|
|
@ -34,13 +34,13 @@ public class DailyCheckUseCase extends UseCase<DailyCheckUseCase.RequestValues,
|
|||
|
||||
public static final class RequestValues implements UseCase.RequestValues {
|
||||
|
||||
protected boolean Up = false;
|
||||
protected boolean up = false;
|
||||
|
||||
protected final Task task;
|
||||
|
||||
public RequestValues(Task task, boolean up) {
|
||||
this.task = task;
|
||||
this.Up = up;
|
||||
this.up = up;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -26,21 +26,21 @@ public class HabitScoreUseCase extends UseCase<HabitScoreUseCase.RequestValues,
|
|||
|
||||
@Override
|
||||
protected Observable<TaskDirectionData> buildUseCaseObservable(RequestValues requestValues) {
|
||||
return taskRepository.taskChecked(requestValues.habit, requestValues.Up).doOnNext(res -> {
|
||||
return taskRepository.taskChecked(requestValues.habit, requestValues.up).doOnNext(res -> {
|
||||
|
||||
soundManager.loadAndPlayAudio(requestValues.Up ? SoundManager.SoundPlusHabit : SoundManager.SoundMinusHabit);
|
||||
soundManager.loadAndPlayAudio(requestValues.up ? SoundManager.SoundPlusHabit : SoundManager.SoundMinusHabit);
|
||||
});
|
||||
}
|
||||
|
||||
public static final class RequestValues implements UseCase.RequestValues {
|
||||
|
||||
protected boolean Up = false;
|
||||
protected boolean up = false;
|
||||
|
||||
protected final Task habit;
|
||||
|
||||
public RequestValues(Task habit, boolean up) {
|
||||
this.habit = habit;
|
||||
this.Up = up;
|
||||
this.up = up;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +0,0 @@
|
|||
package com.habitrpg.android.habitica.interactors;
|
||||
|
||||
import com.habitrpg.android.habitica.data.TaskRepository;
|
||||
import com.habitrpg.android.habitica.events.HabitScoreEvent;
|
||||
import com.habitrpg.android.habitica.executors.PostExecutionThread;
|
||||
import com.habitrpg.android.habitica.executors.ThreadExecutor;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
import rx.Observable;
|
||||
|
||||
public class ListTasksUseCase extends UseCase<ListTasksUseCase.RequestValues, ArrayList<Task>> {
|
||||
|
||||
private final TaskRepository taskRepository;
|
||||
|
||||
@Inject
|
||||
public ListTasksUseCase(TaskRepository taskRepository, ThreadExecutor threadExecutor, PostExecutionThread postExecutionThread) {
|
||||
super(threadExecutor, postExecutionThread);
|
||||
this.taskRepository = taskRepository;
|
||||
}
|
||||
|
||||
@Override
|
||||
protected Observable<ArrayList<Task>> buildUseCaseObservable(ListTasksUseCase.RequestValues requestValues) {
|
||||
return taskRepository.getTasks(requestValues.taskType);
|
||||
}
|
||||
|
||||
public static final class RequestValues implements UseCase.RequestValues {
|
||||
|
||||
protected final String taskType;
|
||||
|
||||
public RequestValues(String taskType) {
|
||||
this.taskType = taskType;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -26,7 +26,7 @@ public class TodoCheckUseCase extends UseCase<TodoCheckUseCase.RequestValues, T
|
|||
|
||||
@Override
|
||||
protected Observable<TaskDirectionData> buildUseCaseObservable(TodoCheckUseCase.RequestValues requestValues) {
|
||||
return taskRepository.taskChecked(requestValues.task, requestValues.Up).doOnNext(res -> {
|
||||
return taskRepository.taskChecked(requestValues.task, requestValues.up).doOnNext(res -> {
|
||||
|
||||
soundManager.loadAndPlayAudio(SoundManager.SoundTodo);
|
||||
});
|
||||
|
|
@ -34,13 +34,13 @@ public class TodoCheckUseCase extends UseCase<TodoCheckUseCase.RequestValues, T
|
|||
|
||||
public static final class RequestValues implements UseCase.RequestValues {
|
||||
|
||||
protected boolean Up = false;
|
||||
protected boolean up = false;
|
||||
|
||||
protected final Task task;
|
||||
|
||||
public RequestValues(Task task, boolean up) {
|
||||
this.task = task;
|
||||
this.Up = up;
|
||||
this.up = up;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,8 +1,7 @@
|
|||
package com.habitrpg.android.habitica.modules;
|
||||
|
||||
import com.habitrpg.android.habitica.ApiClient;
|
||||
import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.ContentCache;
|
||||
import com.habitrpg.android.habitica.HostConfig;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.MaintenanceApiService;
|
||||
|
|
@ -29,18 +28,18 @@ public class ApiModule {
|
|||
|
||||
@Provides
|
||||
public GsonConverterFactory providesGsonConverterFactory() {
|
||||
return ApiClient.createGsonFactory();
|
||||
return com.habitrpg.android.habitica.ApiClientImpl.createGsonFactory();
|
||||
}
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
public IApiClient providesApiHelper(GsonConverterFactory gsonConverter, HostConfig hostConfig, CrashlyticsProxy crashlyticsProxy, Context context) {
|
||||
return new ApiClient(gsonConverter, hostConfig, crashlyticsProxy, context);
|
||||
public ApiClient providesApiHelper(GsonConverterFactory gsonConverter, HostConfig hostConfig, CrashlyticsProxy crashlyticsProxy, Context context) {
|
||||
return new com.habitrpg.android.habitica.ApiClientImpl(gsonConverter, hostConfig, crashlyticsProxy, context);
|
||||
}
|
||||
|
||||
@Provides
|
||||
@Singleton
|
||||
public ContentCache providesContentCache(IApiClient client){
|
||||
public ContentCache providesContentCache(ApiClient client){
|
||||
return new ContentCache(client);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.modules;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.data.TaskRepository;
|
||||
import com.habitrpg.android.habitica.data.implementation.TaskRepositoryImpl;
|
||||
import com.habitrpg.android.habitica.data.local.TaskLocalRepository;
|
||||
|
|
@ -18,7 +18,7 @@ public class RepositoryModule {
|
|||
}
|
||||
|
||||
@Provides
|
||||
TaskRepository providesTaskRepository(TaskLocalRepository localRepository, IApiClient apiClient) {
|
||||
TaskRepository providesTaskRepository(TaskLocalRepository localRepository, ApiClient apiClient) {
|
||||
return new TaskRepositoryImpl(localRepository, apiClient);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import android.os.Bundle;
|
|||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
|
@ -20,7 +20,7 @@ import javax.inject.Inject;
|
|||
*/
|
||||
public class LocalNotificationActionReceiver extends BroadcastReceiver implements HabitRPGUserCallback.OnUserReceived {
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
|
||||
private HabitRPGUser user;
|
||||
private String action;
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallegeDeta
|
|||
import com.habitrpg.android.habitica.ui.fragments.social.challenges.ChallengeTasksRecyclerViewFragment;
|
||||
import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
|
||||
import com.habitrpg.android.habitica.ui.helpers.UiUtils;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
|
||||
|
|
@ -69,7 +69,7 @@ public class ChallengeDetailActivity extends BaseActivity {
|
|||
Toolbar toolbar;
|
||||
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
|
||||
@BindView(R.id.floating_menu_wrapper)
|
||||
FrameLayout floatingMenuWrapper;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.ui.activities;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
import com.habitrpg.android.habitica.ui.AvatarView;
|
||||
|
|
@ -39,7 +39,7 @@ public class ClassSelectionActivity extends BaseActivity implements Action1<Habi
|
|||
AvatarView warriorAvatarView;
|
||||
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
|
||||
ProgressDialog progressDialog;
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import com.facebook.drawee.backends.pipeline.Fresco;
|
|||
import com.facebook.drawee.controller.BaseControllerListener;
|
||||
import com.facebook.drawee.view.SimpleDraweeView;
|
||||
import com.facebook.imagepipeline.image.ImageInfo;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.ContentCache;
|
||||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
|
|
@ -58,7 +58,7 @@ public class FullProfileActivity extends BaseActivity {
|
|||
@Inject
|
||||
ContentCache contentCache;
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
@BindView(R.id.profile_image)
|
||||
SimpleDraweeView profile_image;
|
||||
@BindView(R.id.profile_blurb)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.ui.activities;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment;
|
||||
|
|
@ -22,7 +22,7 @@ import butterknife.BindView;
|
|||
public class IntroActivity extends BaseActivity implements View.OnClickListener, ViewPager.OnPageChangeListener {
|
||||
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
@BindView(R.id.view_pager)
|
||||
ViewPager pager;
|
||||
@BindView(R.id.view_pager_indicator)
|
||||
|
|
|
|||
|
|
@ -15,7 +15,7 @@ import com.facebook.FacebookException;
|
|||
import com.facebook.login.LoginResult;
|
||||
import com.facebook.login.widget.LoginButton;
|
||||
import com.habitrpg.android.habitica.BuildConfig;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.HostConfig;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
|
||||
|
|
@ -78,7 +78,7 @@ public class LoginActivity extends BaseActivity
|
|||
|
||||
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
@Inject
|
||||
public SharedPreferences sharedPrefs;
|
||||
@Inject
|
||||
|
|
|
|||
|
|
@ -97,7 +97,7 @@ import com.habitrpg.android.habitica.widget.AvatarStatsWidgetProvider;
|
|||
import com.habitrpg.android.habitica.widget.DailiesWidgetProvider;
|
||||
import com.habitrpg.android.habitica.widget.HabitButtonWidgetProvider;
|
||||
import com.habitrpg.android.habitica.widget.TodoListWidgetProvider;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.MaintenanceApiService;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.Preferences;
|
||||
|
|
@ -172,7 +172,7 @@ public class MainActivity extends BaseActivity implements Action1<Throwable>, Ha
|
|||
public static final int SELECT_CLASS_RESULT = 11;
|
||||
public static final int GEM_PURCHASE_REQUEST = 111;
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
|
||||
@Inject
|
||||
public SoundManager soundManager;
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.habitrpg.android.habitica.ui.activities;
|
||||
|
||||
import com.facebook.drawee.view.SimpleDraweeView;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
|
||||
|
|
@ -28,7 +28,7 @@ public class MaintenanceActivity extends BaseActivity {
|
|||
public MaintenanceApiService maintenanceService;
|
||||
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
|
||||
@BindView(R.id.titleTextView)
|
||||
TextView titleTextView;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.ui.activities;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.HostConfig;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
|
|
@ -43,7 +43,7 @@ public class PartyInviteActivity extends BaseActivity {
|
|||
@Inject
|
||||
protected HostConfig hostConfig;
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
@BindView(R.id.tab_layout)
|
||||
TabLayout tabLayout;
|
||||
@BindView(R.id.view_pager)
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import android.support.v7.preference.PreferenceManager;
|
|||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.HostConfig;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
|
||||
|
|
@ -28,16 +28,6 @@ import com.raizlabs.android.dbflow.sql.language.Select;
|
|||
import org.greenrobot.eventbus.EventBus;
|
||||
import org.greenrobot.eventbus.Subscribe;
|
||||
|
||||
import android.content.Intent;
|
||||
import android.content.SharedPreferences;
|
||||
import android.os.Bundle;
|
||||
import android.support.v4.app.Fragment;
|
||||
import android.support.v4.app.FragmentPagerAdapter;
|
||||
import android.support.v4.view.ViewPager;
|
||||
import android.support.v7.preference.PreferenceManager;
|
||||
import android.view.View;
|
||||
import android.widget.Button;
|
||||
|
||||
import java.util.Calendar;
|
||||
import java.util.HashMap;
|
||||
import java.util.List;
|
||||
|
|
@ -51,7 +41,7 @@ import butterknife.BindView;
|
|||
public class SetupActivity extends BaseActivity implements View.OnClickListener, ViewPager.OnPageChangeListener, HabitRPGUserCallback.OnUserReceived {
|
||||
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
@Inject
|
||||
protected HostConfig hostConfig;
|
||||
@BindView(R.id.view_pager)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.ui.activities;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
import com.habitrpg.android.habitica.events.commands.SelectMemberCommand;
|
||||
|
|
@ -25,7 +25,7 @@ public class SkillMemberActivity extends BaseActivity {
|
|||
private PartyMemberRecyclerViewAdapter viewAdapter;
|
||||
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
|
||||
@Override
|
||||
protected int getLayoutResId() {
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.ui.adapter.social;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.events.DisplayFragmentEvent;
|
||||
import com.habitrpg.android.habitica.ui.fragments.social.GuildFragment;
|
||||
|
|
@ -26,7 +26,7 @@ import butterknife.ButterKnife;
|
|||
|
||||
public class PublicGuildsRecyclerViewAdapter extends RecyclerView.Adapter<PublicGuildsRecyclerViewAdapter.GuildViewHolder> implements Filterable {
|
||||
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
private List<Group> publicGuildList;
|
||||
private List<Group> fullPublicGuildList;
|
||||
private List<String> memberGuildIDs;
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ import com.habitrpg.android.habitica.R;
|
|||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
import com.habitrpg.android.habitica.helpers.TagsHelper;
|
||||
import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
|
||||
|
|
@ -26,9 +26,9 @@ public class RewardsRecyclerViewAdapter extends BaseTasksRecyclerViewAdapter<Rew
|
|||
|
||||
private final ContentCache contentCache;
|
||||
private final HabitRPGUser user;
|
||||
private IApiClient apiClient;
|
||||
private ApiClient apiClient;
|
||||
|
||||
public RewardsRecyclerViewAdapter(String taskType, TagsHelper tagsHelper, int layoutResource, Context newContext, HabitRPGUser user, IApiClient apiClient) {
|
||||
public RewardsRecyclerViewAdapter(String taskType, TagsHelper tagsHelper, int layoutResource, Context newContext, HabitRPGUser user, ApiClient apiClient) {
|
||||
super(taskType, tagsHelper, layoutResource, newContext, user.getId());
|
||||
this.user = user;
|
||||
this.apiClient = apiClient;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ import android.widget.FrameLayout;
|
|||
|
||||
import com.habitrpg.android.habitica.helpers.SoundManager;
|
||||
import com.habitrpg.android.habitica.ui.activities.MainActivity;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
|
||||
import com.raizlabs.android.dbflow.sql.builder.Condition;
|
||||
import com.raizlabs.android.dbflow.sql.language.Select;
|
||||
|
|
@ -20,7 +20,7 @@ import javax.inject.Inject;
|
|||
public abstract class BaseMainFragment extends BaseFragment {
|
||||
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
public MainActivity activity;
|
||||
public TabLayout tabLayout;
|
||||
public FrameLayout floatingMenuWrapper;
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@ import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
|
|||
import com.habitrpg.android.habitica.ui.SubscriptionDetailsView;
|
||||
import com.habitrpg.android.habitica.ui.SubscriptionOptionView;
|
||||
import com.habitrpg.android.habitica.ui.activities.GemPurchaseActivity;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionPlan;
|
||||
|
||||
|
|
@ -44,7 +44,7 @@ public class SubscriptionFragment extends BaseFragment implements GemPurchaseAct
|
|||
CrashlyticsProxy crashlyticsProxy;
|
||||
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
|
||||
@BindView(R.id.subscribe_listitem1_box)
|
||||
View subscribeListitem1Box;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.ui.fragments.inventory.shops;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
import com.habitrpg.android.habitica.events.UpdateGoldGemsPurchasedevent;
|
||||
|
|
@ -42,7 +42,7 @@ public class ShopFragment extends BaseFragment {
|
|||
public HabitRPGUser user;
|
||||
public Shop shop;
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
private View view;
|
||||
|
||||
@Nullable
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.ui.fragments.preferences;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.callbacks.MergeUserCallback;
|
||||
|
|
@ -41,7 +41,7 @@ public class PreferencesFragment extends BasePreferencesFragment implements
|
|||
SharedPreferences.OnSharedPreferenceChangeListener {
|
||||
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
@Inject
|
||||
public SoundManager soundManager;
|
||||
public MainActivity activity;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.ui.fragments.setup;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
import com.habitrpg.android.habitica.ui.AvatarView;
|
||||
|
|
@ -41,7 +41,7 @@ public class AvatarSetupFragment extends BaseFragment {
|
|||
CustomizationSetupAdapter adapter;
|
||||
GridLayoutManager layoutManager;
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
private HabitRPGUser user;
|
||||
|
||||
@Nullable
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.ui.fragments.social;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
|
|
@ -52,7 +52,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout
|
|||
|
||||
public String seenGroupId;
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
public boolean isTavern;
|
||||
@BindView(R.id.chat_list)
|
||||
RecyclerView mRecyclerView;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.ui.fragments.social;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
import com.habitrpg.android.habitica.databinding.FragmentGroupInfoBinding;
|
||||
|
|
@ -39,7 +39,7 @@ public class GroupInformationFragment extends BaseFragment {
|
|||
FragmentGroupInfoBinding viewBinding;
|
||||
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
|
||||
@BindView(R.id.questMemberView)
|
||||
LinearLayout questMemberView;
|
||||
|
|
|
|||
|
|
@ -1,13 +1,12 @@
|
|||
package com.habitrpg.android.habitica.ui.fragments.social.challenges;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.events.commands.OpenFullProfileCommand;
|
||||
import com.habitrpg.android.habitica.ui.activities.ChallengeDetailActivity;
|
||||
import com.habitrpg.android.habitica.ui.adapter.social.ChallengesListViewAdapter;
|
||||
import com.habitrpg.android.habitica.ui.helpers.MarkdownParser;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
|
||||
|
|
@ -68,7 +67,7 @@ public class ChallegeDetailDialogHolder {
|
|||
LinearLayout task_group_layout;
|
||||
|
||||
private AlertDialog dialog;
|
||||
private IApiClient apiClient;
|
||||
private ApiClient apiClient;
|
||||
private HabitRPGUser user;
|
||||
private Challenge challenge;
|
||||
private Action1<Challenge> challengeJoinedAction;
|
||||
|
|
@ -81,7 +80,7 @@ public class ChallegeDetailDialogHolder {
|
|||
ButterKnife.bind(this, view);
|
||||
}
|
||||
|
||||
public void bind(AlertDialog dialog, IApiClient apiClient, HabitRPGUser user, Challenge challenge,
|
||||
public void bind(AlertDialog dialog, ApiClient apiClient, HabitRPGUser user, Challenge challenge,
|
||||
Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
|
||||
this.dialog = dialog;
|
||||
this.apiClient = apiClient;
|
||||
|
|
@ -326,7 +325,7 @@ public class ChallegeDetailDialogHolder {
|
|||
}
|
||||
|
||||
|
||||
public static void showDialog(Activity activity, IApiClient apiClient, HabitRPGUser user, Challenge challenge,
|
||||
public static void showDialog(Activity activity, ApiClient apiClient, HabitRPGUser user, Challenge challenge,
|
||||
Action1<Challenge> challengeJoinedAction, Action1<Challenge> challengeLeftAction) {
|
||||
View dialogLayout = activity.getLayoutInflater().inflate(R.layout.dialog_challenge_detail, null);
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
package com.habitrpg.android.habitica.ui.fragments.social.challenges;
|
||||
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
import com.habitrpg.android.habitica.helpers.TagsHelper;
|
||||
|
|
@ -37,7 +37,7 @@ public class ChallengeTasksRecyclerViewFragment extends BaseFragment {
|
|||
@Named("UserID")
|
||||
String userID;
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
|
||||
ObservableList<Task> tasksOnInitialize;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.ui.fragments.tasks;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.R;
|
||||
import com.habitrpg.android.habitica.components.AppComponent;
|
||||
import com.habitrpg.android.habitica.events.TaskCreatedEvent;
|
||||
|
|
@ -52,7 +52,7 @@ public class TaskRecyclerViewFragment extends BaseFragment implements View.OnCli
|
|||
@Named("UserID")
|
||||
String userID;
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
@Inject
|
||||
TagsHelper tagsHelper;
|
||||
LinearLayoutManager layoutManager = null;
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.widget;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.habitrpg.android.habitica.HabiticaBaseApplication;
|
||||
import com.habitrpg.android.habitica.HostConfig;
|
||||
|
|
@ -53,7 +53,7 @@ public class AvatarStatsWidgetProvider extends BaseWidgetProvider {
|
|||
}
|
||||
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
@Inject
|
||||
HostConfig hostConfig;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.widget;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.habitrpg.android.habitica.HabiticaBaseApplication;
|
||||
import com.habitrpg.android.habitica.HostConfig;
|
||||
|
|
@ -16,7 +16,7 @@ public class DailiesWidgetProvider extends TaskListWidgetProvider {
|
|||
public static final String TASK_ID_ITEM = "com.habitrpg.android.habitica.TASK_ID_ITEM";
|
||||
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
@Inject
|
||||
HostConfig hostConfig;
|
||||
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import android.os.Build;
|
|||
import android.os.Bundle;
|
||||
import android.widget.RemoteViews;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.habitrpg.android.habitica.HabiticaBaseApplication;
|
||||
import com.habitrpg.android.habitica.HostConfig;
|
||||
|
|
@ -17,14 +17,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
|
|||
import com.raizlabs.android.dbflow.sql.builder.Condition;
|
||||
import com.raizlabs.android.dbflow.sql.language.Select;
|
||||
|
||||
import android.appwidget.AppWidgetManager;
|
||||
import android.content.ComponentName;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.os.Build;
|
||||
import android.os.Bundle;
|
||||
import android.widget.RemoteViews;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
public class HabitButtonWidgetProvider extends BaseWidgetProvider {
|
||||
|
|
@ -33,7 +25,7 @@ public class HabitButtonWidgetProvider extends BaseWidgetProvider {
|
|||
public static final String TASK_ID = "com.habitrpg.android.habitica.TASK_ID_ITEM";
|
||||
public static final String TASK_DIRECTION = "com.habitrpg.android.habitica.TASK_DIRECTION";
|
||||
@Inject
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
@Inject
|
||||
public HostConfig hostConfig;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
package com.habitrpg.android.habitica.widget;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.habitrpg.android.habitica.HabiticaBaseApplication;
|
||||
import com.habitrpg.android.habitica.HostConfig;
|
||||
|
|
@ -28,7 +28,7 @@ public abstract class TaskListWidgetProvider extends BaseWidgetProvider {
|
|||
public static final String TASK_ID_ITEM = "com.habitrpg.android.habitica.TASK_ID_ITEM";
|
||||
|
||||
@Inject
|
||||
IApiClient apiClient;
|
||||
ApiClient apiClient;
|
||||
@Inject
|
||||
HostConfig hostConfig;
|
||||
|
||||
|
|
|
|||
|
|
@ -1,7 +1,5 @@
|
|||
package com.magicmicky.habitrpgwrapper.lib.api;
|
||||
|
||||
import com.habitrpg.android.habitica.ApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.AchievementResult;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage;
|
||||
|
|
@ -18,9 +16,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.Status;
|
|||
import com.magicmicky.habitrpgwrapper.lib.models.SubscriptionValidationRequest;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.Tag;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.TaskDirectionData;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.UserAuth;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.UserAuthResponse;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.UserAuthSocial;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.responses.BuyResponse;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.responses.FeedResponse;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.responses.HabitResponse;
|
||||
|
|
@ -38,7 +34,7 @@ import java.util.Map;
|
|||
import retrofit2.adapter.rxjava.HttpException;
|
||||
import rx.Observable;
|
||||
|
||||
public interface IApiClient {
|
||||
public interface ApiClient {
|
||||
void setLanguageCode(String languageCode);
|
||||
|
||||
Observable<Status> getStatus();
|
||||
|
|
@ -208,7 +204,7 @@ public interface IApiClient {
|
|||
// Notifications
|
||||
Observable<Void> readNotificaiton(String notificationId);
|
||||
|
||||
ApiClient.ErrorResponse getErrorResponse(HttpException throwable);
|
||||
com.habitrpg.android.habitica.ApiClientImpl.ErrorResponse getErrorResponse(HttpException throwable);
|
||||
|
||||
void updateAuthenticationCredentials(String userID, String apiToken);
|
||||
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
package com.habitrpg.android.habitica.api;
|
||||
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.BuildConfig;
|
||||
import com.habitrpg.android.habitica.HostConfig;
|
||||
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
|
||||
|
|
@ -18,7 +18,7 @@ import rx.observers.TestSubscriber;
|
|||
|
||||
public class BaseAPITests {
|
||||
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
public HostConfig hostConfig;
|
||||
|
||||
public String username;
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import android.app.Activity;
|
|||
import android.app.AlertDialog;
|
||||
import android.os.Build;
|
||||
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.IApiClient;
|
||||
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
|
||||
import com.habitrpg.android.habitica.BuildConfig;
|
||||
import com.habitrpg.android.habitica.HabiticaApplication;
|
||||
import com.habitrpg.android.habitica.HostConfig;
|
||||
|
|
@ -37,7 +37,7 @@ import static org.mockito.Mockito.verify;
|
|||
@RunWith(RobolectricTestRunner.class)
|
||||
public class PopupNotificationsManagerTest {
|
||||
|
||||
public IApiClient apiClient;
|
||||
public ApiClient apiClient;
|
||||
public HostConfig hostConfig;
|
||||
|
||||
public String username;
|
||||
|
|
|
|||
Loading…
Reference in a new issue