Import of Biohazard's work

android/build.gradle

@@ -3,8 +3,8 @@ apply plugin: 'crashlytics'
 apply plugin: 'newrelic'
 
 android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.2'
+    compileSdkVersion 22
+    buildToolsVersion '22.0.1'
 
     lintOptions {
         abortOnError false
@@ -25,7 +25,7 @@ android {
     defaultConfig {
         applicationId 'com.xda.one'
         minSdkVersion 14
-        targetSdkVersion 21
+        targetSdkVersion 22
     }
 
     buildTypes {
@@ -56,38 +56,38 @@ android {
 }
 
 dependencies {
-    compile 'com.google.android.gms:play-services-plus:6.5.+'
-    compile 'com.google.android.gms:play-services-identity:6.5.+'
+    compile 'com.google.android.gms:play-services-plus:7.0.0'
+    compile 'com.google.android.gms:play-services-identity:7.0.0'
+    compile 'com.google.android.gms:play-services-analytics:7.0.0'
 
     compile 'com.crashlytics.android:crashlytics:1.+'
 
-    compile 'com.android.support:support-v4:21.0.3'
-    compile 'com.android.support:appcompat-v7:21.0.3'
-    compile 'com.android.support:cardview-v7:21.0.3'
-    compile 'com.android.support:recyclerview-v7:21.0.3'
+    compile 'com.android.support:support-v4:22.1.0'
+    compile 'com.android.support:appcompat-v7:22.1.0'
+    compile 'com.android.support:cardview-v7:22.1.0'
+    compile 'com.android.support:recyclerview-v7:22.1.0'
 
-    compile 'com.squareup.retrofit:retrofit:1.8.0'
-    compile 'com.squareup.retrofit:converter-jackson:1.8.0'
-    compile 'com.squareup.picasso:picasso:2.4.0'
+    compile 'com.squareup.retrofit:retrofit:1.9.0'
+    compile 'com.squareup.retrofit:converter-jackson:1.9.0'
+    compile 'com.squareup.picasso:picasso:2.5.2'
 
-    compile 'com.fasterxml.jackson.core:jackson-databind:2.5.0-rc1'
-    compile 'com.fasterxml.jackson.core:jackson-core:2.5.0-rc1'
-    compile 'com.fasterxml.jackson.core:jackson-annotations:2.5.0-rc1'
+    compile 'com.fasterxml.jackson.core:jackson-annotations:2.5.2'
+    compile 'com.fasterxml.jackson.core:jackson-core:2.5.2'
+    compile 'com.fasterxml.jackson.core:jackson-databind:2.5.2'
 
-    compile 'com.squareup:otto:1.3.5'
+    compile 'com.squareup:otto:1.3.6'
 
     compile 'net.nightwhistler.htmlspanner:htmlspanner:0.5-SNAPSHOT'
-
-    compile 'com.makeramen:roundedimageview:1.3.0'
-    compile 'me.grantland:autofittextview:0.2.0'
+    compile 'com.makeramen:roundedimageview:2.0.1'
+    compile 'me.grantland:autofittextview:0.2.1'
     compile 'com.github.dmytrodanylyk.circular-progress-button:library:1.1.3'
 
-    compile 'org.apache.commons:commons-lang3:3.3.2'
+    compile 'org.apache.commons:commons-lang3:3.4'
     compile 'commons-io:commons-io:2.4'
 
-    compile 'com.newrelic.agent.android:android-agent:4.+'
+    compile 'com.newrelic.agent.android:android-agent:4.273.4'
 
-    compile fileTree(dir: 'libs', include: '*.jar')
+    compile fileTree(include: '*.jar', dir: 'libs')
 }
 
 def Properties props = new Properties()
@@ -108,4 +108,4 @@ if (propFile.canRead()) {
 } else {
     println 'signing.properties not found'
     android.buildTypes.release.signingConfig = null
-}
+}

android/src/main/java/com/xda/one/auth/XDAAuthenticatorActivity.java

@@ -1,14 +1,12 @@
 package com.xda.one.auth;
 
-import com.xda.one.R;
-
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AppCompatActivity;
 
-public class XDAAuthenticatorActivity extends FragmentActivity {
+import com.xda.one.R;
 
-    private final String SCREEN_NAME = "XDAAuthenticatorActivity";
+public class XDAAuthenticatorActivity extends AppCompatActivity {
 
     @Override
     public void onCreate(final Bundle savedInstanceState) {

android/src/main/java/com/xda/one/model/augmented/AugmentedUnifiedThread.java

@@ -1,16 +1,15 @@
 package com.xda.one.model.augmented;
 
+import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.Spannable;
+
 import com.xda.one.api.model.interfaces.UnifiedThread;
 import com.xda.one.api.model.response.ResponseUnifiedThread;
 import com.xda.one.parser.ContentParser;
 import com.xda.one.parser.TextDataStructure;
 import com.xda.one.util.PostUtils;
-import com.xda.one.util.StringUtils;
-
-import android.content.Context;
-import android.os.Parcel;
-import android.os.Parcelable;
-import android.text.Spannable;
 
 public class AugmentedUnifiedThread implements UnifiedThread {
 
@@ -27,7 +26,7 @@ public AugmentedUnifiedThread[] newArray(int size) {
         }
     };
 
-    private static final int MAX_STRING_LENGTH = 100;
+    private static final int MAX_STRING_LENGTH = 200;
 
     private final UnifiedThread mUnifiedThread;
 

android/src/main/java/com/xda/one/ui/BaseActivity.java

@@ -3,8 +3,9 @@
 import com.xda.one.util.OneApplication;
 
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 
-public abstract class BaseActivity extends ActionBarActivity {
+public abstract class BaseActivity extends AppCompatActivity {
 
     public OneApplication getOneApplication() {
         return (OneApplication) super.getApplication();

android/src/main/java/com/xda/one/ui/FindYourDeviceAdapter.java

@@ -1,10 +1,5 @@
 package com.xda.one.ui;
 
-import com.squareup.picasso.Picasso;
-import com.xda.one.R;
-import com.xda.one.api.model.response.ResponseForum;
-import com.xda.one.db.ForumDbHelper;
-
 import android.content.Context;
 import android.database.Cursor;
 import android.support.v7.widget.RecyclerView;
@@ -14,6 +9,11 @@
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.squareup.picasso.Picasso;
+import com.xda.one.R;
+import com.xda.one.api.model.response.ResponseForum;
+import com.xda.one.db.ForumDbHelper;
+
 public class FindYourDeviceAdapter
         extends RecyclerView.Adapter<FindYourDeviceAdapter.FindYourDeviceViewHolder> {
 
@@ -48,8 +48,8 @@ public void onBindViewHolder(final FindYourDeviceViewHolder holder, final int po
 
         Picasso.with(mContext)
                 .load(forum.getImageUrl())
-                .placeholder(R.drawable.phone)
-                .error(R.drawable.phone)
+                .placeholder(R.drawable.ic_nav_phone)
+                .error(R.drawable.ic_nav_phone)
                 .into(holder.imageView);
     }
 

android/src/main/java/com/xda/one/ui/ForumFragment.java

@@ -1,5 +1,26 @@
 package com.xda.one.ui;
 
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.LoaderManager;
+import android.support.v4.content.Loader;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v4.view.ViewCompat;
+import android.support.v4.widget.SwipeRefreshLayout;
+import android.support.v7.app.ActionBar;
+import android.support.v7.view.ActionMode;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.ShareActionProvider;
+import android.support.v7.widget.XDALinerLayoutManager;
+import android.view.LayoutInflater;
+import android.view.Menu;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.Toast;
+
 import com.squareup.otto.Subscribe;
 import com.squareup.picasso.Picasso;
 import com.xda.one.R;
@@ -15,34 +36,15 @@
 import com.xda.one.loader.ForumLoader;
 import com.xda.one.model.misc.ForumType;
 import com.xda.one.ui.helper.ActionModeHelper;
+import com.xda.one.ui.helper.QuickReturnHelper;
+import com.xda.one.ui.widget.DividerItemDecoration;
 import com.xda.one.ui.widget.HierarchySpinnerAdapter;
 import com.xda.one.ui.widget.XDARefreshLayout;
 import com.xda.one.util.AccountUtils;
 import com.xda.one.util.FragmentUtils;
 import com.xda.one.util.UIUtils;
 import com.xda.one.util.Utils;
 
-import android.content.Intent;
-import android.os.Bundle;
-import android.support.v4.app.Fragment;
-import android.support.v4.app.LoaderManager;
-import android.support.v4.content.Loader;
-import android.support.v4.view.MenuItemCompat;
-import android.support.v4.view.ViewCompat;
-import android.support.v4.widget.SwipeRefreshLayout;
-import android.support.v7.app.ActionBar;
-import android.support.v7.view.ActionMode;
-import android.support.v7.widget.RecyclerView;
-import android.support.v7.widget.ShareActionProvider;
-import android.support.v7.widget.XDALinerLayoutManager;
-import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuItem;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.Toast;
-
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -70,7 +72,6 @@ public class ForumFragment extends Fragment
 
     private ForumType mForumType = ForumType.ALL;
 
-    // Adapter for ListView
     private ForumAdapter<Forum> mAdapter;
 
     private XDARefreshLayout mRefreshLayout;
@@ -94,7 +95,7 @@ public static ForumFragment createInstance(final ForumType forumType) {
     }
 
     public static ForumFragment createInstance(final Forum forum, final String parentTitle,
-            final ArrayList<String> hierarchy) {
+                                               final ArrayList<String> hierarchy) {
         final Bundle bundle = new Bundle();
         bundle.putSerializable(FORUM_TYPE, ForumType.CHILD);
         bundle.putParcelable(FORUM, forum);
@@ -154,7 +155,7 @@ public void setupImageViewDevice(ImageView imageView, Forum forum) {
                 new ForumAdapter.SubscribeButtonDelegate() {
                     @Override
                     public void setupSubscribeButton(ImageView subscribeButton,
-                            final Forum forum) {
+                                                     final Forum forum) {
                         // Subscribe button
                         onSetupSubscribeButton(subscribeButton, forum);
                     }
@@ -175,16 +176,16 @@ public void onClick(final View view) {
                 }
             });
             subscribeButton.setImageResource(forum.isSubscribed()
-                    ? R.drawable.ic_star_light
-                    : R.drawable.ic_star_outline_light);
+                    ? R.drawable.ic_star_outline_selected
+                    : R.drawable.ic_star_outline);
         }
     }
 
     private void onSetupImageViewListItem(final ImageView imageView, final Forum responseForum) {
         Picasso.with(getActivity())
                 .load(responseForum.getImageUrl())
-                .placeholder(R.drawable.phone)
-                .error(R.drawable.phone)
+                .placeholder(R.drawable.ic_nav_phone)
+                .error(R.drawable.ic_nav_phone)
                 .into(imageView);
     }
 
@@ -195,7 +196,7 @@ private void onListItemClicked(final Forum forum) {
 
     @Override
     public View onCreateView(final LayoutInflater inflater, final ViewGroup container,
-            final Bundle savedInstanceState) {
+                             final Bundle savedInstanceState) {
         return inflater.inflate(R.layout.forum_fragment, container, false);
     }
 
@@ -261,7 +262,7 @@ public Loader<List<ResponseForum>> onCreateLoader(final int id, final Bundle bun
 
     @Override
     public void onLoadFinished(final Loader<List<ResponseForum>> loader,
-            final List<ResponseForum> responseForums) {
+                               final List<ResponseForum> responseForums) {
         // Remove the old data if the adapter is not empty
         if (mAdapter.getItemCount() != 0) {
             mAdapter.clear();
@@ -360,7 +361,7 @@ public boolean onActionItemClicked(ActionMode actionMode, MenuItem menuItem) {
 
         @Override
         public void onCheckedStateChanged(final ActionMode actionMode, final int position,
-                final boolean isNowChecked) {
+                                          final boolean isNowChecked) {
             actionMode.invalidate();
         }
     }

android/src/main/java/com/xda/one/ui/ForumPagerFragment.java

@@ -4,10 +4,12 @@
 import com.xda.one.api.model.response.ResponseForum;
 import com.xda.one.db.ForumDbHelper;
 import com.xda.one.model.misc.ForumType;
+import com.xda.one.ui.helper.QuickReturnHelper;
 import com.xda.one.ui.widget.TabLayout;
 import com.xda.one.util.FragmentUtils;
 import com.xda.one.util.UIUtils;
 
+import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Context;
 import android.database.Cursor;
@@ -21,6 +23,7 @@
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
 import android.support.v7.widget.SearchView;
+import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.Menu;
@@ -206,4 +209,9 @@ public boolean onSuggestionClick(final int position) {
             return true;
         }
     }
+
+    public interface Callback {
+
+        Toolbar getToolbar();
+    }
 }