incognito view fix (#89)

* auto pip * undo
rebelonion · Dec 19, 2023 · 0bacfb8 · 0bacfb8
1 parent 11d04ec
commit 0bacfb8
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 37 deletions.
diff --git a/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt b/app/src/main/java/ani/dantotsu/home/AnimePageAdapter.kt
@@ -79,7 +79,9 @@ class AnimePageAdapter : RecyclerView.Adapter<AnimePageAdapter.AnimePageViewHold
             ?.getBoolean("incognito", false) ?: false
         if(incognito) {
             binding.incognitoTextView.visibility = View.VISIBLE
-            binding.incognitoView.visibility = View.VISIBLE
+            if (!uiSettings.immersiveMode) {
+                binding.root.fitsSystemWindows = true
+            }
         }
 
         binding.animeTitleContainer.updatePadding(top = statusBarHeight)

diff --git a/app/src/main/java/ani/dantotsu/home/HomeFragment.kt b/app/src/main/java/ani/dantotsu/home/HomeFragment.kt
@@ -119,7 +119,9 @@ class HomeFragment : Fragment() {
             ?.getBoolean("incognito", false) ?: false
         if(incognito) {
             binding.incognitoTextView.visibility = View.VISIBLE
-            binding.incognitoView.visibility = View.VISIBLE
+            if (!uiSettings.immersiveMode) {
+                binding.root.fitsSystemWindows = true
+            }
         }
         binding.homeUserAvatarContainer.setSafeOnClickListener {
             val dialogFragment =

diff --git a/app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt b/app/src/main/java/ani/dantotsu/home/MangaPageAdapter.kt
@@ -79,7 +79,9 @@ class MangaPageAdapter : RecyclerView.Adapter<MangaPageAdapter.MangaPageViewHold
             ?.getBoolean("incognito", false) ?: false
         if(incognito) {
             binding.incognitoTextView.visibility = View.VISIBLE
-            binding.incognitoView.visibility = View.VISIBLE
+            if (!uiSettings.immersiveMode) {
+                binding.root.fitsSystemWindows = true
+            }
         }
 
         binding.mangaTitleContainer.updatePadding(top = statusBarHeight)

diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
@@ -17,26 +17,17 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="vertical">
-            <LinearLayout
-                android:id="@+id/incognitoView"
+            <TextView
+                android:id="@+id/incognitoTextView"
+                android:layout_height="wrap_content"
                 android:layout_width="wrap_content"
-                android:layout_height="30dp"
-                android:orientation="horizontal"
+                android:text="Incognito Mode"
+                android:fontFamily="@font/poppins_bold"
+                android:textSize="15sp"
+                android:textColor="#4f2dbd"
+                android:layout_gravity="bottom|center_horizontal"
+                android:padding="8dp"
                 android:visibility="gone"/>
-
-                <TextView
-                    android:id="@+id/incognitoTextView"
-                    android:layout_height="wrap_content"
-                    android:layout_width="wrap_content"
-                    android:text="Incognito Mode"
-                    android:fontFamily="@font/poppins_bold"
-                    android:textSize="11sp"
-                    android:textColor="#4f2dbd"
-                    android:layout_gravity="bottom|center_horizontal"
-                    android:background="#00FFFFFF"
-                    android:padding="8dp"
-                    android:visibility="gone"/>
-
             <FrameLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content">

diff --git a/app/src/main/res/layout/item_anime_page.xml b/app/src/main/res/layout/item_anime_page.xml
@@ -8,21 +8,14 @@
     android:layout_marginStart="-16dp"
     android:layout_marginEnd="-16dp"
     android:orientation="vertical">
-    <LinearLayout
-        android:id="@+id/incognitoView"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:orientation="horizontal"
-        android:background="?attr/colorPrimary"
-        android:visibility="gone"/>
 
     <TextView
         android:id="@+id/incognitoTextView"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:text="Incognito Mode"
         android:fontFamily="@font/poppins_bold"
-        android:textSize="11sp"
+        android:textSize="15sp"
         android:textColor="#4f2dbd"
         android:layout_gravity="bottom|center_horizontal"
         android:background="#00FFFFFF"

diff --git a/app/src/main/res/layout/item_anime_watch.xml b/app/src/main/res/layout/item_anime_watch.xml
@@ -25,6 +25,7 @@
             android:layout_height="wrap_content"
             android:layout_marginBottom="16dp"
             android:backgroundTint="@color/yt_red"
+            android:visibility="gone"
             android:insetTop="0dp"
             android:insetBottom="0dp"
             android:text="@string/play_yt"

diff --git a/app/src/main/res/layout/item_manga_page.xml b/app/src/main/res/layout/item_manga_page.xml
@@ -8,21 +8,14 @@
     android:layout_marginStart="-16dp"
     android:layout_marginEnd="-16dp"
     android:orientation="vertical">
-    <LinearLayout
-        android:id="@+id/incognitoView"
-        android:layout_width="wrap_content"
-        android:layout_height="30dp"
-        android:orientation="horizontal"
-        android:background="?attr/colorPrimary"
-        android:visibility="gone"/>
 
     <TextView
         android:id="@+id/incognitoTextView"
         android:layout_height="wrap_content"
         android:layout_width="wrap_content"
         android:text="Incognito Mode"
         android:fontFamily="@font/poppins_bold"
-        android:textSize="11sp"
+        android:textSize="15sp"
         android:textColor="#4f2dbd"
         android:layout_gravity="bottom|center_horizontal"
         android:background="#00FFFFFF"