From 425bc857cfe094d8b9be5815030ef3e6b0cf173d Mon Sep 17 00:00:00 2001
From: Alex Ning <chineseperson5@gmail.com>
Date: Wed, 7 Aug 2019 23:28:02 +0800
Subject: Refactored all the other classes to support multi user. Clearing the
 app data is required before launching the app.

---
 app/src/main/res/layout/activity_comment.xml                       | 2 +-
 app/src/main/res/layout/activity_filtered_posts.xml                | 2 +-
 app/src/main/res/layout/activity_login.xml                         | 2 +-
 app/src/main/res/layout/activity_post_image.xml                    | 2 +-
 app/src/main/res/layout/activity_post_link.xml                     | 2 +-
 app/src/main/res/layout/activity_post_text.xml                     | 2 +-
 app/src/main/res/layout/activity_post_video.xml                    | 2 +-
 app/src/main/res/layout/activity_rules.xml                         | 2 +-
 app/src/main/res/layout/activity_search.xml                        | 2 +-
 app/src/main/res/layout/activity_search_result.xml                 | 2 +-
 app/src/main/res/layout/activity_search_subreddits_result.xml      | 2 +-
 app/src/main/res/layout/activity_subreddit_selection.xml           | 2 +-
 app/src/main/res/layout/activity_subscribed_thing_listing.xml      | 4 ++--
 app/src/main/res/layout/activity_view_image.xml                    | 2 +-
 app/src/main/res/layout/activity_view_post_detail.xml              | 2 +-
 app/src/main/res/layout/activity_view_subreddit_detail.xml         | 2 +-
 app/src/main/res/layout/activity_view_user_detail.xml              | 2 +-
 app/src/main/res/layout/activity_view_video.xml                    | 2 +-
 app/src/main/res/layout/app_bar_main.xml                           | 2 +-
 app/src/main/res/layout/content_main.xml                           | 2 +-
 app/src/main/res/layout/content_view_subreddit_detail.xml          | 2 +-
 app/src/main/res/layout/content_view_user_detail.xml               | 2 +-
 app/src/main/res/layout/fragment_comments_listing.xml              | 2 +-
 app/src/main/res/layout/fragment_flair_bottom_sheet.xml            | 2 +-
 app/src/main/res/layout/fragment_followed_users_listing.xml        | 2 +-
 app/src/main/res/layout/fragment_post.xml                          | 2 +-
 app/src/main/res/layout/fragment_subreddit_listing.xml             | 2 +-
 app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml | 2 +-
 app/src/main/res/layout/fragment_user_listing.xml                  | 2 +-
 app/src/main/res/menu/main_activity.xml                            | 2 +-
 app/src/main/res/menu/menu_search.xml                              | 2 +-
 app/src/main/res/menu/search_activity.xml                          | 2 +-
 app/src/main/res/menu/view_subreddit_detail_activity.xml           | 2 +-
 app/src/main/res/menu/view_user_detail_activity.xml                | 2 +-
 34 files changed, 35 insertions(+), 35 deletions(-)

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

diff --git a/app/src/main/res/layout/activity_comment.xml b/app/src/main/res/layout/activity_comment.xml
index b664e845..65abe106 100644
--- a/app/src/main/res/layout/activity_comment.xml
+++ b/app/src/main/res/layout/activity_comment.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_comment_activity"
-    tools:context=".CommentActivity">
+    tools:application=".CommentActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_filtered_posts.xml b/app/src/main/res/layout/activity_filtered_posts.xml
index 48c06348..a7b605a7 100644
--- a/app/src/main/res/layout/activity_filtered_posts.xml
+++ b/app/src/main/res/layout/activity_filtered_posts.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".FilteredPostsActivity">
+    tools:application=".FilteredPostsActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 908efa3c..236d52e4 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="ml.docilealligator.infinityforreddit.LoginActivity">
+    tools:application="ml.docilealligator.infinityforreddit.LoginActivity">
 
     <WebView
         android:id="@+id/webview_login_activity"
diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml
index 5ca123f7..8410242b 100644
--- a/app/src/main/res/layout/activity_post_image.xml
+++ b/app/src/main/res/layout/activity_post_image.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_post_image_activity"
-    tools:context=".PostImageActivity">
+    tools:application=".PostImageActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml
index 664cccd2..77aba190 100644
--- a/app/src/main/res/layout/activity_post_link.xml
+++ b/app/src/main/res/layout/activity_post_link.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_post_link_activity"
-    tools:context=".PostTextActivity">
+    tools:application=".PostTextActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_post_text.xml b/app/src/main/res/layout/activity_post_text.xml
index e002f0a3..6380d3d2 100644
--- a/app/src/main/res/layout/activity_post_text.xml
+++ b/app/src/main/res/layout/activity_post_text.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_post_text_activity"
-    tools:context=".PostTextActivity">
+    tools:application=".PostTextActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml
index ce497f44..3dcce96d 100644
--- a/app/src/main/res/layout/activity_post_video.xml
+++ b/app/src/main/res/layout/activity_post_video.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_post_video_activity"
-    tools:context=".PostImageActivity">
+    tools:application=".PostImageActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_rules.xml b/app/src/main/res/layout/activity_rules.xml
index 6678f13c..a5764fa9 100644
--- a/app/src/main/res/layout/activity_rules.xml
+++ b/app/src/main/res/layout/activity_rules.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".RulesActivity">
+    tools:application=".RulesActivity">
 
     <ProgressBar
         android:id="@+id/progress_bar_rules_activity"
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
index 6f02ef7f..b810a849 100644
--- a/app/src/main/res/layout/activity_search.xml
+++ b/app/src/main/res/layout/activity_search.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SearchActivity">
+    tools:application=".SearchActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_search_result.xml b/app/src/main/res/layout/activity_search_result.xml
index 062ca4a0..797b08d3 100644
--- a/app/src/main/res/layout/activity_search_result.xml
+++ b/app/src/main/res/layout/activity_search_result.xml
@@ -67,6 +67,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:context=".SearchResultActivity" />
+        tools:application=".SearchResultActivity" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_search_subreddits_result.xml b/app/src/main/res/layout/activity_search_subreddits_result.xml
index 6dc3ca23..3b536bb8 100644
--- a/app/src/main/res/layout/activity_search_subreddits_result.xml
+++ b/app/src/main/res/layout/activity_search_subreddits_result.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SearchSubredditsResultActivity">
+    tools:application=".SearchSubredditsResultActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_subreddit_selection.xml b/app/src/main/res/layout/activity_subreddit_selection.xml
index 6c0e6061..6306a39f 100644
--- a/app/src/main/res/layout/activity_subreddit_selection.xml
+++ b/app/src/main/res/layout/activity_subreddit_selection.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SubredditSelectionActivity">
+    tools:application=".SubredditSelectionActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_subscribed_thing_listing.xml b/app/src/main/res/layout/activity_subscribed_thing_listing.xml
index e0d3c8ee..c448e631 100644
--- a/app/src/main/res/layout/activity_subscribed_thing_listing.xml
+++ b/app/src/main/res/layout/activity_subscribed_thing_listing.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SubscribedThingListingActivity">
+    tools:application=".SubscribedThingListingActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_subscribed_thing_listing_activity"
@@ -40,6 +40,6 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        tools:context=".SubscribedThingListingActivity" />
+        tools:application=".SubscribedThingListingActivity" />
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_view_image.xml b/app/src/main/res/layout/activity_view_image.xml
index 3ffcb7ff..ddf04698 100644
--- a/app/src/main/res/layout/activity_view_image.xml
+++ b/app/src/main/res/layout/activity_view_image.xml
@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:id="@+id/parent_relative_layout_view_image_activity"
     android:background="@android:color/black"
-    tools:context="ml.docilealligator.infinityforreddit.ViewImageActivity">
+    tools:application="ml.docilealligator.infinityforreddit.ViewImageActivity">
 
     <ProgressBar
         android:id="@+id/progress_bar_view_image_activity"
diff --git a/app/src/main/res/layout/activity_view_post_detail.xml b/app/src/main/res/layout/activity_view_post_detail.xml
index 1e26a65a..3fef4769 100644
--- a/app/src/main/res/layout/activity_view_post_detail.xml
+++ b/app/src/main/res/layout/activity_view_post_detail.xml
@@ -5,7 +5,7 @@
     android:id="@+id/coordinator_layout_view_post_detail"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".ViewPostDetailActivity">
+    tools:application=".ViewPostDetailActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_view_subreddit_detail.xml b/app/src/main/res/layout/activity_view_subreddit_detail.xml
index 00563d1b..ab1dd28b 100644
--- a/app/src/main/res/layout/activity_view_subreddit_detail.xml
+++ b/app/src/main/res/layout/activity_view_subreddit_detail.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_view_subreddit_detail_activity"
-    tools:context=".ViewSubredditDetailActivity">
+    tools:application=".ViewSubredditDetailActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:id="@+id/appbar_layout_view_subreddit_detail"
diff --git a/app/src/main/res/layout/activity_view_user_detail.xml b/app/src/main/res/layout/activity_view_user_detail.xml
index bbdf6603..c85a76cb 100644
--- a/app/src/main/res/layout/activity_view_user_detail.xml
+++ b/app/src/main/res/layout/activity_view_user_detail.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_view_user_detail_activity"
-    tools:context=".ViewUserDetailActivity">
+    tools:application=".ViewUserDetailActivity">
 
     <androidx.viewpager.widget.ViewPager
         android:id="@+id/view_pager_view_user_detail_activity"
