Restore datastore-proto module and decouple via SettingsDataSource

app/build.gradle.kts

@@ -153,10 +153,9 @@ dependencies {
 
     // Access settings & model data
     implementation(project(":data:settings"))
-    implementation(project(":core:settings:datastore-prefs"))
+    implementation(project(":core:settings:datastore-proto"))
     implementation(project(":core:settings"))
     implementation(project(":core:model"))
-    implementation(libs.androidx.datastore.preferences)
 
     // Camera Preview
     implementation(project(":feature:preview"))

app/src/main/java/com/google/jetpackcamera/AppSettingsModule.kt

@@ -16,13 +16,9 @@
 package com.google.jetpackcamera
 
 import android.content.Context
-import androidx.datastore.core.DataStore
-import androidx.datastore.preferences.core.PreferenceDataStoreFactory
-import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.preferencesDataStoreFile
 import com.google.jetpackcamera.core.common.DefaultCaptureModeOverride
-import com.google.jetpackcamera.core.settings.datastoreprefs.PrefsDataStoreSettingsDataSource
 import com.google.jetpackcamera.model.CaptureMode
+import com.google.jetpackcamera.settings.ProtoDataStoreSettingsDataSource
 import com.google.jetpackcamera.settings.SettingsDataSource
 import dagger.Module
 import dagger.Provides
@@ -35,20 +31,12 @@ import javax.inject.Singleton
 @InstallIn(SingletonComponent::class)
 object AppSettingsModule {
 
-    @Provides
-    @Singleton
-    fun providePreferencesDataStore(@ApplicationContext context: Context): DataStore<Preferences> {
-        return PreferenceDataStoreFactory.create(
-            produceFile = { context.preferencesDataStoreFile("app_settings.preferences_pb") }
-        )
-    }
-
     @Provides
     @Singleton
     fun provideSettingsDataSource(
-        dataStore: DataStore<Preferences>,
+        @ApplicationContext context: Context,
         @DefaultCaptureModeOverride defaultCaptureMode: CaptureMode
     ): SettingsDataSource {
-        return PrefsDataStoreSettingsDataSource(dataStore, defaultCaptureMode)
+        return ProtoDataStoreSettingsDataSource.create(context)
     }
 }

core/model-proto/build.gradle.kts

@@ -0,0 +1,76 @@
+/*
+ * Copyright (C) 2026 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+plugins {
+    alias(libs.plugins.android.library)
+    alias(libs.plugins.kotlin.android)
+    alias(libs.plugins.protobuf)
+}
+
+android {
+    namespace = "com.google.jetpackcamera.model.proto"
+    compileSdk = libs.versions.compileSdk.get().toInt()
+
+    defaultConfig {
+        minSdk = libs.versions.minSdk.get().toInt()
+        testOptions.targetSdk = libs.versions.targetSdk.get().toInt()
+        lint.targetSdk = libs.versions.targetSdk.get().toInt()
+        testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
+    }
+
+    flavorDimensions += "flavor"
+    productFlavors {
+        create("stable") {
+            dimension = "flavor"
+            isDefault = true
+        }
+    }
+
+    compileOptions {
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
+    }
+    kotlin {
+        jvmToolchain(17)
+    }
+}
+
+protobuf {
+    protoc {
+        artifact = "com.google.protobuf:protoc:3.21.12"
+    }
+    generateProtoTasks {
+        all().forEach { task ->
+            task.builtins {
+                create("java") {
+                    option("lite")
+                }
+                create("kotlin") {
+                    option("lite")
+                }
+            }
+        }
+    }
+}
+
+dependencies {
+    api(project(":core:model"))
+    api(libs.protobuf.kotlin.lite)
+
+    // Testing
+    testImplementation(libs.junit)
+    testImplementation(libs.truth)
+    testImplementation(libs.kotlinx.coroutines.test)
+}