Add option for old action bar

java/src/org/futo/inputmethod/latin/uix/ActionBar.kt

@@ -94,6 +94,7 @@ import org.futo.inputmethod.latin.uix.actions.FavoriteActions
 import org.futo.inputmethod.latin.uix.actions.MoreActionsAction
 import org.futo.inputmethod.latin.uix.actions.PinnedActions
 import org.futo.inputmethod.latin.uix.actions.toActionList
+import org.futo.inputmethod.latin.uix.settings.useDataStore
 import org.futo.inputmethod.latin.uix.settings.useDataStoreValueBlocking
 import org.futo.inputmethod.latin.uix.theme.DarkColorScheme
 import org.futo.inputmethod.latin.uix.theme.Typography
@@ -130,6 +131,27 @@ import kotlin.math.roundToInt
  * TODO: Will need to make RTL languages work
  */
 
+val ActionBarScrollIndexSetting = SettingsKey(
+    intPreferencesKey("action_bar_scroll_index"),
+    0
+)
+
+val ActionBarScrollOffsetSetting = SettingsKey(
+    intPreferencesKey("action_bar_scroll_offset"),
+    0
+)
+
+val ActionBarExpanded = SettingsKey(
+    booleanPreferencesKey("actionExpanded"),
+    false
+)
+
+val OldStyleActionsBar = SettingsKey(
+    booleanPreferencesKey("oldActionBar"),
+    false
+)
+
+
 interface ImportantNotice {
     @Composable fun getText(): String
     fun onDismiss(context: Context)
@@ -422,14 +444,6 @@ fun ActionItemSmall(action: Action, onSelect: (Action) -> Unit, onLongSelect: (A
     }
 }
 
-val ActionBarScrollIndexSetting = SettingsKey(
-    intPreferencesKey("action_bar_scroll_index"),
-    0
-)
-val ActionBarScrollOffsetSetting = SettingsKey(
-    intPreferencesKey("action_bar_scroll_offset"),
-    0
-)
 
 @Composable
 fun ActionItems(onSelect: (Action) -> Unit, onLongSelect: (Action) -> Unit) {
@@ -613,11 +627,6 @@ fun ImportantNoticeView(
     }
 }
 
-val ActionBarExpanded = SettingsKey(
-    booleanPreferencesKey("actionExpanded"),
-    false
-)
-
 @Composable
 fun RowScope.PinnedActionItems(onSelect: (Action) -> Unit, onLongSelect: (Action) -> Unit) {
     val actions = if(!LocalInspectionMode.current) {
@@ -658,8 +667,10 @@ fun ActionBar(
         MaterialTheme.colorScheme.surfaceVariant
     }
 
+    val oldActionBar = useDataStore(OldStyleActionsBar)
+
     Column {
-        if(isActionsExpanded) {
+        if(isActionsExpanded && !oldActionBar.value) {
             Box(modifier = Modifier
                 .fillMaxWidth()
                 .height(1.dp)
@@ -694,6 +705,11 @@ fun ActionBar(
                     )
                 }
 
+                if(oldActionBar.value && isActionsExpanded) {
+                    Box(modifier = Modifier.weight(1.0f).fillMaxHeight()) {
+                        ActionItems(onActionActivated, onActionAltActivated)
+                    }
+                } else {
                     if (importantNotice != null) {
                         ImportantNoticeView(importantNotice)
                     } else {
@@ -733,6 +749,7 @@ fun ActionBar(
                 }
             }
         }
+    }
 }
 
 @Composable

java/src/org/futo/inputmethod/latin/uix/settings/pages/DevSettings.kt

@@ -17,6 +17,7 @@ import kotlinx.coroutines.withContext
 import org.futo.inputmethod.latin.BuildConfig
 import org.futo.inputmethod.latin.R
 import org.futo.inputmethod.latin.uix.HiddenKeysSetting
+import org.futo.inputmethod.latin.uix.OldStyleActionsBar
 import org.futo.inputmethod.latin.uix.SettingsKey
 import org.futo.inputmethod.latin.uix.settings.NavigationItem
 import org.futo.inputmethod.latin.uix.settings.NavigationItemStyle
@@ -55,6 +56,8 @@ fun DeveloperScreen(navController: NavHostController = rememberNavController())
 
         SettingToggleDataStore(title = "Dismissed migration notice", setting = dismissedMigrateUpdateNotice)
 
+        SettingToggleDataStore(title = "Old action bar", setting = OldStyleActionsBar)
+
         NavigationItem(
             title = "Crash the app",
             style = NavigationItemStyle.MiscNoArrow,