From b7011d8f82b6e1ea68e2accc5aa6b1f574098471 Mon Sep 17 00:00:00 2001 From: Negue Date: Sun, 23 Apr 2017 16:01:39 +0200 Subject: [PATCH] fix compile - post merge --- .../habitica/HabiticaBaseApplication.java | 20 ------------- .../android/habitica/api/ApiService.java | 1 + .../android/habitica/data/ApiClient.java | 1 + .../habitica/data/ChallengeRepository.java | 8 ++--- .../data/implementation/ApiClientImpl.java | 29 ++++++++++++++++++- .../ChallengeRepositoryImpl.java | 12 ++++---- .../data/local/ChallengeLocalRepository.java | 7 +++-- .../DbFlowChallengeLocalRepository.java | 6 ++-- .../models/social}/PostChallenge.java | 4 +-- .../activities/CreateChallengeActivity.java | 6 ++-- .../ChallengeTasksRecyclerViewAdapter.java | 2 +- 11 files changed, 53 insertions(+), 43 deletions(-) rename Habitica/src/main/java/com/{magicmicky/habitrpgwrapper/lib/models => habitrpg/android/habitica/models/social}/PostChallenge.java (76%) diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java index 6e1c0adc1..d6de88d9c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaBaseApplication.java @@ -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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java index aba6666a8..401d6058e 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/api/ApiService.java @@ -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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java index cac37c0a9..060e181af 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ApiClient.java @@ -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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.java index b3dbf5e9e..cb1d4162d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/ChallengeRepository.java @@ -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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java index cc511bc29..f8d1a3d05 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ApiClientImpl.java @@ -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, ApiClient { return apiService.leaveChallenge(challengeId, body).compose(configureApiCallObserver()); } + @Override + public Observable createChallenge(PostChallenge challenge) { + return apiService.createChallenge(challenge).compose(configureApiCallObserver()); + } + + + @Override + public Observable createChallengeTask(String challengeId, Task task) { + return apiService.createChallengeTask(challengeId, task).compose(configureApiCallObserver()); + } + + @Override + public Observable> createChallengeTasks(String challengeId, List tasks) { + return apiService.createChallengeTasks(challengeId, tasks).compose(configureApiCallObserver()); + } + + @Override + public Observable updateChallenge(PostChallenge challenge) { + return apiService.updateChallenge(challenge.id, challenge).compose(configureApiCallObserver()); + } + + @Override + public Observable deleteChallenge(String challengeId) { + return apiService.deleteChallenge(challengeId).compose(configureApiCallObserver()); + } + @Override public Observable debugAddTenGems() { return apiService.debugAddTenGems().compose(configureApiCallObserver()); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.java index f748c75f8..0b86c0af3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/implementation/ChallengeRepositoryImpl.java @@ -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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.java index 07998aa70..42c3e530f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/ChallengeLocalRepository.java @@ -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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowChallengeLocalRepository.java b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowChallengeLocalRepository.java index e49e0370f..0ceb9c180 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowChallengeLocalRepository.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/data/local/implementation/DbFlowChallengeLocalRepository.java @@ -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; diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PostChallenge.java b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/PostChallenge.java similarity index 76% rename from Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PostChallenge.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/models/social/PostChallenge.java index d384cab95..b8245008c 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PostChallenge.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/models/social/PostChallenge.java @@ -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 diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/CreateChallengeActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/CreateChallengeActivity.java index 565f5c0a5..f1d2d5f8b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/CreateChallengeActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/CreateChallengeActivity.java @@ -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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.java index 2f170e683..2e2da9196 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/challenges/ChallengeTasksRecyclerViewAdapter.java @@ -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;