Fix: Dock Layout Toggle button now correctly opens/closes widget panel

Author: poolsoft

OsmAnd/src-carlauncher/java/net/osmand/plus/activities/MapActivity.java

@@ -824,8 +824,15 @@ private void applyWidgetPanelState() {
 
 	@Override
 	public void onLayoutModeToggle() {
-		// Cycle: 0 (Normal) -> 1 (Widget Hidden) -> 2 (Full Screen) -> 0
-		layoutMode = (layoutMode + 1) % 2;
+		// Toggle Logic: Normal (0) <-> Full Screen (2)
+		if (layoutMode == 0) {
+			layoutMode = 2;
+			isWidgetPanelOpen = false;
+		} else {
+			layoutMode = 0;
+			isWidgetPanelOpen = true;
+		}
+		
 		updateLayoutMode();
 	}
 

OsmAnd/src-carlauncher/res/layout/activity_car_launcher.xml

@@ -22,19 +22,6 @@
         app:layout_constraintEnd_toStartOf="@+id/widget_panel"
         android:elevation="4dp"/>
 
-    <!-- WIDGET PANEL CONTAINER (Drawer) -->
-    <FrameLayout
-        android:id="@+id/widget_panel"
-        android:layout_width="350dp"
-        android:layout_height="0dp"
-        android:background="#111111"
-        android:layout_marginTop="0dp"
-        android:elevation="20dp"
-        android:visibility="gone"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
-
     <!-- WIDGET HANDLE (External Floater) -->
     <ImageButton
         android:id="@+id/widget_handle"
@@ -50,6 +37,19 @@
         app:layout_constraintEnd_toEndOf="parent" 
         app:layout_constraintVertical_bias="0.5" />
 
+    <!-- WIDGET PANEL CONTAINER (Drawer) -->
+    <FrameLayout
+        android:id="@+id/widget_panel"
+        android:layout_width="350dp"
+        android:layout_height="0dp"
+        android:background="#111111"
+        android:layout_marginTop="0dp"
+        android:elevation="20dp"
+        android:visibility="gone"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent" />
+
     <!-- APP DOCK (Bottom Nav Bar Style) -->
     <FrameLayout
         android:id="@+id/app_dock"