ActionBar に Spinner いれようと思ってたけどやめたので AppCompat / Toolbar を使う必要がなくなった

20 files changed, 133 insertions, 280 deletions

diff --git a/app/app.iml b/app/app.iml
index 0e051978..667fde3c 100644
--- a/app/app.iml
+++ b/app/app.iml
@@ -70,7 +70,6 @@
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v13/23.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.0.1/jars" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.navercorp.pulltorefresh/library/3.3.0-SNAPSHOT/jars" />
@@ -92,18 +91,17 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" name="library-1.0.19" level="project" />
-    <orderEntry type="library" exported="" name="guava-19.0-rc2" level="project" />
-    <orderEntry type="library" exported="" name="library-3.3.0-SNAPSHOT" level="project" />
-    <orderEntry type="library" exported="" name="activeandroid-3.1.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="twitter4j-stream-4.0.4" level="project" />
+    <orderEntry type="library" exported="" name="library-1.0.19" level="project" />
     <orderEntry type="library" exported="" name="twitter-text-1.13.0" level="project" />
+    <orderEntry type="library" exported="" name="guava-19.0-rc2" level="project" />
     <orderEntry type="library" exported="" name="crouton-1.8.5" level="project" />
     <orderEntry type="library" exported="" name="twitter4j-media-support-4.0.4" level="project" />
     <orderEntry type="library" exported="" name="support-v13-23.0.1" level="project" />
