ActionBar をやめ AppCompat の Toolbar を使う。Theme.Holo が使えないためデザインに変更あり

10 files changed, 193 insertions, 86 deletions

diff --git a/app/src/main/res/layout/layout_edit_list.xml b/app/src/main/res/layout/layout_edit_list.xml
index c337b0ea..3311477f 100644
--- a/app/src/main/res/layout/layout_edit_list.xml
+++ b/app/src/main/res/layout/layout_edit_list.xml
@@ -24,15 +24,31 @@
   ~ SOFTWARE.
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <ListView
-        android:id="@+id/listview_edit_list"
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:fastScrollEnabled="true">
+        android:orientation="vertical">
+
+    <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <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>
-</FrameLayout>
\ No newline at end of file
+</LinearLayout>
\ 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 6e9577c0..0e50b861 100644
--- a/app/src/main/res/layout/layout_license.xml
+++ b/app/src/main/res/layout/layout_license.xml
@@ -23,56 +23,76 @@
   ~ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
   ~ SOFTWARE.
   -->
-
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:padding="10dp">
+        android:layout_height="match_parent"
+        android:orientation="vertical">
 
-
-        <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.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
             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>
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
-        <FrameLayout
+    <FrameLayout
+            android:id="@+id/main_layout"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="#cacaca"
-            android:padding="10dp">
+            android:layout_height="match_parent">
 
-            <TextView
-                android:id="@+id/textView4"
+        <ScrollView
                 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" />
+                android:layout_height="match_parent"
+                android:orientation="vertical">
+
+            <LinearLayout
+                    android:layout_width="match_parent"
+                    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:paddingBottom="10dp"
+                        android:paddingLeft="10dp"
+                        android:paddingTop="10dp"></LinearLayout>
+
+                <FrameLayout
+                        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>
+
+            </LinearLayout>
 
-        </FrameLayout>
+        </ScrollView>
 
-    </LinearLayout>
+    </FrameLayout>
 
-</ScrollView>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/layout_main.xml
index ade639f7..6de7b0fd 100644
--- a/app/src/main/res/layout/main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -21,13 +21,30 @@
   ~ 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:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical"
+        tools:context=".MainActivity">
 
-<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/viewPager"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical"
-    tools:context=".MainActivity" />
+    <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
+    <FrameLayout
+            android:id="@+id/main_layout"
+            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>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_oauth.xml b/app/src/main/res/layout/layout_oauth.xml
index bdd67be8..077fcaf9 100644
--- a/app/src/main/res/layout/layout_oauth.xml
+++ b/app/src/main/res/layout/layout_oauth.xml
@@ -25,6 +25,7 @@
   -->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/main_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:layout_margin="15dp"
diff --git a/app/src/main/res/layout/setting.xml b/app/src/main/res/layout/layout_setting.xml
index 628f8825..4eec1bc8 100644
--- a/app/src/main/res/layout/setting.xml
+++ b/app/src/main/res/layout/layout_setting.xml
@@ -24,13 +24,29 @@
   ~ SOFTWARE.
   -->
 
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <fragment
-        android:id="@id/fragment_setting"
-        android:name="net.lacolaco.smileessence.view.SettingFragment"
+<LinearLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-</FrameLayout>
\ No newline at end of file
+        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:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+
+    <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
diff --git a/app/src/main/res/menu/edit_list.xml b/app/src/main/res/menu/edit_list.xml
index 97fb02b7..d7441710 100644
--- a/app/src/main/res/menu/edit_list.xml
+++ b/app/src/main/res/menu/edit_list.xml
@@ -24,9 +24,10 @@
   ~ SOFTWARE.
   -->
 
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+      xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
         android:id="@+id/menu_edit_list_delete"
         android:icon="@android:drawable/ic_menu_delete"
