From 5976999131859779900181db222c68b60f8a9888 Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 31 Mar 2021 00:18:31 +0800
Subject: Fix wrong subreddit creation time. Swap sort and search icons in
 several activities. Fix crashing when comparing exclude domains with posts.

---
 app/src/main/res/menu/search_result_activity.xml         | 12 ++++++------
 app/src/main/res/menu/view_subreddit_detail_activity.xml | 13 +++++++------
 app/src/main/res/menu/view_user_detail_activity.xml      |  8 ++++----
 3 files changed, 17 insertions(+), 16 deletions(-)

(limited to 'app/src/main/res')

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"
-- 
cgit v1.2.3