From ee7f0a5c950cfa4d9b687b02152b65ac633b5990 Mon Sep 17 00:00:00 2001
From: Ammar Githam <ammargitham786@gmail.com>
Date: Sat, 12 Sep 2020 17:22:11 +0900
Subject: [PATCH] Remove unused layouts and rename StoryViewerFragment layout

---
 .../fragments/StoryViewerFragment.java        |  23 +-
 .../res/layout/activity_direct_messages.xml   |  86 ---
 .../main/res/layout/activity_mainbackup.xml   | 104 ----
 app/src/main/res/layout/activity_profile.xml  |  17 -
 .../main/res/layout/dialog_main_settings.xml  | 535 ------------------
 ...y_viewer.xml => fragment_story_viewer.xml} |   0
 .../main/res/navigation/feed_nav_graph.xml    |   2 +-
 .../main/res/navigation/profile_nav_graph.xml |   2 +-
 8 files changed, 14 insertions(+), 755 deletions(-)
 delete mode 100644 app/src/main/res/layout/activity_direct_messages.xml
 delete mode 100644 app/src/main/res/layout/activity_mainbackup.xml
 delete mode 100755 app/src/main/res/layout/activity_profile.xml
 delete mode 100755 app/src/main/res/layout/dialog_main_settings.xml
 rename app/src/main/res/layout/{activity_story_viewer.xml => fragment_story_viewer.xml} (100%)
 mode change 100755 => 100644

diff --git a/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java b/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
index b8c0dbf2..e54f5da9 100644
--- a/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
+++ b/app/src/main/java/awais/instagrabber/fragments/StoryViewerFragment.java
@@ -69,7 +69,7 @@ import awais.instagrabber.asyncs.SeenAction;
 import awais.instagrabber.asyncs.VoteAction;
 import awais.instagrabber.asyncs.direct_messages.DirectThreadBroadcaster;
 import awais.instagrabber.customviews.helpers.SwipeGestureListener;
-import awais.instagrabber.databinding.ActivityStoryViewerBinding;
+import awais.instagrabber.databinding.FragmentStoryViewerBinding;
 import awais.instagrabber.interfaces.SwipeEvent;
 import awais.instagrabber.models.FeedStoryModel;
 import awais.instagrabber.models.HighlightModel;
@@ -79,9 +79,6 @@ import awais.instagrabber.models.enums.StoryViewerChoice;
 import awais.instagrabber.models.stickers.PollModel;
 import awais.instagrabber.models.stickers.QuestionModel;
 import awais.instagrabber.models.stickers.QuizModel;
-import awais.instagrabber.webservices.AloService;
-import awais.instagrabber.webservices.ServiceCallback;
-import awais.instagrabber.webservices.StoriesService;
 import awais.instagrabber.utils.Constants;
 import awais.instagrabber.utils.CookieUtils;
 import awais.instagrabber.utils.DownloadUtils;
@@ -90,6 +87,9 @@ import awais.instagrabber.utils.Utils;
 import awais.instagrabber.viewmodels.FeedStoriesViewModel;
 import awais.instagrabber.viewmodels.HighlightsViewModel;
 import awais.instagrabber.viewmodels.StoriesViewModel;
+import awais.instagrabber.webservices.AloService;
+import awais.instagrabber.webservices.ServiceCallback;
+import awais.instagrabber.webservices.StoriesService;
 import awaisomereport.LogCollector;
 
 import static awais.instagrabber.customviews.helpers.SwipeGestureListener.SWIPE_THRESHOLD;
@@ -105,7 +105,8 @@ public class StoryViewerFragment extends Fragment {
 
     private AppCompatActivity fragmentActivity;
     private View root;
-    private ActivityStoryViewerBinding binding;
+    private @NonNull
+    FragmentStoryViewerBinding binding;
     private String currentStoryUsername;
     private StoriesAdapter storiesAdapter;
     private SwipeEvent swipeEvent;
@@ -151,7 +152,7 @@ public class StoryViewerFragment extends Fragment {
             shouldRefresh = false;
             return root;
         }
-        binding = ActivityStoryViewerBinding.inflate(inflater, container, false);
+        binding = FragmentStoryViewerBinding.inflate(inflater, container, false);
         root = binding.getRoot();
         return root;
     }
@@ -504,11 +505,11 @@ public class StoryViewerFragment extends Fragment {
                 // actionBar.setOnClickListener(v -> {
                 //     searchUsername(username);
                 // });
-//                if (isHighlight) {
-//                    actionBar.setSubtitle(getString(R.string.title_highlight, highlight));
-//                } else {
-//                    actionBar.setSubtitle(R.string.title_user_story);
-//                }
+                //                if (isHighlight) {
+                //                    actionBar.setSubtitle(getString(R.string.title_highlight, highlight));
+                //                } else {
+                //                    actionBar.setSubtitle(R.string.title_user_story);
+                //                }
             }
         }
         storiesViewModel.getList().setValue(Collections.emptyList());
