From 70fec9fa457f1b0f3b0a42fa1db968a2e796cce1 Mon Sep 17 00:00:00 2001 From: Keith Holliday Date: Fri, 24 Jun 2016 15:00:46 -0500 Subject: [PATCH] Removed extra code. Fixed Menu index --- Habitica/res/values/strings.xml | 3 --- .../ui/fragments/social/InboxMessageListFragment.java | 4 ---- .../habitrpg/android/habitica/ui/menu/MainDrawerBuilder.java | 4 ++-- 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index b00802a48..be0b94dc2 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -347,7 +347,4 @@ To start, which parts of your life do you want to improve? Open in play store Are you sure you want to change your class? This will cost 3 gems. Message from %1$s - - - Hello blank fragment diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java index 678b64102..907d6deb6 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/InboxMessageListFragment.java @@ -4,14 +4,10 @@ import android.os.Bundle; import android.support.v4.widget.SwipeRefreshLayout; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; -import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.LinearLayout; -import android.widget.TextView; -import com.google.common.collect.Lists; import com.habitrpg.android.habitica.HabiticaApplication; import com.habitrpg.android.habitica.R; import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback; 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 2670f327b..13a1c823c 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 @@ -33,7 +33,7 @@ public class MainDrawerBuilder { // Change the identificationIDs to the position IDs so that its easier to set the selected entry public static final int SIDEBAR_TASKS = 0; public static final int SIDEBAR_SKILLS = 1; - public static final int SIDEBAR_INBOX = 15; + public static final int SIDEBAR_INBOX = 2; public static final int SIDEBAR_TAVERN = 3; public static final int SIDEBAR_PARTY = 4; public static final int SIDEBAR_GUILDS = 5; @@ -46,7 +46,7 @@ public class MainDrawerBuilder { public static final int SIDEBAR_SETTINGS = 12; public static final int SIDEBAR_HELP = 13; public static final int SIDEBAR_ABOUT = 14; - + public static AccountHeaderBuilder CreateDefaultAccountHeader(final Activity activity) { return new AccountHeaderBuilder() .withActivity(activity)