From fad1c0a2648092fdea0c391e4ac134476bdf7cfb Mon Sep 17 00:00:00 2001
From: 3dtours <yeunhiepanh.photo@gmail.com>
Date: Sun, 5 Jul 2026 17:43:49 +0700
Subject: [PATCH] Fix: Resolve timeline overlapping by increasing container
 height to 96dp and reducing card sizes to 68dp

---
 android-project/app/src/main/res/layout/activity_main.xml | 4 ++--
 .../app/src/main/res/layout/item_frame_sub.xml            | 8 ++++----
 android-project/app/src/main/res/layout/item_preset.xml   | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/android-project/app/src/main/res/layout/activity_main.xml b/android-project/app/src/main/res/layout/activity_main.xml
index 0ee5188..0ade566 100644
--- a/android-project/app/src/main/res/layout/activity_main.xml
+++ b/android-project/app/src/main/res/layout/activity_main.xml
@@ -108,7 +108,7 @@
     <FrameLayout
         android:id="@+id/panelSelectionContainer"
         android:layout_width="match_parent"
-        android:layout_height="80dp"
+        android:layout_height="96dp"
         android:background="#000000"
         app:layout_constraintTop_toBottomOf="@id/cameraContainer"
         app:layout_constraintBottom_toTopOf="@id/bottomControlPanel">
@@ -166,7 +166,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/bottomControlPanel"
         android:layout_width="match_parent"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:background="#000000"
         app:layout_constraintTop_toBottomOf="@id/panelSelectionContainer"
         app:layout_constraintBottom_toBottomOf="parent">
diff --git a/android-project/app/src/main/res/layout/item_frame_sub.xml b/android-project/app/src/main/res/layout/item_frame_sub.xml
index 09b5fcc..33df98e 100644
--- a/android-project/app/src/main/res/layout/item_frame_sub.xml
+++ b/android-project/app/src/main/res/layout/item_frame_sub.xml
@@ -2,8 +2,8 @@
 <com.google.android.material.card.MaterialCardView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/cardSubFrame"
-    android:layout_width="80dp"
-    android:layout_height="80dp"
+    android:layout_width="68dp"
+    android:layout_height="68dp"
     android:layout_margin="4dp"
     app:cardCornerRadius="6dp"
     app:cardElevation="1dp"
@@ -19,8 +19,8 @@
 
         <ImageView
             android:id="@+id/imgFrameThumb"
-            android:layout_width="48dp"
-            android:layout_height="48dp"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
             android:scaleType="fitCenter"
             android:contentDescription="Frame Thumb" />
 
diff --git a/android-project/app/src/main/res/layout/item_preset.xml b/android-project/app/src/main/res/layout/item_preset.xml
index d036104..ed821c4 100644
--- a/android-project/app/src/main/res/layout/item_preset.xml
+++ b/android-project/app/src/main/res/layout/item_preset.xml
@@ -6,9 +6,9 @@
 
     <com.google.android.material.card.MaterialCardView
         android:id="@+id/cardPreset"
-        android:layout_width="80dp"
-        android:layout_height="80dp"
-        android:layout_margin="6dp"
+        android:layout_width="68dp"
+        android:layout_height="68dp"
+        android:layout_margin="4dp"
         app:cardCornerRadius="6dp"
         app:cardElevation="1dp"
         app:strokeWidth="0dp"