diff --git a/app/src/main/res/layout/activity_view_video.xml b/app/src/main/res/layout/activity_view_video.xml
index 0ff1b5f3..6ed3f599 100644
--- a/app/src/main/res/layout/activity_view_video.xml
+++ b/app/src/main/res/layout/activity_view_video.xml
@@ -7,7 +7,7 @@
     android:background="@android:color/black"
     android:id="@+id/relative_layout_view_video_activity"
     android:keepScreenOn="true"
-    tools:context="ml.docilealligator.infinityforreddit.ViewVideoActivity">
+    tools:application="ml.docilealligator.infinityforreddit.ViewVideoActivity">
 
     <com.google.android.exoplayer2.ui.PlayerView
         android:id="@+id/player_view_view_video_activity"
diff --git a/app/src/main/res/layout/app_bar_main.xml b/app/src/main/res/layout/app_bar_main.xml
index 3c1aeb21..8bec0647 100644
--- a/app/src/main/res/layout/app_bar_main.xml
+++ b/app/src/main/res/layout/app_bar_main.xml
@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context="ml.docilealligator.infinityforreddit.MainActivity">
+    tools:application="ml.docilealligator.infinityforreddit.MainActivity">
 
     <com.google.android.material.appbar.AppBarLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml
index 9820167d..6f29dd60 100644
--- a/app/src/main/res/layout/content_main.xml
+++ b/app/src/main/res/layout/content_main.xml
@@ -6,5 +6,5 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context="ml.docilealligator.infinityforreddit.MainActivity"
+    tools:application="ml.docilealligator.infinityforreddit.MainActivity"
     tools:showIn="@layout/app_bar_main" />
diff --git a/app/src/main/res/layout/content_view_subreddit_detail.xml b/app/src/main/res/layout/content_view_subreddit_detail.xml
index 2b27dd3c..f5ae24e3 100644
--- a/app/src/main/res/layout/content_view_subreddit_detail.xml
+++ b/app/src/main/res/layout/content_view_subreddit_detail.xml
@@ -6,5 +6,5 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".ViewSubredditDetailActivity"
+    tools:application=".ViewSubredditDetailActivity"
     tools:showIn="@layout/activity_view_subreddit_detail" />
diff --git a/app/src/main/res/layout/content_view_user_detail.xml b/app/src/main/res/layout/content_view_user_detail.xml
index c708ae9e..119bf6ad 100644
--- a/app/src/main/res/layout/content_view_user_detail.xml
+++ b/app/src/main/res/layout/content_view_user_detail.xml
@@ -6,5 +6,5 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:layout_behavior="@string/appbar_scrolling_view_behavior"
-    tools:context=".ViewUserDetailActivity"
+    tools:application=".ViewUserDetailActivity"
     tools:showIn="@layout/activity_view_user_detail" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_comments_listing.xml b/app/src/main/res/layout/fragment_comments_listing.xml
index a347e7af..e0741118 100644
--- a/app/src/main/res/layout/fragment_comments_listing.xml
+++ b/app/src/main/res/layout/fragment_comments_listing.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_comments_listing_fragment"
-    tools:context="ml.docilealligator.infinityforreddit.CommentsListingFragment">
+    tools:application="ml.docilealligator.infinityforreddit.CommentsListingFragment">
 
     <com.lsjwzh.widget.materialloadingprogressbar.CircleProgressBar
         android:id="@+id/progress_bar_comments_listing_fragment"
diff --git a/app/src/main/res/layout/fragment_flair_bottom_sheet.xml b/app/src/main/res/layout/fragment_flair_bottom_sheet.xml
index 215ec734..8f9511d6 100644
--- a/app/src/main/res/layout/fragment_flair_bottom_sheet.xml
+++ b/app/src/main/res/layout/fragment_flair_bottom_sheet.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
-    tools:context=".FlairBottomSheetFragment">
+    tools:application=".FlairBottomSheetFragment">
 
     <TextView
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/fragment_followed_users_listing.xml b/app/src/main/res/layout/fragment_followed_users_listing.xml
index 7e0c58f3..be07b5e7 100644
--- a/app/src/main/res/layout/fragment_followed_users_listing.xml
+++ b/app/src/main/res/layout/fragment_followed_users_listing.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".FollowedUsersListingFragment">
+    tools:application=".FollowedUsersListingFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view_followed_users_listing_fragment"
diff --git a/app/src/main/res/layout/fragment_post.xml b/app/src/main/res/layout/fragment_post.xml
index 0ab81ef0..27add5a2 100644
--- a/app/src/main/res/layout/fragment_post.xml
+++ b/app/src/main/res/layout/fragment_post.xml
@@ -4,7 +4,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:id="@+id/coordinator_layout_post_fragment"
-    tools:context="ml.docilealligator.infinityforreddit.PostFragment">
+    tools:application="ml.docilealligator.infinityforreddit.PostFragment">
 
     <com.lsjwzh.widget.materialloadingprogressbar.CircleProgressBar
         android:id="@+id/progress_bar_post_fragment"
