Skip to content

設定画面のパスワード制限を廃止し横向き向けレイアウトに改める #74

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

Merged
Atsumi3 merged 5 commits into from
Sep 4, 2026
Merged

設定画面のパスワード制限を廃止し横向き向けレイアウトに改める #74

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a13a43d
設定画面のパスワードによる操作制限を廃止する
Atsumi3 Sep 4, 2026
9cce4d8
設定画面を横向き向けの 3 カード構成に改める
Atsumi3 Sep 4, 2026
06d301d
設定画面のテストをタブレット横向きの画面設定で実行する
Atsumi3 Sep 4, 2026
113e0dd
ビルド時のコンパイラ警告を解消する
Atsumi3 Sep 4, 2026
2880028
選択状態の面の色をニュートラルグレーで定義する
Atsumi3 Sep 4, 2026
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
4 changes: 3 additions & 1 deletion app/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,8 @@ android {
kotlin {
compilerOptions {
jvmTarget.set(JvmTarget.JVM_17)
optIn.add("kotlinx.serialization.ExperimentalSerializationApi")
freeCompilerArgs.add("-Xannotation-default-target=param-property")
}
}

Expand All @@ -131,6 +133,7 @@ dependencies {
implementation(libs.dagger.hilt.android)
ksp(libs.dagger.hilt.android.compiler)
implementation(libs.androidx.hilt.navigation.compose)
implementation(libs.androidx.hilt.lifecycle.viewmodel.compose)

implementation(platform(libs.compose.bom))
implementation(libs.compose.material3)
Expand Down Expand Up @@ -187,7 +190,6 @@ openApiGenerate {
outputDir.set(layout.buildDirectory.dir("generated/openapi").get().asFile.absolutePath)
apiPackage.set("info.nukoneko.cuc.android.kidspos.api.generated")
modelPackage.set("info.nukoneko.cuc.android.kidspos.api.generated.model")
invokerPackage.set("info.nukoneko.cuc.android.kidspos.api.generated.invoker")
configOptions.set(
mapOf(
"library" to "jvm-retrofit2",
Expand Down
14 changes: 0 additions & 14 deletions app/src/demo/kotlin/info/nukoneko/cuc/android/kidspos/api/DemoDangerZoneService.kt
View file
Open in desktop

This file was deleted.

6 changes: 0 additions & 6 deletions app/src/demo/kotlin/info/nukoneko/cuc/android/kidspos/di/hilt/ApiModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,8 @@ import dagger.hilt.InstallIn
import dagger.hilt.components.SingletonComponent
import info.nukoneko.cuc.android.kidspos.api.APIService
import info.nukoneko.cuc.android.kidspos.api.AppUpdateService
import info.nukoneko.cuc.android.kidspos.api.DangerZoneService
import info.nukoneko.cuc.android.kidspos.api.DemoAPIService
import info.nukoneko.cuc.android.kidspos.api.DemoAppUpdateService
import info.nukoneko.cuc.android.kidspos.api.DemoDangerZoneService
import javax.inject.Singleton

@Module
Expand All @@ -23,8 +21,4 @@ object ApiModule {
@Provides
@Singleton
fun provideAppUpdateService(): AppUpdateService = DemoAppUpdateService()

@Provides
@Singleton
fun provideDangerZoneService(): DangerZoneService = DemoDangerZoneService()
}
5 changes: 0 additions & 5 deletions app/src/main/kotlin/info/nukoneko/cuc/android/kidspos/api/DangerZoneRateLimitedException.kt
View file
Open in desktop

This file was deleted.

9 changes: 0 additions & 9 deletions app/src/main/kotlin/info/nukoneko/cuc/android/kidspos/api/DangerZoneService.kt
View file
Open in desktop

This file was deleted.

43 changes: 0 additions & 43 deletions app/src/main/kotlin/info/nukoneko/cuc/android/kidspos/api/OpenApiDangerZoneService.kt
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions ...src/main/kotlin/info/nukoneko/cuc/android/kidspos/data/repository/DangerZoneRepository.kt
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions app/src/main/kotlin/info/nukoneko/cuc/android/kidspos/entity/DangerZoneVerification.kt
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion app/src/main/kotlin/info/nukoneko/cuc/android/kidspos/ui/main/MainScreen.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.unit.min
import androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
import androidx.hilt.navigation.compose.hiltViewModel
import androidx.hilt.lifecycle.viewmodel.compose.hiltViewModel
import androidx.lifecycle.compose.collectAsStateWithLifecycle
import info.nukoneko.cuc.android.kidspos.R
import info.nukoneko.cuc.android.kidspos.entity.Item
Expand Down
Loading
Loading