Close #47 Improve SearchFragment

7 files changed, 16 insertions, 1 deletions

diff --git a/res/drawable-hdpi/icon_save.png b/res/drawable-hdpi/icon_save.png
new file mode 100644
index 00000000..c4b7783c
--- /dev/null
+++ b/res/drawable-hdpi/icon_save.png
diff --git a/res/drawable-hdpi/icon_save_white.png b/res/drawable-hdpi/icon_save_white.png
new file mode 100644
index 00000000..0fe36a1e
--- /dev/null
+++ b/res/drawable-hdpi/icon_save_white.png
diff --git a/res/layout/fragment_search.xml b/res/layout/fragment_search.xml
index f218f79c..0889aafa 100644
--- a/res/layout/fragment_search.xml
+++ b/res/layout/fragment_search.xml
@@ -61,13 +61,23 @@
             android:id="@+id/button_search_execute"
             android:layout_width="40dp"
             android:layout_height="match_parent"
-            android:layout_alignParentRight="true"
+            android:layout_toLeftOf="@+id/button_search_save"
             style="?attr/custom_button_transparent"
             android:scaleType="centerCrop"
             android:src="?attr/icon_search"
             android:layout_gravity="fill"
             android:adjustViewBounds="false"/>
 
+        <ImageButton
+            android:id="@+id/button_search_save"
+            android:layout_width="40dp"
+            android:layout_height="match_parent"
+            android:layout_alignParentRight="true"
+            style="?attr/custom_button_transparent"
+            android:scaleType="centerCrop"
+            android:src="?attr/icon_save"
+            android:layout_gravity="fill"
+            android:adjustViewBounds="false"/>
     </RelativeLayout>
 
     <FrameLayout
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index eef02359..4471d3d0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -179,6 +179,7 @@
     <string name="notice_search_query_deleted">クエリを削除しました</string>
     <string name="notice_no_template_exists">定型文が存在しません</string>
     <string name="notice_no_query_exists">クエリが存在しません</string>
+    <string name="notice_query_saved">クエリを保存しました</string>
     <string name="notice_tab_editted">タブ設定は次回起動時から有効になります</string>
     <string name="notice_error_show_status">ツイートを表示できませんでした</string>
     <string name="notice_error_show_user">ユーザーを表示できませんでした</string>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 9e595757..eb29f391 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -53,4 +53,5 @@
     <attr name="icon_garbage" format="reference"/>
     <attr name="icon_search" format="reference"/>
     <attr name="icon_labels" format="reference"/>
+    <attr name="icon_save" format="reference"/>
 </resources>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7546ffbc..adce07ee 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -179,6 +179,7 @@
     <string name="notice_search_query_deleted">Query was deleted</string>
     <string name="notice_no_template_exists">No template exists</string>
     <string name="notice_no_query_exists">No query exists</string>
+    <string name="notice_query_saved">Query is saved</string>
     <string name="notice_tab_editted">Tab setting are enabled on next launch</string>
     <string name="notice_error_show_user">Can\'t show this user</string>
     <string name="notice_error_show_status">Can\'t show this status</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 11854f45..11afb285 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -55,6 +55,7 @@
         <item name="icon_garbage">@drawable/icon_garbage_white</item>
         <item name="icon_search">@drawable/icon_search_white</item>
         <item name="icon_labels">@drawable/icon_labels_white</item>
+        <item name="icon_save">@drawable/icon_save_white</item>
     </style>
 
     <style name="theme_light" parent="@android:style/Theme.Holo.Light.DarkActionBar">
@@ -87,6 +88,7 @@
         <item name="icon_garbage">@drawable/icon_garbage</item>
         <item name="icon_search">@drawable/icon_search</item>
         <item name="icon_labels">@drawable/icon_labels</item>
+        <item name="icon_save">@drawable/icon_save</item>
     </style>
 
     <style name="custom_button_transparent">