From 39b1e778039fd2704254d88ca8d923531c31f9a8 Mon Sep 17 00:00:00 2001
From: Mihai-Cristian Condrea <d4rk7355608@gmail.com>
Date: Thu, 18 Sep 2025 21:45:50 +0300
Subject: [PATCH 1/2] Optimize layouts to reduce redundant containers

---
 app/src/main/res/layout/activity_main.xml     | 26 ++++++-------------
 .../main/res/layout/activity_shortcuts.xml    |  3 +--
 .../res/layout/fragment_buttons_layout.xml    |  1 -
 .../main/res/layout/fragment_clock_layout.xml |  1 -
 app/src/main/res/layout/fragment_code.xml     |  1 -
 app/src/main/res/layout/fragment_home.xml     |  1 -
 app/src/main/res/layout/fragment_layout.xml   |  1 -
 .../layout/fragment_linear_layout_layout.xml  |  1 -
 app/src/main/res/layout/fragment_no_code.xml  |  1 -
 .../main/res/layout/fragment_same_code.xml    |  1 -
 .../res/layout/item_onboarding_option.xml     |  1 -
 11 files changed, 9 insertions(+), 29 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index aa805bc8..b737111f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -24,7 +24,7 @@
         android:id="@+id/nav_rail"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/ad_container"
+        app:layout_constraintBottom_toTopOf="@+id/ad_view"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
         app:menu="@menu/bottom_nav_menu" />
@@ -35,30 +35,20 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:defaultNavHost="true"
-        app:layout_constraintBottom_toTopOf="@+id/ad_container"
+        app:layout_constraintBottom_toTopOf="@+id/ad_view"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/nav_rail"
         app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
         app:navGraph="@navigation/mobile_navigation" />
 
-    <FrameLayout
-        android:id="@+id/ad_container"
+    <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+        android:id="@+id/ad_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@+id/nav_view">
-
-        <View
-            android:id="@+id/ad_placeholder"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="?attr/colorSurfaceContainer" />
-
-        <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
-            android:id="@+id/ad_view"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            app:nativeAdLayout="@layout/ad_bottom_app_bar" />
-    </FrameLayout>
+        app:layout_constraintBottom_toTopOf="@+id/nav_view"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:nativeAdLayout="@layout/ad_bottom_app_bar" />
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/nav_view"
diff --git a/app/src/main/res/layout/activity_shortcuts.xml b/app/src/main/res/layout/activity_shortcuts.xml
index 54de0123..4b057c0e 100644
--- a/app/src/main/res/layout/activity_shortcuts.xml
+++ b/app/src/main/res/layout/activity_shortcuts.xml
@@ -5,8 +5,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_height="match_parent">
 
     <FrameLayout
         android:id="@+id/frame_layout_shortcuts"
diff --git a/app/src/main/res/layout/fragment_buttons_layout.xml b/app/src/main/res/layout/fragment_buttons_layout.xml
index 84208e1e..a634b052 100644
--- a/app/src/main/res/layout/fragment_buttons_layout.xml
+++ b/app/src/main/res/layout/fragment_buttons_layout.xml
@@ -269,7 +269,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_clock_layout.xml b/app/src/main/res/layout/fragment_clock_layout.xml
index d92bc31f..23598a05 100644
--- a/app/src/main/res/layout/fragment_clock_layout.xml
+++ b/app/src/main/res/layout/fragment_clock_layout.xml
@@ -77,7 +77,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_code.xml b/app/src/main/res/layout/fragment_code.xml
index 93d11d82..fce38802 100644
--- a/app/src/main/res/layout/fragment_code.xml
+++ b/app/src/main/res/layout/fragment_code.xml
@@ -33,7 +33,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 1f7971f7..37aa9818 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -188,7 +188,6 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginHorizontal="16dp"
-                android:layout_marginBottom="0dp"
                 app:shapeAppearanceOverlay="@style/ShapeAppearanceOverlay.CardViewTopRounded">
 
                 <androidx.appcompat.widget.LinearLayoutCompat