+    <orderEntry type="library" exported="" name="library-3.3.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" exported="" name="activeandroid-3.1.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" name="support-v4-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="twitter4j-core-4.0.4" level="project" />
-    <orderEntry type="library" exported="" name="appcompat-v7-23.0.1" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-23.0.1" level="project" />
   </component>
 </module>
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index cc71af8d..41078765 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -42,7 +42,6 @@ dependencies {
     compile fileTree(include: ['*.jar'], dir: 'libs')
     compile 'com.android.support:support-v4:23.0.1'
     compile 'com.android.support:support-v13:23.0.1'
-    compile 'com.android.support:appcompat-v7:23.0.1'
     // volley
     compile 'com.mcxiaoke.volley:library:1.0.19'
     // ActiveAndroid
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java
index 32cb49ea..901e372d 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditCommandActivity.java
@@ -24,10 +24,9 @@
 
 package net.lacolaco.smileessence.activity;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.widget.ListView;
@@ -44,7 +43,7 @@ import net.lacolaco.smileessence.viewmodel.CheckBoxModel;
 import java.util.ArrayList;
 import java.util.List;
 
-public class EditCommandActivity extends AppCompatActivity {
+public class EditCommandActivity extends Activity {
 
     // ------------------------------ FIELDS ------------------------------
 
@@ -88,10 +87,6 @@ public class EditCommandActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.layout_edit_list);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
         initializeViews();
         Logger.debug("onCreate");
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java
index 584c4c7c..8d8a36da 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditExtractionActivity.java
@@ -24,10 +24,9 @@
 
 package net.lacolaco.smileessence.activity;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.SparseBooleanArray;
 import android.view.*;
@@ -44,7 +43,7 @@ import net.lacolaco.smileessence.view.dialog.EditTextDialogFragment;
 
 import java.util.List;
 
-public class EditExtractionActivity extends AppCompatActivity implements AdapterView.OnItemClickListener,
+public class EditExtractionActivity extends Activity implements AdapterView.OnItemClickListener,
         AbsListView.MultiChoiceModeListener {
 
     // ------------------------------ FIELDS ------------------------------
@@ -116,10 +115,6 @@ public class EditExtractionActivity extends AppCompatActivity implements Adapter
         super.onCreate(savedInstanceState);
         setContentView(R.layout.layout_edit_list);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
         initializeViews();
         Logger.debug("onCreate");
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java
index 7195b0cf..58ee1d8a 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditTabActivity.java
@@ -24,10 +24,9 @@
 
 package net.lacolaco.smileessence.activity;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.widget.ListView;
 import net.lacolaco.smileessence.Application;
@@ -41,7 +40,7 @@ import net.lacolaco.smileessence.viewmodel.EditableCheckBoxModel;
 import java.util.ArrayList;
 import java.util.List;
 
-public class EditTabActivity extends AppCompatActivity {
+public class EditTabActivity extends Activity {
 
     // ------------------------------ FIELDS ------------------------------
 
@@ -92,10 +91,6 @@ public class EditTabActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.layout_edit_list);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
         initializeViews();
         Logger.debug("onCreate");
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java
index 15d63929..44dfff4d 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/EditTemplateActivity.java
@@ -24,10 +24,9 @@
 
 package net.lacolaco.smileessence.activity;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.SparseBooleanArray;
 import android.view.*;
@@ -44,7 +43,7 @@ import net.lacolaco.smileessence.view.dialog.EditTextDialogFragment;
 
 import java.util.List;
 
-public class EditTemplateActivity extends AppCompatActivity implements AdapterView.OnItemClickListener,
+public class EditTemplateActivity extends Activity implements AdapterView.OnItemClickListener,
         AbsListView.MultiChoiceModeListener {
 
     // ------------------------------ FIELDS ------------------------------
@@ -116,10 +115,6 @@ public class EditTemplateActivity extends AppCompatActivity implements AdapterVi
         super.onCreate(savedInstanceState);
         setContentView(R.layout.layout_edit_list);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
         initializeViews();
         Logger.debug("onCreate");
     }
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.java
index d14ef80c..53946bd4 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/LicenseActivity.java
@@ -24,10 +24,9 @@
 
 package net.lacolaco.smileessence.activity;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.widget.LinearLayout;
 import android.widget.TextView;
@@ -37,7 +36,7 @@ import net.lacolaco.smileessence.R;
 import java.util.ArrayList;
 import java.util.List;
 
-public class LicenseActivity extends AppCompatActivity {
+public class LicenseActivity extends Activity {
 
     // --------------------- GETTER / SETTER METHODS ---------------------
 
@@ -65,10 +64,6 @@ public class LicenseActivity extends AppCompatActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.layout_license);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
         setFiles();
     }
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
index ce849742..d1e45509 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/MainActivity.java
@@ -24,26 +24,23 @@
 
 package net.lacolaco.smileessence.activity;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.support.v4.view.ViewPager;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.WindowManager;
-import android.widget.TextView;
-import com.android.volley.toolbox.NetworkImageView;
+import android.widget.ImageView;
 import net.lacolaco.smileessence.Application;
 import net.lacolaco.smileessence.BuildConfig;
 import net.lacolaco.smileessence.IntentRouter;
 import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.command.CommandOpenURL;
-import net.lacolaco.smileessence.data.ImageCache;
 import net.lacolaco.smileessence.data.PostState;
 import net.lacolaco.smileessence.entity.*;
 import net.lacolaco.smileessence.logging.Logger;
@@ -54,6 +51,7 @@ import net.lacolaco.smileessence.preference.UserPreferenceHelper;
 import net.lacolaco.smileessence.twitter.UserStreamListener;
 import net.lacolaco.smileessence.twitter.task.ShowUserTask;
 import net.lacolaco.smileessence.util.BitmapOptimizer;
+import net.lacolaco.smileessence.util.BitmapURLTask;
 import net.lacolaco.smileessence.util.NetworkHelper;
 import net.lacolaco.smileessence.util.UIHandler;
 import net.lacolaco.smileessence.view.*;
@@ -61,7 +59,7 @@ import net.lacolaco.smileessence.view.adapter.PageListAdapter;
 import net.lacolaco.smileessence.view.dialog.ConfirmDialogFragment;
 import twitter4j.TwitterStream;
 
-public class MainActivity extends AppCompatActivity {
+public class MainActivity extends Activity {
 
     // ------------------------------ FIELDS ------------------------------
 
@@ -357,18 +355,13 @@ public class MainActivity extends AppCompatActivity {
         startStream();
         MuteUserIds.refresh(account);
         account.refreshListSubscriptions();
-        
-        getSupportActionBar().setDisplayShowTitleEnabled(false);
-        final TextView toolbarTitle = (TextView) findViewById(R.id.toolbar_text);
-        final NetworkImageView iconImageView = (NetworkImageView) findViewById(R.id.toolbar_icon);
+
+        final ImageView iconImageView = (ImageView) findViewById(android.R.id.home);
 
         Runnable update = () -> {
-            toolbarTitle.setText(account.getUser().getScreenName());
-            String oldUrl = iconImageView.getImageURL();
+            getActionBar().setTitle(user.getScreenName());
             String newUrl = user.getProfileImageUrl();
-            if (newUrl != null && (oldUrl == null || !oldUrl.equals(newUrl))) {
-                ImageCache.getInstance().setImageToView(newUrl, iconImageView);
-            }
+            new BitmapURLTask(newUrl, iconImageView).execute();
         };
 
         update.run();
@@ -414,11 +407,10 @@ public class MainActivity extends AppCompatActivity {
     }
 
     public void initializeView() {
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-
         viewPager = (ViewPager) findViewById(R.id.viewPager);
         pagerAdapter = new PageListAdapter(this, viewPager);
+        ImageView iconImageView = (ImageView) findViewById(android.R.id.home);
+        iconImageView.setScaleType(ImageView.ScaleType.FIT_CENTER);
         initializePages();
     }
 
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java
index 508c3b83..792aef87 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/ManageAccountsActivity.java
@@ -24,11 +24,10 @@
 
 package net.lacolaco.smileessence.activity;
 
+import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.*;
 import android.widget.*;
 import net.lacolaco.smileessence.Application;
@@ -43,7 +42,7 @@ import net.lacolaco.smileessence.view.dialog.ConfirmDialogFragment;
 import java.util.ArrayList;
 import java.util.List;
 
-public class ManageAccountsActivity extends AppCompatActivity implements AdapterView.OnItemClickListener, AbsListView.OnItemLongClickListener {
+public class ManageAccountsActivity extends Activity implements AdapterView.OnItemClickListener, AbsListView.OnItemLongClickListener {
     public static final int REQUEST_OAUTH = 10;
     private EditAccountsAdapter adapter;
 
@@ -53,10 +52,6 @@ public class ManageAccountsActivity extends AppCompatActivity implements Adapter
         super.onCreate(savedInstanceState);
         setContentView(R.layout.layout_edit_list);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
         ListView listView = (ListView) findViewById(R.id.listview_edit_list);
         adapter = new EditAccountsAdapter();
         listView.setAdapter(adapter);
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.java
index 6672843d..86883825 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/OAuthActivity.java
@@ -24,10 +24,9 @@
 
 package net.lacolaco.smileessence.activity;
 
+import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.text.Editable;
 import android.text.TextUtils;
 import android.text.TextWatcher;
@@ -40,7 +39,7 @@ import net.lacolaco.smileessence.notification.Notificator;
 import net.lacolaco.smileessence.twitter.OAuthSession;
 import twitter4j.auth.AccessToken;
 
-public class OAuthActivity extends AppCompatActivity implements View.OnClickListener, TextWatcher {
+public class OAuthActivity extends Activity implements View.OnClickListener, TextWatcher {
 
     private TextView linkTextView;
     private EditText pinEditText;
@@ -52,10 +51,6 @@ public class OAuthActivity extends AppCompatActivity implements View.OnClickList
         super.onCreate(savedInstanceState);
         setContentView(R.layout.layout_oauth);
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
         linkTextView = (TextView) findViewById(R.id.textView_oauth_link);
         pinEditText = (EditText) findViewById(R.id.editText_oauth_pin);
         pinEditText.addTextChangedListener(this);
diff --git a/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.java b/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.java
index ab383bb5..2cd63e49 100644
--- a/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.java
+++ b/app/src/main/java/net/lacolaco/smileessence/activity/SettingActivity.java
@@ -24,15 +24,14 @@
 
 package net.lacolaco.smileessence.activity;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
-import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import net.lacolaco.smileessence.Application;
 import net.lacolaco.smileessence.R;
 
-public class SettingActivity extends AppCompatActivity {
+public class SettingActivity extends Activity {
 
     // ------------------------ OVERRIDE METHODS ------------------------
 
@@ -41,10 +40,6 @@ public class SettingActivity extends AppCompatActivity {
         setTheme(Application.getThemeResId());
         super.onCreate(savedInstanceState);
         setContentView(R.layout.layout_setting);
-
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
-        setSupportActionBar(toolbar);
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
     }
 
     @Override
diff --git a/app/src/main/java/net/lacolaco/smileessence/notification/Notificator.java b/app/src/main/java/net/lacolaco/smileessence/notification/Notificator.java
index 435496ad..ef2e0868 100644
--- a/app/src/main/java/net/lacolaco/smileessence/notification/Notificator.java
+++ b/app/src/main/java/net/lacolaco/smileessence/notification/Notificator.java
@@ -29,7 +29,6 @@ import android.widget.Toast;
 import de.keyboardsurfer.android.widget.crouton.Configuration;
 import de.keyboardsurfer.android.widget.crouton.Crouton;
 import de.keyboardsurfer.android.widget.crouton.Style;
-import net.lacolaco.smileessence.R;
 import net.lacolaco.smileessence.logging.Logger;
 import net.lacolaco.smileessence.util.UIHandler;
 
@@ -73,7 +72,7 @@ public class Notificator {
         new UIHandler().post(() -> {
             if (isForeground) {
                 Logger.debug(String.format("notify by crouton %s", text));
-                Crouton.makeText(activity, text, getStyle(type), R.id.main_layout).show();
+                Crouton.makeText(activity, text, getStyle(type)).show();
             } else {
                 Logger.debug(String.format("notify by toast %s", text));
                 Toast.makeText(activity, text, Toast.LENGTH_LONG).show();
diff --git a/app/src/main/res/layout/layout_edit_list.xml b/app/src/main/res/layout/layout_edit_list.xml
index 396fb732..316a42ad 100644
--- a/app/src/main/res/layout/layout_edit_list.xml
+++ b/app/src/main/res/layout/layout_edit_list.xml
@@ -24,33 +24,18 @@
   ~ SOFTWARE.
   -->
 
-<LinearLayout
+<FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
+    <ListView
+            android:id="@+id/listview_edit_list"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            android:layout_height="match_parent"
+            android:fastScrollEnabled="true">
 
-    <FrameLayout
-            android:id="@+id/main_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <ListView
-                android:id="@+id/listview_edit_list"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:fastScrollEnabled="true">
-
-        </ListView>
-
-    </FrameLayout>
+    </ListView>
 
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_license.xml b/app/src/main/res/layout/layout_license.xml
index aa2fcbe7..562715aa 100644
--- a/app/src/main/res/layout/layout_license.xml
+++ b/app/src/main/res/layout/layout_license.xml
@@ -23,78 +23,63 @@
   ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   ~ SOFTWARE.
   -->
-<LinearLayout
+<FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
+    <ScrollView
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            android:layout_height="match_parent"
+            android:orientation="vertical">
 
-    <FrameLayout
-            android:id="@+id/main_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <ScrollView
+        <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical">
+                android:layout_height="wrap_content"
+                android:orientation="vertical"
+                android:padding="10dp">
+
+
+            <TextView
+                    android:id="@+id/textView"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left|center_vertical"
+                    android:text="@string/notices_of_files"
+                    android:textSize="20dp"
+                    android:textStyle="bold" />
 
             <LinearLayout
+                    android:id="@+id/linear_license_files"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:layout_gravity="left|center_vertical"
                     android:orientation="vertical"
-                    android:padding="10dp">
+                    android:paddingBottom="10dp"
+                    android:paddingLeft="10dp"
+                    android:paddingTop="10dp" />
 
+            <FrameLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:background="#cacaca"
+                    android:padding="10dp">
 
                 <TextView
-                        android:id="@+id/textView"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="left|center_vertical"
-                        android:text="@string/notices_of_files"
-                        android:textSize="20dp"
-                        android:textStyle="bold" />
-
-                <LinearLayout
-                        android:id="@+id/linear_license_files"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="left|center_vertical"
-                        android:orientation="vertical"
-                        android:paddingBottom="10dp"
-                        android:paddingLeft="10dp"
-                        android:paddingTop="10dp"></LinearLayout>
-
-                <FrameLayout
+                        android:id="@+id/textView4"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:background="#cacaca"
-                        android:padding="10dp">
-
-                    <TextView
-                            android:id="@+id/textView4"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_gravity="center_vertical|left"
-                            android:text="@string/apache"
-                            android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
-                            android:textColor="@color/gray_dark_dark"
-                            android:typeface="monospace" />
-
-                </FrameLayout>
+                        android:layout_gravity="center_vertical|left"
+                        android:text="@string/apache"
+                        android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
+                        android:textColor="@color/gray_dark_dark"
+                        android:typeface="monospace" />
 
-            </LinearLayout>
+            </FrameLayout>
 
-        </ScrollView>
+        </LinearLayout>
 
-    </FrameLayout>
+    </ScrollView>
 
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml
index 44328132..d144df93 100644
--- a/app/src/main/res/layout/layout_main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -21,43 +21,19 @@
   ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   ~ SOFTWARE.
   -->
-<LinearLayout
+
+<FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:tools="http://schemas.android.com/tools"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         tools:context=".MainActivity"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-    <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
-        <com.android.volley.toolbox.NetworkImageView
-                android:id="@+id/toolbar_icon"
-                android:scaleType="fitCenter"
-                android:layout_width="32dp"
-                android:layout_height="32dp" />
-        <TextView
-                android:id="@+id/toolbar_text"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
-    </android.support.v7.widget.Toolbar>
+        android:layout_height="match_parent">
 
-    <FrameLayout
-            android:id="@+id/main_layout"
-            android:background="?attr/page_background"
+    <android.support.v4.view.ViewPager
+            android:id="@+id/viewPager"
             android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <android.support.v4.view.ViewPager
-                android:id="@+id/viewPager"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:orientation="vertical" />
-    </FrameLayout>
+            android:layout_height="match_parent"
+            android:orientation="vertical" />
 
-</LinearLayout>
+</FrameLayout>
diff --git a/app/src/main/res/layout/layout_oauth.xml b/app/src/main/res/layout/layout_oauth.xml
index 61af223d..030ac4a1 100644
--- a/app/src/main/res/layout/layout_oauth.xml
+++ b/app/src/main/res/layout/layout_oauth.xml
@@ -23,59 +23,45 @@
   ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   ~ SOFTWARE.
   -->
+
 <LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:layout_margin="15dp"
+        android:gravity="center_vertical|center_horizontal"
         android:orientation="vertical">
 
-    <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
-            android:layout_width="match_parent"
+    <TextView
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <LinearLayout
-            android:id="@+id/main_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_margin="15dp"
-            android:gravity="center_vertical|center_horizontal"
-            android:orientation="vertical">
-
-        <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/message_oauth_text" />
-
-        <TextView
-                android:id="@+id/textView_oauth_link"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_margin="10dp"
-                android:autoLink="web" />
+            android:text="@string/message_oauth_text" />
 
-        <EditText
-                android:id="@+id/editText_oauth_pin"
-                android:layout_width="200sp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:layout_marginBottom="10dp"
-                android:layout_marginTop="10dp"
-                android:hint="@string/message_oauth_hint"
-                android:inputType="number"
-                android:maxLength="7" />
+    <TextView
+            android:id="@+id/textView_oauth_link"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_margin="10dp"
+            android:autoLink="web" />
 
-        <Button
-                android:id="@+id/button_oauth_auth"
-                android:layout_width="200dp"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/message_oauth_authenticate" />
+    <EditText
+            android:id="@+id/editText_oauth_pin"
+            android:layout_width="200sp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:layout_marginBottom="10dp"
+            android:layout_marginTop="10dp"
+            android:hint="@string/message_oauth_hint"
+            android:inputType="number"
+            android:maxLength="7" />
 
-    </LinearLayout>
+    <Button
+            android:id="@+id/button_oauth_auth"
+            android:layout_width="200dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/message_oauth_authenticate" />
 
-</LinearLayout>
\ No newline at end of file
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_setting.xml b/app/src/main/res/layout/layout_setting.xml
index 82d3ac1d..a31fdaad 100644
--- a/app/src/main/res/layout/layout_setting.xml
+++ b/app/src/main/res/layout/layout_setting.xml
@@ -24,31 +24,16 @@
   ~ SOFTWARE.
   -->
 
-<LinearLayout
+<FrameLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
+        android:layout_height="match_parent">
 
-    <android.support.v7.widget.Toolbar
-            android:id="@+id/toolbar"
+    <fragment
+            android:id="@+id/fragment_setting"
+            android:name="net.lacolaco.smileessence.view.SettingFragment"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="?attr/colorPrimary"
-            app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+            android:layout_height="match_parent" />
 
-    <FrameLayout
-            android:id="@+id/main_layout"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent">
-
-        <fragment
-                android:id="@+id/fragment_setting"
-                android:name="net.lacolaco.smileessence.view.SettingFragment"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent" />
-
-    </FrameLayout>
-
-</LinearLayout>
\ No newline at end of file
+</FrameLayout>
diff --git a/app/src/main/res/menu/edit_list.xml b/app/src/main/res/menu/edit_list.xml
index d7441710..97fb02b7 100644
--- a/app/src/main/res/menu/edit_list.xml
+++ b/app/src/main/res/menu/edit_list.xml
@@ -24,10 +24,9 @@
   ~ SOFTWARE.
   -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item
         android:id="@+id/menu_edit_list_delete"
         android:icon="@android:drawable/ic_menu_delete"
-        app:showAsAction="always" />
+        android:showAsAction="always" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 32cf23ec..45188779 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -1,21 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-      xmlns:app="http://schemas.android.com/apk/res-auto">
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item   android:id="@+id/actionbar_post"
             android:title="@string/actionbar_post"
             android:icon="@drawable/icon_edit"
-            app:showAsAction="always" />
+            android:showAsAction="always" />
     <!--TODO: <item   android:id="@+id/actionbar_search"
             android:title="@string/actionbar_search"
             android:icon="@drawable/icon_search_white"
             app:showAsAction="always" /> -->
     <item android:id="@+id/actionbar_accounts"
           android:title="@string/actionbar_accounts"
-          app:showAsAction="never" />
+          android:showAsAction="never" />
     <item android:id="@+id/actionbar_settings"
           android:title="@string/actionbar_settings"
           android:icon="@drawable/icon_settings"
-          app:showAsAction="never">
+          android:showAsAction="never">
         <menu>
             <item android:id="@+id/actionbar_setting"
                   android:title="@string/actionbar_setting" />
@@ -32,7 +31,7 @@
     <item android:id="@+id/actionbar_services"
           android:title="@string/actionbar_services"
           android:icon="@drawable/icon_website"
-          app:showAsAction="never">
+          android:showAsAction="never">
         <menu>
             <item android:id="@+id/actionbar_favstar"
                   android:title="@string/actionbar_favstar" />
@@ -45,5 +44,5 @@
     <item android:id="@+id/actionbar_report"
           android:title="@string/actionbar_report"
           android:icon="@drawable/icon_email"
-          app:showAsAction="never" />
+          android:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 0831b46f..0c787e9c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,12 +24,7 @@
 
 <resources>
 
-    <style name="theme_dark" parent="Theme.AppCompat">
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionBar">false</item>
-        <item name="colorPrimaryDark">@color/black</item>
-        <item name="colorPrimary">@color/black</item>
-        <item name="colorAccent">@color/metro_blue</item>
+    <style name="theme_dark" parent="android:Theme.Holo">
         <item name="page_background">@color/gray_dark_dark</item>
         <item name="icon_post_delete">@drawable/icon_delete_w</item>
         <item name="icon_post_picture">@drawable/icon_picture_w</item>
@@ -62,12 +57,7 @@
         <item name="icon_save">@drawable/icon_save_white</item>
     </style>
 
-    <style name="theme_light" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="windowNoTitle">true</item>
-        <item name="windowActionBar">false</item>
-        <item name="colorPrimaryDark">@color/gray_dark_dark</item>
-        <item name="colorPrimary">@color/gray_dark_dark</item>
-        <item name="colorAccent">@color/metro_blue</item>
+    <style name="theme_light" parent="android:Theme.Holo.Light.DarkActionBar">
         <item name="page_background">@color/white</item>
         <item name="icon_post_delete">@drawable/icon_delete</item>
         <item name="icon_post_picture">@drawable/icon_picture</item>