sudoxreboot/habitica-android
1
0
Fork 0
mirror of https://github.com/sudoxnym/habitica-android.git synced 2026-05-22 05:38:55 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix compile - post merge

Browse source
This commit is contained in:
Negue 2017-04-23 16:01:39 +02:00
parent a490fdb38a
commit b7011d8f82
11 changed files with 53 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java
View file

@ -1,25 +1,5 @@
package com.habitrpg.android.habitica;
import com.amplitude.api.Amplitude;
import com.facebook.FacebookSdk;
import com.facebook.drawee.backends.pipeline.Fresco;
import com.habitrpg.android.habitica.components.AppComponent;
import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
import com.habitrpg.android.habitica.ui.activities.CreateChallengeActivity;
import com.habitrpg.android.habitica.ui.activities.IntroActivity;
import com.habitrpg.android.habitica.ui.activities.LoginActivity;
import com.habitrpg.android.habitica.ui.activities.SetupActivity;
import com.habitrpg.android.habitica.ui.activities.TaskFormActivity;
import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser;
import com.raizlabs.android.dbflow.config.FlowManager;
import com.squareup.leakcanary.LeakCanary;
import com.squareup.leakcanary.RefWatcher;
import org.solovyev.android.checkout.Billing;
import org.solovyev.android.checkout.Cache;
import org.solovyev.android.checkout.Checkout;
import org.solovyev.android.checkout.PurchaseVerifier;
import android.app.Activity;
import android.content.Context;
import android.content.Intent;

1
Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java
View file

@ -28,6 +28,7 @@ import com.habitrpg.android.habitica.models.responses.UnlockResponse;
import com.habitrpg.android.habitica.models.tasks.ItemData;
import com.habitrpg.android.habitica.models.tasks.Task;
import com.habitrpg.android.habitica.models.tasks.TaskList;
import com.habitrpg.android.habitica.models.social.PostChallenge;
import java.util.ArrayList;
import java.util.List;

1
Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java
View file

@ -8,6 +8,7 @@ import com.habitrpg.android.habitica.models.social.Challenge;
import com.habitrpg.android.habitica.models.social.ChatMessage;
import com.habitrpg.android.habitica.models.ContentResult;
import com.habitrpg.android.habitica.models.social.Group;
import com.habitrpg.android.habitica.models.social.PostChallenge;
import com.habitrpg.android.habitica.models.user.HabitRPGUser;
import com.habitrpg.android.habitica.models.user.Items;
import com.habitrpg.android.habitica.models.LeaveChallengeBody;

8
Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.java
View file

@ -1,9 +1,9 @@
package com.habitrpg.android.habitica.data;
import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
import com.magicmicky.habitrpgwrapper.lib.models.PostChallenge;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
import com.habitrpg.android.habitica.models.social.Challenge;
import com.habitrpg.android.habitica.models.social.PostChallenge;
import com.habitrpg.android.habitica.models.tasks.Task;
import com.habitrpg.android.habitica.models.tasks.TaskList;
import java.util.List;

29
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java
View file