diff --git a/app/src/main/res/layout/fragment_layout.xml b/app/src/main/res/layout/fragment_layout.xml
index 93d11d82..fce38802 100644
--- a/app/src/main/res/layout/fragment_layout.xml
+++ b/app/src/main/res/layout/fragment_layout.xml
@@ -33,7 +33,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_linear_layout_layout.xml b/app/src/main/res/layout/fragment_linear_layout_layout.xml
index 0f96a14b..43a9f1be 100644
--- a/app/src/main/res/layout/fragment_linear_layout_layout.xml
+++ b/app/src/main/res/layout/fragment_linear_layout_layout.xml
@@ -59,7 +59,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_no_code.xml b/app/src/main/res/layout/fragment_no_code.xml
index 15315f88..da518daa 100644
--- a/app/src/main/res/layout/fragment_no_code.xml
+++ b/app/src/main/res/layout/fragment_no_code.xml
@@ -30,7 +30,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/fragment_same_code.xml b/app/src/main/res/layout/fragment_same_code.xml
index 3f2d9477..38d86fc7 100644
--- a/app/src/main/res/layout/fragment_same_code.xml
+++ b/app/src/main/res/layout/fragment_same_code.xml
@@ -55,7 +55,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginStart="24dp"
-        android:layout_marginTop="0dp"
         android:layout_marginEnd="24dp"
         android:layout_marginBottom="24dp"
         app:layout_constraintBottom_toBottomOf="parent"
diff --git a/app/src/main/res/layout/item_onboarding_option.xml b/app/src/main/res/layout/item_onboarding_option.xml
index c0e56bf5..b86d41dd 100644
--- a/app/src/main/res/layout/item_onboarding_option.xml
+++ b/app/src/main/res/layout/item_onboarding_option.xml
@@ -57,7 +57,6 @@
             android:id="@+id/radio_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="0dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"/>

From e03002f34c3447ba8d6fa3f9d33ba2efbeca692a Mon Sep 17 00:00:00 2001
From: Mihai-Cristian Condrea <d4rk7355608@gmail.com>
Date: Thu, 18 Sep 2025 23:41:20 +0300
Subject: [PATCH 2/2] Restore ad placeholder container in main layout

---
 app/src/main/res/layout/activity_main.xml | 26 +++++++++++++++++------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b737111f..1958e47b 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -24,7 +24,7 @@
         android:id="@+id/nav_rail"
         android:layout_width="wrap_content"
         android:layout_height="0dp"
-        app:layout_constraintBottom_toTopOf="@+id/ad_view"
+        app:layout_constraintBottom_toTopOf="@+id/ad_container"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
         app:menu="@menu/bottom_nav_menu" />
@@ -35,20 +35,32 @@
         android:layout_width="0dp"
         android:layout_height="0dp"
         app:defaultNavHost="true"
-        app:layout_constraintBottom_toTopOf="@+id/ad_view"
+        app:layout_constraintBottom_toTopOf="@+id/ad_container"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toEndOf="@id/nav_rail"
         app:layout_constraintTop_toBottomOf="@id/app_bar_layout"
         app:navGraph="@navigation/mobile_navigation" />
 
-    <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
-        android:id="@+id/ad_view"
+    <FrameLayout
+        android:id="@+id/ad_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:layout_constraintBottom_toTopOf="@+id/nav_view"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:nativeAdLayout="@layout/ad_bottom_app_bar" />
+        app:layout_constraintStart_toStartOf="parent">
+
+        <View
+            android:id="@+id/ad_placeholder"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?attr/colorSurfaceContainer" />
+
+        <com.d4rk.androidtutorials.java.ads.views.NativeAdBannerView
+            android:id="@+id/ad_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:nativeAdLayout="@layout/ad_bottom_app_bar" />
+    </FrameLayout>
 
     <com.google.android.material.bottomnavigation.BottomNavigationView
         android:id="@+id/nav_view"
@@ -66,4 +78,4 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>