commit f68ea9109f95976ffc2e8d2dc9aa51d51a40ecbc Author: Артём Батылкин Date: Mon Dec 11 22:17:45 2023 +0400 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..de25127 --- /dev/null +++ b/.gitignore @@ -0,0 +1,16 @@ +*.iml +.gradle +/local.properties +/.idea/caches +/.idea/libraries +/.idea/modules.xml +/.idea/workspace.xml +/.idea/navEditor.xml +/.idea/assetWizardSettings.xml +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +.idea \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..42afabf --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build \ No newline at end of file diff --git a/app/build.gradle.kts b/app/build.gradle.kts new file mode 100644 index 0000000..96dbbdc --- /dev/null +++ b/app/build.gradle.kts @@ -0,0 +1,86 @@ +plugins { + id("com.android.application") + id("org.jetbrains.kotlin.android") + id("com.google.devtools.ksp") +} + +android { + namespace = "ru.ulstu.is.pmu" + compileSdk = 34 + + defaultConfig { + applicationId = "ru.ulstu.is.pmu" + minSdk = 24 + targetSdk = 33 + versionCode = 1 + versionName = "1.0" + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + vectorDrawables { + useSupportLibrary = true + } + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_17 + targetCompatibility = JavaVersion.VERSION_17 + } + kotlinOptions { + jvmTarget = "17" + } + buildFeatures { + compose = true + } + composeOptions { + kotlinCompilerExtensionVersion = "1.4.5" + } + packaging { + resources { + excludes += "/META-INF/{AL2.0,LGPL2.1}" + } + } +} +kotlin { + jvmToolchain(17) +} + +dependencies { + // Core + implementation("androidx.core:core-ktx:1.9.0") + implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2") + + // UI + implementation("androidx.activity:activity-compose:1.7.2") + implementation(platform("androidx.compose:compose-bom:2023.03.00")) + implementation("androidx.navigation:navigation-compose:2.6.0") + implementation("androidx.compose.ui:ui") + implementation("androidx.compose.ui:ui-graphics") + implementation("androidx.compose.ui:ui-tooling-preview") + implementation("androidx.compose.material3:material3:1.1.2") + + // Room + val room_version = "2.5.2" + implementation("androidx.room:room-runtime:$room_version") + annotationProcessor("androidx.room:room-compiler:$room_version") + ksp("androidx.room:room-compiler:$room_version") + implementation("androidx.room:room-ktx:$room_version") + implementation("androidx.room:room-paging:$room_version") + + // Tests + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + androidTestImplementation(platform("androidx.compose:compose-bom:2023.03.00")) + androidTestImplementation("androidx.compose.ui:ui-test-junit4") + debugImplementation("androidx.compose.ui:ui-tooling") + debugImplementation("androidx.compose.ui:ui-test-manifest") +} \ No newline at end of file diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..481bb43 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/app/src/androidTest/java/ru/ulstu/is/pmu/ExampleInstrumentedTest.kt b/app/src/androidTest/java/ru/ulstu/is/pmu/ExampleInstrumentedTest.kt new file mode 100644 index 0000000..abd2614 --- /dev/null +++ b/app/src/androidTest/java/ru/ulstu/is/pmu/ExampleInstrumentedTest.kt @@ -0,0 +1,22 @@ +package ru.ulstu.`is`.pmu + +import androidx.test.ext.junit.runners.AndroidJUnit4 +import androidx.test.platform.app.InstrumentationRegistry +import org.junit.Assert.* +import org.junit.Test +import org.junit.runner.RunWith + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("ru.ulstu.is.pmu", appContext.packageName) + } +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..0c0317d --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,28 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/MainComposeActivity.kt b/app/src/main/java/ru/ulstu/is/pmu/MainComposeActivity.kt new file mode 100644 index 0000000..9e1e3cf --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/MainComposeActivity.kt @@ -0,0 +1,27 @@ +package ru.ulstu.`is`.pmu + +import android.os.Bundle +import androidx.activity.ComponentActivity +import androidx.activity.compose.setContent +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.ui.Modifier +import ru.ulstu.`is`.pmu.ui.navigation.MainNavbar +import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme + +class MainComposeActivity : ComponentActivity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContent { + PmudemoTheme { + Surface( + modifier = Modifier.fillMaxSize(), + color = MaterialTheme.colorScheme.background + ) { + MainNavbar() + } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/StudentApplication.kt b/app/src/main/java/ru/ulstu/is/pmu/StudentApplication.kt new file mode 100644 index 0000000..1fe2ef7 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/StudentApplication.kt @@ -0,0 +1,14 @@ +package ru.ulstu.`is`.pmu + +import android.app.Application +import ru.ulstu.`is`.pmu.database.AppContainer +import ru.ulstu.`is`.pmu.database.AppDataContainer + +class StudentApplication : Application() { + lateinit var container: AppContainer + + override fun onCreate() { + super.onCreate() + container = AppDataContainer(this) + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/database/AppContainer.kt b/app/src/main/java/ru/ulstu/is/pmu/database/AppContainer.kt new file mode 100644 index 0000000..25a4913 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/database/AppContainer.kt @@ -0,0 +1,25 @@ +package ru.ulstu.`is`.pmu.database + +import android.content.Context +import ru.ulstu.`is`.pmu.database.student.repository.GroupRepository +import ru.ulstu.`is`.pmu.database.student.repository.OfflineGroupRepository +import ru.ulstu.`is`.pmu.database.student.repository.OfflineStudentRepository +import ru.ulstu.`is`.pmu.database.student.repository.StudentRepository + +interface AppContainer { + val studentRepository: StudentRepository + val groupRepository: GroupRepository +} + +class AppDataContainer(private val context: Context) : AppContainer { + override val studentRepository: StudentRepository by lazy { + OfflineStudentRepository(AppDatabase.getInstance(context).studentDao()) + } + override val groupRepository: GroupRepository by lazy { + OfflineGroupRepository(AppDatabase.getInstance(context).groupDao()) + } + + companion object { + const val TIMEOUT = 5000L + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/database/AppDatabase.kt b/app/src/main/java/ru/ulstu/is/pmu/database/AppDatabase.kt new file mode 100644 index 0000000..22b0652 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/database/AppDatabase.kt @@ -0,0 +1,72 @@ +package ru.ulstu.`is`.pmu.database + +import android.content.Context +import androidx.room.Database +import androidx.room.Room +import androidx.room.RoomDatabase +import androidx.sqlite.db.SupportSQLiteDatabase +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch +import ru.ulstu.`is`.pmu.database.student.dao.GroupDao +import ru.ulstu.`is`.pmu.database.student.dao.StudentDao +import ru.ulstu.`is`.pmu.database.student.model.Group +import ru.ulstu.`is`.pmu.database.student.model.Student + +@Database(entities = [Student::class, Group::class], version = 1, exportSchema = false) +abstract class AppDatabase : RoomDatabase() { + abstract fun studentDao(): StudentDao + abstract fun groupDao(): GroupDao + + companion object { + private const val DB_NAME: String = "pmy-db" + + @Volatile + private var INSTANCE: AppDatabase? = null + + private suspend fun populateDatabase() { + INSTANCE?.let { database -> + // Groups + val groupDao = database.groupDao() + val group1 = Group(1, "Группа 1") + val group2 = Group(2, "Группа 2") + val group3 = Group(3, "Группа 3") + groupDao.insert(group1) + groupDao.insert(group2) + groupDao.insert(group3) + // Students + val studentDao = database.studentDao() + val student1 = Student("First1", "Last1", group1, "+79998887761", "st1@m.ru") + val student2 = Student("First2", "Last2", group2, "+79998887762", "st2@m.ru") + val student3 = Student("First3", "Last3", group3, "+79998887763", "st3@m.ru") + val student4 = Student("First4", "Last4", group3, "+79998887764", "st4@m.ru") + val student5 = Student("First5", "Last5", group2, "+79998887765", "st5@m.ru") + studentDao.insert(student1) + studentDao.insert(student2) + studentDao.insert(student3) + studentDao.insert(student4) + studentDao.insert(student5) + } + } + + fun getInstance(appContext: Context): AppDatabase { + return INSTANCE ?: synchronized(this) { + Room.databaseBuilder( + appContext, + AppDatabase::class.java, + DB_NAME + ) + .addCallback(object : Callback() { + override fun onCreate(db: SupportSQLiteDatabase) { + super.onCreate(db) + CoroutineScope(Dispatchers.IO).launch { + populateDatabase() + } + } + }) + .build() + .also { INSTANCE = it } + } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/database/student/dao/GroupDao.kt b/app/src/main/java/ru/ulstu/is/pmu/database/student/dao/GroupDao.kt new file mode 100644 index 0000000..dc0bb5c --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/database/student/dao/GroupDao.kt @@ -0,0 +1,23 @@ +package ru.ulstu.`is`.pmu.database.student.dao + +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Update +import ru.ulstu.`is`.pmu.database.student.model.Group + +@Dao +interface GroupDao { + @Query("select * from groups order by group_name collate nocase asc") + suspend fun getAll(): List + + @Insert + suspend fun insert(group: Group) + + @Update + suspend fun update(group: Group) + + @Delete + suspend fun delete(group: Group) +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/database/student/dao/StudentDao.kt b/app/src/main/java/ru/ulstu/is/pmu/database/student/dao/StudentDao.kt new file mode 100644 index 0000000..c9ff7fb --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/database/student/dao/StudentDao.kt @@ -0,0 +1,27 @@ +package ru.ulstu.`is`.pmu.database.student.dao + +import androidx.room.Dao +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Update +import kotlinx.coroutines.flow.Flow +import ru.ulstu.`is`.pmu.database.student.model.Student + +@Dao +interface StudentDao { + @Query("select * from students order by last_name collate nocase asc") + fun getAll(): Flow> + + @Query("select * from students where students.uid = :uid") + fun getByUid(uid: Int): Flow + + @Insert + suspend fun insert(student: Student) + + @Update + suspend fun update(student: Student) + + @Delete + suspend fun delete(student: Student) +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/database/student/model/Group.kt b/app/src/main/java/ru/ulstu/is/pmu/database/student/model/Group.kt new file mode 100644 index 0000000..ce75fa1 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/database/student/model/Group.kt @@ -0,0 +1,32 @@ +package ru.ulstu.`is`.pmu.database.student.model + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.PrimaryKey + +@Entity(tableName = "groups") +data class Group( + @PrimaryKey(autoGenerate = true) + val uid: Int = 0, + @ColumnInfo(name = "group_name") + val name: String +) { + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + other as Group + if (uid != other.uid) return false + return true + } + + override fun hashCode(): Int { + return uid + } + + companion object { + val DEMO_GROUP = Group( + 0, + "Группа 1" + ) + } +} diff --git a/app/src/main/java/ru/ulstu/is/pmu/database/student/model/Student.kt b/app/src/main/java/ru/ulstu/is/pmu/database/student/model/Student.kt new file mode 100644 index 0000000..3df64b5 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/database/student/model/Student.kt @@ -0,0 +1,78 @@ +package ru.ulstu.`is`.pmu.database.student.model + +import androidx.room.ColumnInfo +import androidx.room.Entity +import androidx.room.ForeignKey +import androidx.room.Ignore +import androidx.room.PrimaryKey + +@Entity( + tableName = "students", foreignKeys = [ + ForeignKey( + entity = Group::class, + parentColumns = ["uid"], + childColumns = ["group_id"], + onDelete = ForeignKey.RESTRICT, + onUpdate = ForeignKey.RESTRICT + ) + ] +) +data class Student( + @PrimaryKey(autoGenerate = true) + val uid: Int = 0, + @ColumnInfo(name = "first_name") + val firstName: String, + @ColumnInfo(name = "last_name") + val lastName: String, + @ColumnInfo(name = "group_id", index = true) + val groupId: Int, + val phone: String, + val email: String +) { + + @Ignore + constructor( + firstName: String, + lastName: String, + group: Group, + phone: String, + email: String + ) : this(0, firstName, lastName, group.uid, phone, email) + + + companion object { + fun getStudent(index: Int = 0): Student { + return Student( + index, + "first", + "last", + 0, + "8 999 777 65 65", + "email@mail.ru" + ) + } + } + + override fun equals(other: Any?): Boolean { + if (this === other) return true + if (javaClass != other?.javaClass) return false + other as Student + if (uid != other.uid) return false + if (firstName != other.firstName) return false + if (lastName != other.lastName) return false + if (groupId != other.groupId) return false + if (phone != other.phone) return false + if (email != other.email) return false + return true + } + + override fun hashCode(): Int { + var result = uid + result = 31 * result + firstName.hashCode() + result = 31 * result + lastName.hashCode() + result = 31 * result + groupId + result = 31 * result + phone.hashCode() + result = 31 * result + email.hashCode() + return result + } +} diff --git a/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/GroupRepository.kt b/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/GroupRepository.kt new file mode 100644 index 0000000..ff7f9eb --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/GroupRepository.kt @@ -0,0 +1,7 @@ +package ru.ulstu.`is`.pmu.database.student.repository + +import ru.ulstu.`is`.pmu.database.student.model.Group + +interface GroupRepository { + suspend fun getAllGroups(): List +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/OfflineGroupRepository.kt b/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/OfflineGroupRepository.kt new file mode 100644 index 0000000..6566004 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/OfflineGroupRepository.kt @@ -0,0 +1,8 @@ +package ru.ulstu.`is`.pmu.database.student.repository + +import ru.ulstu.`is`.pmu.database.student.dao.GroupDao +import ru.ulstu.`is`.pmu.database.student.model.Group + +class OfflineGroupRepository(private val groupDao: GroupDao) : GroupRepository { + override suspend fun getAllGroups(): List = groupDao.getAll() +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/OfflineStudentRepository.kt b/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/OfflineStudentRepository.kt new file mode 100644 index 0000000..db28e8e --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/OfflineStudentRepository.kt @@ -0,0 +1,17 @@ +package ru.ulstu.`is`.pmu.database.student.repository + +import kotlinx.coroutines.flow.Flow +import ru.ulstu.`is`.pmu.database.student.dao.StudentDao +import ru.ulstu.`is`.pmu.database.student.model.Student + +class OfflineStudentRepository(private val studentDao: StudentDao) : StudentRepository { + override fun getAllStudents(): Flow> = studentDao.getAll() + + override fun getStudent(uid: Int): Flow = studentDao.getByUid(uid) + + override suspend fun insertStudent(student: Student) = studentDao.insert(student) + + override suspend fun updateStudent(student: Student) = studentDao.update(student) + + override suspend fun deleteStudent(student: Student) = studentDao.delete(student) +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/StudentRepository.kt b/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/StudentRepository.kt new file mode 100644 index 0000000..c1be644 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/database/student/repository/StudentRepository.kt @@ -0,0 +1,12 @@ +package ru.ulstu.`is`.pmu.database.student.repository + +import kotlinx.coroutines.flow.Flow +import ru.ulstu.`is`.pmu.database.student.model.Student + +interface StudentRepository { + fun getAllStudents(): Flow> + fun getStudent(uid: Int): Flow + suspend fun insertStudent(student: Student) + suspend fun updateStudent(student: Student) + suspend fun deleteStudent(student: Student) +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/AppViewModelProvider.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/AppViewModelProvider.kt new file mode 100644 index 0000000..a893e7a --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/AppViewModelProvider.kt @@ -0,0 +1,31 @@ +package ru.ulstu.`is`.pmu.ui + +import androidx.lifecycle.ViewModelProvider +import androidx.lifecycle.createSavedStateHandle +import androidx.lifecycle.viewmodel.CreationExtras +import androidx.lifecycle.viewmodel.initializer +import androidx.lifecycle.viewmodel.viewModelFactory +import ru.ulstu.`is`.pmu.StudentApplication +import ru.ulstu.`is`.pmu.ui.student.edit.GroupDropDownViewModel +import ru.ulstu.`is`.pmu.ui.student.edit.StudentEditViewModel +import ru.ulstu.`is`.pmu.ui.student.list.StudentListViewModel + +object AppViewModelProvider { + val Factory = viewModelFactory { + initializer { + StudentListViewModel(studentApplication().container.studentRepository) + } + initializer { + StudentEditViewModel( + this.createSavedStateHandle(), + studentApplication().container.studentRepository + ) + } + initializer { + GroupDropDownViewModel(studentApplication().container.groupRepository) + } + } +} + +fun CreationExtras.studentApplication(): StudentApplication = + (this[ViewModelProvider.AndroidViewModelFactory.APPLICATION_KEY] as StudentApplication) \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/about/About.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/about/About.kt new file mode 100644 index 0000000..f06726e --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/about/About.kt @@ -0,0 +1,66 @@ +package ru.ulstu.`is`.pmu.ui.about + +import android.content.Intent +import android.content.res.Configuration +import android.net.Uri +import android.widget.TextView +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.Spacer +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.material3.Button +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.runtime.Composable +import androidx.compose.ui.Modifier +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.compose.ui.viewinterop.AndroidView +import ru.ulstu.`is`.pmu.R +import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme + +@Composable +fun About() { + val localContext = LocalContext.current + val aboutText = localContext.resources.getText(R.string.about_text) + + val urlOnClick = { + val openURL = Intent(Intent.ACTION_VIEW) + openURL.data = Uri.parse("https://ulstu.ru/") + localContext.startActivity(openURL) + } + + Column(Modifier.padding(all = 10.dp)) { + AndroidView( + modifier = Modifier + .fillMaxWidth() + .clickable(onClick = urlOnClick), + factory = { context -> TextView(context) }, + update = { it.text = aboutText } + ) + Spacer(Modifier.padding(bottom = 10.dp)) + Button( + modifier = Modifier.fillMaxWidth(), + onClick = urlOnClick + ) { + Text(stringResource(id = R.string.about_title)) + } + } +} + +@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO) +@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES) +@Composable +fun AboutPreview() { + PmudemoTheme { + Surface( + color = MaterialTheme.colorScheme.background + ) { + About() + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/navigation/MainNavbar.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/navigation/MainNavbar.kt new file mode 100644 index 0000000..11e7b51 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/navigation/MainNavbar.kt @@ -0,0 +1,135 @@ +package ru.ulstu.`is`.pmu.ui.navigation + +import androidx.compose.foundation.layout.PaddingValues +import androidx.compose.foundation.layout.padding +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.ArrowBack +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.NavigationBar +import androidx.compose.material3.NavigationBarItem +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Text +import androidx.compose.material3.TopAppBar +import androidx.compose.material3.TopAppBarDefaults +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.res.stringResource +import androidx.navigation.NavDestination +import androidx.navigation.NavDestination.Companion.hierarchy +import androidx.navigation.NavGraph.Companion.findStartDestination +import androidx.navigation.NavHostController +import androidx.navigation.NavType +import androidx.navigation.compose.NavHost +import androidx.navigation.compose.composable +import androidx.navigation.compose.currentBackStackEntryAsState +import androidx.navigation.compose.rememberNavController +import androidx.navigation.navArgument +import ru.ulstu.`is`.pmu.R +import ru.ulstu.`is`.pmu.ui.about.About +import ru.ulstu.`is`.pmu.ui.student.edit.StudentEdit +import ru.ulstu.`is`.pmu.ui.student.list.StudentList + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun Topbar( + navController: NavHostController, + currentScreen: Screen? +) { + TopAppBar( + colors = TopAppBarDefaults.topAppBarColors( + containerColor = MaterialTheme.colorScheme.primary, + titleContentColor = MaterialTheme.colorScheme.onPrimary, + ), + title = { + Text(stringResource(currentScreen?.resourceId ?: R.string.app_name)) + }, + navigationIcon = { + if ( + navController.previousBackStackEntry != null + && (currentScreen == null || !currentScreen.showInBottomBar) + ) { + IconButton(onClick = { navController.navigateUp() }) { + Icon( + imageVector = Icons.Filled.ArrowBack, + contentDescription = null, + tint = MaterialTheme.colorScheme.onPrimary + ) + } + } + } + ) +} + +@Composable +fun Navbar( + navController: NavHostController, + currentDestination: NavDestination?, + modifier: Modifier = Modifier +) { + NavigationBar(modifier) { + Screen.bottomBarItems.forEach { screen -> + NavigationBarItem( + icon = { Icon(screen.icon, contentDescription = null) }, + label = { Text(stringResource(screen.resourceId)) }, + selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true, + onClick = { + navController.navigate(screen.route) { + popUpTo(navController.graph.findStartDestination().id) { + saveState = true + } + launchSingleTop = true + restoreState = true + } + } + ) + } + } +} + +@Composable +fun Navhost( + navController: NavHostController, + innerPadding: PaddingValues, modifier: + Modifier = Modifier +) { + NavHost( + navController, + startDestination = Screen.StudentList.route, + modifier.padding(innerPadding) + ) { + composable(Screen.StudentList.route) { StudentList(navController) } + composable(Screen.About.route) { About() } + composable( + Screen.StudentEdit.route, + arguments = listOf(navArgument("id") { type = NavType.IntType }) + ) { + StudentEdit(navController) + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +fun MainNavbar() { + val navController = rememberNavController() + val navBackStackEntry by navController.currentBackStackEntryAsState() + val currentDestination = navBackStackEntry?.destination + val currentScreen = currentDestination?.route?.let { Screen.getItem(it) } + + Scaffold( + topBar = { + Topbar(navController, currentScreen) + }, + bottomBar = { + if (currentScreen == null || currentScreen.showInBottomBar) { + Navbar(navController, currentDestination) + } + } + ) { innerPadding -> + Navhost(navController, innerPadding) + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/navigation/Screen.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/navigation/Screen.kt new file mode 100644 index 0000000..7e8daf9 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/navigation/Screen.kt @@ -0,0 +1,38 @@ +package ru.ulstu.`is`.pmu.ui.navigation + +import androidx.annotation.StringRes +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Favorite +import androidx.compose.material.icons.filled.Info +import androidx.compose.material.icons.filled.List +import androidx.compose.ui.graphics.vector.ImageVector +import ru.ulstu.`is`.pmu.R + +enum class Screen( + val route: String, + @StringRes val resourceId: Int, + val icon: ImageVector = Icons.Filled.Favorite, + val showInBottomBar: Boolean = true +) { + StudentList( + "student-list", R.string.student_main_title, Icons.Filled.List + ), + About( + "about", R.string.about_title, Icons.Filled.Info + ), + StudentEdit( + "student-edit/{id}", R.string.student_view_title, showInBottomBar = false + ); + + companion object { + val bottomBarItems = listOf( + StudentList, + About, + ) + + fun getItem(route: String): Screen? { + val findRoute = route.split("/").first() + return values().find { value -> value.route.startsWith(findRoute) } + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/student/edit/GroupDropDownViewModel.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/student/edit/GroupDropDownViewModel.kt new file mode 100644 index 0000000..dde27cc --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/student/edit/GroupDropDownViewModel.kt @@ -0,0 +1,46 @@ +package ru.ulstu.`is`.pmu.ui.student.edit + +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.launch +import ru.ulstu.`is`.pmu.database.student.model.Group +import ru.ulstu.`is`.pmu.database.student.repository.GroupRepository + +class GroupDropDownViewModel( + private val groupRepository: GroupRepository +) : ViewModel() { + var groupsListUiState by mutableStateOf(GroupsListUiState()) + private set + + var groupUiState by mutableStateOf(GroupUiState()) + private set + + init { + viewModelScope.launch { + groupsListUiState = GroupsListUiState(groupRepository.getAllGroups()) + } + } + + fun setCurrentGroup(groupId: Int) { + val group: Group? = + groupsListUiState.groupList.firstOrNull { group -> group.uid == groupId } + group?.let { updateUiState(it) } + } + + fun updateUiState(group: Group) { + groupUiState = GroupUiState( + group = group + ) + } +} + +data class GroupsListUiState(val groupList: List = listOf()) + +data class GroupUiState( + val group: Group? = null +) + +fun Group.toUiState() = GroupUiState(group = Group(uid = uid, name = name)) \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/student/edit/StudentEdit.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/student/edit/StudentEdit.kt new file mode 100644 index 0000000..4945a17 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/student/edit/StudentEdit.kt @@ -0,0 +1,196 @@ +package ru.ulstu.`is`.pmu.ui.student.edit + +import android.content.res.Configuration +import androidx.compose.foundation.background +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.text.KeyboardOptions +import androidx.compose.material3.Button +import androidx.compose.material3.DropdownMenu +import androidx.compose.material3.DropdownMenuItem +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.ExposedDropdownMenuBox +import androidx.compose.material3.ExposedDropdownMenuDefaults.TrailingIcon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.Surface +import androidx.compose.material3.Text +import androidx.compose.material3.TextField +import androidx.compose.runtime.Composable +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.runtime.setValue +import androidx.compose.ui.Modifier +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.input.KeyboardType +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.lifecycle.viewmodel.compose.viewModel +import androidx.navigation.NavController +import kotlinx.coroutines.launch +import ru.ulstu.`is`.pmu.R +import ru.ulstu.`is`.pmu.database.student.model.Group +import ru.ulstu.`is`.pmu.database.student.model.Student +import ru.ulstu.`is`.pmu.ui.AppViewModelProvider +import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme + +@Composable +fun StudentEdit( + navController: NavController, + viewModel: StudentEditViewModel = viewModel(factory = AppViewModelProvider.Factory), + groupViewModel: GroupDropDownViewModel = viewModel(factory = AppViewModelProvider.Factory) +) { + val coroutineScope = rememberCoroutineScope() + groupViewModel.setCurrentGroup(viewModel.studentUiState.studentDetails.groupId) + StudentEdit( + studentUiState = viewModel.studentUiState, + groupUiState = groupViewModel.groupUiState, + groupsListUiState = groupViewModel.groupsListUiState, + onClick = { + coroutineScope.launch { + viewModel.saveStudent() + navController.popBackStack() + } + }, + onUpdate = viewModel::updateUiState, + onGroupUpdate = groupViewModel::updateUiState + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun GroupDropDown( + groupUiState: GroupUiState, + groupsListUiState: GroupsListUiState, + onGroupUpdate: (Group) -> Unit +) { + var expanded: Boolean by remember { mutableStateOf(false) } + ExposedDropdownMenuBox( + modifier = Modifier + .padding(top = 7.dp), + expanded = expanded, + onExpandedChange = { + expanded = !expanded + } + ) { + TextField( + value = groupUiState.group?.name + ?: stringResource(id = R.string.student_group_not_select), + onValueChange = {}, + readOnly = true, + trailingIcon = { + TrailingIcon(expanded = expanded) + }, + modifier = Modifier + .fillMaxWidth() + .menuAnchor() + ) + DropdownMenu( + expanded = expanded, + onDismissRequest = { expanded = false }, + modifier = Modifier + .background(Color.White) + .exposedDropdownSize() + ) { + groupsListUiState.groupList.forEach { group -> + DropdownMenuItem( + text = { + Text(text = group.name) + }, + onClick = { + onGroupUpdate(group) + expanded = false + } + ) + } + } + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun StudentEdit( + studentUiState: StudentUiState, + groupUiState: GroupUiState, + groupsListUiState: GroupsListUiState, + onClick: () -> Unit, + onUpdate: (StudentDetails) -> Unit, + onGroupUpdate: (Group) -> Unit +) { + Column( + Modifier + .fillMaxWidth() + .padding(all = 10.dp) + ) { + OutlinedTextField( + modifier = Modifier.fillMaxWidth(), + value = studentUiState.studentDetails.firstName, + onValueChange = { onUpdate(studentUiState.studentDetails.copy(firstName = it)) }, + label = { Text(stringResource(id = R.string.student_firstname)) }, + singleLine = true + ) + OutlinedTextField( + modifier = Modifier.fillMaxWidth(), + value = studentUiState.studentDetails.lastName, + onValueChange = { onUpdate(studentUiState.studentDetails.copy(lastName = it)) }, + label = { Text(stringResource(id = R.string.student_lastname)) }, + singleLine = true + ) + GroupDropDown( + groupUiState = groupUiState, + groupsListUiState = groupsListUiState, + onGroupUpdate = { + onUpdate(studentUiState.studentDetails.copy(groupId = it.uid)) + onGroupUpdate(it) + } + ) + OutlinedTextField( + modifier = Modifier.fillMaxWidth(), + value = studentUiState.studentDetails.phone, + onValueChange = { onUpdate(studentUiState.studentDetails.copy(phone = it)) }, + label = { Text(stringResource(id = R.string.student_phone)) }, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Phone) + ) + OutlinedTextField( + modifier = Modifier.fillMaxWidth(), + value = studentUiState.studentDetails.email, + onValueChange = { onUpdate(studentUiState.studentDetails.copy(email = it)) }, + label = { Text(stringResource(id = R.string.student_email)) }, + singleLine = true, + keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Email) + ) + Button( + onClick = onClick, + enabled = studentUiState.isEntryValid, + shape = MaterialTheme.shapes.small, + modifier = Modifier.fillMaxWidth() + ) { + Text(text = stringResource(R.string.student_save_button)) + } + } +} + +@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO) +@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES) +@Composable +fun StudentEditPreview() { + PmudemoTheme { + Surface( + color = MaterialTheme.colorScheme.background + ) { + StudentEdit( + studentUiState = Student.getStudent().toUiState(true), + groupUiState = Group.DEMO_GROUP.toUiState(), + groupsListUiState = GroupsListUiState(listOf()), + onClick = {}, + onUpdate = {}, + onGroupUpdate = {} + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/student/edit/StudentEditViewModel.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/student/edit/StudentEditViewModel.kt new file mode 100644 index 0000000..e9a1f19 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/student/edit/StudentEditViewModel.kt @@ -0,0 +1,97 @@ +package ru.ulstu.`is`.pmu.ui.student.edit + +import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.setValue +import androidx.lifecycle.SavedStateHandle +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.filterNotNull +import kotlinx.coroutines.flow.first +import kotlinx.coroutines.launch +import ru.ulstu.`is`.pmu.database.student.model.Student +import ru.ulstu.`is`.pmu.database.student.repository.StudentRepository + +class StudentEditViewModel( + savedStateHandle: SavedStateHandle, + private val studentRepository: StudentRepository +) : ViewModel() { + + var studentUiState by mutableStateOf(StudentUiState()) + private set + + private val studentUid: Int = checkNotNull(savedStateHandle["id"]) + + init { + viewModelScope.launch { + if (studentUid > 0) { + studentUiState = studentRepository.getStudent(studentUid) + .filterNotNull() + .first() + .toUiState(true) + } + } + } + + fun updateUiState(studentDetails: StudentDetails) { + studentUiState = StudentUiState( + studentDetails = studentDetails, + isEntryValid = validateInput(studentDetails) + ) + } + + suspend fun saveStudent() { + if (validateInput()) { + if (studentUid > 0) { + studentRepository.updateStudent(studentUiState.studentDetails.toStudent(studentUid)) + } else { + studentRepository.insertStudent(studentUiState.studentDetails.toStudent()) + } + } + } + + private fun validateInput(uiState: StudentDetails = studentUiState.studentDetails): Boolean { + return with(uiState) { + firstName.isNotBlank() + && lastName.isNotBlank() + && phone.isNotBlank() + && email.isNotBlank() + && groupId > 0 + } + } +} + +data class StudentUiState( + val studentDetails: StudentDetails = StudentDetails(), + val isEntryValid: Boolean = false +) + +data class StudentDetails( + val firstName: String = "", + val lastName: String = "", + val phone: String = "", + val email: String = "", + val groupId: Int = 0 +) + +fun StudentDetails.toStudent(uid: Int = 0): Student = Student( + uid = uid, + firstName = firstName, + lastName = lastName, + phone = phone, + email = email, + groupId = groupId +) + +fun Student.toDetails(): StudentDetails = StudentDetails( + firstName = firstName, + lastName = lastName, + phone = phone, + email = email, + groupId = groupId +) + +fun Student.toUiState(isEntryValid: Boolean = false): StudentUiState = StudentUiState( + studentDetails = this.toDetails(), + isEntryValid = isEntryValid +) \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/student/list/StudentList.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/student/list/StudentList.kt new file mode 100644 index 0000000..971f40a --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/student/list/StudentList.kt @@ -0,0 +1,227 @@ +package ru.ulstu.`is`.pmu.ui.student.list + +import android.content.res.Configuration +import androidx.compose.animation.animateColorAsState +import androidx.compose.animation.core.animateFloatAsState +import androidx.compose.foundation.background +import androidx.compose.foundation.clickable +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.Column +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.foundation.layout.fillMaxWidth +import androidx.compose.foundation.layout.padding +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items +import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.outlined.Delete +import androidx.compose.material3.Card +import androidx.compose.material3.CardDefaults +import androidx.compose.material3.DismissDirection +import androidx.compose.material3.DismissState +import androidx.compose.material3.DismissValue.DismissedToStart +import androidx.compose.material3.ExperimentalMaterial3Api +import androidx.compose.material3.FloatingActionButton +import androidx.compose.material3.Icon +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface +import androidx.compose.material3.SwipeToDismiss +import androidx.compose.material3.Text +import androidx.compose.material3.rememberDismissState +import androidx.compose.runtime.Composable +import androidx.compose.runtime.collectAsState +import androidx.compose.runtime.getValue +import androidx.compose.runtime.rememberCoroutineScope +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier +import androidx.compose.ui.draw.scale +import androidx.compose.ui.graphics.Color +import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.style.TextAlign +import androidx.compose.ui.tooling.preview.Preview +import androidx.compose.ui.unit.dp +import androidx.lifecycle.viewmodel.compose.viewModel +import androidx.navigation.NavController +import kotlinx.coroutines.launch +import ru.ulstu.`is`.pmu.R +import ru.ulstu.`is`.pmu.database.student.model.Student +import ru.ulstu.`is`.pmu.ui.AppViewModelProvider +import ru.ulstu.`is`.pmu.ui.navigation.Screen +import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme + +@Composable +fun StudentList( + navController: NavController, + viewModel: StudentListViewModel = viewModel(factory = AppViewModelProvider.Factory) +) { + val coroutineScope = rememberCoroutineScope() + val studentListUiState by viewModel.studentListUiState.collectAsState() + Scaffold( + topBar = {}, + floatingActionButton = { + FloatingActionButton( + onClick = { + val route = Screen.StudentEdit.route.replace("{id}", 0.toString()) + navController.navigate(route) + }, + ) { + Icon(Icons.Filled.Add, "Добавить") + } + } + ) { innerPadding -> + StudentList( + modifier = Modifier + .padding(innerPadding) + .fillMaxSize(), + studentList = studentListUiState.studentList, + onClick = { uid: Int -> + val route = Screen.StudentEdit.route.replace("{id}", uid.toString()) + navController.navigate(route) + }, + onSwipe = { student: Student -> + coroutineScope.launch { + viewModel.deleteStudent(student) + } + } + ) + } +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun SwipeToDelete( + dismissState: DismissState, + student: Student, + onClick: (uid: Int) -> Unit +) { + SwipeToDismiss( + state = dismissState, + directions = setOf( + DismissDirection.EndToStart + ), + background = { + val backgroundColor by animateColorAsState( + when (dismissState.targetValue) { + DismissedToStart -> Color.Red.copy(alpha = 0.8f) + else -> Color.White + }, label = "" + ) + val iconScale by animateFloatAsState( + targetValue = if (dismissState.targetValue == DismissedToStart) 1.3f else 0.5f, + label = "" + ) + Box( + Modifier + .fillMaxSize() + .background(color = backgroundColor) + .padding(end = 16.dp), + contentAlignment = Alignment.CenterEnd + ) { + Icon( + modifier = Modifier.scale(iconScale), + imageVector = Icons.Outlined.Delete, + contentDescription = "Delete", + tint = Color.White + ) + } + }, + dismissContent = { + StudentListItem(student = student, + modifier = Modifier + .padding(vertical = 7.dp) + .clickable { onClick(student.uid) }) + } + ) +} + +@OptIn(ExperimentalMaterial3Api::class) +@Composable +private fun StudentList( + modifier: Modifier = Modifier, + studentList: List, + onClick: (uid: Int) -> Unit, + onSwipe: (student: Student) -> Unit +) { + Column( + modifier = modifier + ) { + if (studentList.isEmpty()) { + Text( + text = stringResource(R.string.student_empty_description), + textAlign = TextAlign.Center, + style = MaterialTheme.typography.titleLarge + ) + } else { + LazyColumn(modifier = Modifier.padding(all = 10.dp)) { + items(items = studentList, key = { it.uid }) { student -> + val dismissState: DismissState = rememberDismissState( + positionalThreshold = { 200.dp.toPx() } + ) + + if (dismissState.isDismissed(direction = DismissDirection.EndToStart)) { + onSwipe(student) + } + + SwipeToDelete( + dismissState = dismissState, + student = student, + onClick = onClick + ) + } + } + } + } +} + +@Composable +private fun StudentListItem( + student: Student, modifier: Modifier = Modifier +) { + Card( + modifier = modifier.fillMaxWidth(), + elevation = CardDefaults.cardElevation(defaultElevation = 2.dp) + ) { + Column( + modifier = modifier.padding(all = 10.dp) + ) { + Text( + text = String.format("%s %s", student.firstName, student.lastName) + ) + } + } +} + +@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO) +@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES) +@Composable +fun StudentListPreview() { + PmudemoTheme { + Surface( + color = MaterialTheme.colorScheme.background + ) { + StudentList( + studentList = (1..20).map { i -> Student.getStudent(i) }, + onClick = {}, + onSwipe = {} + ) + } + } +} + +@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO) +@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES) +@Composable +fun StudentEmptyListPreview() { + PmudemoTheme { + Surface( + color = MaterialTheme.colorScheme.background + ) { + StudentList( + studentList = listOf(), + onClick = {}, + onSwipe = {} + ) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/student/list/StudentListViewModel.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/student/list/StudentListViewModel.kt new file mode 100644 index 0000000..e4c8f4d --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/student/list/StudentListViewModel.kt @@ -0,0 +1,29 @@ +package ru.ulstu.`is`.pmu.ui.student.list + +import androidx.lifecycle.ViewModel +import androidx.lifecycle.viewModelScope +import kotlinx.coroutines.flow.SharingStarted +import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.map +import kotlinx.coroutines.flow.stateIn +import ru.ulstu.`is`.pmu.database.AppDataContainer +import ru.ulstu.`is`.pmu.database.student.model.Student +import ru.ulstu.`is`.pmu.database.student.repository.StudentRepository + +class StudentListViewModel( + private val studentRepository: StudentRepository +) : ViewModel() { + val studentListUiState: StateFlow = studentRepository.getAllStudents().map { + StudentListUiState(it) + }.stateIn( + scope = viewModelScope, + started = SharingStarted.WhileSubscribed(stopTimeoutMillis = AppDataContainer.TIMEOUT), + initialValue = StudentListUiState() + ) + + suspend fun deleteStudent(student: Student) { + studentRepository.deleteStudent(student) + } +} + +data class StudentListUiState(val studentList: List = listOf()) \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Color.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Color.kt new file mode 100644 index 0000000..86a8023 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Color.kt @@ -0,0 +1,11 @@ +package ru.ulstu.`is`.pmu.ui.theme + +import androidx.compose.ui.graphics.Color + +val Purple80 = Color(0xFFD0BCFF) +val PurpleGrey80 = Color(0xFFCCC2DC) +val Pink80 = Color(0xFFEFB8C8) + +val Purple40 = Color(0xFF6650a4) +val PurpleGrey40 = Color(0xFF625b71) +val Pink40 = Color(0xFF7D5260) \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Theme.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Theme.kt new file mode 100644 index 0000000..78d4a93 --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Theme.kt @@ -0,0 +1,70 @@ +package ru.ulstu.`is`.pmu.ui.theme + +import android.app.Activity +import android.os.Build +import androidx.compose.foundation.isSystemInDarkTheme +import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.darkColorScheme +import androidx.compose.material3.dynamicDarkColorScheme +import androidx.compose.material3.dynamicLightColorScheme +import androidx.compose.material3.lightColorScheme +import androidx.compose.runtime.Composable +import androidx.compose.runtime.SideEffect +import androidx.compose.ui.graphics.toArgb +import androidx.compose.ui.platform.LocalContext +import androidx.compose.ui.platform.LocalView +import androidx.core.view.WindowCompat + +private val DarkColorScheme = darkColorScheme( + primary = Purple80, + secondary = PurpleGrey80, + tertiary = Pink80 +) + +private val LightColorScheme = lightColorScheme( + primary = Purple40, + secondary = PurpleGrey40, + tertiary = Pink40 + + /* Other default colors to override + background = Color(0xFFFFFBFE), + surface = Color(0xFFFFFBFE), + onPrimary = Color.White, + onSecondary = Color.White, + onTertiary = Color.White, + onBackground = Color(0xFF1C1B1F), + onSurface = Color(0xFF1C1B1F), + */ +) + +@Composable +fun PmudemoTheme( + darkTheme: Boolean = isSystemInDarkTheme(), + // Dynamic color is available on Android 12+ + dynamicColor: Boolean = true, + content: @Composable () -> Unit +) { + val colorScheme = when { + dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> { + val context = LocalContext.current + if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context) + } + + darkTheme -> DarkColorScheme + else -> LightColorScheme + } + val view = LocalView.current + if (!view.isInEditMode) { + SideEffect { + val window = (view.context as Activity).window + window.statusBarColor = colorScheme.primary.toArgb() + WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme + } + } + + MaterialTheme( + colorScheme = colorScheme, + typography = Typography, + content = content + ) +} \ No newline at end of file diff --git a/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Type.kt b/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Type.kt new file mode 100644 index 0000000..40dc6ca --- /dev/null +++ b/app/src/main/java/ru/ulstu/is/pmu/ui/theme/Type.kt @@ -0,0 +1,34 @@ +package ru.ulstu.`is`.pmu.ui.theme + +import androidx.compose.material3.Typography +import androidx.compose.ui.text.TextStyle +import androidx.compose.ui.text.font.FontFamily +import androidx.compose.ui.text.font.FontWeight +import androidx.compose.ui.unit.sp + +// Set of Material typography styles to start with +val Typography = Typography( + bodyLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 16.sp, + lineHeight = 24.sp, + letterSpacing = 0.5.sp + ) + /* Other default text styles to override + titleLarge = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Normal, + fontSize = 22.sp, + lineHeight = 28.sp, + letterSpacing = 0.sp + ), + labelSmall = TextStyle( + fontFamily = FontFamily.Default, + fontWeight = FontWeight.Medium, + fontSize = 11.sp, + lineHeight = 16.sp, + letterSpacing = 0.5.sp + ) + */ +) \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..07d5da9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..2b068d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml new file mode 100644 index 0000000..6f3b755 --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp new file mode 100644 index 0000000..c209e78 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp new file mode 100644 index 0000000..b2dfe3d Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp new file mode 100644 index 0000000..4f0f1d6 Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp new file mode 100644 index 0000000..62b611d Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp new file mode 100644 index 0000000..948a307 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..1b9a695 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp new file mode 100644 index 0000000..28d4b77 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9287f50 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp new file mode 100644 index 0000000..aa7d642 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp new file mode 100644 index 0000000..9126ae3 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..f8c6127 --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,10 @@ + + + #FFBB86FC + #FF6200EE + #FF3700B3 + #FF03DAC5 + #FF018786 + #FF000000 + #FFFFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..f0974ac --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,19 @@ + + pmu-demo + Имя + Фамилия + Группа + Телефон + e-mail + Список студентов + Профиль студента + Записи о студентах отсутствуют + Группа не указана + Сохранить + О нас + +

Это текст о нас!

\n\n +

Здесь могла быть Ваша реклама!

\n\n +

Наш сайт ulstu.ru

+ + \ No newline at end of file diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml new file mode 100644 index 0000000..bf6a6ee --- /dev/null +++ b/app/src/main/res/values/themes.xml @@ -0,0 +1,5 @@ + + + +