diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java index 577f3e990..0f2ed3ec9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/APIHelper.java @@ -83,7 +83,6 @@ import java.util.List; import java.util.Map; import javax.net.ssl.SSLException; -import javax.net.ssl.SSLPeerUnverifiedException; import okhttp3.Interceptor; import okhttp3.MediaType; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java index ddd8bbdbc..b7547d700 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ContentCache.java @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica; import com.magicmicky.habitrpgwrapper.lib.api.ApiService; -import com.magicmicky.habitrpgwrapper.lib.models.ContentResult; import com.magicmicky.habitrpgwrapper.lib.models.QuestBoss; import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent; import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData; @@ -15,7 +14,6 @@ import java.util.List; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; -import rx.functions.Func1; import rx.schedulers.Schedulers; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaApplication.java b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaApplication.java index ef05403f8..38e3dfc02 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaApplication.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/HabiticaApplication.java @@ -4,10 +4,9 @@ import com.amplitude.api.Amplitude; import com.crashlytics.android.Crashlytics; import com.crashlytics.android.core.CrashlyticsCore; import com.facebook.FacebookSdk; -import com.habitrpg.android.habitica.components.AppComponent; import com.facebook.drawee.backends.pipeline.Fresco; +import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.components.DaggerAppComponent; -import com.habitrpg.android.habitica.modules.ApiModule; import com.habitrpg.android.habitica.modules.AppModule; import com.habitrpg.android.habitica.ui.activities.IntroActivity; import com.habitrpg.android.habitica.ui.activities.LoginActivity; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java index 2b6b87f3a..2f22c62b5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/components/AppComponent.java @@ -4,7 +4,6 @@ import com.habitrpg.android.habitica.HabiticaApplication; import com.habitrpg.android.habitica.modules.ApiModule; import com.habitrpg.android.habitica.modules.AppModule; import com.habitrpg.android.habitica.ui.activities.AboutActivity; -import com.habitrpg.android.habitica.ui.activities.BaseActivity; import com.habitrpg.android.habitica.ui.activities.ClassSelectionActivity; import com.habitrpg.android.habitica.ui.activities.GroupFormActivity; import com.habitrpg.android.habitica.ui.activities.IntroActivity; @@ -16,7 +15,6 @@ import com.habitrpg.android.habitica.ui.activities.PrefsActivity; import com.habitrpg.android.habitica.ui.activities.SetupActivity; import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity; import com.habitrpg.android.habitica.ui.activities.TaskFormActivity; -import com.habitrpg.android.habitica.ui.fragments.BaseFragment; import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment; import com.habitrpg.android.habitica.ui.fragments.NewsFragment; import com.habitrpg.android.habitica.ui.fragments.faq.FAQDetailFragment; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java index 642f27d31..987086a42 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/modules/ApiModule.java @@ -1,69 +1,12 @@ package com.habitrpg.android.habitica.modules; -import com.google.gson.ExclusionStrategy; -import com.google.gson.FieldAttributes; -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; -import com.google.gson.reflect.TypeToken; - import com.habitrpg.android.habitica.APIHelper; import com.habitrpg.android.habitica.HostConfig; -import com.habitrpg.android.habitica.database.CheckListItemExcludeStrategy; import com.magicmicky.habitrpgwrapper.lib.api.MaintenanceApiService; -import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage; -import com.magicmicky.habitrpgwrapper.lib.models.ContentResult; -import com.magicmicky.habitrpgwrapper.lib.models.Customization; -import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle; -import com.magicmicky.habitrpgwrapper.lib.models.Group; -import com.magicmicky.habitrpgwrapper.lib.models.Purchases; -import com.magicmicky.habitrpgwrapper.lib.models.Skill; -import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep; -import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg; -import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food; -import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion; -import com.magicmicky.habitrpgwrapper.lib.models.inventory.Mount; -import com.magicmicky.habitrpgwrapper.lib.models.inventory.Pet; -import com.magicmicky.habitrpgwrapper.lib.models.inventory.QuestContent; -import com.magicmicky.habitrpgwrapper.lib.models.responses.FeedResponse; -import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem; -import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData; -import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem; -import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task; -import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList; -import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag; -import com.magicmicky.habitrpgwrapper.lib.utils.BooleanAsIntAdapter; -import com.magicmicky.habitrpgwrapper.lib.utils.ChatMessageDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.ChecklistItemSerializer; -import com.magicmicky.habitrpgwrapper.lib.utils.ContentDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.CustomizationDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.DateDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.EggListDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.FAQArticleListDeserilializer; -import com.magicmicky.habitrpgwrapper.lib.utils.FeedResponseDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.FoodListDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.GroupSerialization; -import com.magicmicky.habitrpgwrapper.lib.utils.HatchingPotionListDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.ItemDataListDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.MountListDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.PetListDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.PurchasedDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.QuestListDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.RemindersItemSerializer; -import com.magicmicky.habitrpgwrapper.lib.utils.SkillDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.TaskListDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.TaskSerializer; -import com.magicmicky.habitrpgwrapper.lib.utils.TaskTagDeserializer; -import com.magicmicky.habitrpgwrapper.lib.utils.TutorialStepListDeserializer; -import com.raizlabs.android.dbflow.structure.ModelAdapter; import android.content.Context; import android.content.SharedPreferences; -import java.lang.reflect.Type; -import java.util.Date; -import java.util.HashMap; -import java.util.List; - import javax.inject.Singleton; import dagger.Module; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java index 78b7ce645..34a1ac85c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskAlarmBootReceiver.java @@ -1,12 +1,10 @@ package com.habitrpg.android.habitica.receivers; +import com.habitrpg.android.habitica.ui.helpers.TaskAlarmManager; + import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; -import android.os.Bundle; -import android.util.Log; - -import com.habitrpg.android.habitica.ui.helpers.TaskAlarmManager; /** * Created by keithholliday on 5/29/16. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java index 32844831f..8e4aaef56 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/receivers/TaskReceiver.java @@ -1,5 +1,9 @@ package com.habitrpg.android.habitica.receivers; +import com.habitrpg.android.habitica.R; +import com.habitrpg.android.habitica.ui.activities.MainActivity; +import com.habitrpg.android.habitica.ui.helpers.TaskAlarmManager; + import android.app.Notification; import android.app.NotificationManager; import android.app.PendingIntent; @@ -7,11 +11,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.util.Log; - -import com.habitrpg.android.habitica.R; -import com.habitrpg.android.habitica.ui.activities.MainActivity; -import com.habitrpg.android.habitica.ui.helpers.TaskAlarmManager; /** * Created by keithholliday on 5/29/16. diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.java index d2a21e8c5..b4a85988b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/ClassSelectionActivity.java @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.ui.activities; import com.habitrpg.android.habitica.APIHelper; -import com.habitrpg.android.habitica.HabiticaApplication; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.ui.AvatarView; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java index 32ea55cd8..de410f71d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/GroupFormActivity.java @@ -2,8 +2,8 @@ package com.habitrpg.android.habitica.ui.activities; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; -import com.habitrpg.android.habitica.ui.helpers.UiUtils; import com.habitrpg.android.habitica.ui.helpers.MarkdownParser; +import com.habitrpg.android.habitica.ui.helpers.UiUtils; import net.pherth.android.emoji_library.EmojiEditText; import net.pherth.android.emoji_library.EmojiPopup; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.java index 01690b40c..aa6c03415 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/IntroActivity.java @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.ui.activities; import com.habitrpg.android.habitica.APIHelper; -import com.habitrpg.android.habitica.HostConfig; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.ui.fragments.setup.IntroFragment; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java index db7382373..4e997e6a7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MainActivity.java @@ -33,14 +33,13 @@ import com.habitrpg.android.habitica.events.commands.UnlockPathCommand; import com.habitrpg.android.habitica.events.commands.UpdateUserCommand; import com.habitrpg.android.habitica.ui.AvatarView; import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel; -import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder; import com.habitrpg.android.habitica.ui.TutorialView; -import com.habitrpg.android.habitica.ui.helpers.UiUtils; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment; import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils; +import com.habitrpg.android.habitica.ui.helpers.UiUtils; +import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder; import com.habitrpg.android.habitica.userpicture.BitmapUtils; -import com.habitrpg.android.habitica.userpicture.UserPicture; import com.magicmicky.habitrpgwrapper.lib.api.MaintenanceApiService; import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import com.magicmicky.habitrpgwrapper.lib.models.Stats; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java index 535b65799..b35374eae 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/MaintenanceActivity.java @@ -1,15 +1,13 @@ package com.habitrpg.android.habitica.ui.activities; -import net.pherth.android.emoji_library.EmojiTextView; -import com.habitrpg.android.habitica.APIHelper; -import com.habitrpg.android.habitica.HabiticaApplication; -import com.habitrpg.android.habitica.HostConfig; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.ui.helpers.MarkdownParser; import com.magicmicky.habitrpgwrapper.lib.api.MaintenanceApiService; import com.squareup.picasso.Picasso; +import net.pherth.android.emoji_library.EmojiTextView; + import android.content.Intent; import android.net.Uri; import android.os.Bundle; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java index 1df35def4..99520d732 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SetupActivity.java @@ -29,7 +29,6 @@ import android.view.View; import android.widget.Button; import java.util.List; -import java.util.Map; import javax.inject.Inject; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java index 14739fb62..472f75e82 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java @@ -1,7 +1,5 @@ package com.habitrpg.android.habitica.ui.activities; -import net.pherth.android.emoji_library.EmojiEditText; -import net.pherth.android.emoji_library.EmojiPopup; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.events.TaskSaveEvent; @@ -19,11 +17,11 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Days; import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem; import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task; import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag; -import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction; -import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener; import com.raizlabs.android.dbflow.sql.builder.Condition; import com.raizlabs.android.dbflow.sql.language.Select; -import com.raizlabs.android.dbflow.sql.language.Set; + +import net.pherth.android.emoji_library.EmojiEditText; +import net.pherth.android.emoji_library.EmojiPopup; import org.greenrobot.eventbus.EventBus; @@ -58,7 +56,6 @@ import android.widget.NumberPicker; import android.widget.Spinner; import android.widget.TableRow; import android.widget.TextView; -import android.widget.TimePicker; import java.text.DateFormat; import java.text.DecimalFormat; @@ -67,17 +64,14 @@ import java.text.ParseException; import java.util.ArrayList; import java.util.Calendar; import java.util.Date; -import java.util.HashSet; import java.util.List; import java.util.Locale; -import java.util.TreeSet; import java.util.UUID; import butterknife.BindView; import butterknife.OnClick; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; -import rx.functions.Func0; import rx.schedulers.Schedulers; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java index d68188f9c..e74d3855c 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java @@ -4,8 +4,8 @@ import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand; import com.habitrpg.android.habitica.events.commands.UnlockPathCommand; import com.habitrpg.android.habitica.events.commands.UpdateUserCommand; -import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder; import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils; +import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder; import com.magicmicky.habitrpgwrapper.lib.models.Customization; import com.magicmicky.habitrpgwrapper.lib.models.CustomizationSet; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java index b85659703..3381733c3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/ChatRecyclerViewAdapter.java @@ -1,7 +1,5 @@ package com.habitrpg.android.habitica.ui.adapter.social; -import net.pherth.android.emoji_library.EmojiEditText; -import net.pherth.android.emoji_library.EmojiTextView; import com.habitrpg.android.habitica.HabiticaApplication; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.events.commands.CopyChatAsTodoCommand; @@ -16,6 +14,9 @@ import com.habitrpg.android.habitica.ui.helpers.EmojiKeyboard; import com.habitrpg.android.habitica.ui.helpers.ViewHelper; import com.magicmicky.habitrpgwrapper.lib.models.ChatMessage; +import net.pherth.android.emoji_library.EmojiEditText; +import net.pherth.android.emoji_library.EmojiTextView; + import org.greenrobot.eventbus.EventBus; import android.content.Context; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java index b5781f81b..09b2077cd 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/social/PartyMemberRecyclerViewAdapter.java @@ -2,9 +2,9 @@ package com.habitrpg.android.habitica.ui.adapter.social; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.databinding.ValueBarBinding; +import com.habitrpg.android.habitica.ui.AvatarView; import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel; import com.habitrpg.android.habitica.ui.helpers.ViewHelper; -import com.habitrpg.android.habitica.ui.AvatarView; import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import android.content.Context; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java index d54a90ff4..f9a6fa533 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/BaseTasksRecyclerViewAdapter.java @@ -10,8 +10,6 @@ import com.habitrpg.android.habitica.helpers.TagsHelper; import com.habitrpg.android.habitica.ui.helpers.MarkdownParser; import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder; import com.magicmicky.habitrpgwrapper.lib.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; import com.raizlabs.android.dbflow.sql.language.OrderBy; import com.raizlabs.android.dbflow.sql.language.Select; @@ -32,8 +30,6 @@ import java.util.List; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; -import rx.functions.Func0; -import rx.functions.Func1; import rx.schedulers.Schedulers; public abstract class BaseTasksRecyclerViewAdapter diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java index 73680e3a0..222456c94 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/CheckListAdapter.java @@ -1,11 +1,12 @@ package com.habitrpg.android.habitica.ui.adapter.tasks; -import net.pherth.android.emoji_library.EmojiEditText; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperAdapter; import com.habitrpg.android.habitica.ui.helpers.ItemTouchHelperViewHolder; import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem; +import net.pherth.android.emoji_library.EmojiEditText; + import android.graphics.Color; import android.support.v7.widget.RecyclerView; import android.text.Editable; @@ -16,7 +17,6 @@ import android.view.ViewGroup; import android.widget.Button; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import butterknife.BindView; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java index 39719cc26..17b391408 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/DailiesRecyclerViewHolder.java @@ -1,11 +1,9 @@ package com.habitrpg.android.habitica.ui.adapter.tasks; import com.habitrpg.android.habitica.helpers.TagsHelper; -import com.habitrpg.android.habitica.ui.viewHolders.tasks.BaseTaskViewHolder; import com.habitrpg.android.habitica.ui.viewHolders.tasks.DailyViewHolder; import android.content.Context; -import android.view.View; import android.view.ViewGroup; public class DailiesRecyclerViewHolder extends BaseTasksRecyclerViewAdapter { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.java index b334dc65a..dc44a2711 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/HabitsRecyclerViewAdapter.java @@ -4,8 +4,6 @@ import com.habitrpg.android.habitica.helpers.TagsHelper; import com.habitrpg.android.habitica.ui.viewHolders.tasks.HabitViewHolder; import android.content.Context; -import android.view.LayoutInflater; -import android.view.View; import android.view.ViewGroup; public class HabitsRecyclerViewAdapter extends BaseTasksRecyclerViewAdapter { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java index 5c27b4d58..f620b0598 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/tasks/RewardsRecyclerViewAdapter.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.List; import rx.Observable; -import rx.Subscriber; public class RewardsRecyclerViewAdapter extends BaseTasksRecyclerViewAdapter { diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java index 62e9f96f0..e87868d78 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseFragment.java @@ -4,8 +4,6 @@ import com.amplitude.api.Amplitude; import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.events.DisplayTutorialEvent; import com.habitrpg.android.habitica.ui.activities.BaseActivity; -import com.habitrpg.android.habitica.ui.activities.IntroActivity; -import com.habitrpg.android.habitica.ui.activities.MainActivity; import com.magicmicky.habitrpgwrapper.lib.models.TutorialStep; import com.raizlabs.android.dbflow.runtime.transaction.BaseTransaction; import com.raizlabs.android.dbflow.runtime.transaction.TransactionListener; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java index 7b1f866ce..030d8cca5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BaseMainFragment.java @@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.fragments; import com.habitrpg.android.habitica.APIHelper; import com.habitrpg.android.habitica.ui.activities.MainActivity; -import com.habitrpg.android.habitica.ui.activities.PrefsActivity; import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import com.raizlabs.android.dbflow.sql.builder.Condition; import com.raizlabs.android.dbflow.sql.language.Select; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java index bb0079103..257830f68 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragment.java @@ -2,9 +2,9 @@ package com.habitrpg.android.habitica.ui.fragments.faq; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; -import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration; import com.habitrpg.android.habitica.ui.adapter.FAQOverviewRecyclerAdapter; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; +import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration; import com.magicmicky.habitrpgwrapper.lib.models.FAQArticle; import com.raizlabs.android.dbflow.sql.language.Select; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java index ea4040943..c4a33a3b4 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragment.java @@ -2,9 +2,9 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.equipment; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; -import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration; import com.habitrpg.android.habitica.ui.adapter.inventory.EquipmentRecyclerViewAdapter; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; +import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration; import com.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData; import com.raizlabs.android.dbflow.sql.builder.Condition; import com.raizlabs.android.dbflow.sql.language.Select; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java index 0772064be..617d989f3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragment.java @@ -3,10 +3,10 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.items; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.events.ContentReloadedEvent; -import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration; import com.habitrpg.android.habitica.ui.adapter.inventory.ItemRecyclerAdapter; import com.habitrpg.android.habitica.ui.fragments.BaseFragment; import com.habitrpg.android.habitica.ui.helpers.RecyclerViewEmptySupport; +import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration; import com.magicmicky.habitrpgwrapper.lib.models.inventory.Egg; import com.magicmicky.habitrpgwrapper.lib.models.inventory.Food; import com.magicmicky.habitrpgwrapper.lib.models.inventory.HatchingPotion; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java index aba6ae7bb..4d5fbdc67 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragment.java @@ -5,8 +5,8 @@ import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.events.commands.HatchingCommand; import com.habitrpg.android.habitica.events.commands.InvitePartyToQuestCommand; import com.habitrpg.android.habitica.events.commands.OpenMenuItemCommand; -import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; +import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder; import org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java index 2450990c7..c4e6db21f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java @@ -1,7 +1,6 @@ package com.habitrpg.android.habitica.ui.fragments.preferences; import com.habitrpg.android.habitica.R; -import com.habitrpg.android.habitica.ui.fragments.preferences.BasePreferencesFragment; import android.content.ClipData; import android.content.ClipboardManager; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java index ba3c9c067..9627421d5 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/setup/TaskSetupFragment.java @@ -18,9 +18,7 @@ import android.view.ViewGroup; import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.List; -import java.util.Map; import butterknife.BindView; import butterknife.ButterKnife; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java index 440fd6e23..ba9c02320 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java @@ -10,7 +10,6 @@ import org.greenrobot.eventbus.EventBus; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java index 5d2679a96..3953628de 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java @@ -6,10 +6,10 @@ import com.habitrpg.android.habitica.callbacks.SkillCallback; import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.events.SkillUsedEvent; import com.habitrpg.android.habitica.events.commands.UseSkillCommand; -import com.habitrpg.android.habitica.ui.helpers.UiUtils; import com.habitrpg.android.habitica.ui.activities.SkillTasksActivity; import com.habitrpg.android.habitica.ui.adapter.SkillsRecyclerViewAdapter; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; +import com.habitrpg.android.habitica.ui.helpers.UiUtils; import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import com.magicmicky.habitrpgwrapper.lib.models.Skill; import com.magicmicky.habitrpgwrapper.lib.models.responses.SkillResponse; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java index 983faa805..562e7b962 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragment.java @@ -5,7 +5,6 @@ import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.ui.activities.GroupFormActivity; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; import com.magicmicky.habitrpgwrapper.lib.models.Group; -import com.magicmicky.habitrpgwrapper.lib.models.UserParty; import android.app.Activity; import android.content.Intent; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java index 1148f69ce..1d68ace57 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragment.java @@ -2,9 +2,9 @@ package com.habitrpg.android.habitica.ui.fragments.social; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; -import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration; import com.habitrpg.android.habitica.ui.adapter.social.PublicGuildsRecyclerViewAdapter; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; +import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration; import com.magicmicky.habitrpgwrapper.lib.models.Group; import android.os.Bundle; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java index c0c8cbbd1..354f70e25 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragment.java @@ -9,7 +9,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import android.content.Context; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java index 458aa9536..c385ac20f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TaskRecyclerViewFragment.java @@ -5,14 +5,13 @@ import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.components.AppComponent; import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand; import com.habitrpg.android.habitica.helpers.TagsHelper; -import com.habitrpg.android.habitica.ui.activities.BaseActivity; +import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter; import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder; import com.habitrpg.android.habitica.ui.adapter.tasks.HabitsRecyclerViewAdapter; import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter; import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter; -import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration; -import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter; import com.habitrpg.android.habitica.ui.fragments.BaseFragment; +import com.habitrpg.android.habitica.ui.menu.DividerItemDecoration; import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java index 3422709a2..22835b7d9 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragment.java @@ -19,22 +19,18 @@ import com.habitrpg.android.habitica.events.commands.CreateTagCommand; import com.habitrpg.android.habitica.events.commands.FilterTasksByTagsCommand; import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand; import com.habitrpg.android.habitica.helpers.TagsHelper; -import com.habitrpg.android.habitica.ui.menu.EditTextDrawer; -import com.habitrpg.android.habitica.ui.helpers.UiUtils; import com.habitrpg.android.habitica.ui.activities.MainActivity; import com.habitrpg.android.habitica.ui.activities.TaskFormActivity; import com.habitrpg.android.habitica.ui.adapter.tasks.BaseTasksRecyclerViewAdapter; import com.habitrpg.android.habitica.ui.adapter.tasks.DailiesRecyclerViewHolder; -import com.habitrpg.android.habitica.ui.adapter.tasks.HabitsRecyclerViewAdapter; -import com.habitrpg.android.habitica.ui.adapter.tasks.RewardsRecyclerViewAdapter; -import com.habitrpg.android.habitica.ui.adapter.tasks.TodosRecyclerViewAdapter; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; import com.habitrpg.android.habitica.ui.helpers.Debounce; +import com.habitrpg.android.habitica.ui.helpers.UiUtils; +import com.habitrpg.android.habitica.ui.menu.EditTextDrawer; import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import com.magicmicky.habitrpgwrapper.lib.models.Tag; import com.magicmicky.habitrpgwrapper.lib.models.TaskDirection; import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task; -import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskTag; import com.mikepenz.materialdrawer.interfaces.OnCheckedChangeListener; import com.mikepenz.materialdrawer.model.SectionDrawerItem; import com.mikepenz.materialdrawer.model.SwitchDrawerItem; @@ -51,8 +47,6 @@ import android.support.v4.app.Fragment; import android.support.v4.app.FragmentPagerAdapter; import android.support.v4.view.GravityCompat; import android.support.v4.view.ViewPager; -import android.support.v4.widget.DrawerLayout; -import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; import android.view.MenuInflater; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java index c814065c1..c3da8727b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/DataBindingUtils.java @@ -1,10 +1,11 @@ package com.habitrpg.android.habitica.ui.helpers; -import net.pherth.android.emoji_library.EmojiTextView; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.databinding.ValueBarBinding; import com.squareup.picasso.Picasso; +import net.pherth.android.emoji_library.EmojiTextView; + import android.databinding.BindingAdapter; import android.databinding.DataBindingUtil; import android.graphics.PorterDuff; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java index a35639606..7fd0e44b0 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/EmojiKeyboard.java @@ -1,8 +1,9 @@ package com.habitrpg.android.habitica.ui.helpers; +import com.habitrpg.android.habitica.R; + import net.pherth.android.emoji_library.EmojiEditText; import net.pherth.android.emoji_library.EmojiPopup; -import com.habitrpg.android.habitica.R; import android.content.Context; import android.support.v4.content.ContextCompat; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java index 8acf59398..13cad0186 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/MarkdownParser.java @@ -1,6 +1,7 @@ package com.habitrpg.android.habitica.ui.helpers; import com.commonsware.cwac.anddown.AndDown; + import net.pherth.android.emoji_library.EmojiParser; import android.text.Html; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/TaskAlarmManager.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/TaskAlarmManager.java index c92d94dfc..77080a6e6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/TaskAlarmManager.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/TaskAlarmManager.java @@ -1,10 +1,5 @@ package com.habitrpg.android.habitica.ui.helpers; -import android.app.AlarmManager; -import android.app.PendingIntent; -import android.content.Context; -import android.content.Intent; - import com.habitrpg.android.habitica.events.TaskSaveEvent; import com.habitrpg.android.habitica.receivers.TaskReceiver; import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem; @@ -12,10 +7,14 @@ 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 org.greenrobot.eventbus.EventBus; import org.greenrobot.eventbus.Subscribe; +import android.app.AlarmManager; +import android.app.PendingIntent; +import android.content.Context; +import android.content.Intent; + import java.util.Calendar; import java.util.Date; import java.util.List; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java index 8b384bd0d..94b66b646 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java @@ -7,12 +7,12 @@ import com.habitrpg.android.habitica.ui.activities.PrefsActivity; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; import com.habitrpg.android.habitica.ui.fragments.GemsPurchaseFragment; import com.habitrpg.android.habitica.ui.fragments.NewsFragment; -import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragment; -import com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment; import com.habitrpg.android.habitica.ui.fragments.faq.FAQOverviewFragment; import com.habitrpg.android.habitica.ui.fragments.inventory.customization.AvatarOverviewFragment; import com.habitrpg.android.habitica.ui.fragments.inventory.equipment.EquipmentOverviewFragment; import com.habitrpg.android.habitica.ui.fragments.inventory.items.ItemsFragment; +import com.habitrpg.android.habitica.ui.fragments.inventory.stable.StableFragment; +import com.habitrpg.android.habitica.ui.fragments.skills.SkillsFragment; import com.habitrpg.android.habitica.ui.fragments.social.GuildsOverviewFragment; import com.habitrpg.android.habitica.ui.fragments.social.TavernFragment; import com.habitrpg.android.habitica.ui.fragments.social.party.PartyFragment; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java index 7bff8a524..6b1fe32da 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/BaseTaskViewHolder.java @@ -16,7 +16,6 @@ import android.widget.TextView; import butterknife.BindColor; import butterknife.BindView; import butterknife.ButterKnife; -import hugo.weaving.DebugLog; import rx.Observable; import rx.android.schedulers.AndroidSchedulers; import rx.schedulers.Schedulers; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java index 35af26452..812c944d6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/ChecklistedViewHolder.java @@ -1,13 +1,13 @@ package com.habitrpg.android.habitica.ui.viewHolders.tasks; -import net.pherth.android.emoji_library.EmojiTextView; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.events.commands.ChecklistCheckedCommand; -import com.habitrpg.android.habitica.events.TaskSaveEvent; import com.habitrpg.android.habitica.events.commands.TaskCheckedCommand; import com.magicmicky.habitrpgwrapper.lib.models.tasks.ChecklistItem; import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task; +import net.pherth.android.emoji_library.EmojiTextView; + import org.greenrobot.eventbus.EventBus; import android.content.Context; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java index a8c0b6314..788794b1f 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/viewHolders/tasks/RewardViewHolder.java @@ -8,7 +8,6 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task; import org.greenrobot.eventbus.EventBus; -import android.os.Trace; import android.support.annotation.NonNull; import android.support.v4.content.ContextCompat; import android.support.v7.app.AlertDialog; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/UpdateWidgetService.java b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/UpdateWidgetService.java index 1fb4946cc..2561e6d3d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/widget/UpdateWidgetService.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/widget/UpdateWidgetService.java @@ -2,13 +2,10 @@ package com.habitrpg.android.habitica.widget; import com.habitrpg.android.habitica.APIHelper; import com.habitrpg.android.habitica.HabiticaApplication; -import com.habitrpg.android.habitica.HostConfig; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback; import com.habitrpg.android.habitica.ui.activities.MainActivity; -import com.habitrpg.android.habitica.ui.activities.PrefsActivity; import com.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; -import com.raizlabs.android.dbflow.sql.language.Update; import android.app.PendingIntent; import android.app.Service; @@ -16,7 +13,6 @@ import android.appwidget.AppWidgetManager; import android.content.ComponentName; import android.content.Intent; import android.os.IBinder; -import android.util.Log; import android.widget.RemoteViews; import javax.inject.Inject; diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java index 8a1fb062b..aaf5d8d1a 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/HabitRPGUser.java @@ -21,7 +21,6 @@ import android.text.TextUtils; import java.util.ArrayList; import java.util.EnumMap; import java.util.List; -import java.util.Map; @Table(databaseName = HabitDatabase.NAME) public class HabitRPGUser extends BaseModel { diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java index 77958cf18..5edf08658 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/PlayerMinStats.java @@ -1,7 +1,6 @@ package com.magicmicky.habitrpgwrapper.lib.models; import com.google.gson.annotations.SerializedName; -import com.google.repacked.antlr.v4.runtime.atn.BasicState; import com.raizlabs.android.dbflow.annotation.Column; import com.raizlabs.android.dbflow.annotation.ForeignKey; diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java index 9e756eb97..6554ba1c9 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/responses/BuyResponse.java @@ -1,8 +1,6 @@ package com.magicmicky.habitrpgwrapper.lib.models.responses; -import com.magicmicky.habitrpgwrapper.lib.models.Flags; import com.magicmicky.habitrpgwrapper.lib.models.Items; -import com.magicmicky.habitrpgwrapper.lib.models.Stats; import java.util.HashMap; diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskList.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskList.java index 8a122c3ff..2449df02f 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskList.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/models/tasks/TaskList.java @@ -1,7 +1,5 @@ package com.magicmicky.habitrpgwrapper.lib.models.tasks; -import java.util.HashMap; -import java.util.List; import java.util.Map; public class TaskList { diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DateSerializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DateSerializer.java index 289a6db38..a9f32ae66 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DateSerializer.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/DateSerializer.java @@ -5,8 +5,6 @@ import com.google.gson.JsonPrimitive; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; -import org.json.JSONStringer; - import java.lang.reflect.Type; import java.util.Date; diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/RemindersItemSerializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/RemindersItemSerializer.java index 464f3909e..042d8db1e 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/RemindersItemSerializer.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/RemindersItemSerializer.java @@ -4,6 +4,7 @@ import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonSerializationContext; import com.google.gson.JsonSerializer; + import com.magicmicky.habitrpgwrapper.lib.models.tasks.RemindersItem; import java.lang.reflect.Type; diff --git a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskListDeserializer.java b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskListDeserializer.java index d5ab9b42c..c2d552259 100644 --- a/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskListDeserializer.java +++ b/Habitica/src/main/java/com/magicmicky/habitrpgwrapper/lib/utils/TaskListDeserializer.java @@ -8,9 +8,7 @@ import com.magicmicky.habitrpgwrapper.lib.models.tasks.Task; import com.magicmicky.habitrpgwrapper.lib.models.tasks.TaskList; import java.lang.reflect.Type; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; /**