aboutsummaryrefslogtreecommitdiff
path: root/app/src/main/res
diff options
context:
space:
mode:
authorAlex Ning <chineseperson5@gmail.com>2021-03-30 16:18:31 +0000
committerAlex Ning <chineseperson5@gmail.com>2021-03-30 16:18:31 +0000
commit5976999131859779900181db222c68b60f8a9888 (patch)
treeb1e752e2999327617281ce2da07d7a5df526c0af /app/src/main/res
parent57a8e69eb122a6cba4bb1e0d37f0fc31c5d14bea (diff)
downloadinfinity-for-reddit-5976999131859779900181db222c68b60f8a9888.tar
infinity-for-reddit-5976999131859779900181db222c68b60f8a9888.tar.gz
infinity-for-reddit-5976999131859779900181db222c68b60f8a9888.tar.bz2
infinity-for-reddit-5976999131859779900181db222c68b60f8a9888.tar.lz
infinity-for-reddit-5976999131859779900181db222c68b60f8a9888.tar.xz
infinity-for-reddit-5976999131859779900181db222c68b60f8a9888.tar.zst
infinity-for-reddit-5976999131859779900181db222c68b60f8a9888.zip
Fix wrong subreddit creation time. Swap sort and search icons in several activities. Fix crashing when comparing exclude domains with posts.
Diffstat (limited to 'app/src/main/res')
-rw-r--r--app/src/main/res/menu/search_result_activity.xml12
-rw-r--r--app/src/main/res/menu/view_subreddit_detail_activity.xml13
-rw-r--r--app/src/main/res/menu/view_user_detail_activity.xml8
3 files changed, 17 insertions, 16 deletions
diff --git a/app/src/main/res/menu/search_result_activity.xml b/app/src/main/res/menu/search_result_activity.xml
index d503471f..97badadb 100644
--- a/app/src/main/res/menu/search_result_activity.xml
+++ b/app/src/main/res/menu/search_result_activity.xml
@@ -2,17 +2,17 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
- android:id="@+id/action_sort_search_result_activity"
+ android:id="@+id/action_search_search_result_activity"
android:orderInCategory="1"
- android:title="@string/action_sort"
- android:icon="@drawable/ic_sort_toolbar_24dp"
+ android:title="@string/action_search"
+ android:icon="@drawable/ic_search_toolbar_24dp"
app:showAsAction="ifRoom" />
<item
- android:id="@+id/action_search_search_result_activity"
+ android:id="@+id/action_sort_search_result_activity"
android:orderInCategory="2"
- android:title="@string/action_search"
- android:icon="@drawable/ic_search_toolbar_24dp"
+ android:title="@string/action_sort"
+ android:icon="@drawable/ic_sort_toolbar_24dp"
app:showAsAction="ifRoom" />
<item
diff --git a/app/src/main/res/menu/view_subreddit_detail_activity.xml b/app/src/main/res/menu/view_subreddit_detail_activity.xml
index 1144d8e7..3521819a 100644
--- a/app/src/main/res/menu/view_subreddit_detail_activity.xml
+++ b/app/src/main/res/menu/view_subreddit_detail_activity.xml
@@ -4,18 +4,19 @@
xmlns:tools="http://schemas.android.com/tools"
tools:application="ml.docilealligator.infinityforreddit.activities.ViewSubredditDetailActivity">
<item
- android:id="@+id/action_sort_view_subreddit_detail_activity"
+ android:id="@+id/action_search_view_subreddit_detail_activity"
android:orderInCategory="1"
- android:title="@string/action_sort"
- android:icon="@drawable/ic_sort_toolbar_24dp"
+ android:title="@string/action_search"
+ android:icon="@drawable/ic_search_toolbar_24dp"
app:showAsAction="ifRoom" />
<item
- android:id="@+id/action_search_view_subreddit_detail_activity"
+ android:id="@+id/action_sort_view_subreddit_detail_activity"
android:orderInCategory="2"
- android:title="@string/action_search"
- android:icon="@drawable/ic_search_toolbar_24dp"
+ android:title="@string/action_sort"
+ android:icon="@drawable/ic_sort_toolbar_24dp"
app:showAsAction="ifRoom" />
+
<item
android:id="@+id/action_refresh_view_subreddit_detail_activity"
android:orderInCategory="3"
diff --git a/app/src/main/res/menu/view_user_detail_activity.xml b/app/src/main/res/menu/view_user_detail_activity.xml
index b62d5c81..05e4c3cb 100644
--- a/app/src/main/res/menu/view_user_detail_activity.xml
+++ b/app/src/main/res/menu/view_user_detail_activity.xml
@@ -3,16 +3,16 @@
xmlns:tools="http://schemas.android.com/tools"
tools:application="ml.docilealligator.infinityforreddit.activities.ViewUserDetailActivity">
<item
- android:id="@+id/action_sort_view_user_detail_activity"
+ android:id="@+id/action_search_view_user_detail_activity"
android:orderInCategory="1"
android:title="@string/action_search"
- android:icon="@drawable/ic_sort_toolbar_24dp"
+ android:icon="@drawable/ic_search_toolbar_24dp"
app:showAsAction="ifRoom" />
<item
- android:id="@+id/action_search_view_user_detail_activity"
+ android:id="@+id/action_sort_view_user_detail_activity"
android:orderInCategory="2"
android:title="@string/action_search"
- android:icon="@drawable/ic_search_toolbar_24dp"
+ android:icon="@drawable/ic_sort_toolbar_24dp"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_refresh_view_user_detail_activity"