aboutsummaryrefslogtreecommitdiffstats
path: root/app/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/drawable/button_selector_transparent.xml14
-rw-r--r--app/src/main/res/layout/dialog_menu_list.xml9
-rw-r--r--app/src/main/res/layout/dialog_user_detail.xml10
-rw-r--r--app/src/main/res/layout/fragment_post.xml4
-rw-r--r--app/src/main/res/layout/layout_edit_list.xml16
-rw-r--r--app/src/main/res/layout/layout_license.xml14
-rw-r--r--app/src/main/res/layout/layout_main.xml7
-rw-r--r--app/src/main/res/layout/layout_manage_accounts.xml18
-rw-r--r--app/src/main/res/layout/layout_setting.xml14
-rw-r--r--app/src/main/res/menu/edit_list.xml5
-rw-r--r--app/src/main/res/menu/main.xml9
-rw-r--r--app/src/main/res/values/keys.xml1
-rw-r--r--app/src/main/res/values/strings.xml3
-rw-r--r--app/src/main/res/values/styles.xml21
14 files changed, 86 insertions, 59 deletions
diff --git a/app/src/main/res/drawable/button_selector_transparent.xml b/app/src/main/res/drawable/button_selector_transparent.xml
deleted file mode 100644
index 98181935..00000000
--- a/app/src/main/res/drawable/button_selector_transparent.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:state_enabled="false">
- <color android:color="@color/gray_dark" />
- </item>
- <item android:state_enabled="true" android:state_pressed="true">
- <color android:color="@color/metro_blue" />
- </item>
- <item android:state_enabled="true" android:state_pressed="false">
- <color android:color="@color/transparent" />
- </item>
- <item android:state_enabled="true">
- <color android:color="@color/transparent" />
- </item>
-</selector>
diff --git a/app/src/main/res/layout/dialog_menu_list.xml b/app/src/main/res/layout/dialog_menu_list.xml
deleted file mode 100644
index 324e18e0..00000000
--- a/app/src/main/res/layout/dialog_menu_list.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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_dialog_menu_list"
- android:layout_width="match_parent"
- android:layout_height="wrap_content" />
-</FrameLayout>
diff --git a/app/src/main/res/layout/dialog_user_detail.xml b/app/src/main/res/layout/dialog_user_detail.xml
index 6a300d60..49126825 100644
--- a/app/src/main/res/layout/dialog_user_detail.xml
+++ b/app/src/main/res/layout/dialog_user_detail.xml
@@ -79,7 +79,7 @@
android:layout_height="wrap_content"
android:clickable="true"
android:text="screen_name"
- android:textColor="?android:attr/colorAccent"
+ android:textColor="?colorAccent"
android:textSize="16sp" />
<TextView
@@ -142,7 +142,7 @@
android:clickable="true"
android:gravity="center_horizontal"
android:text="0"
- android:textColor="?android:attr/colorAccent"
+ android:textColor="?colorAccent"
android:textSize="20sp" />
<TextView
@@ -153,7 +153,7 @@
android:clickable="true"
android:gravity="center_horizontal"
android:text="0"
- android:textColor="?android:attr/colorAccent"
+ android:textColor="?colorAccent"
android:textSize="20sp" />
<TextView
@@ -164,7 +164,7 @@
android:clickable="true"
android:gravity="center_horizontal"
android:text="0"
- android:textColor="?android:attr/colorAccent"
+ android:textColor="?colorAccent"
android:textSize="20sp" />
<TextView
@@ -175,7 +175,7 @@
android:clickable="true"
android:gravity="center_horizontal"
android:text="0"
- android:textColor="?android:attr/colorAccent"
+ android:textColor="?colorAccent"
android:textSize="20sp" />
</TableRow>
diff --git a/app/src/main/res/layout/fragment_post.xml b/app/src/main/res/layout/fragment_post.xml
index 611a4026..a87b5365 100644
--- a/app/src/main/res/layout/fragment_post.xml
+++ b/app/src/main/res/layout/fragment_post.xml
@@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:elevation="2dp"
- android:background="?android:colorBackgroundFloating">
+ android:background="?colorBackgroundFloating">
<include
android:id="@+id/layout_post_reply_status"
@@ -41,7 +41,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="top"
- android:textAppearance="@android:style/TextAppearance.Material.Large"
+ android:textAppearance="@style/TextAppearance.AppCompat.Large"
android:inputType="text|textMultiLine"
android:minHeight="60dp">
diff --git a/app/src/main/res/layout/layout_edit_list.xml b/app/src/main/res/layout/layout_edit_list.xml
index c326e412..e8aca0f7 100644
--- a/app/src/main/res/layout/layout_edit_list.xml
+++ b/app/src/main/res/layout/layout_edit_list.xml
@@ -1,10 +1,18 @@
-<FrameLayout 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="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="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:elevation="4dp" />
<ListView
android:id="@+id/listview_edit_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:fastScrollEnabled="true"></ListView>
-</FrameLayout>
+ android:fastScrollEnabled="true" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_license.xml b/app/src/main/res/layout/layout_license.xml
index 7cd11d55..52c0fefb 100644
--- a/app/src/main/res/layout/layout_license.xml
+++ b/app/src/main/res/layout/layout_license.xml
@@ -1,6 +1,14 @@
-<FrameLayout 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="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="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:elevation="4dp" />
<ScrollView
android:layout_width="match_parent"
@@ -50,4 +58,4 @@
</FrameLayout>
</LinearLayout>
</ScrollView>
-</FrameLayout>
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_main.xml b/app/src/main/res/layout/layout_main.xml
index 12904065..dbe1fc77 100644
--- a/app/src/main/res/layout/layout_main.xml
+++ b/app/src/main/res/layout/layout_main.xml
@@ -4,6 +4,13 @@
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="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:elevation="4dp" />
+
<android.support.v4.view.ViewPager
android:id="@+id/viewPager"
android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/layout_manage_accounts.xml b/app/src/main/res/layout/layout_manage_accounts.xml
new file mode 100644
index 00000000..e8aca0f7
--- /dev/null
+++ b/app/src/main/res/layout/layout_manage_accounts.xml
@@ -0,0 +1,18 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ 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="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:elevation="4dp" />
+
+ <ListView
+ android:id="@+id/listview_edit_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:fastScrollEnabled="true" />
+</LinearLayout>
diff --git a/app/src/main/res/layout/layout_setting.xml b/app/src/main/res/layout/layout_setting.xml
index b0885afe..51ef6f20 100644
--- a/app/src/main/res/layout/layout_setting.xml
+++ b/app/src/main/res/layout/layout_setting.xml
@@ -1,10 +1,18 @@
-<FrameLayout 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="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="?attr/actionBarSize"
+ android:background="?attr/colorPrimary"
+ android:elevation="4dp" />
<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>
diff --git a/app/src/main/res/menu/edit_list.xml b/app/src/main/res/menu/edit_list.xml
index 42109149..8a41e7cb 100644
--- a/app/src/main/res/menu/edit_list.xml
+++ b/app/src/main/res/menu/edit_list.xml
@@ -1,7 +1,8 @@
-<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"
android:title="Delete" />
</menu>
diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml
index 9b0210fc..eea3bbb5 100644
--- a/app/src/main/res/menu/main.xml
+++ b/app/src/main/res/menu/main.xml
@@ -1,16 +1,17 @@
-<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/actionbar_setting"
android:icon="@drawable/icon_settings"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/actionbar_setting" />
<item
android:id="@+id/actionbar_edit_extraction"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/actionbar_edit_extraction" />
<item
android:id="@+id/actionbar_aclog"
android:icon="@drawable/icon_website"
- android:showAsAction="never"
+ app:showAsAction="never"
android:title="@string/actionbar_aclog" />
</menu>
diff --git a/app/src/main/res/values/keys.xml b/app/src/main/res/values/keys.xml
index 19965c3e..e17ba426 100644
--- a/app/src/main/res/values/keys.xml
+++ b/app/src/main/res/values/keys.xml
@@ -1,6 +1,5 @@
<resources xmlns:tools="http://schemas.android.com/tools" tools:ignore="MissingTranslation">
<string name="key_setting_text_size">textSize</string>
- <string name="key_setting_show_confirm_dialog">confirm</string>
<string name="key_setting_theme">theme</string>
<string name="key_setting_application_information">appInfo</string>
<string name="key_setting_licenses">licenseNotice</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 31f9adec..f1c33e49 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,7 +6,6 @@
<string name="app_thanks_to">Thanks to</string>
<string name="thanks_to">miz_hi, yaplus, firstspring1845, ahiru3net, unyuho123, karno, ret156, vividtomato_, hoyo203, brsywe, NTTrf, mikamikafever</string>
<string name="library_name_twitter4j">twitter4j</string>
- <string name="library_name_crouton">Crouton</string>
<string name="library_name_volley">Volley</string>
<string name="library_name_twitter_text">twitter-text</string>
<string name="activity_setting">App Setting</string>
@@ -61,12 +60,10 @@
<string name="user_detail_loading">Loading</string>
<string name="user_detail_tab_info">Info</string>
<string name="user_detail_tab_timeline">Timeline</string>
- <string name="dialog_title_about">About</string>
<string name="dialog_title_add">Add</string>
<string name="dialog_confirm_finish_app">OK to close?</string>
<string name="dialog_confirm_commands">Execute, OK?</string>
<string name="dialog_confirm_clear_account">Are you sure you want to remove this account @%s?</string>
- <string name="dialog_title_select_userlist">Select a list</string>\
<string name="dialog_confirm_delete_query">Delete this query, OK?</string>
<string name="notice_favorite_succeeded">Succeeded to favorite</string>
<string name="notice_favorite_failed">Failed to favorite</string>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d30b8244..62286a83 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,11 +1,12 @@
<resources>
- <style name="theme_dark" parent="android:Theme.Material">
- <item name="android:dialogTheme">@style/SE.DialogTheme</item>
-
+ <style name="theme_dark" parent="Theme.AppCompat.NoActionBar">
<item name="android:colorBackground">@color/md_grey_900</item>
- <item name="android:colorBackgroundFloating">@color/md_grey_850</item>
- <item name="android:colorAccent">@color/md_blue_A200</item>
- <item name="android:colorPrimary">@color/md_purple_400</item>
+ <item name="android:windowBackground">@color/md_grey_900</item>
+ <item name="colorBackgroundFloating">@color/md_grey_850</item>
+ <item name="colorAccent">@color/md_blue_A200</item>
+ <item name="colorPrimary">@color/md_purple_400</item>
+
+ <item name="dialogTheme">@style/SE.DialogTheme</item>
<item name="color_status_text_header">@color/md_green_700</item>
<item name="color_status_text_normal">#ffffffff</item>
@@ -40,8 +41,10 @@
<item name="icon_save">@drawable/icon_save_white</item>
</style>
- <style name="theme_light" parent="android:Theme.Material.Light.DarkActionBar">
- <item name="android:dialogTheme">@style/SE.DialogTheme</item>
+ <style name="theme_light" parent="Theme.AppCompat.Light.NoActionBar">
+ <item name="dialogTheme">@style/SE.DialogTheme</item>
+
+
<item name="icon_post_delete">@drawable/icon_delete</item>
<item name="icon_post_picture">@drawable/icon_picture</item>
<item name="icon_post_row">@drawable/icon_row</item>
@@ -73,7 +76,7 @@
<item name="icon_save">@drawable/icon_save</item>
</style>
- <style name="SE.DialogTheme" parent="android:ThemeOverlay.Material.Dialog">
+ <style name="SE.DialogTheme" parent="ThemeOverlay.AppCompat.Dialog">
<item name="android:windowMinWidthMajor">@android:dimen/dialog_min_width_major</item>
<item name="android:windowMinWidthMinor">@android:dimen/dialog_min_width_minor</item>
</style>
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-26 04:58:23 +0000