-        android:showAsAction="always" />
+        app: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
new file mode 100644
index 00000000..0d1f73dc
--- /dev/null
+++ b/app/src/main/res/menu/main.xml
@@ -0,0 +1,46 @@
+<?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">
+    <item   android:id="@+id/actionbar_post"
+            android:title="@string/actionbar_post"
+            android:icon="@drawable/icon_edit"
+            app: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_settings"
+          android:title="@string/actionbar_settings"
+          android:icon="@drawable/icon_settings"
+          app:showAsAction="never">
+        <menu>
+            <item android:id="@+id/actionbar_setting"
+                  android:title="@string/actionbar_setting" />
+            <item android:id="@+id/actionbar_edit_templates"
+                  android:title="@string/actionbar_edit_templates" />
+            <item android:id="@+id/actionbar_edit_extraction"
+                  android:title="@string/actionbar_edit_extraction" />
+            <item android:id="@+id/actionbar_edit_commands"
+                  android:title="@string/actionbar_edit_commands" />
+            <item android:id="@+id/actionbar_edit_tabs"
+                  android:title="@string/actionbar_edit_tabs" />
+        </menu>
+    </item>
+    <item android:id="@+id/actionbar_services"
+          android:title="@string/actionbar_services"
+          android:icon="@drawable/icon_website"
+          app:showAsAction="never">
+        <menu>
+            <item android:id="@+id/actionbar_favstar"
+                  android:title="@string/actionbar_favstar" />
+            <item android:id="@+id/actionbar_aclog"
+                  android:title="@string/actionbar_aclog" />
+            <item android:id="@+id/actionbar_twilog"
+                  android:title="@string/actionbar_twilog" />
+        </menu>
+    </item>
+    <item android:id="@+id/actionbar_report"
+          android:title="@string/actionbar_report"
+          android:icon="@drawable/icon_email"
+          app:showAsAction="never" />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/app_info.xml b/app/src/main/res/values/app_info.xml
index 60cee8e7..22c92c12 100644
--- a/app/src/main/res/values/app_info.xml
+++ b/app/src/main/res/values/app_info.xml
@@ -24,7 +24,7 @@
 
 <resources xmlns:tools="http://schemas.android.com/tools"
            tools:ignore="MissingTranslation">
-    <string name="app_name">SmileEssence</string>
+    <string name="app_name">xSmileEssence</string>
     <string name="app_version_full">1.0.11 \"Dolphin\"</string>
     <string name="app_url">http://smileessence.lacolaco.net</string>
     <string name="app_author">Developed by laco0416</string>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
index 807f9f74..e08ab1ce 100644
--- a/app/src/main/res/values/ids.xml
+++ b/app/src/main/res/values/ids.xml
@@ -23,20 +23,6 @@
   -->
 
 <resources>
-    <item name="actionbar_search" type="id" />
-    <item name="actionbar_settings" type="id" />
-    <item name="actionbar_setting" type="id" />
-    <item name="actionbar_edit_templates" type="id" />
-    <item name="actionbar_edit_extraction" type="id" />
-    <item name="actionbar_edit_commands" type="id" />
-    <item name="actionbar_services" type="id" />
-    <item name="actionbar_report" type="id" />
-    <item name="actionbar_favstar" type="id" />
-    <item name="actionbar_aclog" type="id" />
-    <item name="actionbar_twilog" type="id" />
-    <item name="fragment_setting" type="id" />
     <item name="menu_edit_list_add" type="id" />
     <item name="menu_edit_command_all_on" type="id" />
-    <item name="actionbar_post" type="id" />
-    <item name="actionbar_edit_tabs" type="id" />
 </resources>
\ 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 ea7fab11..caedb611 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,7 +24,9 @@
 
 <resources>
 
-    <style name="theme_dark" parent="@android:style/Theme.Holo">
+    <style name="theme_dark" parent="Theme.AppCompat">
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
         <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>
@@ -57,7 +59,9 @@
         <item name="icon_save">@drawable/icon_save_white</item>
     </style>
 
-    <style name="theme_light" parent="@android:style/Theme.Holo.Light.DarkActionBar">
+    <style name="theme_light" parent="Theme.AppCompat.Light.DarkActionBar">
+        <item name="windowNoTitle">true</item>
+        <item name="windowActionBar">false</item>
         <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>