diff --git a/app/src/main/res/layout/fragment_subreddit_listing.xml b/app/src/main/res/layout/fragment_subreddit_listing.xml
index 77f08627..1b789601 100644
--- a/app/src/main/res/layout/fragment_subreddit_listing.xml
+++ b/app/src/main/res/layout/fragment_subreddit_listing.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".SubredditListingFragment">
+    tools:application=".SubredditListingFragment">
 
     <com.lsjwzh.widget.materialloadingprogressbar.CircleProgressBar
         android:id="@+id/progress_bar_subreddit_listing_fragment"
diff --git a/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml b/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml
index b493d50b..995efc14 100644
--- a/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml
+++ b/app/src/main/res/layout/fragment_subscribed_subreddits_listing.xml
@@ -3,7 +3,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".SubscribedSubredditsListingFragment">
+    tools:application=".SubscribedSubredditsListingFragment">
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recycler_view_subscribed_subreddits_listing_fragment"
diff --git a/app/src/main/res/layout/fragment_user_listing.xml b/app/src/main/res/layout/fragment_user_listing.xml
index a877cac4..b2e55538 100644
--- a/app/src/main/res/layout/fragment_user_listing.xml
+++ b/app/src/main/res/layout/fragment_user_listing.xml
@@ -5,7 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context=".UserListingFragment">
+    tools:application=".UserListingFragment">
 
     <com.lsjwzh.widget.materialloadingprogressbar.CircleProgressBar
         android:id="@+id/progress_bar_user_listing_fragment"
diff --git a/app/src/main/res/menu/main_activity.xml b/app/src/main/res/menu/main_activity.xml
index 41d4f28b..3ab9d924 100644
--- a/app/src/main/res/menu/main_activity.xml
+++ b/app/src/main/res/menu/main_activity.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="ml.docilealligator.infinityforreddit.MainActivity">
+    tools:application="ml.docilealligator.infinityforreddit.MainActivity">
     <item
         android:id="@+id/action_sort_main_activity"
         android:orderInCategory="1"
diff --git a/app/src/main/res/menu/menu_search.xml b/app/src/main/res/menu/menu_search.xml
index f0cff4fd..c9cf32eb 100644
--- a/app/src/main/res/menu/menu_search.xml
+++ b/app/src/main/res/menu/menu_search.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="ml.docilealligator.infinityforreddit.SearchResultActivity">
+    tools:application="ml.docilealligator.infinityforreddit.SearchResultActivity">
     <item
         android:id="@+id/action_search_search_activity"
         android:orderInCategory="1"
diff --git a/app/src/main/res/menu/search_activity.xml b/app/src/main/res/menu/search_activity.xml
index c4820b38..67564ffa 100644
--- a/app/src/main/res/menu/search_activity.xml
+++ b/app/src/main/res/menu/search_activity.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="ml.docilealligator.infinityforreddit.SearchResultActivity">
+    tools:application="ml.docilealligator.infinityforreddit.SearchResultActivity">
     <item
         android:id="@+id/action_search_search_activity"
         android:orderInCategory="1"
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 a8912ab2..7c78387b 100644
--- a/app/src/main/res/menu/view_subreddit_detail_activity.xml
+++ b/app/src/main/res/menu/view_subreddit_detail_activity.xml
@@ -2,7 +2,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="ml.docilealligator.infinityforreddit.ViewSubredditDetailActivity">
+    tools:application="ml.docilealligator.infinityforreddit.ViewSubredditDetailActivity">
     <item
         android:id="@+id/action_sort_view_subreddit_detail_activity"
         android:orderInCategory="1"
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 58e469e9..b47f91d3 100644
--- a/app/src/main/res/menu/view_user_detail_activity.xml
+++ b/app/src/main/res/menu/view_user_detail_activity.xml
@@ -1,7 +1,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context="ml.docilealligator.infinityforreddit.ViewUserDetailActivity">
+    tools:application="ml.docilealligator.infinityforreddit.ViewUserDetailActivity">
     <item
         android:id="@+id/action_search_view_user_detail_activity"
         android:orderInCategory="1"
-- 
cgit v1.2.3