diff --git a/app/src/main/res/layout/activity_direct_messages.xml b/app/src/main/res/layout/activity_direct_messages.xml
deleted file mode 100644
index 4f41a9e5..00000000
--- a/app/src/main/res/layout/activity_direct_messages.xml
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.coordinatorlayout.widget.CoordinatorLayout 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"
-    android:id="@+id/homeCoordinator"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:animateLayoutChanges="true"
-    android:fitsSystemWindows="true"
-    tools:context=".activities.DirectMessagesActivity">
-
-    <fragment
-        android:id="@+id/direct_messages_nav_host_fragment"
-        android:name="androidx.navigation.fragment.NavHostFragment"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:defaultNavHost="true"
-        app:layout_behavior="@string/appbar_scrolling_view_behavior"
-        app:navGraph="@navigation/direct_messages_nav_graph"
-        tools:ignore="FragmentTagUsage" />
-
-    <com.google.android.material.appbar.AppBarLayout
-        android:id="@+id/appBarLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:liftOnScroll="true">
-
-        <com.google.android.material.appbar.CollapsingToolbarLayout
-            android:id="@+id/collapsingToolbarLayout"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:animateLayoutChanges="true"
-            app:contentScrim="?attr/colorPrimary"
-            app:layout_scrollFlags="scroll|enterAlways|exitUntilCollapsed|snap"
-            app:scrimAnimationDuration="10">
-
-            <androidx.appcompat.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                app:layout_collapseMode="pin"
-                app:layout_scrollFlags="scroll|exitUntilCollapsed">
-
-                <TextView
-                    android:id="@+id/toolbar_title"
-                    style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"
-                    android:layout_width="200dp"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
-                    android:text="@string/app_name" />
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/dmSeen"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:paddingStart="4dp"
-                    android:paddingLeft="4dp"
-                    android:paddingTop="4dp"
-                    android:paddingEnd="8dp"
-                    android:paddingRight="8dp"
-                    android:paddingBottom="4dp"
-                    app:srcCompat="@android:drawable/ic_menu_view" />
-
-                <androidx.appcompat.widget.AppCompatImageView
-                    android:id="@+id/dmInfo"
-                    android:layout_width="wrap_content"
-                    android:layout_height="match_parent"
-                    android:layout_gravity="center"
-                    android:background="?selectableItemBackgroundBorderless"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:paddingStart="4dp"
-                    android:paddingLeft="4dp"
-                    android:paddingTop="4dp"
-                    android:paddingEnd="8dp"
-                    android:paddingRight="8dp"
-                    android:paddingBottom="4dp"
-                    app:srcCompat="@drawable/ic_outline_info_24" />
-            </androidx.appcompat.widget.Toolbar>
-        </com.google.android.material.appbar.CollapsingToolbarLayout>
-    </com.google.android.material.appbar.AppBarLayout>
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_mainbackup.xml b/app/src/main/res/layout/activity_mainbackup.xml
deleted file mode 100644
index cbefb539..00000000
--- a/app/src/main/res/layout/activity_mainbackup.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".activities.MainActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include
-            android:id="@+id/toolbar"
-            layout="@layout/layout_include_toolbar" />
-
-        <awais.instagrabber.customviews.RemixDrawerLayout
-            android:id="@+id/drawerLayout"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:layout_weight="1">
-
-            <!-- Profile View -->
-            <include
-                android:id="@+id/profile_view"
-                layout="@layout/layout_profile_view" />
-
-            <!-- Feed View -->
-            <include
-                android:id="@+id/feed_view"
-                layout="@layout/layout_feed_view" />
-
-            <!-- Discover View -->
-            <androidx.coordinatorlayout.widget.CoordinatorLayout
-                android:id="@+id/discoverLayout"
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:layout_gravity="end"
-                android:animateLayoutChanges="true"
-                android:tag="@android:string/yes">
-
-                <com.google.android.material.appbar.AppBarLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@null"
-                    app:elevation="0dp">
-                    <com.google.android.material.appbar.CollapsingToolbarLayout
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        app:layout_scrollFlags="scroll|snap|enterAlways">
-
-                        <androidx.appcompat.widget.AppCompatSpinner
-                            android:id="@+id/discoverType"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:entries="@array/discover_placeholder"/>
-                    </com.google.android.material.appbar.CollapsingToolbarLayout>
-                </com.google.android.material.appbar.AppBarLayout>
-
-                <androidx.swiperefreshlayout.widget.SwipeRefreshLayout
-                    android:id="@+id/discoverSwipeRefreshLayout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="end"
-                    android:tag="@android:string/yes"
-                    app:layout_behavior="@string/appbar_scrolling_view_behavior">
-
-                    <androidx.recyclerview.widget.RecyclerView
-                        android:id="@+id/discoverPosts"
-                        android:layout_width="match_parent"
-                        android:layout_height="match_parent"
-                        android:clipToPadding="false"
-                        tools:listitem="@layout/item_feed_photo" />
-                </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
-            </androidx.coordinatorlayout.widget.CoordinatorLayout>
-        </awais.instagrabber.customviews.RemixDrawerLayout>
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/iconSlider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal">
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            app:srcCompat="@drawable/ic_feed"
-            app:tint="?android:textColorSecondary" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            app:srcCompat="@drawable/ic_profile"
-            app:tint="?android:textColorPrimary" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:layout_width="20dp"
-            android:layout_height="20dp"
-            app:srcCompat="@drawable/ic_discover"
-            app:tint="?android:textColorSecondary" />
-    </LinearLayout>
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_profile.xml b/app/src/main/res/layout/activity_profile.xml
deleted file mode 100755
index 6927fda5..00000000
--- a/app/src/main/res/layout/activity_profile.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    tools:context=".activities.ProfileViewer">
-
-    <include
-        android:id="@+id/toolbar"
-        layout="@layout/layout_include_toolbar" />
-
-    <include
-        android:id="@+id/profile_view"
-        layout="@layout/layout_profile_view" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_main_settings.xml b/app/src/main/res/layout/dialog_main_settings.xml
deleted file mode 100755
index 8935b967..00000000
--- a/app/src/main/res/layout/dialog_main_settings.xml
+++ /dev/null
@@ -1,535 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.appcompat.widget.LinearLayoutCompat xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <androidx.appcompat.widget.AppCompatTextView
-            style="@style/TextAppearance.AppCompat.Headline"
-            android:id="@+id/settingTitle"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="end"
-            android:paddingStart="?attr/dialogPreferredPadding"
-            android:paddingLeft="?attr/dialogPreferredPadding"
-            android:paddingTop="10dp"
-            android:paddingEnd="?attr/dialogPreferredPadding"
-            android:paddingRight="?attr/dialogPreferredPadding"
-            android:paddingBottom="6dp"
-            android:singleLine="true"
-            android:text="@string/action_settings" />
-
-        <androidx.appcompat.widget.AppCompatImageView
-            android:id="@+id/importExport"
-            android:layout_width="48dp"
-            android:layout_height="match_parent"
-            android:background="?selectableItemBackgroundBorderless"
-            android:padding="6dp"
-            app:srcCompat="@drawable/ic_import_export" />
-    </LinearLayout>
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:clipToPadding="false"
-        android:paddingBottom="10dp">
-
-        <androidx.appcompat.widget.LinearLayoutCompat
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:orientation="vertical">
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:weightSum="2">
-
-                <androidx.appcompat.widget.AppCompatButton
-                    android:id="@+id/btnLogin"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_weight="1"
-                    android:text="@string/login"
-                    android:textColor="@color/btn_green_text_color"
-                    android:textSize="20sp"
-                    app:backgroundTint="@color/btn_green_background" />
-
-                <androidx.appcompat.widget.AppCompatButton
-                    android:id="@+id/btnLogout"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginLeft="8dp"
-                    android:layout_marginEnd="8dp"
-                    android:layout_marginRight="8dp"
-                    android:layout_weight="1"
-                    android:text="@string/logout"
-                    android:textColor="@color/btn_red_text_color"
-                    android:textSize="20sp"
-                    app:backgroundTint="@color/btn_red_background" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:orientation="vertical"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/select_language"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-
-                <androidx.appcompat.widget.AppCompatSpinner
-                    android:id="@+id/spLanguage"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:entries="@array/languages"
-                    android:paddingTop="4dp"
-                    android:paddingBottom="4dp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:orientation="vertical"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/theme_settings"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-
-                <androidx.appcompat.widget.AppCompatSpinner
-                    android:id="@+id/spAppTheme"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:entries="@array/theme_presets"
-                    android:paddingTop="4dp"
-                    android:paddingBottom="4dp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbAmoledTheme"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/use_amoled_dark_theme" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/use_amoled_dark_theme"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbDownloadUsername"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/download_user_folder" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/download_user_folder"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbSaveTo"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_gravity="center_vertical"
-                    android:contentDescription="@string/save_to_folder" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:layout_weight="1"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/save_to_folder"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-
-                <androidx.appcompat.widget.AppCompatButton
-                    android:id="@+id/btnSaveTo"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:orientation="vertical"
-                    android:text="@string/select_folder" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbBottomToolbar"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/bottom_toolbar" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/bottom_toolbar"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbUpdates"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/bottom_toolbar" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/update_check"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbAutoplayVideos"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/post_viewer_autoplay_video" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/post_viewer_autoplay_video"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbMuteVideos"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/post_viewer_muted_autoplay" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/post_viewer_muted_autoplay"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbAutoloadPosts"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/autoload_posts" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/autoload_posts"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.AppCompatTextView
-                android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:gravity="center_vertical"
-                android:padding="5dp"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:text="@string/login_settings"
-                android:textColor="?android:textColorPrimary"
-                android:textSize="16sp" />
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbMarkAsSeen"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/mark_as_seen_setting" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/mark_as_seen_setting"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbMarkDmAsSeen"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/dm_mark_as_seen_setting" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/dm_mark_as_seen_setting"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbActivity"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/activity_setting" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/activity_setting"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:gravity="center_vertical"
-                    android:layout_width="0dp"
-                    android:layout_height="match_parent"
-                    android:layout_weight="1"
-                    android:text="@string/anonymous_settings"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-                <androidx.appcompat.widget.AppCompatButton
-                    android:id="@+id/btnPrivacy"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="center_vertical"
-                    android:text="@string/privacy_warning" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbInstadp"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/instadp_settings" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/instadp_settings"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.LinearLayoutCompat
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="5dp"
-                android:layout_marginLeft="5dp"
-                android:background="?android:selectableItemBackground"
-                android:orientation="horizontal"
-                android:padding="5dp">
-
-                <androidx.appcompat.widget.AppCompatCheckBox
-                    android:id="@+id/cbStoriesig"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:contentDescription="@string/storiesig_settings" />
-
-                <androidx.appcompat.widget.AppCompatTextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="center_vertical"
-                    android:padding="5dp"
-                    android:text="@string/storiesig_settings"
-                    android:textColor="?android:textColorPrimary"
-                    android:textSize="16sp" />
-            </androidx.appcompat.widget.LinearLayoutCompat>
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/btnTimeSettings"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/time_settings"
-                android:textColor="@color/btn_blue_text_color"
-                android:textSize="20sp"
-                app:backgroundTint="@color/btn_blue_background" />
-
-            <androidx.appcompat.widget.AppCompatButton
-                android:id="@+id/btnReport"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="8dp"
-                android:layout_marginLeft="8dp"
-                android:layout_marginEnd="8dp"
-                android:layout_marginRight="8dp"
-                android:text="@string/send_logs"
-                android:textColor="@color/btn_black_text_color"
-                android:textSize="20sp"
-                app:backgroundTint="@color/btn_black_background" />
-        </androidx.appcompat.widget.LinearLayoutCompat>
-    </androidx.core.widget.NestedScrollView>
-</androidx.appcompat.widget.LinearLayoutCompat>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_story_viewer.xml b/app/src/main/res/layout/fragment_story_viewer.xml
old mode 100755
new mode 100644
similarity index 100%
rename from app/src/main/res/layout/activity_story_viewer.xml
rename to app/src/main/res/layout/fragment_story_viewer.xml
diff --git a/app/src/main/res/navigation/feed_nav_graph.xml b/app/src/main/res/navigation/feed_nav_graph.xml
index 19f3ce50..e5228e0e 100644
--- a/app/src/main/res/navigation/feed_nav_graph.xml
+++ b/app/src/main/res/navigation/feed_nav_graph.xml
@@ -86,7 +86,7 @@
         android:id="@+id/storyViewerFragment"
         android:name="awais.instagrabber.fragments.StoryViewerFragment"
         android:label="StoryViewerFragment"
-        tools:layout="@layout/activity_story_viewer">
+        tools:layout="@layout/fragment_story_viewer">
         <argument
             android:name="feedStoryIndex"
             app:argType="integer"
diff --git a/app/src/main/res/navigation/profile_nav_graph.xml b/app/src/main/res/navigation/profile_nav_graph.xml
index 81e41859..1af3b2bd 100644
--- a/app/src/main/res/navigation/profile_nav_graph.xml
+++ b/app/src/main/res/navigation/profile_nav_graph.xml
@@ -124,7 +124,7 @@
         android:id="@+id/storyViewerFragment"
         android:name="awais.instagrabber.fragments.StoryViewerFragment"
         android:label="StoryViewerFragment"
-        tools:layout="@layout/activity_story_viewer">
+        tools:layout="@layout/fragment_story_viewer">
         <argument
             android:name="feedStoryIndex"
             app:argType="integer"