Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

設定画面の保存ロジックを作成しました。プロフィール画面のUIも整えました。 #146

Open
wants to merge 7 commits into
base: main
Choose a base branch
from
Open

設定画面の保存ロジックを作成しました。プロフィール画面のUIも整えました。 #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4c7713c
DataStoreからのデータ読み込みと保存ロジックを書いた
nekomoti22 Mar 6, 2025
d144367
プロフィール画面のDetaStoreの読み込みと書き込みを実装。ここらでpullしようかな。
nekomoti22 Mar 8, 2025
f002952
案の定コンフリクトが起こったので解消
nekomoti22 Mar 8, 2025
2865133
プロフィール画面のUIを整えました。
nekomoti22 Mar 9, 2025
79e4a48
startDistinationの戻し忘れを直しました
nekomoti22 Mar 9, 2025
1fcb623
Merge branch 'main' into feature/issue-20
nekomoti22 Mar 11, 2025
8db2608
ViewModel名を変更しました
nekomoti22 Mar 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions .idea/deploymentTargetSelector.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

13 changes: 0 additions & 13 deletions .idea/deviceManager.xml
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions .idea/other.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 20 additions & 9 deletions app/src/main/java/com/example/runningavater/MyAppNavHost.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package com.example.runningavater
import android.app.Application
import android.content.Context
import android.content.SharedPreferences
import android.net.Uri
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Home
Expand All @@ -16,6 +17,9 @@ import androidx.compose.material3.Scaffold
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.vector.ImageVector
Expand Down Expand Up @@ -46,6 +50,7 @@ fun getStartDestination(context: Context): String {
if (isFirstLaunch) {
return "initialFlow/1"
} else {
// return "initialFlow/1"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
// return "initialFlow/1"

return "authentication"
}
}
Expand All @@ -59,6 +64,8 @@ fun MyAppNavHost(
val currentDestination = navBackStackEntry?.destination
val context = LocalContext.current
val startDestination = getStartDestination(context)
var profileImageUri by remember { mutableStateOf<Uri?>(null) }
// val startDestination = if (true) "initialFlow/2" else "authentication"
Scaffold(
bottomBar = {
if (currentDestination?.route?.startsWith("initialFlow") != true) {
Expand All @@ -81,13 +88,17 @@ fun MyAppNavHost(
SettingsScreen(navController, profileImageUri = null) // 設定画面を表示
}
composable(route = "settings/profile") {
ProfileScreen(navController) // プロフィール画面を表示
ProfileScreen(navController,
profileImageUri = profileImageUri,
onImageSelected = { newUri ->
profileImageUri = newUri
}) // プロフィール画面を表示
}
composable(route = "settings/spansettings") {
SpanSettingsScreen() // 期間設定画面を表示
}
composable(route = "settings/goalsettings") {
GoalSettingsScreen() // 歩数画面を表示
GoalSettingsScreen(navController) // 歩数画面を表示
}
initialFlow(navController)
}
Expand Down Expand Up @@ -123,13 +134,13 @@ private fun MainBottomBar(
}
},
colors =
NavigationBarItemDefaults.colors(
selectedIconColor = Color.White,
selectedTextColor = Color.White,
unselectedIconColor = Color.White.copy(alpha = 0.5f),
unselectedTextColor = Color.White.copy(alpha = 0.5f),
indicatorColor = Color.White.copy(alpha = 0.3f),
),
NavigationBarItemDefaults.colors(
selectedIconColor = Color.White,
selectedTextColor = Color.White,
unselectedIconColor = Color.White.copy(alpha = 0.5f),
unselectedTextColor = Color.White.copy(alpha = 0.5f),
indicatorColor = Color.White.copy(alpha = 0.3f),
),
)
}
}
Expand Down
3 changes: 1 addition & 2 deletions app/src/main/java/com/example/runningavater/PreferenceDatastore.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
import android.content.Context
import androidx.datastore.core.DataStore
import androidx.datastore.preferences.core.Preferences
import androidx.datastore.preferences.core.intPreferencesKey
import androidx.datastore.preferences.core.stringPreferencesKey
import androidx.datastore.preferences.preferencesDataStore

