merge main

Author: nekomoti22

Diff for: .github/workflows/main.yml

@@ -1,28 +1,17 @@
 import android.content.Context
 import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.Preferences
-import androidx.datastore.preferences.core.edit
 import androidx.datastore.preferences.core.intPreferencesKey
+import androidx.datastore.preferences.core.stringPreferencesKey
 import androidx.datastore.preferences.preferencesDataStore
-import kotlinx.coroutines.flow.Flow
-import kotlinx.coroutines.flow.map
 
-val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "settings")
+val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "dataStore")
 
 // Key definition
 val EXAMPLE_COUNTER = intPreferencesKey("example_counter")
-
-// Read data from DataStore
-fun exampleCounterFlow(context: Context): Flow<Int> =
-    context.dataStore.data
-        .map { preferences ->
-            preferences[EXAMPLE_COUNTER] ?: 0
-        }
-
-// Save data to DataStore
-suspend fun incrementCounter(context: Context) {
-    context.dataStore.edit { preferences ->
-        val currentCounterValue = preferences[EXAMPLE_COUNTER] ?: 0
-        preferences[EXAMPLE_COUNTER] = currentCounterValue + 1
-    }
-}
+val bearName = stringPreferencesKey("bearName")
+val targetPeriod = stringPreferencesKey("target_period")
+val targetSteps = stringPreferencesKey("target_steps")
+val userName = stringPreferencesKey("UserName")
+val userIcon = stringPreferencesKey("UserIcon")
+val enthusiaasm = stringPreferencesKey("Enthusiasm")

Diff for: app/src/main/java/com/example/runningavater/PreferenceDatastore.kt

@@ -0,0 +1,108 @@
+package com.example.runningavater.settings
+
+import android.app.Application
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.text.KeyboardOptions
+import androidx.compose.material3.AlertDialog
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.material3.TextField
+import androidx.compose.material3.TextFieldDefaults
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.saveable.rememberSaveable
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.input.KeyboardType
+import androidx.datastore.preferences.core.edit
+import androidx.lifecycle.AndroidViewModel
+import androidx.lifecycle.viewModelScope
+import androidx.lifecycle.viewmodel.compose.viewModel
+import com.example.runningavater.ui.theme.GranulatedSugar
+import dataStore
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.map
+import kotlinx.coroutines.launch
+import targetSteps
+
+@Composable
+fun GoalSettingDialog(
+    onDismissRequest: () -> Unit,
+    onConfirmation: () -> Unit,
+    dialogTitle: String,
+    dialogText: String,
+    icon: ImageVector,
+    viewModel: RoadDataStoreProfile = viewModel(),
+) {
+    val bearName by viewModel.roadTargetSteps.collectAsState(initial = "未設定")
+    var bearTextFieldValue by rememberSaveable { mutableStateOf("") }
+    LaunchedEffect(bearName) {
+        bearTextFieldValue = bearName
+    }
+    AlertDialog(
+        containerColor = Color.White,
+        title = {
+            Text("目標歩数設定")
+        },
+        text = {
+            Column {
+                Text("1日の目標歩数を入力してね")
+                TextField(
+                    colors =
+                    TextFieldDefaults.colors(
+                        focusedContainerColor = GranulatedSugar,
+                        unfocusedContainerColor = GranulatedSugar,
+                    ),
+                    value = bearTextFieldValue,
+                    onValueChange = { newValue ->
+                        bearTextFieldValue = newValue
+                    },
+                    keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Number)
+                )
+            }
+        },
+
+        onDismissRequest = {
+            onDismissRequest()
+        },
+        confirmButton = {
+            TextButton(
+                onClick = {
+                    viewModel.saveTargetSteps(bearTextFieldValue)
+                    onConfirmation()
+                }
+            ) {
+                Text("保存して閉じる")
+            }
+        },
+        dismissButton = {
+            TextButton(
+                onClick = {
+                    onDismissRequest()
+                }
+            ) {
+                Text("閉じる")
+            }
+        }
+    )
+}
+
+class RoadDataStoreProfile(application: Application) : AndroidViewModel(application) {
+    val roadTargetSteps: Flow<String> =
+        getApplication<Application>().dataStore.data.map { preferences ->
+            preferences[targetSteps] ?: ""
+        }
+
+    fun saveTargetSteps(name: String) {
+        viewModelScope.launch {
+            getApplication<Application>().dataStore.edit { preferences ->
+                preferences[targetSteps] = name
+            }
+        }
+    }
+
+}