diff --git a/Habitica/Habitica.iml b/Habitica/Habitica.iml
index 1974bce4c..6ef5aef95 100644
--- a/Habitica/Habitica.iml
+++ b/Habitica/Habitica.iml
@@ -70,7 +70,7 @@
-
+
@@ -79,13 +79,10 @@
-
-
-
@@ -110,11 +107,10 @@
-
+
-
@@ -126,12 +122,11 @@
-
-
+
@@ -145,9 +140,9 @@
-
-
+
+
@@ -165,8 +160,6 @@
-
-
diff --git a/Habitica/build.gradle b/Habitica/build.gradle
index 1d0ec30f5..75568385d 100644
--- a/Habitica/build.gradle
+++ b/Habitica/build.gradle
@@ -50,14 +50,13 @@ dependencies {
transitive = true
}
- compile('com.github.florent37:materialviewpager:1.1.0@aar') {
- transitive = true
- }
+ compile 'com.android.support:appcompat-v7:22.2.1'
+ compile 'com.android.support:design:22.2.1'
+ compile 'com.android.support:gridlayout-v7:22.2.1'
+ compile 'com.android.support:recyclerview-v7:22.2.1'
- compile 'com.android.support:appcompat-v7:22.2.+'
- compile 'com.android.support:design:22.2.+'
- compile 'com.android.support:gridlayout-v7:22.2.+'
- compile 'com.android.support:recyclerview-v7:22.2.+'
+ // Image Loading/Caching
+ compile 'com.squareup.picasso:picasso:2.5.2'
// Icons
compile 'com.mikepenz:iconics:1.1.0@aar'
diff --git a/Habitica/res/layout/activity_main.xml b/Habitica/res/layout/activity_main.xml
index eb5d84514..93c18f899 100644
--- a/Habitica/res/layout/activity_main.xml
+++ b/Habitica/res/layout/activity_main.xml
@@ -1,24 +1,84 @@
-
+ android:elevation="0dp"
+ tools:context=".MainActivity">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/Habitica/res/values/styles.xml b/Habitica/res/values/styles.xml
index 52b5eb4fe..c931f34b0 100644
--- a/Habitica/res/values/styles.xml
+++ b/Habitica/res/values/styles.xml
@@ -7,9 +7,11 @@
- @style/MyOwnListSeperatorTextViewStyle
- @android:color/white
+ - 0dp
+ - 0dp
+
- @null
- - @style/DrawerArrowStyle
- false
@@ -56,7 +58,7 @@
@@ -107,7 +109,6 @@
+
+
\ No newline at end of file
diff --git a/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
index 2f1a0e7ef..e7fa66bc8 100644
--- a/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/LoginActivity.java
@@ -346,7 +346,7 @@ public class LoginActivity extends AppCompatActivity
.make(this.findViewById(R.id.login_linear_layout), content, Snackbar.LENGTH_LONG);
View snackbarView = snackbar.getView();
- snackbarView.setBackgroundColor(getResources().getColor(R.color.red));//change Snackbar's background color;
+ snackbarView.setBackgroundColor(Color.RED);//change Snackbar's background color;
snackbar.show(); // Don’t forget to show!
}
diff --git a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
index 3e355f787..72c6d5e44 100644
--- a/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/MainActivity.java
@@ -4,8 +4,10 @@ import android.content.Intent;
import android.graphics.Color;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
+import android.support.design.widget.TabLayout;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import android.view.Gravity;
@@ -16,7 +18,6 @@ import android.widget.CompoundButton;
import com.crashlytics.android.Crashlytics;
import com.crashlytics.android.core.CrashlyticsCore;
-import com.github.florent37.materialviewpager.MaterialViewPager;
import com.habitrpg.android.habitica.callbacks.HabitRPGUserCallback;
import com.habitrpg.android.habitica.callbacks.TaskCreationCallback;
import com.habitrpg.android.habitica.callbacks.TaskScoringCallback;
@@ -79,10 +80,18 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
static final int TASK_UPDATED_RESULT = 2;
//region View Elements
- @InjectView(R.id.materialViewPager)
- MaterialViewPager materialViewPager;
+ @InjectView(R.id.viewpager)
+ ViewPager materialViewPager;
+ @InjectView(R.id.toolbar)
Toolbar toolbar;
+
+ @InjectView(R.id.detail_tabs)
+ TabLayout detail_tabs;
+
+ @InjectView(R.id.avatar_with_bars)
+ View avatar_with_bars;
+
Drawer drawer;
Drawer filterDrawer;
@@ -95,8 +104,6 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
private HostConfig hostConfig;
APIHelper mAPIHelper;
- android.support.v4.view.ViewPager viewPager;
-
// just to test the view
private HabitRPGUser User;
@@ -128,8 +135,6 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
return;
}
- toolbar = materialViewPager.getToolbar();
-
if (toolbar != null) {
setSupportActionBar(toolbar);
@@ -150,9 +155,9 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
View mPagerRootView = materialViewPager.getRootView();
- View avatarHeaderView = mPagerRootView.findViewById(R.id.avatar_with_bars_layout);
+ //View avatarHeaderView = mPagerRootView.findViewById(R.id.avatar_with_bars_layout);
- avatarInHeader = new AvatarWithBarsViewModel(this, avatarHeaderView);
+ avatarInHeader = new AvatarWithBarsViewModel(this, avatar_with_bars);
drawer = MainDrawerBuilder.CreateDefaultBuilderSettings(this, toolbar)
.withSelectedItem(0)
@@ -166,10 +171,9 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
.withCloseOnClick(false)
.append(drawer);
- viewPager = materialViewPager.getViewPager();
- viewPager.setOffscreenPageLimit(6);
+ materialViewPager.setOffscreenPageLimit(6);
- materialViewPager.getViewPager().setCurrentItem(0);
+ materialViewPager.setCurrentItem(0);
User = new Select().from(HabitRPGUser.class).where(Condition.column("id").eq(hostConfig.getUser())).querySingle();
this.observer = new FlowContentObserver();
@@ -213,7 +217,7 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
}
private void showSnackbar(String content, boolean negative) {
- Fragment f = ViewFragmentsDictionary.get(materialViewPager.getViewPager().getCurrentItem());
+ Fragment f = ViewFragmentsDictionary.get(materialViewPager.getCurrentItem());
Snackbar snackbar = Snackbar.make(f.getView().findViewById(R.id.fab), content, Snackbar.LENGTH_LONG);
@@ -221,7 +225,7 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
View snackbarView = snackbar.getView();
//change Snackbar's background color;
- snackbarView.setBackgroundColor(getResources().getColor(R.color.red));
+ snackbarView.setBackgroundColor(Color.RED);
}
snackbar.show();
@@ -392,7 +396,7 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
public void loadTaskLists() {
android.support.v4.app.FragmentManager fragmentManager = getSupportFragmentManager();
- viewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
+ materialViewPager.setAdapter(new FragmentPagerAdapter(fragmentManager) {
int oldPosition = -1;
@@ -448,7 +452,9 @@ public class MainActivity extends InstabugAppCompatActivity implements HabitRPGU
}
});
- materialViewPager.getPagerTitleStrip().setViewPager(viewPager);
+
+ detail_tabs.setupWithViewPager(materialViewPager);
+
}
diff --git a/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java b/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
index c2b3a2061..c439e6c38 100644
--- a/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
+++ b/Habitica/src/com/habitrpg/android/habitica/TavernActivity.java
@@ -1,5 +1,6 @@
package com.habitrpg.android.habitica;
+import android.graphics.Color;
import android.os.Bundle;
import android.support.design.widget.Snackbar;
import android.support.v4.widget.SwipeRefreshLayout;
@@ -119,7 +120,7 @@ public class TavernActivity extends AppCompatActivity implements Callback classType, boolean showFloatingButton) {
this.classType = classType;
this.showFloatingButton = showFloatingButton;
- mAdapter = new RecyclerViewMaterialAdapter(adapter);
- adapter.setParentAdapter(mAdapter);
+ mAdapter = adapter;
}
private View view;
@@ -59,8 +55,8 @@ public class TaskRecyclerViewFragment extends Fragment implements View.OnClickLi
@Override
public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
- if (alreadyCreated)
- return;
+ //if (alreadyCreated)
+ // return;
mRecyclerView = (RecyclerView) view.findViewById(R.id.recyclerView);
@@ -86,12 +82,10 @@ public class TaskRecyclerViewFragment extends Fragment implements View.OnClickLi
mRecyclerView.setLayoutManager(layoutManager);
}
- layoutManager.setSmoothScrollbarEnabled(true);
+ //layoutManager.setSmoothScrollbarEnabled(true);
mRecyclerView.setAdapter(mAdapter);
- MaterialViewPagerHelper.registerRecyclerView(getActivity(), mRecyclerView, null);
-
alreadyCreated = true;
}