From a4e7fc2682f9a2e2d2814e6d341c3a48ea0253ce Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Sun, 15 May 2016 11:26:56 +0200 Subject: [PATCH] add fragment lifecycle tests --- Habitica/AndroidManifest.xml | 2 +- Habitica/build.gradle | 2 + Habitica/res/values/strings.constants.xml | 2 +- .../ui/activities/GroupFormActivity.java | 2 +- .../habitica/ui/activities/MainActivity.java | 8 +- .../habitica/ui/activities/PrefsActivity.java | 4 +- .../ui/activities/SkillTasksActivity.java | 2 +- .../CustomizationRecyclerViewAdapter.java | 2 +- .../inventory/StableRecyclerAdapter.java | 4 +- .../habitica/ui/fragments/BaseFragment.java | 1 + .../ui/fragments/GemsPurchaseFragment.java | 12 ++- .../ui/fragments/faq/FAQOverviewFragment.java | 2 +- .../equipment/EquipmentDetailFragment.java | 2 +- .../inventory/items/ItemRecyclerFragment.java | 67 ++++++++-------- .../inventory/items/ItemsFragment.java | 2 +- .../MountDetailRecyclerFragment.java | 2 +- .../PetDetailRecyclerFragment.java | 2 +- .../{ => stable}/StableFragment.java | 2 +- .../{ => stable}/StableRecyclerFragment.java | 2 +- .../AccountDetailsFragment.java | 3 +- .../BasePreferencesFragment.java | 2 +- .../PreferencesFragment.java | 2 +- .../TimePreferenceDialogFragment.java | 2 +- .../SkillTasksRecyclerViewFragment.java | 2 +- .../{ => skills}/SkillsFragment.java | 5 +- .../ui/fragments/social/ChatListFragment.java | 4 +- .../social/PublicGuildsFragment.java | 2 +- .../tasks/TaskRecyclerViewFragment.java | 2 +- .../ui/fragments/tasks/TasksFragment.java | 8 +- .../habitica/ui/{ => helpers}/UiUtils.java | 2 +- .../ui/{ => menu}/DividerItemDecoration.java | 2 +- .../ui/{ => menu}/EditTextDrawer.java | 2 +- .../ui/{ => menu}/MainDrawerBuilder.java | 6 +- .../ui/{ => menu}/SectionIconDrawerItem.java | 2 +- .../ui/fragments/AboutFragmentTest.java | 10 +++ .../ui/fragments/BaseFragmentTests.java | 77 +++++++++++++++++++ .../fragments/GemsPurchaseFragmentTest.java | 10 +++ .../ui/fragments/NewsFragmentTest.java | 10 +++ .../fragments/faq/FAQDetailFragmentTest.java | 12 +++ .../faq/FAQOverviewFragmentTest.java | 12 +++ .../AvatarCustomizationFragmentTest.java | 12 +++ .../AvatarOverviewFragmentTest.java | 12 +++ .../EquipmentDetailFragmentTest.java | 12 +++ .../EquipmentOverviewFragmentTest.java | 12 +++ .../items/ItemRecyclerFragmentTest.java | 15 ++++ .../inventory/items/ItemsFragmentTest.java | 12 +++ .../MountDetailRecyclerFragmentTest.java | 12 +++ .../stable/PetDetailRecyclerFragmentTest.java | 12 +++ .../inventory/stable/StableFragmentTest.java | 12 +++ .../stable/StableRecyclerFragmentTest.java | 12 +++ .../fragments/skills/SkillsFragmentTest.java | 12 +++ .../SkillsTaskRecyclerViewFragmentTest.java | 12 +++ .../social/ChatListFragmentTest.java | 13 ++++ .../social/GroupInformationFragmentTest.java | 12 +++ .../fragments/social/GuildFragmentTest.java | 12 +++ .../social/GuildsOverviewFragmentTest.java | 12 +++ .../social/PublicGuildsFragmentTest.java | 12 +++ .../fragments/social/TavernFragmentTest.java | 12 +++ .../social/party/PartyFragmentTest.java | 12 +++ .../social/party/PartyInviteFragmentTest.java | 12 +++ .../party/PartyMemberListFragmentTest.java | 12 +++ .../ui/fragments/tasks/TasksFragmentTest.java | 12 +++ .../lib/utils/DateDeserializerTest.java | 2 +- 63 files changed, 486 insertions(+), 83 deletions(-) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/{ => stable}/MountDetailRecyclerFragment.java (98%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/{ => stable}/PetDetailRecyclerFragment.java (98%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/{ => stable}/StableFragment.java (97%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/{ => stable}/StableRecyclerFragment.java (99%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/{ => preferences}/AccountDetailsFragment.java (90%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/{ => preferences}/BasePreferencesFragment.java (87%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/{ => preferences}/PreferencesFragment.java (99%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/{ => preferences}/TimePreferenceDialogFragment.java (97%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/{ => skills}/SkillTasksRecyclerViewFragment.java (97%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/{ => skills}/SkillsFragment.java (96%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/{ => helpers}/UiUtils.java (97%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/{ => menu}/DividerItemDecoration.java (98%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/{ => menu}/EditTextDrawer.java (97%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/{ => menu}/MainDrawerBuilder.java (97%) rename Habitica/src/main/java/com/habitrpg/android/habitica/ui/{ => menu}/SectionIconDrawerItem.java (98%) create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/AboutFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/BaseFragmentTests.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/NewsFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsTaskRecyclerViewFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragmentTest.java create mode 100644 Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragmentTest.java diff --git a/Habitica/AndroidManifest.xml b/Habitica/AndroidManifest.xml index 6d85d046d..c29ff34b4 100644 --- a/Habitica/AndroidManifest.xml +++ b/Habitica/AndroidManifest.xml @@ -2,7 +2,7 @@ diff --git a/Habitica/build.gradle b/Habitica/build.gradle index 915b019b2..3c0d94e5f 100644 --- a/Habitica/build.gradle +++ b/Habitica/build.gradle @@ -121,6 +121,8 @@ dependencies { testCompile 'com.squareup.leakcanary:leakcanary-android-no-op:1.3.1' testCompile 'org.robolectric:robolectric:3.0' testCompile 'org.robolectric:shadows-multidex:3.0' + testCompile "org.robolectric:shadows-support-v4:3.0" + testCompile "org.mockito:mockito-core:1.+" //Leak Detection debugCompile 'com.squareup.leakcanary:leakcanary-android:1.3.1' diff --git a/Habitica/res/values/strings.constants.xml b/Habitica/res/values/strings.constants.xml index 2c56c1eb5..d48f3595f 100644 --- a/Habitica/res/values/strings.constants.xml +++ b/Habitica/res/values/strings.constants.xml @@ -6,5 +6,5 @@ APIToken Username E-mail - https://habitica.com + https://v3.habitica.com \ No newline at end of file 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 546b08325..8b71766e6 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 @@ -3,7 +3,7 @@ package com.habitrpg.android.habitica.ui.activities; import com.github.data5tream.emojilib.EmojiEditText; import com.github.data5tream.emojilib.EmojiPopup; import com.habitrpg.android.habitica.R; -import com.habitrpg.android.habitica.ui.UiUtils; +import com.habitrpg.android.habitica.ui.helpers.UiUtils; import com.habitrpg.android.habitica.ui.helpers.MarkdownParser; import android.app.Activity; 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 813d1d6c0..06df9ea08 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 @@ -31,9 +31,9 @@ import com.habitrpg.android.habitica.events.commands.SellItemCommand; import com.habitrpg.android.habitica.events.commands.UnlockPathCommand; import com.habitrpg.android.habitica.events.commands.UpdateUserCommand; import com.habitrpg.android.habitica.ui.AvatarWithBarsViewModel; -import com.habitrpg.android.habitica.ui.MainDrawerBuilder; +import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder; import com.habitrpg.android.habitica.ui.TutorialView; -import com.habitrpg.android.habitica.ui.UiUtils; +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; @@ -128,8 +128,8 @@ import java.util.concurrent.TimeUnit; import butterknife.BindView; import rx.functions.Action1; -import static com.habitrpg.android.habitica.ui.UiUtils.SnackbarDisplayType; -import static com.habitrpg.android.habitica.ui.UiUtils.showSnackbar; +import static com.habitrpg.android.habitica.ui.helpers.UiUtils.SnackbarDisplayType; +import static com.habitrpg.android.habitica.ui.helpers.UiUtils.showSnackbar; public class MainActivity extends BaseActivity implements Action1, HabitRPGUserCallback.OnUserReceived, TaskScoringCallback.OnTaskScored, diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java index 912703974..d91469584 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/PrefsActivity.java @@ -3,8 +3,8 @@ package com.habitrpg.android.habitica.ui.activities; import com.habitrpg.android.habitica.BuildConfig; import com.habitrpg.android.habitica.HostConfig; import com.habitrpg.android.habitica.R; -import com.habitrpg.android.habitica.ui.fragments.AccountDetailsFragment; -import com.habitrpg.android.habitica.ui.fragments.PreferencesFragment; +import com.habitrpg.android.habitica.ui.fragments.preferences.AccountDetailsFragment; +import com.habitrpg.android.habitica.ui.fragments.preferences.PreferencesFragment; import android.content.Context; import android.content.SharedPreferences; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java index 910866bc4..f4d3a4767 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/SkillTasksActivity.java @@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.ui.activities; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.ui.adapter.SkillTasksRecyclerViewAdapter; -import com.habitrpg.android.habitica.ui.fragments.SkillTasksRecyclerViewFragment; +import com.habitrpg.android.habitica.ui.fragments.skills.SkillTasksRecyclerViewFragment; 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/adapter/CustomizationRecyclerViewAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/CustomizationRecyclerViewAdapter.java index 37e561d5f..9283b9e6a 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,7 +4,7 @@ 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.MainDrawerBuilder; +import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder; import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils; 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/inventory/StableRecyclerAdapter.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java index dfe815abe..8c0601933 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/adapter/inventory/StableRecyclerAdapter.java @@ -2,8 +2,8 @@ package com.habitrpg.android.habitica.ui.adapter.inventory; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.ui.activities.MainActivity; -import com.habitrpg.android.habitica.ui.fragments.inventory.MountDetailRecyclerFragment; -import com.habitrpg.android.habitica.ui.fragments.inventory.PetDetailRecyclerFragment; +import com.habitrpg.android.habitica.ui.fragments.inventory.stable.MountDetailRecyclerFragment; +import com.habitrpg.android.habitica.ui.fragments.inventory.stable.PetDetailRecyclerFragment; import com.habitrpg.android.habitica.ui.helpers.DataBindingUtils; import com.magicmicky.habitrpgwrapper.lib.models.inventory.Animal; 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 9281e4fdb..3db645ec2 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 @@ -91,6 +91,7 @@ public class BaseFragment extends DialogFragment { } if (unbinder != null) { unbinder.unbind(); + unbinder = null; } super.onDestroyView(); diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java index 1aef7f99e..3e1d9981d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragment.java @@ -19,6 +19,7 @@ import org.solovyev.android.checkout.Sku; import android.content.Context; import android.os.Bundle; import android.support.annotation.NonNull; +import android.support.annotation.Nullable; import android.support.v4.content.ContextCompat; import android.view.LayoutInflater; import android.view.View; @@ -53,10 +54,15 @@ public class GemsPurchaseFragment extends BaseMainFragment { super.onCreateView(inflater, container, savedInstanceState); - View v = inflater.inflate(R.layout.fragment_gem_purchase, container, false); + return inflater.inflate(R.layout.fragment_gem_purchase, container, false); + } + + @Override + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { + super.onViewCreated(view, savedInstanceState); btnPurchaseGems.setEnabled(false); - ViewHelper.SetBackgroundTint(btnPurchaseGems, ContextCompat.getColor(container.getContext(), R.color.brand)); + ViewHelper.SetBackgroundTint(btnPurchaseGems, ContextCompat.getColor(getContext(), R.color.brand)); final ActivityCheckout checkout = listener.getActivityCheckout(); @@ -116,8 +122,6 @@ public class GemsPurchaseFragment extends BaseMainFragment { } }); - - return v; } private void updateBuyButtonText(String price){ 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 21605b7b4..627f12d3a 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 @@ -1,7 +1,7 @@ package com.habitrpg.android.habitica.ui.fragments.faq; import com.habitrpg.android.habitica.R; -import com.habitrpg.android.habitica.ui.DividerItemDecoration; +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.magicmicky.habitrpgwrapper.lib.models.FAQArticle; 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 7950e7434..2c845a392 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 @@ -1,7 +1,7 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.equipment; import com.habitrpg.android.habitica.R; -import com.habitrpg.android.habitica.ui.DividerItemDecoration; +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.magicmicky.habitrpgwrapper.lib.models.tasks.ItemData; 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 b1ae2adad..3edfadb94 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 @@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.inventory.items; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.events.ContentReloadedEvent; -import com.habitrpg.android.habitica.ui.DividerItemDecoration; +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; @@ -61,40 +61,39 @@ public class ItemRecyclerFragment extends BaseFragment { public View onCreateView(LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) { if (view == null) { view = inflater.inflate(R.layout.fragment_items, container, false); - - unbinder = ButterKnife.bind(this, view); - - recyclerView.setEmptyView(emptyView); - emptyView.setText(getString(R.string.empty_items, itemTypeText)); - - android.support.v4.app.FragmentActivity context = getActivity(); - - layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager(); - - if (layoutManager == null) { - layoutManager = new LinearLayoutManager(context); - - recyclerView.setLayoutManager(layoutManager); - } - - adapter = (ItemRecyclerAdapter)recyclerView.getAdapter(); - if (adapter == null) { - adapter = new ItemRecyclerAdapter(); - adapter.context = this.getActivity(); - adapter.isHatching = this.isHatching; - adapter.isFeeding = this.isFeeding; - adapter.fragment = this; - adapter.ownedPets = this.ownedPets; - if (this.hatchingItem != null) { - adapter.hatchingItem = this.hatchingItem; - } - if (this.feedingPet != null) { - adapter.feedingPet = this.feedingPet; - } - recyclerView.setAdapter(adapter); - } - recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST)); } + unbinder = ButterKnife.bind(this, view); + + recyclerView.setEmptyView(emptyView); + emptyView.setText(getString(R.string.empty_items, itemTypeText)); + + android.support.v4.app.FragmentActivity context = getActivity(); + + layoutManager = (LinearLayoutManager) recyclerView.getLayoutManager(); + + if (layoutManager == null) { + layoutManager = new LinearLayoutManager(context); + + recyclerView.setLayoutManager(layoutManager); + } + + adapter = (ItemRecyclerAdapter)recyclerView.getAdapter(); + if (adapter == null) { + adapter = new ItemRecyclerAdapter(); + adapter.context = this.getActivity(); + adapter.isHatching = this.isHatching; + adapter.isFeeding = this.isFeeding; + adapter.fragment = this; + adapter.ownedPets = this.ownedPets; + if (this.hatchingItem != null) { + adapter.hatchingItem = this.hatchingItem; + } + if (this.feedingPet != null) { + adapter.feedingPet = this.feedingPet; + } + recyclerView.setAdapter(adapter); + } + recyclerView.addItemDecoration(new DividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL_LIST)); if (savedInstanceState != null){ this.itemType = savedInstanceState.getString(ITEM_TYPE_KEY, ""); 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 31b27a20a..6e5e4cdfb 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 @@ -4,7 +4,7 @@ import com.habitrpg.android.habitica.R; 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.MainDrawerBuilder; +import com.habitrpg.android.habitica.ui.menu.MainDrawerBuilder; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; import org.greenrobot.eventbus.EventBus; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/MountDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java similarity index 98% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/MountDetailRecyclerFragment.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java index 5b65f21f7..c835e017d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/MountDetailRecyclerFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragment.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui.fragments.inventory; +package com.habitrpg.android.habitica.ui.fragments.inventory.stable; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.ui.adapter.inventory.MountDetailRecyclerAdapter; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/PetDetailRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java similarity index 98% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/PetDetailRecyclerFragment.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java index 16ff995e7..f95fc2c88 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/PetDetailRecyclerFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragment.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui.fragments.inventory; +package com.habitrpg.android.habitica.ui.fragments.inventory.stable; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.events.commands.FeedCommand; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java similarity index 97% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableFragment.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java index c0374baba..64c77f902 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragment.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui.fragments.inventory; +package com.habitrpg.android.habitica.ui.fragments.inventory.stable; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.ui.fragments.BaseMainFragment; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java similarity index 99% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java index fc8f6beba..f1e57dc57 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/StableRecyclerFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragment.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui.fragments.inventory; +package com.habitrpg.android.habitica.ui.fragments.inventory.stable; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.events.ContentReloadedEvent; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AccountDetailsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java similarity index 90% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AccountDetailsFragment.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java index 5999ce103..2450990c7 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/AccountDetailsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/AccountDetailsFragment.java @@ -1,6 +1,7 @@ -package com.habitrpg.android.habitica.ui.fragments; +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/BasePreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.java similarity index 87% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BasePreferencesFragment.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.java index fe1b4562b..1600f402a 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/BasePreferencesFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/BasePreferencesFragment.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui.fragments; +package com.habitrpg.android.habitica.ui.fragments.preferences; import com.habitrpg.android.habitica.R; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PreferencesFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java similarity index 99% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PreferencesFragment.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java index 35b9a158a..f8760d5bc 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/PreferencesFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/PreferencesFragment.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui.fragments; +package com.habitrpg.android.habitica.ui.fragments.preferences; import com.habitrpg.android.habitica.APIHelper; import com.habitrpg.android.habitica.HabiticaApplication; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/TimePreferenceDialogFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.java similarity index 97% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/TimePreferenceDialogFragment.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.java index 771150272..6641d346b 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/TimePreferenceDialogFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/preferences/TimePreferenceDialogFragment.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui.fragments; +package com.habitrpg.android.habitica.ui.fragments.preferences; import com.habitrpg.android.habitica.prefs.TimePreference; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SkillTasksRecyclerViewFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java similarity index 97% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SkillTasksRecyclerViewFragment.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java index 0e8d2dd5a..05ef77341 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SkillTasksRecyclerViewFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillTasksRecyclerViewFragment.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui.fragments; +package com.habitrpg.android.habitica.ui.fragments.skills; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java similarity index 96% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java index 41daf5e0b..884358858 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/SkillsFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragment.java @@ -1,13 +1,14 @@ -package com.habitrpg.android.habitica.ui.fragments; +package com.habitrpg.android.habitica.ui.fragments.skills; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.callbacks.MergeUserCallback; import com.habitrpg.android.habitica.callbacks.SkillCallback; import com.habitrpg.android.habitica.events.SkillUsedEvent; import com.habitrpg.android.habitica.events.commands.UseSkillCommand; -import com.habitrpg.android.habitica.ui.UiUtils; +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.magicmicky.habitrpgwrapper.lib.models.HabitRPGUser; import com.magicmicky.habitrpgwrapper.lib.models.Skill; import com.raizlabs.android.dbflow.sql.builder.Condition; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java index 061056af3..b12cc9681 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragment.java @@ -9,7 +9,7 @@ import com.habitrpg.android.habitica.events.commands.FlagChatMessageCommand; import com.habitrpg.android.habitica.events.commands.SendNewGroupMessageCommand; import com.habitrpg.android.habitica.events.commands.ToggleInnCommand; import com.habitrpg.android.habitica.events.commands.ToggleLikeMessageCommand; -import com.habitrpg.android.habitica.ui.UiUtils; +import com.habitrpg.android.habitica.ui.helpers.UiUtils; import com.habitrpg.android.habitica.ui.activities.MainActivity; import com.habitrpg.android.habitica.ui.activities.PrefsActivity; import com.habitrpg.android.habitica.ui.adapter.social.ChatRecyclerViewAdapter; @@ -51,7 +51,7 @@ public class ChatListFragment extends BaseFragment implements SwipeRefreshLayout private APIHelper apiHelper; private HabitRPGUser user; private String userId; - private boolean isTavern; + public boolean isTavern; private MainActivity activity; public void configure(Context ctx, String groupId, APIHelper apiHelper, HabitRPGUser user, MainActivity activity, boolean isTavern) { 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 df5cf5e0f..b42396e29 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 @@ -1,7 +1,7 @@ package com.habitrpg.android.habitica.ui.fragments.social; import com.habitrpg.android.habitica.R; -import com.habitrpg.android.habitica.ui.DividerItemDecoration; +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.magicmicky.habitrpgwrapper.lib.models.Group; 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 03459100b..fcbaef823 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 @@ -2,7 +2,7 @@ package com.habitrpg.android.habitica.ui.fragments.tasks; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.events.commands.AddNewTaskCommand; -import com.habitrpg.android.habitica.ui.DividerItemDecoration; +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.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 aa76e3ef8..e5726523c 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 @@ -2,7 +2,6 @@ package com.habitrpg.android.habitica.ui.fragments.tasks; import com.github.clans.fab.FloatingActionButton; import com.github.clans.fab.FloatingActionMenu; -import com.habitrpg.android.habitica.ContentCache; import com.habitrpg.android.habitica.HabiticaApplication; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback; @@ -19,8 +18,8 @@ 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.EditTextDrawer; -import com.habitrpg.android.habitica.ui.UiUtils; +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; @@ -33,15 +32,12 @@ import com.habitrpg.android.habitica.ui.helpers.Debounce; 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.ItemData; 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; import com.mikepenz.materialdrawer.model.interfaces.IDrawerItem; -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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/UiUtils.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java similarity index 97% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/UiUtils.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java index 7fa478d7a..729c9b043 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/UiUtils.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/helpers/UiUtils.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui; +package com.habitrpg.android.habitica.ui.helpers; import com.habitrpg.android.habitica.R; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/DividerItemDecoration.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/DividerItemDecoration.java similarity index 98% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/DividerItemDecoration.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/DividerItemDecoration.java index 7dc45168a..5afc4d06d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/DividerItemDecoration.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/DividerItemDecoration.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui; +package com.habitrpg.android.habitica.ui.menu; import android.content.Context; import android.content.res.TypedArray; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/EditTextDrawer.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTextDrawer.java similarity index 97% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/EditTextDrawer.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTextDrawer.java index f8438d76a..d7b86e398 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/EditTextDrawer.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/EditTextDrawer.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui; +package com.habitrpg.android.habitica.ui.menu; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.events.commands.CreateTagCommand; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java similarity index 97% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java index 308c50e6e..8b384bd0d 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/MainDrawerBuilder.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui; +package com.habitrpg.android.habitica.ui.menu; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.ui.activities.AboutActivity; @@ -7,9 +7,9 @@ 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.SkillsFragment; +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.StableFragment; 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; diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SectionIconDrawerItem.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/SectionIconDrawerItem.java similarity index 98% rename from Habitica/src/main/java/com/habitrpg/android/habitica/ui/SectionIconDrawerItem.java rename to Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/SectionIconDrawerItem.java index f2a4bf751..78e89cd83 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/SectionIconDrawerItem.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/menu/SectionIconDrawerItem.java @@ -1,4 +1,4 @@ -package com.habitrpg.android.habitica.ui; +package com.habitrpg.android.habitica.ui.menu; import com.habitrpg.android.habitica.R; import com.mikepenz.fastadapter.utils.ViewHolderFactory; diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/AboutFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/AboutFragmentTest.java new file mode 100644 index 000000000..b6ea3c8d3 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/AboutFragmentTest.java @@ -0,0 +1,10 @@ +package com.habitrpg.android.habitica.ui.fragments; + +public class AboutFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new AboutFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/BaseFragmentTests.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/BaseFragmentTests.java new file mode 100644 index 000000000..9a69764f7 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/BaseFragmentTests.java @@ -0,0 +1,77 @@ +package com.habitrpg.android.habitica.ui.fragments; + + +import com.habitrpg.android.habitica.BuildConfig; +import com.habitrpg.android.habitica.R; +import com.habitrpg.android.habitica.ui.activities.MainActivity; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.Robolectric; +import org.robolectric.RobolectricGradleTestRunner; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; +import org.robolectric.util.ActivityController; + +import android.content.Intent; +import android.os.Build; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.support.v4.app.FragmentActivity; +import android.widget.LinearLayout; + +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + + +@Config(constants = BuildConfig.class, sdk = Build.VERSION_CODES.LOLLIPOP) +@RunWith(RobolectricGradleTestRunner.class) +abstract public class BaseFragmentTests { + + public F fragment; + private ActivityController activityController; + private FragmentControllerActivity activity; + + @Before + public void setUp() { + activityController = Robolectric.buildActivity(FragmentControllerActivity.class); + Intent intent = new Intent(RuntimeEnvironment.application, FragmentControllerActivity.class); + activity = activityController + .withIntent(intent) + .create() + .get(); + } + + @Test + public void fragmentLifecycleTest() throws Exception { + assertNull(this.fragment.getView()); + this.activity.getSupportFragmentManager().beginTransaction() + .add(R.id.frame_container, this.fragment).commit(); + + this.activityController.start().resume().visible(); + + assertNotNull(this.fragment.getView()); + } + + @After + public void tearDown() { + this.activityController.pause().stop().destroy(); + } + + private static class FragmentControllerActivity extends MainActivity { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + LinearLayout view = new LinearLayout(this); + view.setId(R.id.frame_container); + + setContentView(view); + } + + @Override + public void setActiveFragment(BaseMainFragment fragment) { + } + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragmentTest.java new file mode 100644 index 000000000..573e94e32 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/GemsPurchaseFragmentTest.java @@ -0,0 +1,10 @@ +package com.habitrpg.android.habitica.ui.fragments; + +public class GemsPurchaseFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new GemsPurchaseFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/NewsFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/NewsFragmentTest.java new file mode 100644 index 000000000..29c854b6e --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/NewsFragmentTest.java @@ -0,0 +1,10 @@ +package com.habitrpg.android.habitica.ui.fragments; + +public class NewsFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new NewsFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragmentTest.java new file mode 100644 index 000000000..873efb98f --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQDetailFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.faq; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class FAQDetailFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new FAQDetailFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragmentTest.java new file mode 100644 index 000000000..5f9c6537c --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/faq/FAQOverviewFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.faq; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class FAQOverviewFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new FAQOverviewFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java new file mode 100644 index 000000000..7fe0cac09 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarCustomizationFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.inventory.customization; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class AvatarCustomizationFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new AvatarCustomizationFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragmentTest.java new file mode 100644 index 000000000..e4d054146 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/customization/AvatarOverviewFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.inventory.customization; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class AvatarOverviewFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new AvatarOverviewFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragmentTest.java new file mode 100644 index 000000000..fe5358ee8 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentDetailFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.inventory.equipment; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class EquipmentDetailFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new EquipmentDetailFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java new file mode 100644 index 000000000..67b757028 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/equipment/EquipmentOverviewFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.inventory.equipment; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class EquipmentOverviewFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new EquipmentOverviewFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.java new file mode 100644 index 000000000..26165940f --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemRecyclerFragmentTest.java @@ -0,0 +1,15 @@ +package com.habitrpg.android.habitica.ui.fragments.inventory.items; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class ItemRecyclerFragmentTest extends BaseFragmentTests { + + public void setUp() { + super.setUp(); + this.fragment = new ItemRecyclerFragment(); + this.fragment.itemType = "eggs"; + this.fragment.isHatching = false; + this.fragment.isFeeding = false; + this.fragment.itemTypeText = ""; + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragmentTest.java new file mode 100644 index 000000000..6083f2a02 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/items/ItemsFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.inventory.items; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class ItemsFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new ItemsFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java new file mode 100644 index 000000000..20760a4e9 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/MountDetailRecyclerFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.inventory.stable; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class MountDetailRecyclerFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new MountDetailRecyclerFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java new file mode 100644 index 000000000..c0a286979 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/PetDetailRecyclerFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.inventory.stable; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class PetDetailRecyclerFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new PetDetailRecyclerFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragmentTest.java new file mode 100644 index 000000000..5b1d96a30 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.inventory.stable; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class StableFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new StableFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragmentTest.java new file mode 100644 index 000000000..302bbcfc1 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/inventory/stable/StableRecyclerFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.inventory.stable; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class StableRecyclerFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new StableRecyclerFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragmentTest.java new file mode 100644 index 000000000..8e81e27cd --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.skills; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class SkillsFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new SkillsFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsTaskRecyclerViewFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsTaskRecyclerViewFragmentTest.java new file mode 100644 index 000000000..4d24d3c92 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/skills/SkillsTaskRecyclerViewFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.skills; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class SkillsTaskRecyclerViewFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new SkillTasksRecyclerViewFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragmentTest.java new file mode 100644 index 000000000..ee3e67999 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/ChatListFragmentTest.java @@ -0,0 +1,13 @@ +package com.habitrpg.android.habitica.ui.fragments.social; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; +import com.habitrpg.android.habitica.ui.fragments.social.ChatListFragment; + +public class ChatListFragmentTest extends BaseFragmentTests { + + public void setUp() { + super.setUp(); + this.fragment = new ChatListFragment(); + this.fragment.isTavern = false; + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragmentTest.java new file mode 100644 index 000000000..a20ef0344 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GroupInformationFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.social; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class GroupInformationFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new GroupInformationFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragmentTest.java new file mode 100644 index 000000000..304d9e549 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GuildFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.social; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class GuildFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new GuildFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragmentTest.java new file mode 100644 index 000000000..f0af6383c --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/GuildsOverviewFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.social; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class GuildsOverviewFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new GuildsOverviewFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragmentTest.java new file mode 100644 index 000000000..f2d122b39 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/PublicGuildsFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.social; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class PublicGuildsFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new PublicGuildsFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragmentTest.java new file mode 100644 index 000000000..67aa97cb8 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/TavernFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.social; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class TavernFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new TavernFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragmentTest.java new file mode 100644 index 000000000..24e3fa22f --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.social.party; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class PartyFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new PartyFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragmentTest.java new file mode 100644 index 000000000..656db405e --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyInviteFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.social.party; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class PartyInviteFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new PartyInviteFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragmentTest.java new file mode 100644 index 000000000..0f1d419b5 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/social/party/PartyMemberListFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.social.party; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class PartyMemberListFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new PartyMemberListFragment(); + } +} diff --git a/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragmentTest.java b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragmentTest.java new file mode 100644 index 000000000..2545dfee4 --- /dev/null +++ b/Habitica/src/test/java/com/habitrpg/android/habitica/ui/fragments/tasks/TasksFragmentTest.java @@ -0,0 +1,12 @@ +package com.habitrpg.android.habitica.ui.fragments.tasks; + +import com.habitrpg.android.habitica.ui.fragments.BaseFragmentTests; + +public class TasksFragmentTest extends BaseFragmentTests { + + @Override + public void setUp() { + super.setUp(); + this.fragment = new TasksFragment(); + } +} diff --git a/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializerTest.java b/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializerTest.java index 3d9dd1279..7bcc30a03 100644 --- a/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializerTest.java +++ b/Habitica/src/test/java/com/magicmicky/habitrpgwrapper/lib/utils/DateDeserializerTest.java @@ -51,7 +51,7 @@ public class DateDeserializerTest { } }; - this.referenceTimestamp = new Long("1443445200000"); + this.referenceTimestamp = Long.valueOf("1443445200000"); } @Test