From bdbbc3760e88aa2a7c1910c1a715b8bc9684125c Mon Sep 17 00:00:00 2001
From: MM20 <15646950+MM2-0@users.noreply.github.com>
Date: Sat, 3 Sep 2022 15:07:37 +0200
Subject: [PATCH] Add show grid labels and fill clock widget height preferences
 to proto schema

---
 .../de/mm20/launcher2/preferences/DataStore.kt |  3 ++-
 .../preferences/migrations/Migration_8_9.kt    | 18 ++++++++++++++++++
 preferences/src/main/proto/settings.proto      |  2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_8_9.kt

diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/DataStore.kt b/preferences/src/main/java/de/mm20/launcher2/preferences/DataStore.kt
index 42dad212..d4c4cb34 100644
--- a/preferences/src/main/java/de/mm20/launcher2/preferences/DataStore.kt
+++ b/preferences/src/main/java/de/mm20/launcher2/preferences/DataStore.kt
@@ -22,7 +22,7 @@ internal val Context.dataStore: LauncherDataStore by dataStore(
     }
 )
 
-internal const val SchemaVersion = 8
+internal const val SchemaVersion = 9
 
 internal fun getMigrations(context: Context): List<DataMigration<Settings>> {
     return listOf(
@@ -34,5 +34,6 @@ internal fun getMigrations(context: Context): List<DataMigration<Settings>> {
         Migration_5_6(),
         Migration_6_7(),
         Migration_7_8(),
+        Migration_8_9(),
     )
 }
\ No newline at end of file
diff --git a/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_8_9.kt b/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_8_9.kt
new file mode 100644
index 00000000..b4eaa47c
--- /dev/null
+++ b/preferences/src/main/java/de/mm20/launcher2/preferences/migrations/Migration_8_9.kt
@@ -0,0 +1,18 @@
+package de.mm20.launcher2.preferences.migrations
+
+import de.mm20.launcher2.preferences.Settings
+
+class Migration_8_9: VersionedMigration(8, 9) {
+    override suspend fun applyMigrations(builder: Settings.Builder): Settings.Builder {
+        return builder
+            .setClockWidget(
+                builder.clockWidget.toBuilder()
+                    .setFillHeight(true)
+            )
+            .setGrid(
+                builder.grid.toBuilder()
+                    .setShowLabels(true)
+            )
+    }
+
+}
\ No newline at end of file
diff --git a/preferences/src/main/proto/settings.proto b/preferences/src/main/proto/settings.proto
index a0841842..a6aa5389 100644
--- a/preferences/src/main/proto/settings.proto
+++ b/preferences/src/main/proto/settings.proto
@@ -120,6 +120,7 @@ message Settings {
     bool battery_part = 5;
     bool alarm_part = 6;
     bool favorites_part = 7;
+    bool fill_height = 8;
   }
   ClockWidgetSettings clock_widget = 7;
 
@@ -192,6 +193,7 @@ message Settings {
   message GridSettings {
     uint32 column_count = 1;
     uint32 icon_size = 2;
+    bool show_labels = 3;
   }
   GridSettings grid = 19;