@ -1,4 +1,4 @@
package com.habitrpg.android.habitica;
package com.habitrpg.android.habitica.data.implementation;
import android.content.Context;
import android.support.v7.app.AlertDialog;
@ -18,6 +18,7 @@ import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.data.ApiClient;
import com.habitrpg.android.habitica.database.CheckListItemExcludeStrategy;
import com.habitrpg.android.habitica.helpers.PopupNotificationsManager;
import com.habitrpg.android.habitica.models.social.PostChallenge;
import com.habitrpg.android.habitica.proxy.ifce.CrashlyticsProxy;
import com.habitrpg.android.habitica.api.ApiService;
import com.habitrpg.android.habitica.api.Server;
@ -826,6 +827,32 @@ public class ApiClientImpl implements Action1<Throwable>, ApiClient {
return apiService.leaveChallenge(challengeId, body).compose(configureApiCallObserver());
}
@Override
public Observable<Challenge> createChallenge(PostChallenge challenge) {
return apiService.createChallenge(challenge).compose(configureApiCallObserver());
}
@Override
public Observable<Task> createChallengeTask(String challengeId, Task task) {
return apiService.createChallengeTask(challengeId, task).compose(configureApiCallObserver());
}
@Override
public Observable<List<Task>> createChallengeTasks(String challengeId, List<Task> tasks) {
return apiService.createChallengeTasks(challengeId, tasks).compose(configureApiCallObserver());
}
@Override
public Observable<Challenge> updateChallenge(PostChallenge challenge) {
return apiService.updateChallenge(challenge.id, challenge).compose(configureApiCallObserver());
}
@Override
public Observable<Void> deleteChallenge(String challengeId) {
return apiService.deleteChallenge(challengeId).compose(configureApiCallObserver());
}
@Override
public Observable<Void> debugAddTenGems() {
return apiService.debugAddTenGems().compose(configureApiCallObserver());

12
Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.java
View file

@ -1,14 +1,14 @@
package com.habitrpg.android.habitica.data.implementation;
import com.github.underscore.$;
import com.habitrpg.android.habitica.data.ApiClient;
import com.habitrpg.android.habitica.data.ChallengeRepository;
import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository;
import com.magicmicky.habitrpgwrapper.lib.api.ApiClient;
import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
import com.magicmicky.habitrpgwrapper.lib.models.PostChallenge;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.TasksOrder;
import com.habitrpg.android.habitica.models.social.Challenge;
import com.habitrpg.android.habitica.models.social.PostChallenge;
import com.habitrpg.android.habitica.models.tasks.Task;
import com.habitrpg.android.habitica.models.tasks.TaskList;
import com.habitrpg.android.habitica.models.tasks.TasksOrder;
import java.util.ArrayList;
import java.util.List;

7
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.java
View file

@ -1,8 +1,9 @@
package com.habitrpg.android.habitica.data.local;
import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
import com.magicmicky.habitrpgwrapper.lib.models.Group;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
import com.habitrpg.android.habitica.models.social.Challenge;
import com.habitrpg.android.habitica.models.social.Group;
import com.habitrpg.android.habitica.models.tasks.Task;
import java.util.List;

6
Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowChallengeLocalRepository.java
View file

@ -1,9 +1,9 @@
package com.habitrpg.android.habitica.data.local.implementation;
import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository;
import com.magicmicky.habitrpgwrapper.lib.models.Challenge;
import com.magicmicky.habitrpgwrapper.lib.models.Group;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
import com.habitrpg.android.habitica.models.social.Challenge;
import com.habitrpg.android.habitica.models.social.Group;
import com.habitrpg.android.habitica.models.tasks.Task;
import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction;
import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener;
import com.raizlabs.android.dbflow.sql.builder.Condition;

4
Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PostChallenge.java → Habitica/src/main/java/com/habitrpg/android/habitica/models/social/PostChallenge.java
View file

@ -1,6 +1,6 @@
package com.magicmicky.habitrpgwrapper.lib.models;
package com.habitrpg.android.habitica.models.social;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.TasksOrder;
import com.habitrpg.android.habitica.models.tasks.TasksOrder;
/**
* Needs to be a separate Class, the normal Challenge has the group as Object

6
Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/CreateChallengeActivity.java
View file

@ -33,10 +33,10 @@ import com.habitrpg.android.habitica.data.local.ChallengeLocalRepository;
import com.habitrpg.android.habitica.events.TaskSaveEvent;
import com.habitrpg.android.habitica.events.TaskTappedEvent;
import com.habitrpg.android.habitica.events.commands.DeleteTaskCommand;
import com.habitrpg.android.habitica.models.social.Group;
import com.habitrpg.android.habitica.models.tasks.Task;
import com.habitrpg.android.habitica.ui.adapter.social.challenges.ChallengeTasksRecyclerViewAdapter;
import com.magicmicky.habitrpgwrapper.lib.models.Group;
import com.magicmicky.habitrpgwrapper.lib.models.PostChallenge;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
import com.habitrpg.android.habitica.models.social.PostChallenge;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;

2
Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.java
View file

@ -11,13 +11,13 @@ import com.github.underscore.$;
import com.habitrpg.android.habitica.R;
import com.habitrpg.android.habitica.components.AppComponent;
import com.habitrpg.android.habitica.helpers.TaskFilterHelper;
import com.habitrpg.android.habitica.models.tasks.Task;
import com.habitrpg.android.habitica.ui.adapter.tasks.SortableTasksRecyclerViewAdapter;
import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder;
import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder;
import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder;
import com.habitrpg.android.habitica.ui.viewHolders.tasks.RewardViewHolder;
import com.habitrpg.android.habitica.ui.viewHolders.tasks.TodoViewHolder;
import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task;
import java.util.List;