commit 9703a42d644eb17beaabebabb3fa1abc81aa24bd Author: Nana <10011001nana@gmail.com> Date: Wed Apr 23 12:17:15 2025 +0300 init diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..7d9c0e4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,18 @@ +*.iml +.kotlin +.gradle +**/build/ +xcuserdata +!src/**/build/ +local.properties +.idea +.DS_Store +captures +.externalNativeBuild +.cxx +*.xcodeproj/* +!*.xcodeproj/project.pbxproj +!*.xcodeproj/xcshareddata/ +!*.xcodeproj/project.xcworkspace/ +!*.xcworkspace/contents.xcworkspacedata +**/xcshareddata/WorkspaceSettings.xcsettings diff --git a/README.md b/README.md new file mode 100644 index 0000000..1ba257b --- /dev/null +++ b/README.md @@ -0,0 +1,14 @@ +This is a Kotlin Multiplatform project targeting Android, iOS. + +* `/composeApp` is for code that will be shared across your Compose Multiplatform applications. + It contains several subfolders: + - `commonMain` is for code that’s common for all targets. + - Other folders are for Kotlin code that will be compiled for only the platform indicated in the folder name. + For example, if you want to use Apple’s CoreCrypto for the iOS part of your Kotlin app, + `iosMain` would be the right folder for such calls. + +* `/iosApp` contains iOS applications. Even if you’re sharing your UI with Compose Multiplatform, + you need this entry point for your iOS app. This is also where you should add SwiftUI code for your project. + + +Learn more about [Kotlin Multiplatform](https://www.jetbrains.com/help/kotlin-multiplatform-dev/get-started.html)… \ No newline at end of file diff --git a/build.gradle.kts b/build.gradle.kts new file mode 100644 index 0000000..1ecfdb5 --- /dev/null +++ b/build.gradle.kts @@ -0,0 +1,11 @@ +plugins { + // this is necessary to avoid the plugins to be loaded multiple times + // in each subproject's classloader + alias(libs.plugins.androidApplication) apply false + alias(libs.plugins.androidLibrary) apply false + alias(libs.plugins.composeMultiplatform) apply false + alias(libs.plugins.composeCompiler) apply false + alias(libs.plugins.kotlinMultiplatform) apply false + alias(libs.plugins.kotlinSerialization) apply false + alias(libs.plugins.ksp) apply false +} \ No newline at end of file diff --git a/composeApp/build.gradle.kts b/composeApp/build.gradle.kts new file mode 100644 index 0000000..e6c3582 --- /dev/null +++ b/composeApp/build.gradle.kts @@ -0,0 +1,161 @@ +import org.jetbrains.kotlin.gradle.ExperimentalKotlinGradlePluginApi +import org.jetbrains.kotlin.gradle.dsl.JvmTarget + +plugins { + alias(libs.plugins.kotlinMultiplatform) + alias(libs.plugins.androidApplication) + alias(libs.plugins.composeMultiplatform) + alias(libs.plugins.composeCompiler) + alias(libs.plugins.kotlinSerialization) + alias(libs.plugins.ksp) + alias(libs.plugins.ktorfit) +} + +compose.resources { + publicResClass = false + packageOfResClass = "com.presenceapp.composeapp.resources" + generateResClass = auto +} + +kotlin { + androidTarget { + @OptIn(ExperimentalKotlinGradlePluginApi::class) + compilerOptions { + jvmTarget.set(JvmTarget.JVM_11) + } + } + + listOf( + iosX64(), + iosArm64(), + iosSimulatorArm64() + ).forEach { iosTarget -> + iosTarget.binaries.framework { + baseName = "ComposeApp" + isStatic = true + } + + iosTarget.compilations.getByName("main") { + cinterops { + val uikit by creating { + defFile(file("src/iosMain/c_interop/Uikit.def")) + } + } + } + } + + sourceSets { + val androidMain by getting { + dependencies { + implementation(compose.preview) + implementation(libs.androidx.activity.compose) + implementation(libs.androidx.lifecycle.viewmodel) + implementation(libs.androidx.lifecycle.runtime.compose) + implementation(libs.androidx.datastore.preferences) + implementation(libs.androidx.datastore.preferences.core) + implementation(libs.androidx.startup.runtime) + + // ktor + implementation(libs.ktor.client.okhttp) + + // koin + implementation(libs.koin.android) + implementation(libs.koin.androidx.compose) + implementation(libs.koin.ktor) + } + } + + val commonMain by getting { + resources.srcDirs("src/commonMain/composeResources") + dependencies { + implementation(compose.runtime) + implementation(compose.foundation) + implementation(compose.material3) + implementation(compose.ui) + implementation(compose.components.resources) + implementation(compose.components.uiToolingPreview) + implementation(libs.kotlinx.serialization.json) + implementation(libs.kotlinx.coroutines.core) + implementation(libs.kotlinx.datetime) + + // voyager + implementation(libs.voyager.navigator) + implementation(libs.voyager.screenmodel) + implementation(libs.voyager.koin) + + // ktor + implementation(libs.ktor.client.core) + implementation(libs.ktor.client.websockets) + implementation(libs.ktor.client.content.negotiation) + implementation(libs.ktor.client.logging) + implementation(libs.ktor.client.cio) + implementation(libs.ktor.serialization.kotlinx.json) + + // ktorfit + implementation(libs.ktorfit) + + // koin + implementation(libs.koin.core) + implementation(libs.koin.compose) + + // logging + implementation(libs.kotlin.logging) + + // settings + implementation(libs.multiplatform.settings) + } + } + + iosMain.dependencies { + // ktor + implementation(libs.ktor.client.darwin) + + // koin + implementation(libs.koin.core.native) + + implementation(libs.kotlinx.coroutines.core.v173nativemt) + implementation(libs.kermit) + } + } +} + +android { + namespace = "org.example.presenceapp" + compileSdk = libs.versions.android.compileSdk.get().toInt() + + defaultConfig { + applicationId = "org.example.presenceapp" + minSdk = libs.versions.android.minSdk.get().toInt() + targetSdk = libs.versions.android.targetSdk.get().toInt() + versionCode = 1 + versionName = "1.0" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } + buildTypes { + getByName("release") { + isMinifyEnabled = false + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + } +} + +dependencies { + implementation(libs.androidx.ui.android) + implementation(libs.androidx.annotation.jvm) + implementation(libs.androidx.ui.text.android) + implementation(libs.androidx.material3.android) + implementation(libs.androidx.foundation.layout.android) + debugImplementation(compose.uiTooling) + + add("kspCommonMainMetadata", libs.ktorfit.ksp) + add("kspAndroid", libs.ktorfit.ksp) + add("kspIosX64", libs.ktorfit.ksp) + add("kspIosArm64", libs.ktorfit.ksp) +} \ No newline at end of file diff --git a/composeApp/src/androidMain/AndroidManifest.xml b/composeApp/src/androidMain/AndroidManifest.xml new file mode 100644 index 0000000..480cf08 --- /dev/null +++ b/composeApp/src/androidMain/AndroidManifest.xml @@ -0,0 +1,26 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/org/example/presenceapp/MainActivity.kt b/composeApp/src/androidMain/kotlin/org/example/presenceapp/MainActivity.kt new file mode 100644 index 0000000..05c432e --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/example/presenceapp/MainActivity.kt @@ -0,0 +1,35 @@ +package org.example.presenceapp + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.runtime.Composable +import androidx.compose.ui.tooling.preview.Preview +import org.example.presenceapp.di.androidModule +import org.example.presenceapp.di.networkModule +import org.koin.android.ext.koin.androidContext +import org.koin.core.context.GlobalContext.startKoin +import org.koin.core.logger.Level +import org.koin.core.logger.PrintLogger + +class MainActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + startKoin { + logger(PrintLogger(Level.DEBUG)) + androidContext(applicationContext) + modules(networkModule + androidModule) + } + + setContent { + App() + } + } +} + +@Preview +@Composable +fun AppAndroidPreview() { + App() +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/org/example/presenceapp/Platform.android.kt b/composeApp/src/androidMain/kotlin/org/example/presenceapp/Platform.android.kt new file mode 100644 index 0000000..6536f4e --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/example/presenceapp/Platform.android.kt @@ -0,0 +1,9 @@ +package org.example.presenceapp + +import android.os.Build + +class AndroidPlatform : Platform { + override val name: String = "Android ${Build.VERSION.SDK_INT}" +} + +actual fun getPlatform(): Platform = AndroidPlatform() \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/org/example/presenceapp/PlatformContext.android.kt b/composeApp/src/androidMain/kotlin/org/example/presenceapp/PlatformContext.android.kt new file mode 100644 index 0000000..8771a15 --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/example/presenceapp/PlatformContext.android.kt @@ -0,0 +1,12 @@ +package org.example.presenceapp + +import android.content.Context +import androidx.compose.runtime.Composable +import androidx.compose.ui.platform.LocalContext + +actual class PlatformContext(val context: Context) + +@Composable +actual fun getPlatformContext(): PlatformContext { + return PlatformContext(LocalContext.current) +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/SettingsStorage.kt b/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/SettingsStorage.kt new file mode 100644 index 0000000..586457a --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/SettingsStorage.kt @@ -0,0 +1,19 @@ +package org.example.presenceapp.data.local.storage + +import android.content.Context +import android.content.SharedPreferences +import org.example.presenceapp.PlatformContext + +actual class SettingsStorage actual constructor(private val context: PlatformContext) { + private val sharedPreferences: SharedPreferences by lazy { + context.context.getSharedPreferences("app_settings", Context.MODE_PRIVATE) + } + + actual suspend fun put(key: String, value: String) { + sharedPreferences.edit().putString(key, value).apply() + } + + actual suspend fun get(key: String, defaultValue: String): String { + return sharedPreferences.getString(key, defaultValue) ?: defaultValue + } +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorage.android.kt b/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorage.android.kt new file mode 100644 index 0000000..5500874 --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorage.android.kt @@ -0,0 +1,32 @@ +package org.example.presenceapp.data.local.storage.attendance + +import android.content.Context +import androidx.datastore.preferences.core.edit +import androidx.datastore.preferences.core.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.map +import kotlinx.serialization.json.Json +import org.example.presenceapp.domain.entities.Attendance + +private val Context.attendanceDataStore by preferencesDataStore(name = "attendance_prefs") + +class AttendanceStorageAndroid(private val context: Context): AttendanceStorage { + + private val ATTENDANCE_KEY = stringPreferencesKey("attendance_map") + + override suspend fun saveAttendanceMap(map: Map) { + val json = Json.encodeToString(map) + context.attendanceDataStore.edit { prefs -> + prefs[ATTENDANCE_KEY] = json + } + } + + override fun attendanceMapFlow(): Flow> { + return context.attendanceDataStore.data.map { prefs -> + prefs[ATTENDANCE_KEY]?.let { + Json.decodeFromString>(it) + } ?: emptyMap() + } + } +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorageProvider.android.kt b/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorageProvider.android.kt new file mode 100644 index 0000000..81f345e --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorageProvider.android.kt @@ -0,0 +1,9 @@ +package org.example.presenceapp.data.local.storage.attendance + +import org.example.presenceapp.PlatformContext + +actual class AttendanceStorageProvider actual constructor(private val context: PlatformContext) { + actual fun provide(): AttendanceStorage { + return AttendanceStorageAndroid(context.context) + } +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/login/AndroidTokenStorage.kt b/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/login/AndroidTokenStorage.kt new file mode 100644 index 0000000..03f4b17 --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/example/presenceapp/data/local/storage/login/AndroidTokenStorage.kt @@ -0,0 +1,32 @@ +package org.example.presenceapp.data.local.storage.login + +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.stringPreferencesKey +import androidx.datastore.preferences.preferencesDataStore +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.map +import org.example.project.data.local.TokenStorage + +class AndroidTokenStorage(private val context: Context): TokenStorage { + private val Context.dataStore: DataStore by preferencesDataStore(name = "auth_store") + private val tokenKey = stringPreferencesKey("auth_token") + + override suspend fun getToken(): String? { + return context.dataStore.data + .map { preferences -> preferences[tokenKey] } + .first() + } + override suspend fun setToken(token: String) { + context.dataStore.edit { preferences -> + preferences[tokenKey] = token + } + } + override suspend fun deleteToken() { + context.dataStore.edit { preferences -> + preferences.remove(tokenKey) + } + } +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/org/example/presenceapp/di/AndroidModule.kt b/composeApp/src/androidMain/kotlin/org/example/presenceapp/di/AndroidModule.kt new file mode 100644 index 0000000..a79dc6f --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/example/presenceapp/di/AndroidModule.kt @@ -0,0 +1,18 @@ +package org.example.presenceapp.di + +import org.example.presenceapp.data.local.LocalDataSource +import org.example.presenceapp.data.local.storage.attendance.AttendanceStorage +import org.example.presenceapp.data.local.storage.attendance.AttendanceStorageAndroid +import org.example.presenceapp.data.local.storage.login.AndroidTokenStorage +import org.example.presenceapp.data.local.storage.login.AuthManager +import org.example.project.data.local.TokenStorage +import org.koin.android.ext.koin.androidContext +import org.koin.dsl.module + +val androidModule = module { + single { AndroidTokenStorage(androidContext()) } + single { AuthManager(get()) } + + single { AttendanceStorageAndroid(androidContext()) } + single { LocalDataSource(get()) } +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/org/example/presenceapp/ui/settings/SettingsManager.android.kt b/composeApp/src/androidMain/kotlin/org/example/presenceapp/ui/settings/SettingsManager.android.kt new file mode 100644 index 0000000..59679ef --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/example/presenceapp/ui/settings/SettingsManager.android.kt @@ -0,0 +1,31 @@ +package org.example.presenceapp.ui.settings + +import android.content.Context +import android.content.SharedPreferences +import androidx.compose.runtime.Composable +import androidx.core.content.edit +import org.example.presenceapp.PlatformContext +import org.example.presenceapp.getPlatformContext + +actual class SettingsManager actual constructor(platformContext: PlatformContext) { + private val sharedPreferences: SharedPreferences = + platformContext.context.getSharedPreferences("app_preferences", Context.MODE_PRIVATE) + + actual fun isDialogShown(): Boolean { + return sharedPreferences.getBoolean(KEY_DIALOG_SHOWN, false) + } + + actual fun setDialogShown() { + sharedPreferences.edit() { putBoolean(KEY_DIALOG_SHOWN, true) } + } + + companion object { + private const val KEY_DIALOG_SHOWN = "dialog_shown" + } +} + +@Composable +actual fun getSettingsManager(): SettingsManager { + val platformContext = getPlatformContext() + return SettingsManager(platformContext) +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/org/example/presenceapp/ui/theme/Theme.android.kt b/composeApp/src/androidMain/kotlin/org/example/presenceapp/ui/theme/Theme.android.kt new file mode 100644 index 0000000..6b41ee9 --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/example/presenceapp/ui/theme/Theme.android.kt @@ -0,0 +1,44 @@ +package org.example.presenceapp.ui.theme + +import android.content.ComponentCallbacks +import android.content.Context +import android.content.res.Configuration +import androidx.compose.runtime.Composable +import androidx.compose.runtime.DisposableEffect +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.ui.platform.LocalContext +import org.example.presenceapp.ui.theme.themeManager.AndroidThemeManager +import org.example.presenceapp.ui.theme.themeManager.ThemeState + +@Composable +actual fun rememberThemeState(): ThemeState { + val context = LocalContext.current + val configuration = remember { mutableStateOf(context.resources.configuration) } + + DisposableEffect(Unit) { + val listener = object: ComponentCallbacks { + override fun onConfigurationChanged(newConfig: Configuration) { + configuration.value = newConfig + } + override fun onLowMemory() {} + } + + context.registerComponentCallbacks(listener) + onDispose { + context.unregisterComponentCallbacks(listener) + } + } + + return remember { + ThemeState( + themeManager = AndroidThemeManager(context), + isSystemDark = isSystemDark(context) + ) + } +} + +private fun isSystemDark(context: Context): Boolean { + val configuration = context.resources.configuration + return (configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == Configuration.UI_MODE_NIGHT_YES +} \ No newline at end of file diff --git a/composeApp/src/androidMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeManager.android.kt b/composeApp/src/androidMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeManager.android.kt new file mode 100644 index 0000000..28ac646 --- /dev/null +++ b/composeApp/src/androidMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeManager.android.kt @@ -0,0 +1,34 @@ +package org.example.presenceapp.ui.theme.themeManager + +import android.content.Context +import androidx.appcompat.app.AppCompatDelegate + +class AndroidThemeManager( + private val context: Context +) : ThemeManager { + private val prefs = context.getSharedPreferences("theme_prefs", Context.MODE_PRIVATE) + + override fun getCurrentTheme(): ThemeTypes { + return try { + ThemeTypes.valueOf( + prefs.getString("app_theme", ThemeTypes.SYSTEM.name) ?: ThemeTypes.SYSTEM.name + ) + } catch (e: Exception) { + ThemeTypes.SYSTEM + } + } + + override fun setTheme(theme: ThemeTypes) { + prefs.edit().putString("app_theme", theme.name).apply() + applyThemeImmediately(context, theme) + } + + private fun applyThemeImmediately(context: Context, theme: ThemeTypes) { + val mode = when (theme) { + ThemeTypes.LIGHT -> AppCompatDelegate.MODE_NIGHT_NO + ThemeTypes.DARK -> AppCompatDelegate.MODE_NIGHT_YES + ThemeTypes.SYSTEM -> AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM + } + AppCompatDelegate.setDefaultNightMode(mode) + } +} \ No newline at end of file diff --git a/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml b/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/composeApp/src/androidMain/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/composeApp/src/androidMain/res/drawable/ic_launcher_background.xml b/composeApp/src/androidMain/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..e93e11a --- /dev/null +++ b/composeApp/src/androidMain/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/composeApp/src/androidMain/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..a571e60 Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher.png differ diff --git a/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..61da551 Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c41dd28 Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher.png differ diff --git a/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..db5080a Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..6dba46d Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..da31a87 Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..15ac681 Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..b216f2d Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..f25a419 Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..e96783c Binary files /dev/null and b/composeApp/src/androidMain/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/composeApp/src/androidMain/res/values/strings.xml b/composeApp/src/androidMain/res/values/strings.xml new file mode 100644 index 0000000..21310d0 --- /dev/null +++ b/composeApp/src/androidMain/res/values/strings.xml @@ -0,0 +1,3 @@ + + PresenceApp + \ No newline at end of file diff --git a/composeApp/src/commonMain/composeResources/drawable/arrow_back.xml b/composeApp/src/commonMain/composeResources/drawable/arrow_back.xml new file mode 100644 index 0000000..1f68399 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/drawable/arrow_back.xml @@ -0,0 +1,13 @@ + + + diff --git a/composeApp/src/commonMain/composeResources/drawable/compose-multiplatform.xml b/composeApp/src/commonMain/composeResources/drawable/compose-multiplatform.xml new file mode 100644 index 0000000..c0bcfb2 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/drawable/compose-multiplatform.xml @@ -0,0 +1,36 @@ + + + + + + + + \ No newline at end of file diff --git a/composeApp/src/commonMain/composeResources/drawable/info.xml b/composeApp/src/commonMain/composeResources/drawable/info.xml new file mode 100644 index 0000000..5ea0de9 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/drawable/info.xml @@ -0,0 +1,9 @@ + + + diff --git a/composeApp/src/commonMain/composeResources/drawable/is_here.xml b/composeApp/src/commonMain/composeResources/drawable/is_here.xml new file mode 100644 index 0000000..62bbd7d --- /dev/null +++ b/composeApp/src/commonMain/composeResources/drawable/is_here.xml @@ -0,0 +1,9 @@ + + + diff --git a/composeApp/src/commonMain/composeResources/drawable/isnt_here.xml b/composeApp/src/commonMain/composeResources/drawable/isnt_here.xml new file mode 100644 index 0000000..0c42a52 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/drawable/isnt_here.xml @@ -0,0 +1,9 @@ + + + diff --git a/composeApp/src/commonMain/composeResources/drawable/schedule.xml b/composeApp/src/commonMain/composeResources/drawable/schedule.xml new file mode 100644 index 0000000..d8de2b8 --- /dev/null +++ b/composeApp/src/commonMain/composeResources/drawable/schedule.xml @@ -0,0 +1,9 @@ + + + diff --git a/composeApp/src/commonMain/composeResources/drawable/settings.xml b/composeApp/src/commonMain/composeResources/drawable/settings.xml new file mode 100644 index 0000000..ee3bfcc --- /dev/null +++ b/composeApp/src/commonMain/composeResources/drawable/settings.xml @@ -0,0 +1,9 @@ + + + diff --git a/composeApp/src/commonMain/composeResources/font/montserrat.ttf b/composeApp/src/commonMain/composeResources/font/montserrat.ttf new file mode 100644 index 0000000..48ba65e Binary files /dev/null and b/composeApp/src/commonMain/composeResources/font/montserrat.ttf differ diff --git a/composeApp/src/commonMain/composeResources/font/montserrat_medium.ttf b/composeApp/src/commonMain/composeResources/font/montserrat_medium.ttf new file mode 100644 index 0000000..dfbcfe4 Binary files /dev/null and b/composeApp/src/commonMain/composeResources/font/montserrat_medium.ttf differ diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/App.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/App.kt new file mode 100644 index 0000000..ae79935 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/App.kt @@ -0,0 +1,16 @@ +package org.example.presenceapp + +import androidx.compose.runtime.Composable +import cafe.adriel.voyager.navigator.Navigator +import org.example.presenceapp.ui.schedule.ScheduleScreen +import org.example.presenceapp.ui.theme.AppTheme +import org.example.project.ui.login.LoginScreen +import org.jetbrains.compose.ui.tooling.preview.Preview + +@Composable +@Preview +fun App() { + AppTheme { + Navigator(LoginScreen()) + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/Platform.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/Platform.kt new file mode 100644 index 0000000..50e45f3 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/Platform.kt @@ -0,0 +1,7 @@ +package org.example.presenceapp + +interface Platform { + val name: String +} + +expect fun getPlatform(): Platform \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/PlatformContext.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/PlatformContext.kt new file mode 100644 index 0000000..90a3a37 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/PlatformContext.kt @@ -0,0 +1,8 @@ +package org.example.presenceapp + +import androidx.compose.runtime.Composable + +expect class PlatformContext + +@Composable +expect fun getPlatformContext(): PlatformContext \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/Mapper.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/Mapper.kt new file mode 100644 index 0000000..d8f23e8 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/Mapper.kt @@ -0,0 +1,120 @@ +package org.example.presenceapp.data.common + +import org.example.presenceapp.data.common.dto.attendance.AttendanceRequestDto +import org.example.presenceapp.data.common.dto.attendance.AttendanceResponseDto +import org.example.presenceapp.data.common.dto.attendance.PresettingRequestDto +import org.example.presenceapp.data.common.dto.attendance.PresettingResponseDto +import org.example.presenceapp.data.common.dto.auth.AuthRequestDto +import org.example.presenceapp.data.common.dto.auth.AuthResponseDto +import org.example.presenceapp.data.common.dto.auth.GroupDto +import org.example.presenceapp.data.common.dto.auth.ResponsibleDto +import org.example.presenceapp.data.common.dto.auth.ResponsibleTypeDto +import org.example.presenceapp.data.common.dto.auth.RoleResponseDto +import org.example.presenceapp.data.common.dto.auth.UserResponseDto +import org.example.presenceapp.data.common.dto.schedule.ScheduleRequestDto +import org.example.presenceapp.data.common.dto.schedule.ScheduleResponseDto +import org.example.presenceapp.data.common.dto.schedule.SubjectResponseDto +import org.example.presenceapp.domain.command.attendance.AddAttendanceCommand +import org.example.presenceapp.domain.command.attendance.AddPresettingCommand +import org.example.presenceapp.domain.command.GroupCommand +import org.example.presenceapp.domain.command.LoginCommand +import org.example.presenceapp.domain.entities.Attendance +import org.example.presenceapp.domain.entities.AttendanceType +import org.example.presenceapp.domain.entities.GroupResponse +import org.example.presenceapp.domain.entities.LoginResponse +import org.example.presenceapp.domain.entities.Presetting +import org.example.presenceapp.domain.entities.Responsible +import org.example.presenceapp.domain.entities.ResponsibleType +import org.example.presenceapp.domain.entities.RoleResponse +import org.example.presenceapp.domain.entities.Schedule +import org.example.presenceapp.domain.entities.Subject +import org.example.presenceapp.domain.entities.UserResponse + +fun LoginCommand.toDto(): AuthRequestDto = AuthRequestDto( + login = email, + password = password +) + +fun GroupCommand.toDto(): ScheduleRequestDto = ScheduleRequestDto(groupId) + +fun AddAttendanceCommand.toDto(): AttendanceRequestDto = AttendanceRequestDto( + studentId = studentId, + scheduleId = scheduleId, + attendanceTypeId = attendanceTypeId, + attendanceDate = attendanceDate +) + +fun AddPresettingCommand.toDto(): PresettingRequestDto = PresettingRequestDto( + attendanceTypeId = attendanceTypeId, + startAt = startAt, + endAt = endAt +) + + + +fun ScheduleResponseDto.toEntity(): Schedule = Schedule( + subject = subject.toEntity(), + audience = audience, + dayOfWeek = dayOfWeek, + lessonNumber = lessonNumber, + id = id +) + +fun SubjectResponseDto.toEntity(): Subject = Subject( + id = id, + name = name +) + +fun AuthResponseDto.toEntity(): LoginResponse = LoginResponse( + token = token, + user = user.toEntity() +) + +fun UserResponseDto.toEntity(): UserResponse = UserResponse( + uuid = uuid, + email = email, + number = number, + fio = fio, + role = role.toEntity(), + responsible = responsible.map { it.toEntity() } +) + +fun ResponsibleDto.toEntity(): Responsible = Responsible( + group = group.toEntity(), + responsibleType = responsibleType.toEntity() +) + +fun GroupDto.toEntity(): GroupResponse = GroupResponse( + id = id, + name = name +) + +fun ResponsibleTypeDto.toEntity(): ResponsibleType = ResponsibleType( + id = id, + name = name +) + +fun RoleResponseDto.toEntity(): RoleResponse = RoleResponse( + id = id, + name = name +) + +fun AttendanceResponseDto.toEntity(): Attendance = Attendance( + attendanceTypeId = attendanceId, + studentId = studentId, + scheduleId = scheduleId, + date = attendanceDate, + type = attendanceTypeId +) + +fun AttendanceResponseDto.toAttendanceType(): AttendanceType = AttendanceType( + id = attendanceTypeId, + name = "" +) +fun PresettingResponseDto.toEntity(): Presetting = Presetting( + id = id, + attendanceType = attendanceType.toAttendanceType(), + studentId = studentId, + startAt = startAt, + endAt = endAt +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/attendance/AttendanceRequestDto.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/attendance/AttendanceRequestDto.kt new file mode 100644 index 0000000..59f5e72 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/attendance/AttendanceRequestDto.kt @@ -0,0 +1,19 @@ +package org.example.presenceapp.data.common.dto.attendance + +import kotlinx.datetime.LocalDate +import kotlinx.serialization.Serializable + +@Serializable +data class AttendanceRequestDto( + val studentId: Int, + val scheduleId: Int, + val attendanceTypeId: Int, + val attendanceDate: LocalDate +) + +@Serializable +data class PresettingRequestDto( + val attendanceTypeId: Int, + val startAt: LocalDate, + val endAt: LocalDate?, +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/attendance/AttendanceResponseDto.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/attendance/AttendanceResponseDto.kt new file mode 100644 index 0000000..5894106 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/attendance/AttendanceResponseDto.kt @@ -0,0 +1,28 @@ +package org.example.presenceapp.data.common.dto.attendance + +import kotlinx.datetime.LocalDate +import kotlinx.serialization.Serializable + +@Serializable +data class AttendanceResponseDto( + val attendanceId: Int, + val scheduleId: Int, + val attendanceTypeId: Int, + val attendanceDate: LocalDate, + val studentId: Int +) + +@Serializable +data class AttendanceTypeResponseDto( + val id: Int, + val name: String, +) + +@Serializable +data class PresettingResponseDto( + val id: Int, + val attendanceType: AttendanceResponseDto, + val studentId: Int, + val startAt: LocalDate, + val endAt: LocalDate, +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/auth/AuthRequestDto.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/auth/AuthRequestDto.kt new file mode 100644 index 0000000..e796984 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/auth/AuthRequestDto.kt @@ -0,0 +1,9 @@ +package org.example.presenceapp.data.common.dto.auth + +import kotlinx.serialization.Serializable + +@Serializable +data class AuthRequestDto( + val login: String, + val password: String +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/auth/AuthResponseDto.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/auth/AuthResponseDto.kt new file mode 100644 index 0000000..484928a --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/auth/AuthResponseDto.kt @@ -0,0 +1,43 @@ +package org.example.presenceapp.data.common.dto.auth + +import kotlinx.serialization.Serializable + +@Serializable +data class AuthResponseDto( + val user: UserResponseDto, + val token: String +) + +@Serializable +data class UserResponseDto( + val uuid: String, + val email: String, + val number: String, + val fio: String, + val role: RoleResponseDto, + var responsible: List = emptyList() +) + +@Serializable +data class RoleResponseDto( + val id: Int, + val name: String +) + +@Serializable +data class GroupDto( + val id: Int, + val name: String +) + +@Serializable +data class ResponsibleTypeDto( + val id: Int, + val name: String +) + +@Serializable +data class ResponsibleDto( + val group: GroupDto, + val responsibleType: ResponsibleTypeDto +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/group/StudentDto.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/group/StudentDto.kt new file mode 100644 index 0000000..05c7989 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/group/StudentDto.kt @@ -0,0 +1,15 @@ +package org.example.presenceapp.data.common.dto.group + +import kotlinx.datetime.LocalDate +import kotlinx.serialization.Serializable + +@Serializable +data class StudentResponseDto( + val studentId: Int, + val uuid: String, + val email: String, + val number: String, + val fio: String, + val enrollDate: LocalDate, + val expulsionDate: LocalDate? = null +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/schedule/ScheduleRequestDto.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/schedule/ScheduleRequestDto.kt new file mode 100644 index 0000000..32826ee --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/schedule/ScheduleRequestDto.kt @@ -0,0 +1,8 @@ +package org.example.presenceapp.data.common.dto.schedule + +import kotlinx.serialization.Serializable + +@Serializable +data class ScheduleRequestDto( + val groupId: Int +) diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/schedule/ScheduleResponseDto.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/schedule/ScheduleResponseDto.kt new file mode 100644 index 0000000..459739c --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/common/dto/schedule/ScheduleResponseDto.kt @@ -0,0 +1,18 @@ +package org.example.presenceapp.data.common.dto.schedule + +import kotlinx.serialization.Serializable + +@Serializable +data class ScheduleResponseDto( + val id: Int, + val lessonNumber: Int, + val audience: String, + val subject: SubjectResponseDto, + val dayOfWeek: Int, +) + +@Serializable +data class SubjectResponseDto( + val id: Int, + val name: String +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/LocalDataSource.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/LocalDataSource.kt new file mode 100644 index 0000000..1697f8a --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/LocalDataSource.kt @@ -0,0 +1,27 @@ +package org.example.presenceapp.data.local + +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.flow.map +import org.example.presenceapp.data.local.storage.attendance.AttendanceStorage +import org.example.presenceapp.domain.entities.AbsenceReason +import org.example.presenceapp.domain.entities.Attendance +import org.example.presenceapp.domain.entities.AttendanceType + +class LocalDataSource(private val attendanceStorage: AttendanceStorage) { + suspend fun saveAttendance(map: Map) { + attendanceStorage.saveAttendanceMap(map) + } + + fun observeAttendance(): Flow> { + return attendanceStorage.attendanceMapFlow() + .map { attendanceMap -> + attendanceMap + } + .catch { e -> + println("Error reading attendance: ${e.message}") + emit(emptyMap()) + } + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/SettingsStorage.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/SettingsStorage.kt new file mode 100644 index 0000000..ff2fb49 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/SettingsStorage.kt @@ -0,0 +1,8 @@ +package org.example.presenceapp.data.local.storage + +import org.example.presenceapp.PlatformContext + +expect class SettingsStorage(context: PlatformContext) { + suspend fun put(key: String, value: String) + suspend fun get(key: String, defaultValue: String): String +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorage.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorage.kt new file mode 100644 index 0000000..5d80c32 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorage.kt @@ -0,0 +1,9 @@ +package org.example.presenceapp.data.local.storage.attendance + +import kotlinx.coroutines.flow.Flow +import org.example.presenceapp.domain.entities.Attendance + +interface AttendanceStorage { + suspend fun saveAttendanceMap(map: Map) + fun attendanceMapFlow(): Flow> +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorageProvider.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorageProvider.kt new file mode 100644 index 0000000..8e1f5e8 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorageProvider.kt @@ -0,0 +1,7 @@ +package org.example.presenceapp.data.local.storage.attendance + +import org.example.presenceapp.PlatformContext + +expect class AttendanceStorageProvider(context: PlatformContext) { + fun provide(): AttendanceStorage +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/login/AuthManager.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/login/AuthManager.kt new file mode 100644 index 0000000..dc1b195 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/login/AuthManager.kt @@ -0,0 +1,9 @@ +package org.example.presenceapp.data.local.storage.login + +import org.example.project.data.local.TokenStorage + +class AuthManager(private val tokenStorage: TokenStorage) { + suspend fun setToken(token: String) = tokenStorage.setToken(token) + suspend fun deleteToken() = tokenStorage.deleteToken() + suspend fun getToken(): String? = tokenStorage.getToken() +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/login/TokenStorage.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/login/TokenStorage.kt new file mode 100644 index 0000000..13e1817 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/local/storage/login/TokenStorage.kt @@ -0,0 +1,7 @@ +package org.example.project.data.local + +interface TokenStorage { + suspend fun getToken(): String? + suspend fun setToken(token: String) + suspend fun deleteToken() +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/api/AttendanceApi.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/api/AttendanceApi.kt new file mode 100644 index 0000000..5e2efe1 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/api/AttendanceApi.kt @@ -0,0 +1,28 @@ +package org.example.presenceapp.data.remote.api + +import de.jensklingenberg.ktorfit.http.Body +import de.jensklingenberg.ktorfit.http.GET +import de.jensklingenberg.ktorfit.http.POST +import de.jensklingenberg.ktorfit.http.Path +import org.example.presenceapp.data.common.dto.attendance.AttendanceRequestDto +import org.example.presenceapp.data.common.dto.attendance.AttendanceResponseDto +import org.example.presenceapp.data.common.dto.attendance.AttendanceTypeResponseDto +import org.example.presenceapp.data.common.dto.attendance.PresettingResponseDto +import org.example.presenceapp.domain.command.attendance.AddPresettingCommand + +interface AttendanceApi { + @POST("api/v1/presence") + suspend fun addAttendance(@Body commands: List): List + + @GET("api/v1/presence/dictionary/attendance_type") + suspend fun getAttendanceTypes(): List + + @GET("api/v1/presence/{groupId}") + suspend fun getAttendance(@Path("groupId") groupId: Int): List + + @POST("api/v1/presence/presetting") + suspend fun addPresetting(@Body command: AddPresettingCommand): Boolean + + @GET("api/v1/presence/presetting/{groupId}") + suspend fun getPresetting(@Path("groupId") groupId: Int): List +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/api/AuthApi.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/api/AuthApi.kt new file mode 100644 index 0000000..b7fd262 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/api/AuthApi.kt @@ -0,0 +1,11 @@ +package org.example.presenceapp.data.remote.api + +import de.jensklingenberg.ktorfit.http.Body +import de.jensklingenberg.ktorfit.http.POST +import org.example.presenceapp.data.common.dto.auth.AuthRequestDto +import org.example.presenceapp.data.common.dto.auth.AuthResponseDto + +interface AuthApi { + @POST("api/v1/auth/login") + suspend fun login(@Body request: AuthRequestDto): AuthResponseDto +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/api/GroupApi.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/api/GroupApi.kt new file mode 100644 index 0000000..de84433 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/api/GroupApi.kt @@ -0,0 +1,18 @@ +package org.example.presenceapp.data.remote.api + +import de.jensklingenberg.ktorfit.http.GET +import de.jensklingenberg.ktorfit.http.Path +import org.example.presenceapp.data.common.dto.attendance.AttendanceResponseDto +import org.example.presenceapp.data.common.dto.group.StudentResponseDto +import org.example.presenceapp.data.common.dto.schedule.ScheduleResponseDto + +interface GroupApi { + @GET("api/v1/group/{id}/schedule") + suspend fun getSchedule(@Path id: Int): List + + @GET("api/v1/group/{id}/students") + suspend fun getStudents(@Path id: Int): List + + @GET("api/v1/group/{id}/presence") + suspend fun getPresence(@Path id: Int): List +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/impl/AttendanceApiImpl.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/impl/AttendanceApiImpl.kt new file mode 100644 index 0000000..522f0b0 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/impl/AttendanceApiImpl.kt @@ -0,0 +1,26 @@ +package org.example.presenceapp.data.remote.impl + +import org.example.presenceapp.data.common.dto.attendance.AttendanceResponseDto +import org.example.presenceapp.data.common.dto.attendance.AttendanceTypeResponseDto +import org.example.presenceapp.data.common.dto.attendance.PresettingResponseDto +import org.example.presenceapp.data.common.toDto +import org.example.presenceapp.data.remote.api.AttendanceApi +import org.example.presenceapp.domain.command.attendance.AddAttendanceCommand +import org.example.presenceapp.domain.command.attendance.AddPresettingCommand + +class AttendanceApiImpl(private val attendanceApi: AttendanceApi) { + suspend fun addAttendance(commands: List): List = + attendanceApi.addAttendance(commands.map { it.toDto() }) + + suspend fun getAttendance(groupId: Int): List = + attendanceApi.getAttendance(groupId) + + suspend fun getAttendanceTypes(): List = + attendanceApi.getAttendanceTypes() + + suspend fun addPresetting(command: AddPresettingCommand): Boolean = + attendanceApi.addPresetting(command) + + suspend fun getPresetting(groupId: Int): List = + attendanceApi.getPresetting(groupId) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/impl/AuthApiImpl.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/impl/AuthApiImpl.kt new file mode 100644 index 0000000..d804f4c --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/impl/AuthApiImpl.kt @@ -0,0 +1,9 @@ +package org.example.presenceapp.data.remote.impl + +import org.example.presenceapp.data.remote.api.AuthApi +import org.example.presenceapp.data.common.dto.auth.AuthRequestDto +import org.example.presenceapp.data.common.dto.auth.AuthResponseDto + +class AuthApiImpl(private val authApi: AuthApi) { + suspend fun login(requestDto: AuthRequestDto): AuthResponseDto = authApi.login(requestDto) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/impl/ScheduleApiImpl.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/impl/ScheduleApiImpl.kt new file mode 100644 index 0000000..4ecf352 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/impl/ScheduleApiImpl.kt @@ -0,0 +1,13 @@ +package org.example.presenceapp.data.remote.impl + +import org.example.presenceapp.data.common.dto.attendance.AttendanceResponseDto +import org.example.presenceapp.data.common.dto.group.StudentResponseDto +import org.example.presenceapp.data.common.dto.schedule.ScheduleRequestDto +import org.example.presenceapp.data.common.dto.schedule.ScheduleResponseDto +import org.example.presenceapp.data.remote.api.GroupApi + +class ScheduleApiImpl(private val groupApi: GroupApi) { + suspend fun getSchedule(scheduleRequestDto: ScheduleRequestDto): List = groupApi.getSchedule(scheduleRequestDto.groupId) + suspend fun getStudent(scheduleRequestDto: ScheduleRequestDto): List = groupApi.getStudents(scheduleRequestDto.groupId) + suspend fun getAttendance(scheduleRequestDto: ScheduleRequestDto): List = groupApi.getPresence(scheduleRequestDto.groupId) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/network/KtorfitClient.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/network/KtorfitClient.kt new file mode 100644 index 0000000..b5c5e19 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/remote/network/KtorfitClient.kt @@ -0,0 +1,46 @@ +package org.example.presenceapp.data.remote.network + +import de.jensklingenberg.ktorfit.Ktorfit +import io.ktor.client.HttpClient +import io.ktor.client.plugins.DefaultRequest +import io.ktor.client.plugins.contentnegotiation.ContentNegotiation +import io.ktor.client.request.header +import io.ktor.http.ContentType +import io.ktor.http.HttpHeaders +import io.ktor.serialization.kotlinx.json.json +import kotlinx.serialization.json.Json +import org.example.presenceapp.data.remote.api.AuthApi +import org.example.presenceapp.data.remote.api.GroupApi +import org.example.presenceapp.data.remote.api.AttendanceApi + +object KtorfitClient { + private const val BASE_URL = "http://185.207.0.137:8080/" + private val json = Json { ignoreUnknownKeys = true } + + private val ktorClient = HttpClient { + install(ContentNegotiation) { + json(json) + } + install(DefaultRequest) { + header(HttpHeaders.ContentType, ContentType.Application.Json) + } + } + + val instance: Ktorfit = Ktorfit.Builder() + .baseUrl(BASE_URL) + .httpClient(ktorClient) + .build() + + + fun createAuthApi(): AuthApi { + return instance.create() + } + + fun createScheduleApi(): GroupApi { + return instance.create() + } + + fun createAttendanceApi(): AttendanceApi { + return instance.create() + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/AttendanceNetRepository.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/AttendanceNetRepository.kt new file mode 100644 index 0000000..fde4d08 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/AttendanceNetRepository.kt @@ -0,0 +1,55 @@ +package org.example.presenceapp.data.repository + +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.catch +import kotlinx.coroutines.flow.map +import org.example.presenceapp.data.common.toDto +import org.example.presenceapp.data.common.toEntity +import org.example.presenceapp.data.local.LocalDataSource +import org.example.presenceapp.data.remote.impl.AttendanceApiImpl +import org.example.presenceapp.domain.command.attendance.AddAttendanceCommand +import org.example.presenceapp.domain.command.attendance.AddPresettingCommand +import org.example.presenceapp.domain.command.attendance.GetAttendanceCommand +import org.example.presenceapp.domain.command.attendance.GetPresettingCommand +import org.example.presenceapp.domain.entities.Attendance +import org.example.presenceapp.domain.entities.Presetting +import org.example.presenceapp.domain.repo.attendance.AttendanceRepository +import org.example.presenceapp.domain.repo.attendance.PresettingRepository + +class AttendanceNetRepository( + private val localDataSource: LocalDataSource, + private val attendanceApiImpl: AttendanceApiImpl +): AttendanceRepository, PresettingRepository { + suspend fun saveAttendanceLocally(attendance: Map) { + localDataSource.saveAttendance(attendance) + } + + fun observeLocalAttendance(): Flow> { + return localDataSource.observeAttendance() + .map { attendanceMap -> + attendanceMap + } + .catch { e -> + emit(emptyMap()) + } + } + + override suspend fun addAttendance(addAttendanceCommand: AddAttendanceCommand): List { + val result = attendanceApiImpl.addAttendance(listOf(addAttendanceCommand)) + return result.map { it.toEntity() } + } + + override suspend fun getAttendance(getAttendanceCommand: GetAttendanceCommand): List { + val result = attendanceApiImpl.getAttendance(getAttendanceCommand.groupId) + return result.map { it.toEntity() } + } + + override suspend fun addPresetting(addPresettingCommand: AddPresettingCommand): Boolean { + return attendanceApiImpl.addPresetting(addPresettingCommand) + } + + override suspend fun getPresetting(getPresettingCommand: GetPresettingCommand): List { + val result = attendanceApiImpl.getPresetting(getPresettingCommand.groupId) + return result.map { it.toEntity() } + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/AuthRepository.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/AuthRepository.kt new file mode 100644 index 0000000..6ce3b1f --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/AuthRepository.kt @@ -0,0 +1,20 @@ +package org.example.presenceapp.data.repository + +import org.example.presenceapp.data.common.toDto +import org.example.presenceapp.data.common.toEntity +import org.example.presenceapp.data.remote.impl.AuthApiImpl +import org.example.presenceapp.domain.command.LoginCommand +import org.example.presenceapp.domain.entities.LoginResponse +import org.example.presenceapp.domain.repo.LoginRepository +import org.example.presenceapp.data.local.storage.login.AuthManager + +class AuthRepository( + private val authApiImpl: AuthApiImpl, + private val authManager: AuthManager, +): LoginRepository { + override suspend fun login(loginCommand: LoginCommand): LoginResponse { + val result = authApiImpl.login(loginCommand.toDto()) + authManager.setToken(result.token) + return result.toEntity() + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/ScheduleNetRepository.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/ScheduleNetRepository.kt new file mode 100644 index 0000000..2bf2db0 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/ScheduleNetRepository.kt @@ -0,0 +1,17 @@ +package org.example.presenceapp.data.repository + +import org.example.presenceapp.data.common.toDto +import org.example.presenceapp.data.common.toEntity +import org.example.presenceapp.data.remote.impl.ScheduleApiImpl +import org.example.presenceapp.domain.command.GroupCommand +import org.example.presenceapp.domain.entities.Schedule +import org.example.presenceapp.domain.repo.ScheduleRepository + +class ScheduleNetRepository( + private val scheduleApiImpl: ScheduleApiImpl +): ScheduleRepository { + override suspend fun getSchedule(groupCommand: GroupCommand): List { + val result = scheduleApiImpl.getSchedule(groupCommand.toDto()) + return result.map { it.toEntity() } + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/settings/SettingsRepository.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/settings/SettingsRepository.kt new file mode 100644 index 0000000..f766123 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/settings/SettingsRepository.kt @@ -0,0 +1,8 @@ +package org.example.presenceapp.data.repository.settings + +import org.example.presenceapp.domain.entities.AttendanceType + +interface SettingsRepository { + suspend fun getDefaultAttendanceStatus(): AttendanceType + suspend fun setDefaultAttendanceStatus(type: AttendanceType) +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/settings/SettingsRepositoryImpl.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/settings/SettingsRepositoryImpl.kt new file mode 100644 index 0000000..d4fe695 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/data/repository/settings/SettingsRepositoryImpl.kt @@ -0,0 +1,24 @@ +package org.example.presenceapp.data.repository.settings + +import org.example.presenceapp.data.local.storage.SettingsStorage +import org.example.presenceapp.domain.entities.AttendanceType + +class SettingsRepositoryImpl( + private val settingsStorage: SettingsStorage +) : SettingsRepository { + + override suspend fun getDefaultAttendanceStatus(): AttendanceType { + val statusString = settingsStorage.get( + key = "default_attendance_status", + defaultValue = AttendanceType.ABSENT.name + ) + return enumValueOf(statusString) + } + + override suspend fun setDefaultAttendanceStatus(type: AttendanceType) { + settingsStorage.put( + key = "default_attendance_status", + value = type.name + ) + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/di/NetworkModule.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/di/NetworkModule.kt new file mode 100644 index 0000000..028850f --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/di/NetworkModule.kt @@ -0,0 +1,33 @@ +package org.example.presenceapp.di + +import de.jensklingenberg.ktorfit.Ktorfit +import org.example.presenceapp.data.remote.api.AuthApi +import org.example.presenceapp.data.remote.api.GroupApi +import org.example.presenceapp.data.remote.api.createAuthApi +import org.example.presenceapp.data.remote.api.createGroupApi +import org.example.presenceapp.data.remote.impl.AuthApiImpl +import org.example.presenceapp.data.remote.impl.ScheduleApiImpl +import org.example.presenceapp.data.remote.network.KtorfitClient +import org.example.presenceapp.data.repository.AuthRepository +import org.example.presenceapp.data.repository.ScheduleNetRepository +import org.example.presenceapp.domain.repo.LoginRepository +import org.example.presenceapp.domain.repo.ScheduleRepository +import org.example.presenceapp.domain.usecases.LoginUseCase +import org.example.project.ui.login.LoginViewModel +import org.koin.dsl.module + +val networkModule = module { + single { KtorfitClient.instance } + single { get().createAuthApi() } + single { get().createGroupApi() } + + single { AuthApiImpl(get()) } + single { AuthRepository(get(), get()) } + + single { LoginUseCase(get()) } + + single { ScheduleApiImpl(get()) } + single { ScheduleNetRepository (get()) } + + factory { LoginViewModel(get(), get()) } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/GroupCommand.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/GroupCommand.kt new file mode 100644 index 0000000..867fdde --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/GroupCommand.kt @@ -0,0 +1,5 @@ +package org.example.presenceapp.domain.command + +data class GroupCommand( + val groupId: Int +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/LoginCommand.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/LoginCommand.kt new file mode 100644 index 0000000..d39d20b --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/LoginCommand.kt @@ -0,0 +1,6 @@ +package org.example.presenceapp.domain.command + +data class LoginCommand( + val email: String, + val password: String +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/AddAttendanceCommand.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/AddAttendanceCommand.kt new file mode 100644 index 0000000..ad43d5f --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/AddAttendanceCommand.kt @@ -0,0 +1,10 @@ +package org.example.presenceapp.domain.command.attendance + +import kotlinx.datetime.LocalDate + +data class AddAttendanceCommand( + val attendanceDate: LocalDate, + val studentId: Int, + val attendanceTypeId: Int, + val scheduleId: Int +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/AddPresettingCommand.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/AddPresettingCommand.kt new file mode 100644 index 0000000..7c90f8d --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/AddPresettingCommand.kt @@ -0,0 +1,10 @@ +package org.example.presenceapp.domain.command.attendance + +import kotlinx.datetime.LocalDate + +data class AddPresettingCommand( + val attendanceTypeId: Int, + val studentId: Int, + val startAt: LocalDate, + val endAt: LocalDate, +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/GetAttendanceCommand.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/GetAttendanceCommand.kt new file mode 100644 index 0000000..90fb99a --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/GetAttendanceCommand.kt @@ -0,0 +1,8 @@ +package org.example.presenceapp.domain.command.attendance + +import kotlinx.datetime.LocalDate + +data class GetAttendanceCommand( + val groupId: Int, + val beforeAt: LocalDate? +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/GetPresettingCommand.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/GetPresettingCommand.kt new file mode 100644 index 0000000..7fd7256 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/command/attendance/GetPresettingCommand.kt @@ -0,0 +1,8 @@ +package org.example.presenceapp.domain.command.attendance + +import kotlinx.datetime.LocalDate + +data class GetPresettingCommand( + val groupId: Int, + val endAt: LocalDate? +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/common/SomeStudents.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/common/SomeStudents.kt new file mode 100644 index 0000000..14abfd9 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/common/SomeStudents.kt @@ -0,0 +1,33 @@ +package org.example.presenceapp.domain.common + +import org.example.presenceapp.domain.entities.Schedule + +data class Student( + val id: String, + val name: String +) + +class SomeStudents { + val students = listOf( + Student(id = "1", name = "Васильев Кирилл"), + Student(id = "2", name = "Игнатова Вероника"), + Student(id = "3", name = "Латышева Екатерина"), + Student(id = "4", name = "Ермолаев Егор"), + Student(id = "5", name = "Фролов Владимир"), + Student(id = "6", name = "Чеботарева Анастасия"), + Student(id = "7", name = "Попова Виктория"), + Student(id = "8", name = "Соловьева Лейла"), + Student(id = "9", name = "Орлова Анжелика"), + Student(id = "10", name = "Осипова Татьяна"), + Student(id = "11", name = "Николаева Ева"), + Student(id = "12", name = "Федосеева Майя") + ) +} + +object SampleData { + val lessonTimes = listOf("9:00", "9:55", "10:50", "11:55", "13:00", "14:00", "14:55", "15:45") +} + +object SelectedLessonHolder { + var selectedLesson: Schedule? = null +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/common/ToDayMonthString.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/common/ToDayMonthString.kt new file mode 100644 index 0000000..4a48fde --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/common/ToDayMonthString.kt @@ -0,0 +1,36 @@ +package org.example.project.domain.models + +import kotlinx.datetime.LocalDate +import kotlinx.datetime.Month +import kotlinx.datetime.number + + +fun Week.formatWeek(): String { + val start = "${startDate.dayOfMonth.toString().padStart(2, '0')}.${startDate.month.number.toString().padStart(2, '0')}" + val end = "${endDate.dayOfMonth.toString().padStart(2, '0')}.${endDate.month.number.toString().padStart(2, '0')}" + return "$start - $end" +} + + +val russianMonths = mapOf( + Month.JANUARY to "Январь", + Month.FEBRUARY to "Февраль", + Month.MARCH to "Март", + Month.APRIL to "Апрель", + Month.MAY to "Май", + Month.JUNE to "Июнь", + Month.JULY to "Июль", + Month.AUGUST to "Август", + Month.SEPTEMBER to "Сентябрь", + Month.OCTOBER to "Октябрь", + Month.NOVEMBER to "Ноябрь", + Month.DECEMBER to "Декабрь" +) + +fun Month.toRussianName(): String = russianMonths[this] ?: name + + +fun LocalDate.formatDay(): String { + val currentDay = "${dayOfMonth.toString().padStart(2, '0')}.${month.number.toString().padStart(2, '0')}" + return currentDay +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/Attendance.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/Attendance.kt new file mode 100644 index 0000000..4b3a59d --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/Attendance.kt @@ -0,0 +1,19 @@ +package org.example.presenceapp.domain.entities + +import kotlinx.datetime.LocalDate +import kotlinx.serialization.Serializable + +@Serializable +data class Attendance( + val studentId: Int, + val attendanceTypeId: Int, + val scheduleId: Int, + val date: LocalDate, + val type: Int, +) + +@Serializable +data class AttendanceType( + val id: Int, + var name: String = "" +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/DayData.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/DayData.kt new file mode 100644 index 0000000..3341234 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/DayData.kt @@ -0,0 +1,9 @@ +package org.example.presenceapp.domain.entities + +import kotlinx.datetime.LocalDate + +data class DayData( + val date: LocalDate, + val isCurrentMonth: Boolean, + val attendance: AttendanceType? +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/DaysOfWeek.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/DaysOfWeek.kt new file mode 100644 index 0000000..f45fb8d --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/DaysOfWeek.kt @@ -0,0 +1,16 @@ +package org.example.project.domain.models + +import kotlinx.datetime.LocalDate +import kotlinx.datetime.Month + +data class MonthWithWeeks( + val month: Month, + val year: Int, + val weeks: List +) + +data class Week( + val startDate: LocalDate, + val endDate: LocalDate, +) + diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/LoginResponse.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/LoginResponse.kt new file mode 100644 index 0000000..9588471 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/LoginResponse.kt @@ -0,0 +1,35 @@ +package org.example.presenceapp.domain.entities + +data class LoginResponse ( + val user: UserResponse, + val token: String +) + +data class UserResponse( + val uuid: String, + val email: String, + val number: String, + val fio: String, + val role: RoleResponse, + var responsible: List +) + +data class RoleResponse( + val id: Int, + val name: String +) + +data class GroupResponse( + val id: Int, + val name: String +) + +data class ResponsibleType( + val id: Int, + val name: String +) + +data class Responsible( + val group: GroupResponse, + val responsibleType: ResponsibleType +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/Presetting.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/Presetting.kt new file mode 100644 index 0000000..c6eef6b --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/Presetting.kt @@ -0,0 +1,11 @@ +package org.example.presenceapp.domain.entities + +import kotlinx.datetime.LocalDate + +data class Presetting( + val id: Int, + val studentId: Int, + val attendanceType: AttendanceType, + val startAt: LocalDate, + val endAt: LocalDate +) \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/ResponseState.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/ResponseState.kt new file mode 100644 index 0000000..83b6af0 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/ResponseState.kt @@ -0,0 +1,17 @@ +package org.example.presenceapp.domain.entities + +sealed class ResponseState { + class Error(val error: String): ResponseState() + class Success(val data: T): ResponseState() +} + +sealed class Either { + class Left(val value: A): Either() + class Right(val value: B): Either() +} + +enum class ServiceError { + NOT_FOUND, + UNAUTHORIZED, + NOT_CREATED +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/Schedule.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/Schedule.kt new file mode 100644 index 0000000..438e121 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/Schedule.kt @@ -0,0 +1,15 @@ +package org.example.presenceapp.domain.entities + +data class Schedule( + val id: Int, + val lessonNumber: Int, + val audience: String, + val subject: Subject, + val dayOfWeek: Int, +) +data class Subject( + val id: Int, + val name: String +) + + diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/UserInfo.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/UserInfo.kt new file mode 100644 index 0000000..fe4cfd3 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/entities/UserInfo.kt @@ -0,0 +1,7 @@ +package org.example.presenceapp.domain.entities + +object UserInfo { + var userName: String = "" + var userGroup: String = "" + var userRole: String = "" +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/LoginRepository.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/LoginRepository.kt new file mode 100644 index 0000000..50b65df --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/LoginRepository.kt @@ -0,0 +1,8 @@ +package org.example.presenceapp.domain.repo + +import org.example.presenceapp.domain.command.LoginCommand +import org.example.presenceapp.domain.entities.LoginResponse + +interface LoginRepository { + suspend fun login(loginCommand: LoginCommand): LoginResponse +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/ScheduleRepository.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/ScheduleRepository.kt new file mode 100644 index 0000000..310104b --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/ScheduleRepository.kt @@ -0,0 +1,8 @@ +package org.example.presenceapp.domain.repo + +import org.example.presenceapp.domain.command.GroupCommand +import org.example.presenceapp.domain.entities.Schedule + +interface ScheduleRepository { + suspend fun getSchedule(groupCommand: GroupCommand): List +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/attendance/AttendanceRepository.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/attendance/AttendanceRepository.kt new file mode 100644 index 0000000..b1998c2 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/attendance/AttendanceRepository.kt @@ -0,0 +1,10 @@ +package org.example.presenceapp.domain.repo.attendance + +import org.example.presenceapp.domain.command.attendance.AddAttendanceCommand +import org.example.presenceapp.domain.command.attendance.GetAttendanceCommand +import org.example.presenceapp.domain.entities.Attendance + +interface AttendanceRepository { + suspend fun addAttendance(addAttendanceCommand: AddAttendanceCommand): List + suspend fun getAttendance(getAttendanceCommand: GetAttendanceCommand): List +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/attendance/AttendanceTypeRepository.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/attendance/AttendanceTypeRepository.kt new file mode 100644 index 0000000..6e20f04 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/attendance/AttendanceTypeRepository.kt @@ -0,0 +1,7 @@ +package org.example.presenceapp.domain.repo.attendance + +import org.example.presenceapp.domain.entities.AttendanceType + +interface AttendanceTypeRepository { + suspend fun getAttendanceTypes(): List +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/attendance/PresettingRepository.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/attendance/PresettingRepository.kt new file mode 100644 index 0000000..21cd972 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/repo/attendance/PresettingRepository.kt @@ -0,0 +1,10 @@ +package org.example.presenceapp.domain.repo.attendance + +import org.example.presenceapp.domain.command.attendance.AddPresettingCommand +import org.example.presenceapp.domain.command.attendance.GetPresettingCommand +import org.example.presenceapp.domain.entities.Presetting + +interface PresettingRepository { + suspend fun addPresetting(addPresettingCommand: AddPresettingCommand): Boolean + suspend fun getPresetting(getPresettingCommand: GetPresettingCommand): List +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/usecases/AttendanceUseCase.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/usecases/AttendanceUseCase.kt new file mode 100644 index 0000000..4901bf8 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/usecases/AttendanceUseCase.kt @@ -0,0 +1,52 @@ +package org.example.presenceapp.domain.usecases + +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flow +import org.example.presenceapp.domain.command.attendance.AddAttendanceCommand +import org.example.presenceapp.domain.command.attendance.AddPresettingCommand +import org.example.presenceapp.domain.command.attendance.GetAttendanceCommand +import org.example.presenceapp.domain.command.attendance.GetPresettingCommand +import org.example.presenceapp.domain.entities.Attendance +import org.example.presenceapp.domain.entities.Either +import org.example.presenceapp.domain.entities.Presetting +import org.example.presenceapp.domain.repo.attendance.AttendanceRepository + +class AttendanceUseCase( + private val attendanceRepository: AttendanceRepository +) { + fun addAttendance(addAttendanceCommand: AddAttendanceCommand): Flow> = flow { + return@flow try { + val result = attendanceRepository.addAttendance(addAttendanceCommand) + emit(Either.Right(result)) + } catch (e:Exception) { + emit(Either.Left(e)) + } + } + + fun getAttendance(getAttendanceCommand: GetAttendanceCommand): Flow>> = flow { + return@flow try { + val result = attendanceRepository.getAttendance(getAttendanceCommand) + emit(Either.Right(result)) + } catch (e:Exception) { + emit(Either.Left(e)) + } + } + + fun addPresetting(addPresettingCommand: AddPresettingCommand): Flow> = flow { + return@flow try { + val result = attendanceRepository.addPresetting(addPresettingCommand) + emit(Either.Right(result)) + } catch (e:Exception) { + emit(Either.Left(e)) + } + } + + fun getPresetting(getPresettingCommand: GetPresettingCommand): Flow>> = flow { + return@flow try { + val result = attendanceRepository.getPresetting(getPresettingCommand) + emit(Either.Right(result)) + } catch (e:Exception) { + emit(Either.Left(e)) + } + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/usecases/LoginUseCase.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/usecases/LoginUseCase.kt new file mode 100644 index 0000000..015e5ed --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/usecases/LoginUseCase.kt @@ -0,0 +1,21 @@ +package org.example.presenceapp.domain.usecases + +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flow +import org.example.presenceapp.domain.entities.Either +import org.example.presenceapp.domain.command.LoginCommand +import org.example.presenceapp.domain.entities.LoginResponse +import org.example.presenceapp.domain.repo.LoginRepository + +class LoginUseCase( + private val loginRepository: LoginRepository +) { + fun login(loginCommand: LoginCommand): Flow> = flow { + return@flow try { + val result = loginRepository.login(loginCommand) + emit(Either.Right(result)) + } catch (e:Exception) { + emit(Either.Left(e)) + } + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/usecases/ScheduleUseCase.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/usecases/ScheduleUseCase.kt new file mode 100644 index 0000000..0e86022 --- /dev/null +++ b/composeApp/src/commonMain/kotlin/org/example/presenceapp/domain/usecases/ScheduleUseCase.kt @@ -0,0 +1,21 @@ +package org.example.presenceapp.domain.usecases + +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flow +import org.example.presenceapp.domain.command.GroupCommand +import org.example.presenceapp.domain.entities.Either +import org.example.presenceapp.domain.entities.Schedule +import org.example.presenceapp.domain.repo.ScheduleRepository + +class ScheduleUseCase( + private val scheduleRepository: ScheduleRepository +) { + fun getSchedule(groupCommand: GroupCommand): Flow>> = flow { + return@flow try { + val result = scheduleRepository.getSchedule(groupCommand) + emit(Either.Right(result)) + } catch (e: Exception) { + emit(Either.Left(e)) + } + } +} \ No newline at end of file diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/attendance/AttendanceScreen.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/attendance/AttendanceScreen.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/attendance/AttendanceScreenModel.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/attendance/AttendanceScreenModel.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/attendance/components/AttendanceColumn.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/attendance/components/AttendanceColumn.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/attendance/components/AttendanceToString.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/attendance/components/AttendanceToString.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/CalendarScreen.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/CalendarScreen.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/CalendarScreenModel.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/CalendarScreenModel.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/components/CalendarDayCell.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/components/CalendarDayCell.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/components/CalendarGrid.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/components/CalendarGrid.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/components/CalendarMonth.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/components/CalendarMonth.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/components/CalendarUtils.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/components/CalendarUtils.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/components/CalendarWeekDays.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/calendar/components/CalendarWeekDays.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonBottomBar.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonBottomBar.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonButton.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonButton.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonDataText.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonDataText.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonDialog.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonDialog.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonIconButton.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonIconButton.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonLabel.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonLabel.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonMainText.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonMainText.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonMediumText.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonMediumText.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonRegularText.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonRegularText.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonTopBar.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/CommonTopBar.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/ErrorDialog.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/commons/ErrorDialog.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/info/InfoScreen.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/info/InfoScreen.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/info/InfoScreenModel.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/info/InfoScreenModel.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/info/InfoScreenState.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/info/InfoScreenState.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/info/components/InfoCard.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/info/components/InfoCard.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/LoginScreen.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/LoginScreen.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/LoginScreenState.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/LoginScreenState.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/LoginViewModel.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/LoginViewModel.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/components/LoginButton.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/components/LoginButton.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/components/LoginCheckBox.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/components/LoginCheckBox.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/components/LoginTextField.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/login/components/LoginTextField.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/ScheduleScreen.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/ScheduleScreen.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/ScheduleScreenModel.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/ScheduleScreenModel.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/ScheduleScreenState.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/ScheduleScreenState.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/components/EmptyScheduleLessonsItem.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/components/EmptyScheduleLessonsItem.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/components/ScheduleDaySelector.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/components/ScheduleDaySelector.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/components/ScheduleDayText.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/components/ScheduleDayText.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/components/ScheduleLessonItem.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/components/ScheduleLessonItem.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/components/ScheduleLessonList.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/schedule/components/ScheduleLessonList.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/settings/Preset.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/settings/Preset.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/settings/SettingsManager.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/settings/SettingsManager.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/settings/SettingsScreen.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/settings/SettingsScreen.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/settings/SettingsScreenModel.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/settings/SettingsScreenModel.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/settings/components/SettingsReasonOption.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/settings/components/SettingsReasonOption.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/theme/Theme.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/theme/Theme.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeManager.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeManager.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeState.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeState.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeTypes.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeTypes.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/types/ButtonType.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/types/ButtonType.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/types/ScreenType.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/types/ScreenType.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/weeks/WeeksScreen.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/weeks/WeeksScreen.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/weeks/WeeksScreenState.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/weeks/WeeksScreenState.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/weeks/WeeksViewModel.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/weeks/WeeksViewModel.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/weeks/components/MonthHeader.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/weeks/components/MonthHeader.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/weeks/components/ScheduleCard.kt b/composeApp/src/commonMain/kotlin/org/example/presenceapp/ui/weeks/components/ScheduleCard.kt new file mode 100644 index 0000000..e69de29 diff --git a/composeApp/src/iosMain/c_interop/Uikit.def b/composeApp/src/iosMain/c_interop/Uikit.def new file mode 100644 index 0000000..f5ae0c8 --- /dev/null +++ b/composeApp/src/iosMain/c_interop/Uikit.def @@ -0,0 +1,2 @@ +language = Objective-C +modules = UIKit \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/org/example/presenceapp/MainViewController.kt b/composeApp/src/iosMain/kotlin/org/example/presenceapp/MainViewController.kt new file mode 100644 index 0000000..a8fcd5c --- /dev/null +++ b/composeApp/src/iosMain/kotlin/org/example/presenceapp/MainViewController.kt @@ -0,0 +1,5 @@ +package org.example.presenceapp + +import androidx.compose.ui.window.ComposeUIViewController + +fun MainViewController() = ComposeUIViewController { App() } \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/org/example/presenceapp/Platform.ios.kt b/composeApp/src/iosMain/kotlin/org/example/presenceapp/Platform.ios.kt new file mode 100644 index 0000000..1fa812b --- /dev/null +++ b/composeApp/src/iosMain/kotlin/org/example/presenceapp/Platform.ios.kt @@ -0,0 +1,9 @@ +package org.example.presenceapp + +import platform.UIKit.UIDevice + +class IOSPlatform: Platform { + override val name: String = UIDevice.currentDevice.systemName() + " " + UIDevice.currentDevice.systemVersion +} + +actual fun getPlatform(): Platform = IOSPlatform() \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/org/example/presenceapp/PlatformContext.ios.kt b/composeApp/src/iosMain/kotlin/org/example/presenceapp/PlatformContext.ios.kt new file mode 100644 index 0000000..db10ccf --- /dev/null +++ b/composeApp/src/iosMain/kotlin/org/example/presenceapp/PlatformContext.ios.kt @@ -0,0 +1,10 @@ +package org.example.presenceapp + +import androidx.compose.runtime.Composable + +actual class PlatformContext + +@Composable +actual fun getPlatformContext(): PlatformContext { + return PlatformContext() +} \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/org/example/presenceapp/data/local/storage/SettingsStorage.kt b/composeApp/src/iosMain/kotlin/org/example/presenceapp/data/local/storage/SettingsStorage.kt new file mode 100644 index 0000000..ba50644 --- /dev/null +++ b/composeApp/src/iosMain/kotlin/org/example/presenceapp/data/local/storage/SettingsStorage.kt @@ -0,0 +1,16 @@ +package org.example.presenceapp.data.local.storage + +import org.example.presenceapp.PlatformContext +import platform.Foundation.NSUserDefaults + +actual class SettingsStorage actual constructor(private val context: PlatformContext) { + private val userDefaults = NSUserDefaults.standardUserDefaults() + + actual suspend fun put(key: String, value: String) { + userDefaults.setObject(value, forKey = key) + } + + actual suspend fun get(key: String, defaultValue: String): String { + return userDefaults.stringForKey(key) ?: defaultValue + } +} \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorage.ios.kt b/composeApp/src/iosMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorage.ios.kt new file mode 100644 index 0000000..133c9c4 --- /dev/null +++ b/composeApp/src/iosMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorage.ios.kt @@ -0,0 +1,30 @@ +package org.example.presenceapp.data.local.storage.attendance + +import kotlinx.coroutines.flow.Flow +import kotlinx.coroutines.flow.flow +import kotlinx.serialization.json.Json +import org.example.presenceapp.domain.entities.Attendance +import platform.Foundation.NSUserDefaults + +class AttendanceStorageIos: AttendanceStorage { + + private val defaults = NSUserDefaults.standardUserDefaults + + override suspend fun saveAttendanceMap(map: Map) { + val json = Json.encodeToString(map) + defaults.setObject(json, forKey = "attendance_map") + } + + override fun attendanceMapFlow(): Flow> { + return flow { + val json = defaults.stringForKey("attendance_map") + emit( + if (json != null) { + Json.decodeFromString>(json) + } else { + emptyMap() + } + ) + } + } +} \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorageProvider.ios.kt b/composeApp/src/iosMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorageProvider.ios.kt new file mode 100644 index 0000000..7480594 --- /dev/null +++ b/composeApp/src/iosMain/kotlin/org/example/presenceapp/data/local/storage/attendance/AttendanceStorageProvider.ios.kt @@ -0,0 +1,9 @@ +package org.example.presenceapp.data.local.storage.attendance + +import org.example.presenceapp.PlatformContext + +actual class AttendanceStorageProvider actual constructor(context: PlatformContext) { + actual fun provide(): AttendanceStorage { + return AttendanceStorageIos() + } +} \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/org/example/presenceapp/di/iOSModule.kt b/composeApp/src/iosMain/kotlin/org/example/presenceapp/di/iOSModule.kt new file mode 100644 index 0000000..c149a0b --- /dev/null +++ b/composeApp/src/iosMain/kotlin/org/example/presenceapp/di/iOSModule.kt @@ -0,0 +1,7 @@ +package org.example.presenceapp.di + +import org.koin.dsl.module + +val iosModule = module { + +} \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/org/example/presenceapp/ui/settings/SettingsManager.ios.kt b/composeApp/src/iosMain/kotlin/org/example/presenceapp/ui/settings/SettingsManager.ios.kt new file mode 100644 index 0000000..87feb9e --- /dev/null +++ b/composeApp/src/iosMain/kotlin/org/example/presenceapp/ui/settings/SettingsManager.ios.kt @@ -0,0 +1,27 @@ +package org.example.presenceapp.ui.settings + +import androidx.compose.runtime.Composable +import org.example.presenceapp.PlatformContext +import platform.Foundation.NSUserDefaults + +actual class SettingsManager actual constructor(platformContext: PlatformContext) { + private val userDefaults = NSUserDefaults.standardUserDefaults() + + actual fun isDialogShown(): Boolean { + return userDefaults.boolForKey(KEY_DIALOG_SHOWN) ?: false + } + + actual fun setDialogShown() { + userDefaults.setBool(true, forKey = KEY_DIALOG_SHOWN) + } + + companion object { + private const val KEY_DIALOG_SHOWN = "dialog_shown" + } +} + +@Composable +actual fun getSettingsManager(): SettingsManager { + val platformContext = PlatformContext() + return SettingsManager(platformContext) +} \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/org/example/presenceapp/ui/theme/Theme.ios.kt b/composeApp/src/iosMain/kotlin/org/example/presenceapp/ui/theme/Theme.ios.kt new file mode 100644 index 0000000..d96f89b --- /dev/null +++ b/composeApp/src/iosMain/kotlin/org/example/presenceapp/ui/theme/Theme.ios.kt @@ -0,0 +1,14 @@ +package org.example.presenceapp.ui.theme + +import androidx.compose.runtime.Composable +import org.example.presenceapp.ui.theme.themeManager.IosThemeManager +import org.example.presenceapp.ui.theme.themeManager.ThemeObserver +import org.example.presenceapp.ui.theme.themeManager.ThemeState + +@Composable +actual fun rememberThemeState(): ThemeState { + return ThemeState( + themeManager = IosThemeManager(), + isSystemDark = ThemeObserver.isDarkMode() + ) +} \ No newline at end of file diff --git a/composeApp/src/iosMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeManager.ios.kt b/composeApp/src/iosMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeManager.ios.kt new file mode 100644 index 0000000..0589d0d --- /dev/null +++ b/composeApp/src/iosMain/kotlin/org/example/presenceapp/ui/theme/themeManager/ThemeManager.ios.kt @@ -0,0 +1,39 @@ +package org.example.presenceapp.ui.theme.themeManager + +import platform.Foundation.setValue +import platform.UIKit.UIApplication +import platform.UIKit.UIUserInterfaceStyle +import platform.UIKit.UIWindow + +@Suppress("CONFLICTING_OVERLOADS") +fun UIWindow.setOverrideUserInterfaceStyle(style: UIUserInterfaceStyle) { + this.setValue(style, forKey = "overrideUserInterfaceStyle") +} + +class IosThemeManager: ThemeManager { + private var currentTheme: ThemeTypes = ThemeTypes.SYSTEM + + override fun getCurrentTheme() = currentTheme + override fun setTheme(theme: ThemeTypes) { + currentTheme = theme + updateAllWindowsTheme(theme) + } + + private fun updateAllWindowsTheme(theme: ThemeTypes) { + val style = when (theme) { + ThemeTypes.LIGHT -> UIUserInterfaceStyle.UIUserInterfaceStyleLight + ThemeTypes.DARK -> UIUserInterfaceStyle.UIUserInterfaceStyleDark + ThemeTypes.SYSTEM -> UIUserInterfaceStyle.UIUserInterfaceStyleUnspecified + } + + (UIApplication.sharedApplication.windows as? List)?.forEach { window -> + window.setOverrideUserInterfaceStyle(style) + } + } +} + +external class ThemeObserver: platform.darwin.NSObject { + companion object { + fun isDarkMode(): Boolean + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..964007c --- /dev/null +++ b/gradle.properties @@ -0,0 +1,10 @@ +#Kotlin +kotlin.code.style=official +kotlin.daemon.jvmargs=-Xmx2048M + +#Gradle +org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 + +#Android +android.nonTransitiveRClass=true +android.useAndroidX=true \ No newline at end of file diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml new file mode 100644 index 0000000..d08a6ff --- /dev/null +++ b/gradle/libs.versions.toml @@ -0,0 +1,127 @@ +[versions] +agp = "8.5.2" +android-compileSdk = "35" +android-minSdk = "24" +android-targetSdk = "35" +androidx-activityCompose = "1.10.1" +androidx-appcompat = "1.7.0" +androidx-constraintlayout = "2.2.1" +androidx-core-ktx = "1.15.0" +androidx-espresso-core = "3.6.1" +androidx-lifecycle = "2.8.4" +androidx-material = "1.12.0" +androidx-test-junit = "1.2.1" +compose-multiplatform = "1.7.3" +datastorePreferences = "1.1.4" +junit = "4.13.2" +kermit = "2.0.0" +kotlin = "2.1.10" +kotlinLogging = "2.1.21" +kotlinxCoroutinesCore = "1.7.3-native-mt" +logbackClassic = "1.2.9" +material3Android = "1.3.1" +compose-ui = "1.7.3" +multiplatformSettings = "1.1.1" +resources = "1.7.3" + +kotlinxSerialization = "1.8.0" +kotlinx-coroutines = "1.10.1" +slf4jApi = "2.0.16" +startupRuntime = "1.2.0" +voyager = "1.1.0-beta02" +ktor = "3.1.2" +ktorfit = "2.5.0" +koin = "3.5.3" +koin-compose = "1.0.4" +ksp = "2.1.10-1.0.31" +kotlinx-datetime = "0.6.0" +uiAndroid = "1.7.8" +annotationJvm = "1.9.1" +uiTextAndroid = "1.7.8" +foundationLayoutAndroid = "1.7.8" + + + +[libraries] +androidx-datastore-preferences = { module = "androidx.datastore:datastore-preferences", version.ref = "datastorePreferences" } +androidx-datastore-preferences-core = { module = "androidx.datastore:datastore-preferences-core", version.ref = "datastorePreferences" } +androidx-startup-runtime = { module = "androidx.startup:startup-runtime", version.ref = "startupRuntime" } +kermit = { module = "co.touchlab:kermit", version.ref = "kermit" } +kotlin-logging = { module = "io.github.microutils:kotlin-logging", version.ref = "kotlinLogging" } +kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" } +kotlin-test-junit = { module = "org.jetbrains.kotlin:kotlin-test-junit", version.ref = "kotlin" } +junit = { group = "junit", name = "junit", version.ref = "junit" } +androidx-core-ktx = { group = "androidx.core", name = "core-ktx", version.ref = "androidx-core-ktx" } +androidx-test-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidx-test-junit" } +androidx-espresso-core = { group = "androidx.test.espresso", name = "espresso-core", version.ref = "androidx-espresso-core" } +androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "androidx-appcompat" } +androidx-material = { group = "com.google.android.material", name = "material", version.ref = "androidx-material" } +androidx-constraintlayout = { group = "androidx.constraintlayout", name = "constraintlayout", version.ref = "androidx-constraintlayout" } +androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "androidx-activityCompose" } +androidx-lifecycle-viewmodel = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-viewmodel", version.ref = "androidx-lifecycle" } +androidx-lifecycle-runtime-compose = { group = "org.jetbrains.androidx.lifecycle", name = "lifecycle-runtime-compose", version.ref = "androidx-lifecycle" } +androidx-material3-android = { group = "androidx.compose.material3", name = "material3-android", version.ref = "material3Android" } +compose-ui = { module = "androidx.compose.ui:ui", version.ref = "compose-ui" } +kotlinx-coroutines-core-v173nativemt = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinxCoroutinesCore" } +logback-classic = { module = "ch.qos.logback:logback-classic", version.ref = "logbackClassic" } +multiplatform-settings = { module = "com.russhwolf:multiplatform-settings", version.ref = "multiplatformSettings" } +resources = { module = "org.jetbrains.compose.resources:resources", version.ref = "resources" } + +# serialization +kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serialization-json", version.ref = "kotlinxSerialization" } + +# coroutines +kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" } + +# voyager +slf4j-api = { module = "org.slf4j:slf4j-api", version.ref = "slf4jApi" } +voyager-navigator = { module = "cafe.adriel.voyager:voyager-navigator", version.ref = "voyager" } +voyager-screenmodel = { module = "cafe.adriel.voyager:voyager-screenmodel", version.ref = "voyager" } +voyager-koin = { module = "cafe.adriel.voyager:voyager-koin", version.ref = "voyager" } + +# ktor +ktor-client-core = { module = "io.ktor:ktor-client-core", version.ref = "ktor" } +ktor-client-websockets = { module = "io.ktor:ktor-client-websockets", version.ref = "ktor" } +ktor-client-okhttp = { module = "io.ktor:ktor-client-okhttp", version.ref = "ktor" } +ktor-client-cio = { module = "io.ktor:ktor-client-cio", version.ref = "ktor" } +ktor-client-darwin = { module = "io.ktor:ktor-client-darwin", version.ref = "ktor" } +ktor-client-json = { module = "io.ktor:ktor-client-json", version.ref = "ktor" } +ktor-client-logging = { module = "io.ktor:ktor-client-logging", version.ref = "ktor" } +ktor-client-content-negotiation = { module = "io.ktor:ktor-client-content-negotiation", version.ref = "ktor" } +ktor-serialization-kotlinx-json = { module = "io.ktor:ktor-serialization-kotlinx-json", version.ref = "ktor" } + +# ktorfit +ktorfit = { module = "de.jensklingenberg.ktorfit:ktorfit-lib", version.ref = "ktorfit" } +ktorfit-ksp = { module = "de.jensklingenberg.ktorfit:ktorfit-ksp", version.ref = "ktorfit" } + +# koin +koin-core = { module = "io.insert-koin:koin-core", version.ref = "koin" } +koin-android = { module = "io.insert-koin:koin-android", version.ref = "koin" } +koin-androidx-compose = { module = "io.insert-koin:koin-androidx-compose", version.ref = "koin" } +koin-ktor = { module = "io.insert-koin:koin-ktor", version.ref = "koin" } +koin-core-native = { module = "io.insert-koin:koin-core", version.ref = "koin" } +koin-compose = { module = "io.insert-koin:koin-compose", version.ref = "koin-compose" } + +# date time +kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" } + +androidx-ui-android = { group = "androidx.compose.ui", name = "ui-android", version.ref = "uiAndroid" } +androidx-annotation-jvm = { group = "androidx.annotation", name = "annotation-jvm", version.ref = "annotationJvm" } +androidx-ui-text-android = { group = "androidx.compose.ui", name = "ui-text-android", version.ref = "uiTextAndroid" } +androidx-foundation-layout-android = { group = "androidx.compose.foundation", name = "foundation-layout-android", version.ref = "foundationLayoutAndroid" } + + + +[plugins] +androidApplication = { id = "com.android.application", version.ref = "agp" } +androidLibrary = { id = "com.android.library", version.ref = "agp" } +composeMultiplatform = { id = "org.jetbrains.compose", version.ref = "compose-multiplatform" } +composeCompiler = { id = "org.jetbrains.kotlin.plugin.compose", version.ref = "kotlin" } +kotlinMultiplatform = { id = "org.jetbrains.kotlin.multiplatform", version.ref = "kotlin" } +kotlinSerialization = { id = "org.jetbrains.kotlin.plugin.serialization", version.ref = "kotlin" } + +# ksp +ksp = { id = "com.google.devtools.ksp", version.ref = "ksp" } + +# ktorfit +ktorfit = { id = "de.jensklingenberg.ktorfit", version.ref = "ktorfit" } \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..2c35211 Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..09523c0 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,7 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip +networkTimeout=10000 +validateDistributionUrl=true +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..f5feea6 --- /dev/null +++ b/gradlew @@ -0,0 +1,252 @@ +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# 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 +# +# https://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. +# +# SPDX-License-Identifier: Apache-2.0 +# + +############################################################################## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# +############################################################################## + +# Attempt to set APP_HOME + +# Resolve links: $0 may be a link +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac +done + +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s +' "$PWD" ) || exit + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD=maximum + +warn () { + echo "$*" +} >&2 + +die () { + echo + echo "$*" + echo + exit 1 +} >&2 + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD=$JAVA_HOME/jre/sh/java + else + JAVACMD=$JAVA_HOME/bin/java + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD=java + if ! command -v java >/dev/null 2>&1 + then + die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +fi + +# Increase the maximum file descriptors if we can. +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC2039,SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac +fi + +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) + + # Now convert the arguments - kludge to limit ourselves to /bin/sh + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) + fi + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg + done +fi + + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Collect all arguments for the java command: +# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# and any embedded shellness will be escaped. +# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be +# treated as '${Hostname}' itself on the command line. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" +fi + +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..9d21a21 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,94 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem +@rem SPDX-License-Identifier: Apache-2.0 +@rem + +@if "%DEBUG%"=="" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if %ERRORLEVEL% equ 0 goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. 1>&2 +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2 +echo. 1>&2 +echo Please set the JAVA_HOME variable in your environment to match the 1>&2 +echo location of your Java installation. 1>&2 + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if %ERRORLEVEL% equ 0 goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/iosApp/Configuration/Config.xcconfig b/iosApp/Configuration/Config.xcconfig new file mode 100644 index 0000000..219172e --- /dev/null +++ b/iosApp/Configuration/Config.xcconfig @@ -0,0 +1,3 @@ +TEAM_ID= +BUNDLE_ID=org.example.presenceapp.PresenceApp +APP_NAME=PresenceApp \ No newline at end of file diff --git a/iosApp/iosApp.xcodeproj/project.pbxproj b/iosApp/iosApp.xcodeproj/project.pbxproj new file mode 100644 index 0000000..b7d9d2e --- /dev/null +++ b/iosApp/iosApp.xcodeproj/project.pbxproj @@ -0,0 +1,393 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 56; + objects = { + +/* Begin PBXBuildFile section */ + 058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557BA273AAA24004C7B11 /* Assets.xcassets */; }; + 058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */; }; + 2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */ = {isa = PBXBuildFile; fileRef = 2152FB032600AC8F00CF470E /* iOSApp.swift */; }; + 7555FF83242A565900829871 /* ContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7555FF82242A565900829871 /* ContentView.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXFileReference section */ + 058557BA273AAA24004C7B11 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; + 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = "Preview Assets.xcassets"; sourceTree = ""; }; + 2152FB032600AC8F00CF470E /* iOSApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = iOSApp.swift; sourceTree = ""; }; + 7555FF7B242A565900829871 /* PresenceApp.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = PresenceApp.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 7555FF82242A565900829871 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; + 7555FF8C242A565B00829871 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; + AB3632DC29227652001CCB65 /* Config.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Config.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + B92378962B6B1156000C7307 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 058557D7273AAEEB004C7B11 /* Preview Content */ = { + isa = PBXGroup; + children = ( + 058557D8273AAEEB004C7B11 /* Preview Assets.xcassets */, + ); + path = "Preview Content"; + sourceTree = ""; + }; + 42799AB246E5F90AF97AA0EF /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; + 7555FF72242A565900829871 = { + isa = PBXGroup; + children = ( + AB1DB47929225F7C00F7AF9C /* Configuration */, + 7555FF7D242A565900829871 /* iosApp */, + 7555FF7C242A565900829871 /* Products */, + 42799AB246E5F90AF97AA0EF /* Frameworks */, + ); + sourceTree = ""; + }; + 7555FF7C242A565900829871 /* Products */ = { + isa = PBXGroup; + children = ( + 7555FF7B242A565900829871 /* PresenceApp.app */, + ); + name = Products; + sourceTree = ""; + }; + 7555FF7D242A565900829871 /* iosApp */ = { + isa = PBXGroup; + children = ( + 058557BA273AAA24004C7B11 /* Assets.xcassets */, + 7555FF82242A565900829871 /* ContentView.swift */, + 7555FF8C242A565B00829871 /* Info.plist */, + 2152FB032600AC8F00CF470E /* iOSApp.swift */, + 058557D7273AAEEB004C7B11 /* Preview Content */, + ); + path = iosApp; + sourceTree = ""; + }; + AB1DB47929225F7C00F7AF9C /* Configuration */ = { + isa = PBXGroup; + children = ( + AB3632DC29227652001CCB65 /* Config.xcconfig */, + ); + path = Configuration; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 7555FF7A242A565900829871 /* iosApp */ = { + isa = PBXNativeTarget; + buildConfigurationList = 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */; + buildPhases = ( + F36B1CEB2AD83DDC00CB74D5 /* Compile Kotlin Framework */, + 7555FF77242A565900829871 /* Sources */, + B92378962B6B1156000C7307 /* Frameworks */, + 7555FF79242A565900829871 /* Resources */, + ); + buildRules = ( + ); + dependencies = ( + ); + name = iosApp; + packageProductDependencies = ( + ); + productName = iosApp; + productReference = 7555FF7B242A565900829871 /* PresenceApp.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 7555FF73242A565900829871 /* Project object */ = { + isa = PBXProject; + attributes = { + BuildIndependentTargetsInParallel = YES; + LastSwiftUpdateCheck = 1130; + LastUpgradeCheck = 1540; + ORGANIZATIONNAME = orgName; + TargetAttributes = { + 7555FF7A242A565900829871 = { + CreatedOnToolsVersion = 11.3.1; + }; + }; + }; + buildConfigurationList = 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */; + compatibilityVersion = "Xcode 14.0"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 7555FF72242A565900829871; + packageReferences = ( + ); + productRefGroup = 7555FF7C242A565900829871 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 7555FF7A242A565900829871 /* iosApp */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 7555FF79242A565900829871 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 058557D9273AAEEB004C7B11 /* Preview Assets.xcassets in Resources */, + 058557BB273AAA24004C7B11 /* Assets.xcassets in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + F36B1CEB2AD83DDC00CB74D5 /* Compile Kotlin Framework */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + name = "Compile Kotlin Framework"; + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "if [ \"YES\" = \"$OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED\" ]; then\n echo \"Skipping Gradle build task invocation due to OVERRIDE_KOTLIN_BUILD_IDE_SUPPORTED environment variable set to \\\"YES\\\"\"\n exit 0\nfi\ncd \"$SRCROOT/..\"\n./gradlew :composeApp:embedAndSignAppleFrameworkForXcode\n"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 7555FF77242A565900829871 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 2152FB042600AC8F00CF470E /* iOSApp.swift in Sources */, + 7555FF83242A565900829871 /* ContentView.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin XCBuildConfiguration section */ + 7555FFA3242A565B00829871 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = AB3632DC29227652001CCB65 /* Config.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 15.3; + MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; + MTL_FAST_MATH = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = iphoneos; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 7555FFA4242A565B00829871 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = AB3632DC29227652001CCB65 /* Config.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_ENABLE_OBJC_WEAK = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_COMMA = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_STRICT_PROTOTYPES = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; + CLANG_WARN_UNREACHABLE_CODE = YES; + CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_USER_SCRIPT_SANDBOXING = NO; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNDECLARED_SELECTOR = YES; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + IPHONEOS_DEPLOYMENT_TARGET = 15.3; + MTL_ENABLE_DEBUG_INFO = NO; + MTL_FAST_MATH = YES; + SDKROOT = iphoneos; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + VALIDATE_PRODUCT = YES; + }; + name = Release; + }; + 7555FFA6242A565B00829871 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; + DEVELOPMENT_TEAM = "${TEAM_ID}"; + ENABLE_PREVIEWS = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)\n$(SRCROOT)/../composeApp/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", + ); + INFOPLIST_FILE = iosApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 15.3; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}"; + PRODUCT_NAME = "${APP_NAME}"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Debug; + }; + 7555FFA7242A565B00829871 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CODE_SIGN_IDENTITY = "Apple Development"; + CODE_SIGN_STYLE = Automatic; + DEVELOPMENT_ASSET_PATHS = "\"iosApp/Preview Content\""; + DEVELOPMENT_TEAM = "${TEAM_ID}"; + ENABLE_PREVIEWS = YES; + FRAMEWORK_SEARCH_PATHS = ( + "$(inherited)", + "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)\n$(SRCROOT)/../composeApp/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)", + ); + INFOPLIST_FILE = iosApp/Info.plist; + IPHONEOS_DEPLOYMENT_TARGET = 15.3; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/Frameworks", + ); + PRODUCT_BUNDLE_IDENTIFIER = "${BUNDLE_ID}${TEAM_ID}"; + PRODUCT_NAME = "${APP_NAME}"; + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + TARGETED_DEVICE_FAMILY = "1,2"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 7555FF76242A565900829871 /* Build configuration list for PBXProject "iosApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7555FFA3242A565B00829871 /* Debug */, + 7555FFA4242A565B00829871 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 7555FFA5242A565B00829871 /* Build configuration list for PBXNativeTarget "iosApp" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 7555FFA6242A565B00829871 /* Debug */, + 7555FFA7242A565B00829871 /* Release */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 7555FF73242A565900829871 /* Project object */; +} \ No newline at end of file diff --git a/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json b/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json new file mode 100644 index 0000000..ee7e3ca --- /dev/null +++ b/iosApp/iosApp/Assets.xcassets/AccentColor.colorset/Contents.json @@ -0,0 +1,11 @@ +{ + "colors" : [ + { + "idiom" : "universal" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..8edf56e --- /dev/null +++ b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,14 @@ +{ + "images" : [ + { + "filename" : "app-icon-1024.png", + "idiom" : "universal", + "platform" : "ios", + "size" : "1024x1024" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/app-icon-1024.png b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/app-icon-1024.png new file mode 100644 index 0000000..53fc536 Binary files /dev/null and b/iosApp/iosApp/Assets.xcassets/AppIcon.appiconset/app-icon-1024.png differ diff --git a/iosApp/iosApp/Assets.xcassets/Contents.json b/iosApp/iosApp/Assets.xcassets/Contents.json new file mode 100644 index 0000000..4aa7c53 --- /dev/null +++ b/iosApp/iosApp/Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/iosApp/iosApp/ContentView.swift b/iosApp/iosApp/ContentView.swift new file mode 100644 index 0000000..3cd5c32 --- /dev/null +++ b/iosApp/iosApp/ContentView.swift @@ -0,0 +1,21 @@ +import UIKit +import SwiftUI +import ComposeApp + +struct ComposeView: UIViewControllerRepresentable { + func makeUIViewController(context: Context) -> UIViewController { + MainViewControllerKt.MainViewController() + } + + func updateUIViewController(_ uiViewController: UIViewController, context: Context) {} +} + +struct ContentView: View { + var body: some View { + ComposeView() + .ignoresSafeArea(.keyboard) // Compose has own keyboard handler + } +} + + + diff --git a/iosApp/iosApp/Info.plist b/iosApp/iosApp/Info.plist new file mode 100644 index 0000000..412e378 --- /dev/null +++ b/iosApp/iosApp/Info.plist @@ -0,0 +1,50 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + $(PRODUCT_BUNDLE_PACKAGE_TYPE) + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + LSRequiresIPhoneOS + + CADisableMinimumFrameDurationOnPhone + + UIApplicationSceneManifest + + UIApplicationSupportsMultipleScenes + + + UILaunchScreen + + UIRequiredDeviceCapabilities + + armv7 + + UISupportedInterfaceOrientations + + UIInterfaceOrientationPortrait + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + UISupportedInterfaceOrientations~ipad + + UIInterfaceOrientationPortrait + UIInterfaceOrientationPortraitUpsideDown + UIInterfaceOrientationLandscapeLeft + UIInterfaceOrientationLandscapeRight + + + diff --git a/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json b/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json new file mode 100644 index 0000000..4aa7c53 --- /dev/null +++ b/iosApp/iosApp/Preview Content/Preview Assets.xcassets/Contents.json @@ -0,0 +1,6 @@ +{ + "info" : { + "author" : "xcode", + "version" : 1 + } +} \ No newline at end of file diff --git a/iosApp/iosApp/ThemeObserver.swift b/iosApp/iosApp/ThemeObserver.swift new file mode 100644 index 0000000..f5eae32 --- /dev/null +++ b/iosApp/iosApp/ThemeObserver.swift @@ -0,0 +1,18 @@ +import UIKit + +@objc public class ThemeObserver: NSObject { + @objc public static func isDarkMode() -> Bool { + if #available(iOS 12.0, *) { + return UITraitCollection.current.userInterfaceStyle == .dark + } + return false + } +} + +@objc public static func setTheme(theme: String) { + UserDefaults.standard.set(theme, forKey: "appTheme") +} + +@objc public static func getTheme() -> String { + return UserDefaults.standard.string(forKey: "appTheme") ?? "SYSTEM" +} \ No newline at end of file diff --git a/iosApp/iosApp/iOSApp.swift b/iosApp/iosApp/iOSApp.swift new file mode 100644 index 0000000..d83dca6 --- /dev/null +++ b/iosApp/iosApp/iOSApp.swift @@ -0,0 +1,10 @@ +import SwiftUI + +@main +struct iOSApp: App { + var body: some Scene { + WindowGroup { + ContentView() + } + } +} \ No newline at end of file diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..eb79f3d --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,33 @@ +rootProject.name = "PresenceApp" +enableFeaturePreview("TYPESAFE_PROJECT_ACCESSORS") + +pluginManagement { + repositories { + google { + mavenContent { + includeGroupAndSubgroups("androidx") + includeGroupAndSubgroups("com.android") + includeGroupAndSubgroups("com.google") + } + } + mavenCentral() + gradlePluginPortal() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + } +} + +dependencyResolutionManagement { + repositories { + google { + mavenContent { + includeGroupAndSubgroups("androidx") + includeGroupAndSubgroups("com.android") + includeGroupAndSubgroups("com.google") + } + } + mavenCentral() + maven("https://maven.pkg.jetbrains.space/public/p/compose/dev") + } +} + +include(":composeApp") \ No newline at end of file