major style revamp

app/build.gradle

@@ -1,15 +1,15 @@
 apply plugin: 'com.android.application'
 
 android {
- compileSdkVersion 22
- buildToolsVersion "22.0.1"
+ compileSdkVersion 23
+ buildToolsVersion "23.0.1"
 
  defaultConfig {
  applicationId "com.adonai.manman"
  minSdkVersion 14
  targetSdkVersion 22
- versionCode 131
- versionName "1.3.1"
+ versionCode 140
+ versionName "1.4.0"
  }
 
  signingConfigs {
@@ -53,12 +53,14 @@ android {
 
 dependencies {
  compile fileTree(dir: 'libs', include: ['*.jar'])
- compile 'com.android.support:support-v4:22.2.1' // support library (ViewPager etc.)
- compile "com.android.support:appcompat-v7:22.2.1" // support library (material design)
+ compile 'com.android.support:support-v4:23.2.1' // support library (ViewPager etc.)
+ compile 'com.android.support:appcompat-v7:23.2.1' // support library (material design)
+ compile 'com.android.support:cardview-v7:23.2.1' // support library (material design)
+ compile 'com.android.support:design:23.2.1' // support library (material design)
  compile 'com.astuetz:pagerslidingtabstrip:1.0.1' // header tabs bar
  compile 'com.github.castorflex.smoothprogressbar:library:1.1.0' // progressbar on chapter load
  compile 'com.j256.ormlite:ormlite-android:4.48' // ORM for man pages
- compile 'com.google.code.gson:gson:2.3.1'  // Json (De)Serializer
+ compile 'com.google.code.gson:gson:2.6.2' // Json (De)Serializer
  compile 'org.jsoup:jsoup:1.8.3' // html DOM parser
  compile 'org.ccil.cowan.tagsoup:tagsoup:1.2.1' // html SAX parser
  compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3' // file encoding detector

app/src/main/assets/css/green.css

@@ -24,7 +24,7 @@ button,html,input,select,textarea{
 body{
  margin: 5pt;
  background-color: #000000;
- color: #00ff00;
+ color: #00cc00;
 }
 
 .in-doc{
@@ -231,7 +231,7 @@ var{
 }
 
 a h2, a h3{
- color:#ccc
+ color:#00ff00
 }
 
 a{

app/src/main/java/com/adonai/manman/MainPagerActivity.java

@@ -4,15 +4,19 @@
 import android.app.AlertDialog;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
 import android.support.annotation.NonNull;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentPagerAdapter;
 import android.support.v4.content.LocalBroadcastManager;
+import android.support.v4.graphics.drawable.DrawableCompat;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -28,7 +32,7 @@
  * @author Adonai
  */
 @SuppressWarnings("FieldCanBeLocal")
-public class MainPagerActivity extends ActionBarActivity {
+public class MainPagerActivity extends AppCompatActivity {
 
  public static String FOLDER_LIST_KEY = "folder.list";
 
@@ -43,6 +47,7 @@ public class MainPagerActivity extends ActionBarActivity {
  public final static String BACK_BUTTON_NOTIFY = "back.button.pressed";
 
  private ViewPager mPager;
+ private Toolbar mActionBar;
  private DonateHelper mDonateHelper;
 
  @Override
@@ -59,6 +64,9 @@ protected void onCreate(Bundle savedInstanceState) {
  super.onCreate(savedInstanceState);
  setContentView(R.layout.activity_main_pager);
 
+ mActionBar = (Toolbar) findViewById(R.id.app_toolbar);
+ setSupportActionBar(mActionBar);
+
  mPager = (ViewPager) findViewById(R.id.page_holder);
  mPager.setAdapter(new ManFragmentPagerAdapter(getSupportFragmentManager()));
  PagerSlidingTabStrip tabs = (PagerSlidingTabStrip) findViewById(R.id.tabs);
@@ -160,7 +168,7 @@ private void showAbout() {
  // Inflate the about message contents
  View messageView = getLayoutInflater().inflate(R.layout.about_dialog, null, false);
  AlertDialog.Builder builder = new AlertDialog.Builder(this);
- builder.setIcon(R.drawable.ic_launcher_small);
+ builder.setIcon(R.drawable.ic_launcher_notification_icon);
  builder.setTitle(R.string.app_name);
  builder.setView(messageView);
  builder.create();

app/src/main/java/com/adonai/manman/ManChaptersFragment.java

@@ -39,11 +39,6 @@
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.DefaultHttpClient;
 import org.ccil.cowan.tagsoup.Parser;
 import org.xml.sax.InputSource;
 

app/src/main/java/com/adonai/manman/ManLocalArchiveFragment.java

@@ -9,9 +9,6 @@
 import android.support.v4.app.LoaderManager;
 import android.support.v4.content.Loader;
 import android.view.LayoutInflater;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.AdapterView;
@@ -105,22 +102,6 @@ public void onDestroyView() {
  mPreferences.unregisterOnSharedPreferenceChangeListener(this);
  }
 
- @Override
- public void onCreateOptionsMenu(Menu menu, MenuInflater inflater) {
- super.onCreateOptionsMenu(menu, inflater);
- inflater.inflate(R.menu.local_archive_fragment_menu, menu);
- }
-
- @Override
- public boolean onOptionsItemSelected(MenuItem item) {
- switch (item.getItemId()) {
- case R.id.folder_settings:
- showFolderSettingsDialog();
- return true;
- }
- return super.onOptionsItemSelected(item);
- }
-
  private void showFolderSettingsDialog() {
  new FolderChooseFragment().show(getFragmentManager(), "FolderListFragment");
  }

app/src/main/java/com/adonai/manman/ManPageSearchFragment.java

@@ -43,28 +43,12 @@
 import com.squareup.okhttp.Request;
 import com.squareup.okhttp.Response;
 
-import org.apache.http.HttpResponse;
-import org.apache.http.HttpStatus;
-import org.apache.http.client.methods.HttpGet;
-import org.apache.http.client.methods.HttpUriRequest;
-import org.apache.http.impl.client.DefaultHttpClient;
-import org.apache.http.util.EntityUtils;
-
-import java.io.BufferedInputStream;
-import java.io.BufferedReader;
 import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.StringReader;
-import java.net.URL;
 import java.net.URLEncoder;
-import java.nio.charset.Charset;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import javax.net.ssl.HttpsURLConnection;
-
 
 /**
  * Fragment to show search results in a handy list view
@@ -393,7 +377,7 @@ public void run() {
  @SuppressLint("SetJavaScriptEnabled")
  @Override
  public void run() {
- descriptionRequest.setImageResource(R.drawable.ic_menu_moreoverflow_normal_holo);
+ descriptionRequest.setImageResource(R.drawable.abc_ic_menu_moreoverflow_mtrl_alpha);
  description.getSettings().setJavaScriptEnabled(true);
  String styledHtml = Utils.getWebWithCss(getActivity(), descAnswer.getUrl(), descAnswer.getHtmlDescription());
  description.loadDataWithBaseURL(descAnswer.getUrl(), styledHtml, "text/html", "UTF-8", descAnswer.getUrl());
@@ -409,7 +393,7 @@ public void run() {
  @Override
  public void run() {
  Toast.makeText(getActivity(), R.string.connection_error, Toast.LENGTH_SHORT).show();
- descriptionRequest.setImageResource(R.drawable.ic_menu_moreoverflow_normal_holo);
+ descriptionRequest.setImageResource(R.drawable.abc_ic_menu_moreoverflow_mtrl_alpha);
  }
  });
  }

app/src/main/res/layout/activity_main_pager.xml

@@ -1,27 +1,45 @@
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:custom="http://schemas.android.com/apk/res-auto"
- android:id="@+id/replacer" 
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:custom="http://schemas.android.com/apk/res-auto"
+ android:orientation="vertical"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
 
- <LinearLayout 
- android:orientation="vertical"
+ <android.support.v7.widget.Toolbar
+ android:id="@+id/app_toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:theme="?attr/actionbar_theme"
+ custom:elevation="4dp"
+ custom:popupTheme="?attr/this_theme"/>
+
+ <FrameLayout
+ android:id="@+id/replacer"
  android:layout_width="match_parent"
  android:layout_height="match_parent">
-
- <com.astuetz.PagerSlidingTabStrip
- android:id="@+id/tabs"
- android:layout_width="match_parent"
- android:layout_height="48dip"
- custom:pstsShouldExpand="true"
- custom:pstsDividerColor="?attr/semi_transparent_divider_color"/>
-
- <android.support.v4.view.ViewPager
- android:layout_height="match_parent"
+
+ <LinearLayout
+ android:orientation="vertical"
  android:layout_width="match_parent"
- android:paddingTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:id="@+id/page_holder"/>
- </LinearLayout>
-
-</FrameLayout>
+ android:layout_height="match_parent">
+
+ <com.astuetz.PagerSlidingTabStrip
+ android:id="@+id/tabs"
+ android:layout_width="match_parent"
+ android:layout_height="48dip"
+ custom:pstsShouldExpand="true"
+ custom:pstsDividerColor="?attr/semi_transparent_divider_color"/>
+
+ <android.support.v4.view.ViewPager
+ android:layout_height="match_parent"
+ android:layout_width="match_parent"
+ android:paddingTop="@dimen/activity_vertical_margin"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:id="@+id/page_holder"/>
+
+ </LinearLayout>
+
+ </FrameLayout>
+
+</LinearLayout>