val Context.dataStore: DataStore<Preferences> by preferencesDataStore(name = "dataStore")

// Key definition
val EXAMPLE_COUNTER = intPreferencesKey("example_counter")
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")

47 changes: 23 additions & 24 deletions app/src/main/java/com/example/runningavater/initialFlow/InitialFlow5.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,19 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.sp
import androidx.compose.ui.zIndex
import androidx.datastore.preferences.core.edit
import androidx.datastore.preferences.core.stringPreferencesKey
import androidx.lifecycle.ViewModel
import androidx.lifecycle.viewModelScope
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavHostController
import androidx.navigation.compose.rememberNavController
import bearName
import com.example.runningavater.R
import com.example.runningavater.initialFlow.components.BackButton
import com.example.runningavater.initialFlow.components.InitialFlowBackground
import com.example.runningavater.initialFlow.components.NextButton
import com.example.runningavater.settingsDataStore
import com.example.runningavater.ui.theme.GranulatedSugar
import com.example.runningavater.ui.theme.RunningAvaterTheme
import dataStore
import kotlinx.coroutines.launch

@SuppressLint("ComposeViewModelInjection")
Expand All @@ -63,10 +63,10 @@ fun InitialFlow5Screen(navController: NavHostController) {
Box(modifier = Modifier.fillMaxSize()) {
Column(
modifier =
Modifier
.fillMaxWidth()
.align(Alignment.TopCenter)
.padding(top = 48.dp),
Modifier
.fillMaxWidth()
.align(Alignment.TopCenter)
.padding(top = 48.dp),
horizontalAlignment = Alignment.CenterHorizontally,
) {
Text(
Expand All @@ -80,13 +80,13 @@ fun InitialFlow5Screen(navController: NavHostController) {
painter = painterResource(id = R.drawable.initialflow56),
contentDescription = "くまちゃん",
modifier =
Modifier
.padding(
top = 20.dp,
bottom = 20.dp,
)
.size(200.dp)
.zIndex(-1f),
Modifier
.padding(
top = 20.dp,
bottom = 20.dp,
)
.size(200.dp)
.zIndex(-1f),
)
TextField(
value = text.value,
Expand Down Expand Up @@ -116,16 +116,16 @@ fun InitialFlow5Screen(navController: NavHostController) {
Text(
text = "※名前は後から変更できるよ",
modifier =
Modifier
.align(Alignment.End)
.padding(end = 20.dp),
Modifier
.align(Alignment.End)
.padding(end = 20.dp),
)
}
Column(
modifier =
Modifier
.align(Alignment.BottomStart)
.padding(0.dp, 0.dp, 0.dp, 80.dp),
Modifier
.align(Alignment.BottomStart)
.padding(0.dp, 0.dp, 0.dp, 80.dp),
) {
NextButton(
navController = navController,
Expand All @@ -138,9 +138,9 @@ fun InitialFlow5Screen(navController: NavHostController) {
}
Column(
modifier =
Modifier
.align(Alignment.BottomEnd)
.padding(20.dp),
Modifier
.align(Alignment.BottomEnd)
.padding(20.dp),
) {
BackButton(
navController = navController,
Expand All @@ -152,14 +152,13 @@ fun InitialFlow5Screen(navController: NavHostController) {

// ViewModel内にDataStore書き込みの処理を追加
class YourViewModel : ViewModel() {
val bearName = stringPreferencesKey("bearName")

fun saveNameToDataStore(
context: Context,
name: String,
) {
viewModelScope.launch {
context.settingsDataStore.edit { preferences ->
context.dataStore.edit { preferences ->
preferences[bearName] = name // 入力した文字列(name)を保存
}
}
Expand Down
Loading