Stranni15k/PIBD-31-Batylkin-Mobile-App
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

merge into: Stranni15k:coursework
Branches Tags
Stranni15k:main
Stranni15k:coursework
Stranni15k:lab4
Stranni15k:lab5
Stranni15k:lab3
Stranni15k:lab2
Stranni15k:lab1
...
pull from: Stranni15k:main
Branches Tags
Stranni15k:coursework
Stranni15k:lab4
Stranni15k:lab5
Stranni15k:lab3
Stranni15k:lab2
Stranni15k:lab1
Stranni15k:main

No commits in common. "coursework" and "main" have entirely different histories.
coursework ... main

98 changed files with 36 additions and 5904 deletions
Show Stats Expand all files Collapse all files

49
.gitignore vendored
View File

@ -1,16 +1,35 @@
*.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
# ---> Android
# Gradle files
.gradle/
build/
# Local configuration file (sdk path, etc)
local.properties
.idea
# Log/OS Files
*.log
# Android Studio generated files and folders
captures/
.externalNativeBuild/
.cxx/
*.apk
output.json
# IntelliJ
*.iml
.idea/
misc.xml
deploymentTargetDropDown.xml
render.experimental.xml
# Keystore files
*.jks
*.keystore
# Google Services (e.g. APIs or Firebase)
google-services.json
# Android Profiling
*.hprof

2
README.md Normal file
View File

@ -0,0 +1,2 @@
# PIBD-31-Batylkin-Mobile-App

1
app/.gitignore vendored
View File

@ -1 +0,0 @@
/build

98
app/build.gradle.kts
View File

@ -1,98 +0,0 @@
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("com.google.devtools.ksp")
id("org.jetbrains.kotlin.plugin.serialization")
}
android {
namespace = "ru.ulstu.is.pmu"
compileSdk = 34
defaultConfig {
applicationId = "ru.ulstu.is.pmu"
minSdk = 24
targetSdk = 34
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")
implementation("androidx.compose.material:material:1.4.3")
implementation ("com.itextpdf:itextpdf:5.5.13")
// Room
val roomVersion = "2.5.2"
implementation("androidx.room:room-runtime:$roomVersion")
annotationProcessor("androidx.room:room-compiler:$roomVersion")
ksp("androidx.room:room-compiler:$roomVersion")
implementation("androidx.room:room-ktx:$roomVersion")
implementation("androidx.room:room-paging:$roomVersion")
// retrofit
val retrofitVersion = "2.9.0"
implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
implementation("androidx.paging:paging-compose:3.2.1")
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0")
// 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")
}

21
app/proguard-rules.pro vendored
View File

@ -1,21 +0,0 @@
# 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

22
app/src/androidTest/java/ru/ulstu/is/pmu/ExampleInstrumentedTest.kt
View File

@ -1,22 +0,0 @@
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)
}
}

31
app/src/main/AndroidManifest.xml
View File

@ -1,31 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">
<uses-permission android:name="android.permission.INTERNET" />
<application
android:name=".StudentApplication"
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
android:fullBackupContent="@xml/backup_rules"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.Pmudemo"
tools:targetApi="31"
android:networkSecurityConfig="@xml/network_security_config">
<activity
android:name=".MainComposeActivity"
android:exported="true"
android:theme="@style/Theme.Pmudemo">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>
</manifest>

27
app/src/main/java/ru/ulstu/is/pmu/MainComposeActivity.kt
View File

@ -1,27 +0,0 @@
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()
}
}
}
}
}

14
app/src/main/java/ru/ulstu/is/pmu/StudentApplication.kt
View File

@ -1,14 +0,0 @@
package ru.ulstu.`is`.pmu
import android.app.Application
import ru.ulstu.`is`.pmu.common.AppContainer
import ru.ulstu.`is`.pmu.common.AppDataContainer
class StudentApplication : Application() {
lateinit var container: AppContainer
override fun onCreate() {
super.onCreate()
container = AppDataContainer(this)
}
}

3
app/src/main/java/ru/ulstu/is/pmu/api/ApiStatus.kt
View File

@ -1,3 +0,0 @@
package ru.ulstu.`is`.pmu.api
enum class ApiStatus { LOADING, ERROR, DONE }

94
app/src/main/java/ru/ulstu/is/pmu/api/MyServerService.kt
View File

@ -1,94 +0,0 @@
package ru.ulstu.`is`.pmu.api
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
import kotlinx.serialization.json.Json
import okhttp3.Interceptor.*
import okhttp3.MediaType.Companion.toMediaType
import okhttp3.OkHttpClient
import okhttp3.logging.HttpLoggingInterceptor
import retrofit2.Retrofit
import retrofit2.http.Body
import retrofit2.http.DELETE
import retrofit2.http.GET
import retrofit2.http.POST
import retrofit2.http.PUT
import retrofit2.http.Path
import retrofit2.http.Query
import ru.ulstu.`is`.pmu.api.model.UserRemote
import ru.ulstu.`is`.pmu.api.model.PetRemote
import ru.ulstu.`is`.pmu.api.report.ReportRemote
interface MyServerService {
@GET("report")
suspend fun getReportInfo(
@Query("fromDate") fromDate: String,
@Query("toDate") toDate: String
): List<ReportRemote>
@GET("users")
suspend fun getUsers(): List<UserRemote>
@GET("users/{id}")
suspend fun getUser(
@Path("id") id: Int,
): UserRemote
@GET("users")
suspend fun getUsers(
@Query("_page") page: Int,
@Query("_limit") limit: Int,
): List<UserRemote>
@GET("pets")
suspend fun getPets(
@Query("_page") page: Int,
@Query("_limit") limit: Int,
): List<PetRemote>
@GET("pets/{id}")
suspend fun getPet(
@Path("id") id: Int,
): PetRemote
@POST("pets")
suspend fun createPet(
@Body pet: PetRemote,
): PetRemote
@PUT("pets/{id}")
suspend fun updatePet(
@Path("id") id: Int,
@Body pet: PetRemote,
): PetRemote
@DELETE("pets/{id}")
suspend fun deletePet(
@Path("id") id: Int,
): PetRemote
companion object {
private const val BASE_URL = "http://10.0.2.2:8079/"
@Volatile
private var INSTANCE: MyServerService? = null
fun getInstance(): MyServerService {
return INSTANCE ?: synchronized(this) {
val logger = HttpLoggingInterceptor()
logger.level = HttpLoggingInterceptor.Level.BASIC
val client = OkHttpClient.Builder()
.addInterceptor(logger)
.build()
return Retrofit.Builder()
.baseUrl(BASE_URL)
.client(client)
.addConverterFactory(Json.asConverterFactory("application/json".toMediaType()))
.build()
.create(MyServerService::class.java)
.also { INSTANCE = it }
}
}
}
}

32
app/src/main/java/ru/ulstu/is/pmu/api/model/PetRemote.kt
View File

@ -1,32 +0,0 @@
package ru.ulstu.`is`.pmu.api.model
import kotlinx.serialization.Serializable
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
@Serializable
data class PetRemote(
val id: Int = 0,
val name: String = "",
val note: String = "",
val birthday: String = "",
val userId: Int=0,
val imageResourceId: Int=0
)
fun PetRemote.toPet(): Pet = Pet(
id,
name,
note,
birthday,
userId,
imageResourceId
)
fun Pet.toPetRemote(): PetRemote = PetRemote(
uid,
name,
note,
birthday,
userId,
imageResourceId
)

19
app/src/main/java/ru/ulstu/is/pmu/api/model/UserRemote.kt
View File

@ -1,19 +0,0 @@
package ru.ulstu.`is`.pmu.api.model
import kotlinx.serialization.Serializable
import ru.ulstu.`is`.pmu.database.entyties.model.User
@Serializable
data class UserRemote(
val id: Int = 0,
val login: String,
val nameFirst: String,
val nameLast: String
)
fun UserRemote.toUser(): User = User(
id,
login,
nameFirst,
nameLast
)

111
app/src/main/java/ru/ulstu/is/pmu/api/pet/PetRemoteMediator.kt
View File

@ -1,111 +0,0 @@
package ru.ulstu.`is`.pmu.api.pet
import androidx.paging.ExperimentalPagingApi
import androidx.paging.LoadType
import androidx.paging.PagingState
import androidx.paging.RemoteMediator
import androidx.room.withTransaction
import retrofit2.HttpException
import ru.ulstu.`is`.pmu.api.MyServerService
import ru.ulstu.`is`.pmu.api.model.toPet
import ru.ulstu.`is`.pmu.api.user.RestUserRepository
import ru.ulstu.`is`.pmu.database.AppDatabase
import ru.ulstu.`is`.pmu.database.pet.repository.OfflinePetRepository
import ru.ulstu.`is`.pmu.database.remotekeys.model.RemoteKeyType
import ru.ulstu.`is`.pmu.database.remotekeys.model.RemoteKeys
import ru.ulstu.`is`.pmu.database.remotekeys.repository.OfflineRemoteKeyRepository
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
import java.io.IOException
@OptIn(ExperimentalPagingApi::class)
class PetRemoteMediator(
private val service: MyServerService,
private val dbPetRepository: OfflinePetRepository,
private val dbRemoteKeyRepository: OfflineRemoteKeyRepository,
private val userRestRepository: RestUserRepository,
private val database: AppDatabase
) : RemoteMediator<Int, Pet>() {
override suspend fun initialize(): InitializeAction {
return InitializeAction.LAUNCH_INITIAL_REFRESH
}
override suspend fun load(
loadType: LoadType,
state: PagingState<Int, Pet>
): MediatorResult {
val page = when (loadType) {
LoadType.REFRESH -> {
val remoteKeys = getRemoteKeyClosestToCurrentPosition(state)
remoteKeys?.nextKey?.minus(1) ?: 1
}
LoadType.PREPEND -> {
val remoteKeys = getRemoteKeyForFirstItem(state)
remoteKeys?.prevKey
?: return MediatorResult.Success(endOfPaginationReached = remoteKeys != null)
}
LoadType.APPEND -> {
val remoteKeys = getRemoteKeyForLastItem(state)
remoteKeys?.nextKey
?: return MediatorResult.Success(endOfPaginationReached = remoteKeys != null)
}
}
try {
val pets = service.getPets(page, state.config.pageSize).map { it.toPet() }
val endOfPaginationReached = pets.isEmpty()
database.withTransaction {
if (loadType == LoadType.REFRESH) {
dbRemoteKeyRepository.deleteRemoteKey(RemoteKeyType.PET)
dbPetRepository.clearPets()
}
val prevKey = if (page == 1) null else page - 1
val nextKey = if (endOfPaginationReached) null else page + 1
val keys = pets.map {
RemoteKeys(
entityId = it.uid,
type = RemoteKeyType.PET,
prevKey = prevKey,
nextKey = nextKey
)
}
userRestRepository.getAllInList()
dbRemoteKeyRepository.createRemoteKeys(keys)
dbPetRepository.insertPets(pets)
}
return MediatorResult.Success(endOfPaginationReached = endOfPaginationReached)
} catch (exception: IOException) {
return MediatorResult.Error(exception)
} catch (exception: HttpException) {
return MediatorResult.Error(exception)
}
}
private suspend fun getRemoteKeyForLastItem(state: PagingState<Int, Pet>): RemoteKeys? {
return state.pages.lastOrNull { it.data.isNotEmpty() }?.data?.lastOrNull()
?.let { pet ->
dbRemoteKeyRepository.getAllRemoteKeys(pet.uid, RemoteKeyType.PET)
}
}
private suspend fun getRemoteKeyForFirstItem(state: PagingState<Int, Pet>): RemoteKeys? {
return state.pages.firstOrNull { it.data.isNotEmpty() }?.data?.firstOrNull()
?.let { pet ->
dbRemoteKeyRepository.getAllRemoteKeys(pet.uid, RemoteKeyType.PET)
}
}
private suspend fun getRemoteKeyClosestToCurrentPosition(
state: PagingState<Int, Pet>
): RemoteKeys? {
return state.anchorPosition?.let { position ->
state.closestItemToPosition(position)?.uid?.let { petUid ->
dbRemoteKeyRepository.getAllRemoteKeys(petUid, RemoteKeyType.PET)
}
}
}
}

91
app/src/main/java/ru/ulstu/is/pmu/api/pet/RestPetRepository.kt
View File

@ -1,91 +0,0 @@
package ru.ulstu.`is`.pmu.api.pet
import android.util.Log
import androidx.paging.ExperimentalPagingApi
import androidx.paging.Pager
import androidx.paging.PagingConfig
import androidx.paging.PagingData
import kotlinx.coroutines.flow.Flow
import ru.ulstu.`is`.pmu.api.MyServerService
import ru.ulstu.`is`.pmu.api.model.toPet
import ru.ulstu.`is`.pmu.api.model.toPetRemote
import ru.ulstu.`is`.pmu.api.report.ReportRemote
import ru.ulstu.`is`.pmu.api.user.RestUserRepository
import ru.ulstu.`is`.pmu.common.AppContainer
import ru.ulstu.`is`.pmu.common.PetRepository
import ru.ulstu.`is`.pmu.database.AppDatabase
import ru.ulstu.`is`.pmu.database.remotekeys.repository.OfflineRemoteKeyRepository
import ru.ulstu.`is`.pmu.database.pet.repository.OfflinePetRepository
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
class RestPetRepository(
private val service: MyServerService,
private val dbPetRepository: OfflinePetRepository,
private val dbRemoteKeyRepository: OfflineRemoteKeyRepository,
private val userRestRepository: RestUserRepository,
private val database: AppDatabase
) : PetRepository {
override fun getAllPets(): Flow<PagingData<Pet>> {
Log.d(RestPetRepository::class.simpleName, "Get pets")
val pagingSourceFactory = { dbPetRepository.getAllPetsPagingSource() }
@OptIn(ExperimentalPagingApi::class)
return Pager(
config = PagingConfig(
pageSize = AppContainer.LIMIT,
enablePlaceholders = false
),
remoteMediator = PetRemoteMediator(
service,
dbPetRepository,
dbRemoteKeyRepository,
userRestRepository,
database,
),
pagingSourceFactory = pagingSourceFactory
).flow
}
override fun getByUser(uid: Int): Flow<PagingData<Pet>> {
Log.d(RestPetRepository::class.simpleName, "Get 4444444444444444444444444444444444444444444444444444444")
val pagingSourceFactory = { dbPetRepository.getByUserPetsPagingSource(uid) }
@OptIn(ExperimentalPagingApi::class)
return Pager(
config = PagingConfig(
pageSize = AppContainer.LIMIT,
enablePlaceholders = false
),
remoteMediator = PetRemoteMediator(
service,
dbPetRepository,
dbRemoteKeyRepository,
userRestRepository,
database,
),
pagingSourceFactory = pagingSourceFactory
).flow
}
override suspend fun getPet(uid: Int): Pet =
service.getPet(uid).toPet()
override suspend fun insertPet(pet: Pet) {
service.createPet(pet.toPetRemote()).toPet()
}
override suspend fun updatePet(pet: Pet) {
service.updatePet(pet.uid, pet.toPetRemote()).toPet()
}
override suspend fun deletePet(pet: Pet) {
service.deletePet(pet.uid).toPet()
}
suspend fun getReport(fromDate: String, toDate: String):List<ReportRemote>
{
return service.getReportInfo(fromDate,toDate)
}
}

12
app/src/main/java/ru/ulstu/is/pmu/api/report/ReportRemote.kt
View File

@ -1,12 +0,0 @@
package ru.ulstu.`is`.pmu.api.report
import kotlinx.serialization.Serializable
@Serializable
data class ReportRemote(
val reportId: Int = 0,
val petid: Int = 0,
val petname: String = "",
val birthday: String = "",
val userid: Int = 0,
val login: String = ""
)

69
app/src/main/java/ru/ulstu/is/pmu/api/user/RestUserRepository.kt
View File

@ -1,69 +0,0 @@
package ru.ulstu.`is`.pmu.api.user
import android.util.Log
import androidx.paging.ExperimentalPagingApi
import androidx.paging.Pager
import androidx.paging.PagingConfig
import androidx.paging.PagingData
import kotlinx.coroutines.flow.Flow
import ru.ulstu.`is`.pmu.api.MyServerService
import ru.ulstu.`is`.pmu.api.model.toUser
import ru.ulstu.`is`.pmu.api.pet.RestPetRepository
import ru.ulstu.`is`.pmu.common.AppContainer
import ru.ulstu.`is`.pmu.common.UserRepository
import ru.ulstu.`is`.pmu.database.AppDatabase
import ru.ulstu.`is`.pmu.database.remotekeys.repository.OfflineRemoteKeyRepository
import ru.ulstu.`is`.pmu.database.entyties.model.User
import ru.ulstu.`is`.pmu.database.entyties.repository.OfflineUserRepository
class RestUserRepository(
private val service: MyServerService,
private val dbUserRepository: OfflineUserRepository,
private val dbRemoteKeyRepository: OfflineRemoteKeyRepository,
private val database: AppDatabase
): UserRepository {
override suspend fun getAllInList(): List<User> {
Log.d(RestUserRepository::class.simpleName, "Get users")
val existUsers = dbUserRepository.getAllInList().associateBy { it.uid }.toMutableMap()
service.getUsers()
.map { it.toUser() }
.forEach { user ->
val existUser = existUsers[user.uid]
if (existUser == null) {
dbUserRepository.createUser(user)
} else if (existUser != user) {
dbUserRepository.updateUser(user)
}
existUsers[user.uid] = user
}
Log.d(RestUserRepository::class.simpleName, "Geted users")
return existUsers.map { it.value }.sortedBy { it.uid }
}
override fun getAllUsers(): Flow<PagingData<User>> {
Log.d(RestPetRepository::class.simpleName, "Get pets")
val pagingSourceFactory = { dbUserRepository.getAllUsersPagingSource() }
@OptIn(ExperimentalPagingApi::class)
return Pager(
config = PagingConfig(
pageSize = AppContainer.LIMIT,
enablePlaceholders = false
),
remoteMediator = UserRemoteMediator(
service,
dbUserRepository,
dbRemoteKeyRepository,
database
),
pagingSourceFactory = pagingSourceFactory
).flow
}
override suspend fun getUser(uid: Int): User =
service.getUser(uid).toUser()
}

108
app/src/main/java/ru/ulstu/is/pmu/api/user/UserRemoteMediator.kt
View File

@ -1,108 +0,0 @@
package ru.ulstu.`is`.pmu.api.user
import androidx.paging.ExperimentalPagingApi
import androidx.paging.LoadType
import androidx.paging.PagingState
import androidx.paging.RemoteMediator
import androidx.room.withTransaction
import retrofit2.HttpException
import ru.ulstu.`is`.pmu.api.MyServerService
import ru.ulstu.`is`.pmu.api.model.toUser
import ru.ulstu.`is`.pmu.database.AppDatabase
import ru.ulstu.`is`.pmu.database.remotekeys.model.RemoteKeyType
import ru.ulstu.`is`.pmu.database.remotekeys.model.RemoteKeys
import ru.ulstu.`is`.pmu.database.remotekeys.repository.OfflineRemoteKeyRepository
import ru.ulstu.`is`.pmu.database.entyties.model.User
import ru.ulstu.`is`.pmu.database.entyties.repository.OfflineUserRepository
import java.io.IOException
@OptIn(ExperimentalPagingApi::class)
class UserRemoteMediator(
private val service: MyServerService,
private val dbUserRepository: OfflineUserRepository,
private val dbRemoteKeyRepository: OfflineRemoteKeyRepository,
private val database: AppDatabase
) : RemoteMediator<Int, User>() {
override suspend fun initialize(): InitializeAction {
return InitializeAction.LAUNCH_INITIAL_REFRESH
}
override suspend fun load(
loadType: LoadType,
state: PagingState<Int, User>
): MediatorResult {
val page = when (loadType) {
LoadType.REFRESH -> {
val remoteKeys = getRemoteKeyClosestToCurrentPosition(state)
remoteKeys?.nextKey?.minus(1) ?: 1
}
LoadType.PREPEND -> {
val remoteKeys = getRemoteKeyForFirstItem(state)
remoteKeys?.prevKey
?: return MediatorResult.Success(endOfPaginationReached = remoteKeys != null)
}
LoadType.APPEND -> {
val remoteKeys = getRemoteKeyForLastItem(state)
remoteKeys?.nextKey
?: return MediatorResult.Success(endOfPaginationReached = remoteKeys != null)
}
}
try {
val users = service.getUsers(page, state.config.pageSize).map { it.toUser() }
val endOfPaginationReached = users.isEmpty()
database.withTransaction {
if (loadType == LoadType.REFRESH) {
dbRemoteKeyRepository.deleteRemoteKey(RemoteKeyType.USER)
dbUserRepository.clearUsers()
}
val prevKey = if (page == 1) null else page - 1
val nextKey = if (endOfPaginationReached) null else page + 1
val keys = users.map {
RemoteKeys(
entityId = it.uid,
type = RemoteKeyType.USER,
prevKey = prevKey,
nextKey = nextKey
)
}
dbRemoteKeyRepository.createRemoteKeys(keys)
dbUserRepository.insertUsers(users)
}
return MediatorResult.Success(endOfPaginationReached = endOfPaginationReached)
} catch (exception: IOException) {
return MediatorResult.Error(exception)
} catch (exception: HttpException) {
return MediatorResult.Error(exception)
}
}
private suspend fun getRemoteKeyForLastItem(state: PagingState<Int, User>): RemoteKeys? {
return state.pages.lastOrNull { it.data.isNotEmpty() }?.data?.lastOrNull()
?.let { user ->
dbRemoteKeyRepository.getAllRemoteKeys(user.uid, RemoteKeyType.USER)
}
}
private suspend fun getRemoteKeyForFirstItem(state: PagingState<Int, User>): RemoteKeys? {
return state.pages.firstOrNull { it.data.isNotEmpty() }?.data?.firstOrNull()
?.let { user ->
dbRemoteKeyRepository.getAllRemoteKeys(user.uid, RemoteKeyType.USER)
}
}
private suspend fun getRemoteKeyClosestToCurrentPosition(
state: PagingState<Int, User>
): RemoteKeys? {
return state.anchorPosition?.let { position ->
state.closestItemToPosition(position)?.uid?.let { userUid ->
dbRemoteKeyRepository.getAllRemoteKeys(userUid, RemoteKeyType.USER)
}
}
}
}

50
app/src/main/java/ru/ulstu/is/pmu/common/AppContainer.kt
View File

@ -1,50 +0,0 @@
package ru.ulstu.`is`.pmu.common
import android.content.Context
import ru.ulstu.`is`.pmu.api.MyServerService
import ru.ulstu.`is`.pmu.api.user.RestUserRepository
import ru.ulstu.`is`.pmu.api.pet.RestPetRepository
import ru.ulstu.`is`.pmu.database.AppDatabase
import ru.ulstu.`is`.pmu.database.pet.repository.OfflinePetRepository
import ru.ulstu.`is`.pmu.database.remotekeys.repository.OfflineRemoteKeyRepository
import ru.ulstu.`is`.pmu.database.entyties.repository.OfflineUserRepository
interface AppContainer {
val petRestRepository: RestPetRepository
val userRestRepository: RestUserRepository
companion object {
const val TIMEOUT = 5000L
const val LIMIT = 10
}
}
class AppDataContainer(private val context: Context) : AppContainer {
private val petRepository: OfflinePetRepository by lazy {
OfflinePetRepository(AppDatabase.getInstance(context).petDao())
}
private val userRepository: OfflineUserRepository by lazy {
OfflineUserRepository(AppDatabase.getInstance(context).userDao())
}
private val remoteKeyRepository: OfflineRemoteKeyRepository by lazy {
OfflineRemoteKeyRepository(AppDatabase.getInstance(context).remoteKeysDao())
}
override val petRestRepository: RestPetRepository by lazy {
RestPetRepository(
MyServerService.getInstance(),
petRepository,
remoteKeyRepository,
userRestRepository,
AppDatabase.getInstance(context)
)
}
override val userRestRepository: RestUserRepository by lazy {
RestUserRepository(
MyServerService.getInstance(),
userRepository,
remoteKeyRepository,
AppDatabase.getInstance(context)
)
}
}

43
app/src/main/java/ru/ulstu/is/pmu/common/AppViewModelProvider.kt
View File

@ -1,43 +0,0 @@
package ru.ulstu.`is`.pmu.common
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.pet.edit.PetEditViewModel
import ru.ulstu.`is`.pmu.ui.pet.edit.UserDropDownViewModel
import ru.ulstu.`is`.pmu.ui.pet.list.PetListViewModel
import ru.ulstu.`is`.pmu.ui.pet.list.UserListViewModel
import ru.ulstu.`is`.pmu.ui.pet.report.ReportViewModel
object AppViewModelProvider {
val Factory = viewModelFactory {
initializer {
PetListViewModel(petApplication().container.petRestRepository)
}
initializer {
UserListViewModel(petApplication().container.userRestRepository)
}
initializer {
PetEditViewModel(
this.createSavedStateHandle(),
petApplication().container.petRestRepository
)
}
initializer {
UserDropDownViewModel(petApplication().container.userRestRepository
)
}
initializer {
ReportViewModel(
petApplication().container.petRestRepository,
)
}
}
}
fun CreationExtras.petApplication(): StudentApplication =
(this[ViewModelProvider.AndroidViewModelFactory.APPLICATION_KEY] as StudentApplication)

48
app/src/main/java/ru/ulstu/is/pmu/common/MyViewModel.kt
View File

@ -1,48 +0,0 @@
package ru.ulstu.`is`.pmu.common
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 retrofit2.HttpException
import ru.ulstu.`is`.pmu.api.ApiStatus
import java.io.IOException
open class MyViewModel : ViewModel() {
var apiStatus by mutableStateOf(ApiStatus.DONE)
private set
var apiError by mutableStateOf("")
private set
fun runInScope(
actionSuccess: suspend () -> Unit,
actionError: suspend () -> Unit
) {
viewModelScope.launch {
apiStatus = ApiStatus.LOADING
runCatching {
actionSuccess()
apiStatus = ApiStatus.DONE
apiError = ""
}.onFailure { e: Throwable ->
when (e) {
is IOException,
is HttpException -> {
actionError()
apiStatus = ApiStatus.ERROR
apiError = e.localizedMessage ?: e.toString()
}
else -> throw e
}
}
}
}
fun runInScope(actionSuccess: suspend () -> Unit) {
runInScope(actionSuccess, actionError = {})
}
}

14
app/src/main/java/ru/ulstu/is/pmu/common/PetRepository.kt
View File

@ -1,14 +0,0 @@
package ru.ulstu.`is`.pmu.common
import androidx.paging.PagingData
import kotlinx.coroutines.flow.Flow
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
interface PetRepository {
fun getAllPets(): Flow<PagingData<Pet>>
fun getByUser(uid: Int): Flow<PagingData<Pet>>
suspend fun getPet(uid: Int): Pet
suspend fun insertPet(student: Pet)
suspend fun updatePet(student: Pet)
suspend fun deletePet(student: Pet)
}

11
app/src/main/java/ru/ulstu/is/pmu/common/UserRepository.kt
View File

@ -1,11 +0,0 @@
package ru.ulstu.`is`.pmu.common
import androidx.paging.PagingData
import kotlinx.coroutines.flow.Flow
import ru.ulstu.`is`.pmu.database.entyties.model.User
interface UserRepository {
suspend fun getAllInList(): List<User>
fun getAllUsers(): Flow<PagingData<User>>
suspend fun getUser(uid: Int): User
}

59
app/src/main/java/ru/ulstu/is/pmu/database/AppDatabase.kt
View File

@ -1,59 +0,0 @@
package ru.ulstu.`is`.pmu.database
import android.content.Context
import androidx.room.Database
import androidx.room.Room
import androidx.room.RoomDatabase
import ru.ulstu.`is`.pmu.database.remotekeys.dao.RemoteKeysDao
import ru.ulstu.`is`.pmu.database.remotekeys.model.RemoteKeys
import ru.ulstu.`is`.pmu.database.entyties.dao.PetDao
import ru.ulstu.`is`.pmu.database.entyties.dao.UserDao
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
import ru.ulstu.`is`.pmu.database.entyties.model.User
@Database(
entities = [
Pet::class,
User::class,
RemoteKeys::class,
],
version = 1,
exportSchema = false
)
abstract class AppDatabase : RoomDatabase() {
abstract fun userDao(): UserDao
abstract fun petDao(): PetDao
abstract fun remoteKeysDao(): RemoteKeysDao
companion object {
private const val DB_NAME: String = "pmy-db"
@Volatile
private var INSTANCE: AppDatabase? = null
private suspend fun populateDatabase() {
INSTANCE?.let { database ->
val userDao = database.userDao()
val user1 = User(1, "ivan","Иван","Иванов")
val user2 = User(2, "max","Макс","Максов")
val user3 = User(3, "ann","Анна","Аннова")
userDao.insert(user1)
userDao.insert(user2)
userDao.insert(user3)
}
}
fun getInstance(appContext: Context): AppDatabase {
return INSTANCE ?: synchronized(this) {
Room.databaseBuilder(
appContext,
AppDatabase::class.java,
DB_NAME
)
.build()
.also { INSTANCE = it }
}
}
}
}

35
app/src/main/java/ru/ulstu/is/pmu/database/entyties/dao/PetDao.kt
View File

@ -1,35 +0,0 @@
package ru.ulstu.`is`.pmu.database.entyties.dao
import androidx.paging.PagingSource
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.entyties.model.Pet
@Dao
interface PetDao {
@Query("select * from pets")
fun getAll(): PagingSource<Int, Pet>
@Query("select * from pets where pets.user_id = :uid")
fun getByUser(uid: Int): PagingSource<Int, Pet>
@Query("select * from pets where pets.uid = :uid")
fun getByUid(uid: Int): Flow<Pet>
@Insert
suspend fun insert(vararg pet: Pet)
@Update
suspend fun update(pet: Pet)
@Delete
suspend fun delete(pet: Pet)
@Query("DELETE FROM pets")
suspend fun deleteAll()
}

33
app/src/main/java/ru/ulstu/is/pmu/database/entyties/dao/UserDao.kt
View File

@ -1,33 +0,0 @@
package ru.ulstu.`is`.pmu.database.entyties.dao
import androidx.paging.PagingSource
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.entyties.model.User
@Dao
interface UserDao {
@Query("select * from users")
fun getAllInList(): List<User>
@Query("select * from users")
fun getAll(): PagingSource<Int, User>
@Query("select * from users where users.uid = :uid")
fun getByUid(uid: Int): Flow<User>
@Insert
suspend fun insert(vararg user: User)
@Update
suspend fun update(user: User)
@Delete
suspend fun delete(user: User)
@Query("DELETE FROM users")
suspend fun deleteAll()
}

79
app/src/main/java/ru/ulstu/is/pmu/database/entyties/model/Pet.kt
View File

@ -1,79 +0,0 @@
package ru.ulstu.`is`.pmu.database.entyties.model
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.ForeignKey
import androidx.room.Ignore
import androidx.room.PrimaryKey
import ru.ulstu.`is`.pmu.R
@Entity(
tableName = "pets", foreignKeys = [
ForeignKey(
entity = User::class,
parentColumns = ["uid"],
childColumns = ["user_id"],
onDelete = ForeignKey.CASCADE,
onUpdate = ForeignKey.CASCADE
)
]
)
data class Pet(
@PrimaryKey(autoGenerate = true)
val uid: Int = 0,
@ColumnInfo(name = "name")
val name: String,
@ColumnInfo(name = "note")
val note: String,
@ColumnInfo(name = "birthday")
val birthday: String,
@ColumnInfo(name = "user_id", index = true)
val userId: Int,
@ColumnInfo(name = "image_resource_id") // Добавляем поле для хранения ресурса изображения
val imageResourceId: Int
) {
@Ignore
constructor(
name: String,
note: String,
birthday: String,
user: User,
imageResourceId: Int // Добавляем параметр для изображения
) : this(0, name, note,birthday, user.uid, imageResourceId)
companion object {
fun getPet(index: Int = 0): Pet {
return Pet(
index,
"name",
"note",
"01.01.2024",
0,
R.drawable.pet1 // Задаем значение по умолчанию для изображения
)
}
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as Pet
if (uid != other.uid) return false
if (name != other.name) return false
if (note != other.note) return false
if (userId != other.userId) return false
if (imageResourceId != other.imageResourceId) return false // Сравниваем изображения
return true
}
override fun hashCode(): Int {
var result = uid
result = 31 * result + name.hashCode()
result = 31 * result + note.hashCode()
result = 31 * result + userId
result = 31 * result + imageResourceId // Включаем изображение в вычисление хэш-кода
return result
}
}

56
app/src/main/java/ru/ulstu/is/pmu/database/entyties/model/User.kt
View File

@ -1,56 +0,0 @@
package ru.ulstu.`is`.pmu.database.entyties.model
import androidx.room.ColumnInfo
import androidx.room.Entity
import androidx.room.Ignore
import androidx.room.PrimaryKey
@Entity(tableName = "users")
data class User(
@PrimaryKey(autoGenerate = true)
val uid: Int = 0,
@ColumnInfo(name = "login")
val login: String,
@ColumnInfo(name = "first_name")
val nameFirst: String,
@ColumnInfo(name = "last_name")
val nameLast: String
) {
@Ignore
constructor(
login: String,
nameFirst: String,
nameLast: String,
) : this(0, login, nameFirst, nameLast)
companion object {
fun getUser(index: Int = 0): User {
return User(
index,
"lodin",
"first",
"last"
)
}
val DEMO_USER = User(
0,
"login",
"first",
"last"
)
}
override fun equals(other: Any?): Boolean {
if (this === other) return true
if (javaClass != other?.javaClass) return false
other as User
if (uid != other.uid) return false
if (login != other.login) return false
return true
}
override fun hashCode(): Int {
return uid
}
}

47
app/src/main/java/ru/ulstu/is/pmu/database/entyties/repository/OfflinePetRepository.kt
View File

@ -1,47 +0,0 @@
package ru.ulstu.`is`.pmu.database.pet.repository
import androidx.paging.Pager
import androidx.paging.PagingConfig
import androidx.paging.PagingData
import androidx.paging.PagingSource
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.first
import ru.ulstu.`is`.pmu.common.AppContainer
import ru.ulstu.`is`.pmu.common.PetRepository
import ru.ulstu.`is`.pmu.database.entyties.dao.PetDao
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
class OfflinePetRepository(private val petDao: PetDao) : PetRepository {
override fun getAllPets(): Flow<PagingData<Pet>> = Pager(
config = PagingConfig(
pageSize = AppContainer.LIMIT,
enablePlaceholders = false
),
pagingSourceFactory = petDao::getAll
).flow
override fun getByUser(uid: Int): Flow<PagingData<Pet>> = Pager(
config = PagingConfig(
pageSize = AppContainer.LIMIT,
enablePlaceholders = false
),
pagingSourceFactory = petDao::getAll
).flow
override suspend fun getPet(uid: Int): Pet = petDao.getByUid(uid).first()
override suspend fun insertPet(pet: Pet) = petDao.insert(pet)
override suspend fun updatePet(pet: Pet) = petDao.update(pet)
override suspend fun deletePet(pet: Pet) = petDao.delete(pet)
fun getAllPetsPagingSource(): PagingSource<Int, Pet> = petDao.getAll()
fun getByUserPetsPagingSource(uid:Int): PagingSource<Int, Pet> = petDao.getByUser(uid)
suspend fun insertPets(pets: List<Pet>) =
petDao.insert(*pets.toTypedArray())
suspend fun clearPets() = petDao.deleteAll()
}

35
app/src/main/java/ru/ulstu/is/pmu/database/entyties/repository/OfflineUserRepository.kt
View File

@ -1,35 +0,0 @@
package ru.ulstu.`is`.pmu.database.entyties.repository
import androidx.paging.Pager
import androidx.paging.PagingConfig
import androidx.paging.PagingData
import androidx.paging.PagingSource
import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.first
import ru.ulstu.`is`.pmu.common.AppContainer
import ru.ulstu.`is`.pmu.common.UserRepository
import ru.ulstu.`is`.pmu.database.entyties.dao.UserDao
import ru.ulstu.`is`.pmu.database.entyties.model.User
class OfflineUserRepository(private val userDao: UserDao) : UserRepository {
override suspend fun getAllInList(): List<User> = userDao.getAllInList()
override fun getAllUsers(): Flow<PagingData<User>> = Pager(
config = PagingConfig(
pageSize = AppContainer.LIMIT,
enablePlaceholders = false
),
pagingSourceFactory = userDao::getAll
).flow
suspend fun createUser(user: User) = userDao.insert(user)
suspend fun updateUser(user: User) = userDao.update(user)
fun getAllUsersPagingSource(): PagingSource<Int, User> = userDao.getAll()
suspend fun insertUsers(users: List<User>) =
userDao.insert(*users.toTypedArray())
suspend fun clearUsers() = userDao.deleteAll()
override suspend fun getUser(uid: Int): User = userDao.getByUid(uid).first()
}

20
app/src/main/java/ru/ulstu/is/pmu/database/remotekeys/dao/RemoteKeysDao.kt
View File

@ -1,20 +0,0 @@
package ru.ulstu.`is`.pmu.database.remotekeys.dao
import androidx.room.Dao
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import ru.ulstu.`is`.pmu.database.remotekeys.model.RemoteKeyType
import ru.ulstu.`is`.pmu.database.remotekeys.model.RemoteKeys
@Dao
interface RemoteKeysDao {
@Query("SELECT * FROM remote_keys WHERE entityId = :entityId AND type = :type")
suspend fun getRemoteKeys(entityId: Int, type: RemoteKeyType): RemoteKeys?
@Insert(onConflict = OnConflictStrategy.REPLACE)
suspend fun insertAll(remoteKey: List<RemoteKeys>)
@Query("DELETE FROM remote_keys WHERE type = :type")
suspend fun clearRemoteKeys(type: RemoteKeyType)
}

28
app/src/main/java/ru/ulstu/is/pmu/database/remotekeys/model/RemoteKeys.kt
View File

@ -1,28 +0,0 @@
package ru.ulstu.`is`.pmu.database.remotekeys.model
import androidx.room.Entity
import androidx.room.PrimaryKey
import androidx.room.TypeConverter
import androidx.room.TypeConverters
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
import ru.ulstu.`is`.pmu.database.entyties.model.User
enum class RemoteKeyType(private val type: String) {
PET(Pet::class.simpleName ?: "Pet"),
USER(User::class.simpleName ?: "User");
@TypeConverter
fun toRemoteKeyType(value: String) = RemoteKeyType.values().first { it.type == value }
@TypeConverter
fun fromRemoteKeyType(value: RemoteKeyType) = value.type
}
@Entity(tableName = "remote_keys")
data class RemoteKeys(
@PrimaryKey val entityId: Int,
@TypeConverters(RemoteKeyType::class)
val type: RemoteKeyType,
val prevKey: Int?,
val nextKey: Int?
)

16
app/src/main/java/ru/ulstu/is/pmu/database/remotekeys/repository/OfflineRemoteKeyRepository.kt
View File

@ -1,16 +0,0 @@
package ru.ulstu.`is`.pmu.database.remotekeys.repository
import ru.ulstu.`is`.pmu.database.remotekeys.dao.RemoteKeysDao
import ru.ulstu.`is`.pmu.database.remotekeys.model.RemoteKeyType
import ru.ulstu.`is`.pmu.database.remotekeys.model.RemoteKeys
class OfflineRemoteKeyRepository(private val remoteKeysDao: RemoteKeysDao) : RemoteKeyRepository {
override suspend fun getAllRemoteKeys(id: Int, type: RemoteKeyType) =
remoteKeysDao.getRemoteKeys(id, type)
override suspend fun createRemoteKeys(remoteKeys: List<RemoteKeys>) =
remoteKeysDao.insertAll(remoteKeys)
override suspend fun deleteRemoteKey(type: RemoteKeyType) =
remoteKeysDao.clearRemoteKeys(type)
}

10
app/src/main/java/ru/ulstu/is/pmu/database/remotekeys/repository/RemoteKeyRepository.kt
View File

@ -1,10 +0,0 @@
package ru.ulstu.`is`.pmu.database.remotekeys.repository
import ru.ulstu.`is`.pmu.database.remotekeys.model.RemoteKeyType
import ru.ulstu.`is`.pmu.database.remotekeys.model.RemoteKeys
interface RemoteKeyRepository {
suspend fun getAllRemoteKeys(id: Int, type: RemoteKeyType): RemoteKeys?
suspend fun createRemoteKeys(remoteKeys: List<RemoteKeys>)
suspend fun deleteRemoteKey(type: RemoteKeyType)
}

69
app/src/main/java/ru/ulstu/is/pmu/ui/NetworkUi.kt
View File

@ -1,69 +0,0 @@
package ru.ulstu.`is`.pmu.ui
import android.content.res.Configuration
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
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.Alignment
import androidx.compose.ui.Modifier
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.TextUnit
import androidx.compose.ui.unit.TextUnitType
import androidx.compose.ui.unit.dp
import ru.ulstu.`is`.pmu.R
@Composable
fun ErrorPlaceholder(message: String, onBack: () -> Unit) {
Column(
modifier = Modifier
.fillMaxSize()
.padding(10.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Text(
modifier = Modifier.fillMaxWidth(),
textAlign = TextAlign.Center,
fontSize = TextUnit(value = 20F, type = TextUnitType.Sp),
text = message,
color = Color(0xFFFF1744)
)
Spacer(modifier = Modifier.padding(bottom = 10.dp))
Button(
modifier = Modifier.fillMaxWidth(),
onClick = { onBack() }
) {
Text(stringResource(id = R.string.back))
}
}
}
@Composable
fun LoadingPlaceholder() {
Column(
modifier = Modifier
.fillMaxSize()
.padding(10.dp),
horizontalAlignment = Alignment.CenterHorizontally,
verticalArrangement = Arrangement.Center
) {
Text(
modifier = Modifier.fillMaxWidth(),
textAlign = TextAlign.Center,
fontSize = TextUnit(value = 25F, type = TextUnitType.Sp),
text = stringResource(id = R.string.loading)
)
}
}

146
app/src/main/java/ru/ulstu/is/pmu/ui/navigation/MainNavbar.kt
View File

@ -1,146 +0,0 @@
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.pet.edit.PetEdit
import ru.ulstu.`is`.pmu.ui.pet.list.PetList
import ru.ulstu.`is`.pmu.ui.pet.list.PetUserList
import ru.ulstu.`is`.pmu.ui.pet.list.UserList
import ru.ulstu.`is`.pmu.ui.pet.report.ReportPage
@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.PetList.route,
modifier.padding(innerPadding)
) {
composable(Screen.Report.route) { ReportPage(navController = navController) }
composable(Screen.PetList.route) { PetList(navController) }
composable(Screen.UserList.route) { UserList(navController) }
composable(
Screen.PetEdit.route,
arguments = listOf(navArgument("id") { type = NavType.IntType })
) {
PetEdit(navController)
}
composable(
Screen.PetUserList.route,
arguments = listOf(navArgument("id") { type = NavType.IntType })
) { backStackEntry ->
val id = backStackEntry.arguments?.getInt("id") ?: throw IllegalStateException("ID is not found")
PetUserList(navController, id)
}
}
}
@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)
}
}

46
app/src/main/java/ru/ulstu/is/pmu/ui/navigation/Screen.kt
View File

@ -1,46 +0,0 @@
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.Home
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
) {
PetList(
"pet-list", R.string.list_pet, Icons.Filled.Home
),
Report(
"report", R.string.report, Icons.Filled.Info
),
PetUserList(
"pet-user-list/{id}", R.string.list_pet, showInBottomBar = false
),
UserList(
"user-list", R.string.list_user, Icons.Filled.List
),
PetEdit(
"pet-edit/{id}", R.string.pet_view, showInBottomBar = false
);
companion object {
val bottomBarItems = listOf(
UserList,
PetList,
Report
)
fun getItem(route: String): Screen? {
val findRoute = route.split("/").first()
return values().find { value -> value.route.startsWith(findRoute) }
}
}
}

360
app/src/main/java/ru/ulstu/is/pmu/ui/pet/edit/PetEdit.kt
View File

@ -1,360 +0,0 @@
package ru.ulstu.`is`.pmu.ui.pet.edit
import android.content.res.Configuration
import android.widget.CalendarView
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.defaultMinSize
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.lazy.LazyRow
import androidx.compose.foundation.shape.RoundedCornerShape
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.TextButton
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.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
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 androidx.compose.ui.window.Dialog
import androidx.compose.ui.window.DialogProperties
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.api.ApiStatus
import ru.ulstu.`is`.pmu.common.AppViewModelProvider
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
import ru.ulstu.`is`.pmu.database.entyties.model.User
import ru.ulstu.`is`.pmu.ui.ErrorPlaceholder
import ru.ulstu.`is`.pmu.ui.LoadingPlaceholder
import java.text.SimpleDateFormat
import java.util.Calendar
import java.util.Date
import java.util.Locale
@Composable
fun PetEdit(
navController: NavController,
viewModel: PetEditViewModel = viewModel(factory = AppViewModelProvider.Factory),
userViewModel: UserDropDownViewModel = viewModel(factory = AppViewModelProvider.Factory)
) {
if (userViewModel.apiStatus == ApiStatus.ERROR) {
ErrorPlaceholder(
message = userViewModel.apiError,
onBack = { navController.popBackStack() }
)
return
}
val coroutineScope = rememberCoroutineScope()
userViewModel.setCurrentUser(viewModel.petUiState.petDetails.userId)
when (viewModel.apiStatus) {
ApiStatus.DONE -> {
PetEdit(
petUiState = viewModel.petUiState,
userUiState = userViewModel.userUiState,
usersListUiState = userViewModel.usersListUiState,
onClick = {
coroutineScope.launch {
viewModel.savePet()
navController.popBackStack()
}
},
onUpdate = viewModel::updateUiState,
onUserUpdate = userViewModel::updateUiState
)
}
ApiStatus.LOADING -> LoadingPlaceholder()
else -> ErrorPlaceholder(
message = viewModel.apiError,
onBack = { navController.popBackStack() }
)
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun UserDropDown(
userUiState: UserUiState,
usersListUiState: UsersListUiState,
onUserUpdate: (User) -> Unit
) {
var expanded: Boolean by remember { mutableStateOf(false) }
ExposedDropdownMenuBox(
modifier = Modifier
.padding(top = 7.dp),
expanded = expanded,
onExpandedChange = {
expanded = !expanded
}
) {
TextField(
value = userUiState.user?.nameFirst
?: stringResource(id = R.string.user_is_not_selested),
onValueChange = {},
readOnly = true,
trailingIcon = {
TrailingIcon(expanded = expanded)
},
modifier = Modifier
.fillMaxWidth()
.menuAnchor()
)
DropdownMenu(
expanded = expanded,
onDismissRequest = { expanded = false },
modifier = Modifier
.background(Color.White)
.exposedDropdownSize()
) {
usersListUiState.userList.forEach { user ->
DropdownMenuItem(
text = {
Text(text = user.nameFirst)
},
onClick = {
onUserUpdate(user)
expanded = false
}
)
}
}
}
}
@Composable
private fun PetEdit(
petUiState: PetUiState,
userUiState: UserUiState,
usersListUiState: UsersListUiState,
onClick: () -> Unit,
onUpdate: (PetDetails) -> Unit,
onUserUpdate: (User) -> Unit
) {
var selectedImage by remember { mutableStateOf(petUiState.petDetails.imageResourceId) } // Выбранное изображение
if (selectedImage ==0) selectedImage=R.drawable.pet1
if (selectedImage==R.drawable.pet1) onUpdate(petUiState.petDetails.copy(imageResourceId = R.drawable.pet1))
if (petUiState.petDetails.birthday=="") onUpdate(petUiState.petDetails.copy(birthday = SimpleDateFormat("dd.MM.yyyy").format(Date()).toString()))
val imageIds = intArrayOf(
R.drawable.pet1,
R.drawable.pet2,
R.drawable.pet3,
R.drawable.pet4,
R.drawable.pet5,
R.drawable.pet6,
R.drawable.pet7,
R.drawable.pet8
)
Column(
modifier = Modifier
.fillMaxWidth()
.padding(all = 10.dp)
) {
LazyRow(
modifier = Modifier.fillMaxWidth(),
contentPadding = PaddingValues(horizontal = 8.dp)
) {
items(imageIds.size) { index ->
val imageId = imageIds[index]
val isSelected = selectedImage == imageId // Проверка, выбрано ли изображение
Image(
painter = painterResource(id = imageId),
contentDescription = null,
modifier = Modifier
.size(100.dp)
.padding(4.dp)
.clickable {
selectedImage = imageId
onUpdate(petUiState.petDetails.copy(imageResourceId = selectedImage))
}
.background(if (isSelected) Color.Gray.copy(alpha = 0.5f) else Color.Transparent)
)
}
}
OutlinedTextField(
modifier = Modifier.fillMaxWidth(),
value = petUiState.petDetails.name,
onValueChange = { onUpdate(petUiState.petDetails.copy(name = it)) },
label = { Text(stringResource(id = R.string.name) )},
singleLine = true
)
OutlinedTextField(
modifier = Modifier.fillMaxWidth(),
value = petUiState.petDetails.note,
onValueChange = { onUpdate(petUiState.petDetails.copy(note = it)) },
label = { Text(stringResource(id = R.string.note)) },
singleLine = false
)
UserDropDown(
userUiState = userUiState,
usersListUiState = usersListUiState,
onUserUpdate = {
onUpdate(petUiState.petDetails.copy(userId = it.uid))
onUserUpdate(it)
}
)
var showDatePicker by remember { mutableStateOf(false) }
if (showDatePicker) {
DatePicker(
onDateSelected = { selectedDate ->
onUpdate(petUiState.petDetails.copy(birthday = SimpleDateFormat("dd.MM.yyyy").format(selectedDate)))
showDatePicker = false
},
onDismissRequest = {
showDatePicker = false
}
)
}
Button(
onClick = { showDatePicker = true },
modifier = Modifier.fillMaxWidth()
) {
Text("Выбрать дату рождения")
}
Text( modifier = Modifier
.align(alignment = Alignment.CenterHorizontally),
text = "Дата рождения:" + petUiState.petDetails.birthday)
Button(
onClick = onClick,
enabled = petUiState.isEntryValid,
shape = MaterialTheme.shapes.small,
modifier = Modifier.fillMaxWidth()
) {
Text(text = stringResource(R.string.save))
}
}
}
@Composable
fun CustomCalendarView(onDateSelected: (Date) -> Unit) {
AndroidView(
modifier = Modifier.wrapContentSize(),
factory = { context ->
// Используем стандартный контекст, без применения кастомной темы
CalendarView(context).apply {
// Настройки CalendarView
val calendar = Calendar.getInstance()
setOnDateChangeListener { _, year, month, dayOfMonth ->
calendar.set(Calendar.YEAR, year)
calendar.set(Calendar.MONTH, month)
calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth)
onDateSelected(calendar.time)
}
}
}
)
}
@Composable
fun DatePicker(onDateSelected: (Date) -> Unit, onDismissRequest: () -> Unit) {
val selDate = remember { mutableStateOf(Date()) }
//todo - add strings to resource after POC
Dialog(onDismissRequest = { onDismissRequest() }, properties = DialogProperties()) {
Column(
modifier = Modifier
.wrapContentSize()
.background(
color = Color.White
)
) {
Column(
Modifier
.defaultMinSize(minHeight = 72.dp)
.fillMaxWidth()
.background(
color = MaterialTheme.colorScheme.primary
)
.padding(16.dp)
) {
Text(
text = "Выберите дату"
)
Spacer(modifier = Modifier.size(24.dp))
Text(
text = SimpleDateFormat("MMM d, yyyy", Locale.getDefault()).format(selDate.value)
)
Spacer(modifier = Modifier.size(16.dp))
}
CustomCalendarView(onDateSelected = {
selDate.value = it
})
Spacer(modifier = Modifier.size(8.dp))
Row(
modifier = Modifier
.align(Alignment.End)
.padding(bottom = 16.dp, end = 16.dp)
.background(
color = Color.White,
shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp)
)
) {
TextButton(
onClick = onDismissRequest
) {
//TODO - hardcode string
Text(
text = "Отмена"
)
}
TextButton(
onClick = {
onDateSelected(selDate.value)
onDismissRequest()
}
) {
//TODO - hardcode string
Text(
text = "Подтвердить"
)
}
}
}
}
}

99
app/src/main/java/ru/ulstu/is/pmu/ui/pet/edit/PetEditViewModel.kt
View File

@ -1,99 +0,0 @@
package ru.ulstu.`is`.pmu.ui.pet.edit
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.lifecycle.SavedStateHandle
import ru.ulstu.`is`.pmu.common.MyViewModel
import ru.ulstu.`is`.pmu.common.PetRepository
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
class PetEditViewModel(
savedStateHandle: SavedStateHandle,
private val petRepository: PetRepository
) : MyViewModel() {
var petUiState by mutableStateOf(PetUiState())
private set
private val petUid: Int = checkNotNull(savedStateHandle["id"])
init {
if (petUid > 0) {
runInScope(
actionSuccess = {
petUiState = petRepository.getPet(petUid)
.toUiState(true)
},
actionError = {
petUiState = PetUiState()
}
)
}
}
fun updateUiState(petDetails: PetDetails) {
petUiState = PetUiState(
petDetails = petDetails,
isEntryValid = validateInput(petDetails)
)
}
suspend fun savePet() {
if (validateInput()) {
runInScope(
actionSuccess = {
if (petUid > 0) {
petRepository.updatePet(petUiState.petDetails.toPet(petUid))
} else {
petRepository.insertPet(petUiState.petDetails.toPet())
}
}
)
}
}
private fun validateInput(uiState: PetDetails = petUiState.petDetails): Boolean {
return with(uiState) {
name.isNotBlank()
&& note.isNotBlank()
&& userId > 0
}
}
}
data class PetUiState(
val petDetails: PetDetails = PetDetails(),
val isEntryValid: Boolean = false
)
data class PetDetails(
val name: String = "",
val note: String = "",
val birthday: String = "",
val userId: Int = 0,
val imageResourceId: Int =0
)
fun PetDetails.toPet(uid: Int = 0): Pet = Pet(
uid = uid,
name = name,
note = note,
birthday =birthday,
userId = userId,
imageResourceId=imageResourceId
)
fun Pet.toDetails(): PetDetails = PetDetails(
name = name,
note = note,
birthday =birthday,
userId = userId,
imageResourceId=imageResourceId
)
fun Pet.toUiState(isEntryValid: Boolean = false): PetUiState = PetUiState(
petDetails = this.toDetails(),
isEntryValid = isEntryValid
)

53
app/src/main/java/ru/ulstu/is/pmu/ui/pet/edit/UserDropDownViewModel.kt
View File

@ -1,53 +0,0 @@
package ru.ulstu.`is`.pmu.ui.pet.edit
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.lifecycle.viewModelScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import ru.ulstu.`is`.pmu.common.MyViewModel
import ru.ulstu.`is`.pmu.common.UserRepository
import ru.ulstu.`is`.pmu.database.entyties.model.User
class UserDropDownViewModel(
private val userRepository: UserRepository
) : MyViewModel() {
var usersListUiState by mutableStateOf(UsersListUiState())
private set
var userUiState by mutableStateOf(UserUiState())
private set
init {
viewModelScope.launch {
val userList = withContext(Dispatchers.IO) {
userRepository.getAllInList()
}
usersListUiState = UsersListUiState(userList)
}
}
fun setCurrentUser(groupId: Int) {
val user: User? =
usersListUiState.userList.firstOrNull { group -> group.uid == groupId }
user?.let { updateUiState(it) }
}
fun updateUiState(user: User) {
userUiState = UserUiState(
user = user
)
}
}
data class UsersListUiState(val userList: List<User> = listOf())
data class UserUiState(
val user: User? = null
)
fun User.toUiState() = UserUiState(user = User(uid = uid, login=login,nameFirst=nameFirst, nameLast=nameLast))

265
app/src/main/java/ru/ulstu/is/pmu/ui/pet/list/PetList.kt
View File

@ -1,265 +0,0 @@
package ru.ulstu.`is`.pmu.ui.pet.list
import android.content.res.Configuration
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.spring
import androidx.compose.animation.fadeOut
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
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.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material.pullrefresh.PullRefreshIndicator
import androidx.compose.material.pullrefresh.pullRefresh
import androidx.compose.material.pullrefresh.rememberPullRefreshState
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
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.LaunchedEffect
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.Alignment
import androidx.compose.ui.Alignment.Companion.CenterHorizontally
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
import androidx.paging.PagingData
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.collectAsLazyPagingItems
import androidx.paging.compose.itemContentType
import androidx.paging.compose.itemKey
import kotlinx.coroutines.delay
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.launch
import ru.ulstu.`is`.pmu.common.AppViewModelProvider
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
import ru.ulstu.`is`.pmu.ui.navigation.Screen
@Composable
fun PetList(
navController: NavController,
viewModel: PetListViewModel = viewModel(factory = AppViewModelProvider.Factory)
) {
val petListUiState = viewModel.petListUiState.collectAsLazyPagingItems()
Scaffold(
topBar = {},
floatingActionButton = {
FloatingActionButton(
onClick = {
val route = Screen.PetEdit.route.replace("{id}", 0.toString())
navController.navigate(route)
},
) {
Icon(Icons.Filled.Add, "Добавить")
}
}
) { innerPadding ->
PetList(
modifier = Modifier
.padding(innerPadding)
.fillMaxSize(),
petList = petListUiState,
onClick = { uid: Int ->
val route = Screen.PetEdit.route.replace("{id}", uid.toString())
navController.navigate(route)
},
onSwipe = { pet: Pet ->
viewModel.deletePet(pet)
}
)
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun SwipeToDelete(
dismissState: DismissState,
pet: Pet,
onClick: (uid: Int) -> Unit
) {
SwipeToDismiss(
state = dismissState,
directions = setOf(
DismissDirection.EndToStart
),
background = {
val backgroundColor by animateColorAsState(
when (dismissState.targetValue) {
DismissValue.DismissedToStart -> Color.Red.copy(alpha = 0.8f)
else -> Color.White
}, label = ""
)
val iconScale by animateFloatAsState(
targetValue = if (dismissState.targetValue == DismissValue.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 = {
PetListItem(pet = pet,
modifier = Modifier
.padding(vertical = 7.dp)
.clickable { onClick(pet.uid) })
}
)
}
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
@Composable
private fun PetList(
modifier: Modifier = Modifier,
petList: LazyPagingItems<Pet>,
onClick: (uid: Int) -> Unit,
onSwipe: (pet: Pet) -> Unit
) {
val refreshScope = rememberCoroutineScope()
var refreshing by remember { mutableStateOf(false) }
fun refresh() = refreshScope.launch {
refreshing = true
petList.refresh()
refreshing = false
}
val state = rememberPullRefreshState(refreshing, ::refresh)
Box(
modifier = modifier.pullRefresh(state)
) {
Column(
modifier = modifier
) {
LazyColumn(
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
items(
count = petList.itemCount,
key = petList.itemKey(),
contentType = petList.itemContentType()
) { index ->
val pet = petList[index]
pet?.let {
var show by remember { mutableStateOf(true) }
val dismissState = rememberDismissState(
confirmValueChange = {
if (it == DismissValue.DismissedToStart ||
it == DismissValue.DismissedToEnd
) {
show = false
true
} else false
}, positionalThreshold = { 200.dp.toPx() }
)
AnimatedVisibility(
show, exit = fadeOut(spring())
) {
SwipeToDelete(
dismissState = dismissState,
pet = pet,
onClick = onClick
)
}
LaunchedEffect(show) {
if (!show) {
delay(800)
onSwipe(pet)
}
}
}
}
}
PullRefreshIndicator(
refreshing, state,
Modifier
.align(CenterHorizontally)
.zIndex(100f)
)
}
}
}
@Composable
private fun PetListItem(
pet: Pet,
modifier: Modifier = Modifier
) {
Column(
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.fillMaxSize()
) {
Card(
modifier = modifier
.padding(8.dp)
.width(100.dp)
.height(150.dp), // Устанавливаем ширину и высоту карточки
elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
) {
Image(
painter = painterResource(id = pet.imageResourceId),
contentDescription = null,
modifier = Modifier
.size(100.dp)
.padding(8.dp)
)
Text(
text = String.format("%s%n%s", pet.name, pet.birthday),
textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth()
)
}
}
}

30
app/src/main/java/ru/ulstu/is/pmu/ui/pet/list/PetListViewModel.kt
View File

@ -1,30 +0,0 @@
package ru.ulstu.`is`.pmu.ui.pet.list
import androidx.paging.PagingData
import kotlinx.coroutines.flow.Flow
import ru.ulstu.`is`.pmu.common.PetRepository
import ru.ulstu.`is`.pmu.common.MyViewModel
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
class PetListViewModel(
private val petRepository: PetRepository
) : MyViewModel() {
var petListUiState: Flow<PagingData<Pet>> = petRepository.getAllPets()
fun deletePet(pet: Pet) {
runInScope(
actionSuccess = {
petRepository.deletePet(pet)
}
)
}
fun getByUser(id: Int) {
runInScope(
actionSuccess = {
petListUiState = petRepository.getByUser(id)
}
)
}
}

241
app/src/main/java/ru/ulstu/is/pmu/ui/pet/list/PetUserList.kt
View File

@ -1,241 +0,0 @@
package ru.ulstu.`is`.pmu.ui.pet.list
import android.content.res.Configuration
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.spring
import androidx.compose.animation.fadeOut
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
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.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.size
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumn
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material.pullrefresh.PullRefreshIndicator
import androidx.compose.material.pullrefresh.pullRefresh
import androidx.compose.material.pullrefresh.rememberPullRefreshState
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
import androidx.compose.material3.ExperimentalMaterial3Api
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.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.Alignment
import androidx.compose.ui.Alignment.Companion.CenterHorizontally
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
import androidx.paging.PagingData
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.collectAsLazyPagingItems
import androidx.paging.compose.itemContentType
import androidx.paging.compose.itemKey
import kotlinx.coroutines.flow.MutableStateFlow
import kotlinx.coroutines.launch
import ru.ulstu.`is`.pmu.common.AppViewModelProvider
import ru.ulstu.`is`.pmu.database.entyties.model.Pet
import ru.ulstu.`is`.pmu.ui.navigation.Screen
@Composable
fun PetUserList(
navController: NavController,
idUser: Int,
viewModel: PetListViewModel = viewModel(factory = AppViewModelProvider.Factory)
) {
viewModel.getByUser(idUser)
val petListUiState = viewModel.petListUiState.collectAsLazyPagingItems()
Scaffold(
topBar = {}
) { innerPadding ->
PetUserList(
modifier = Modifier
.padding(innerPadding)
.fillMaxSize(),
petList = petListUiState,
onClick = { uid: Int ->
val route = Screen.PetEdit.route.replace("{id}", uid.toString())
navController.navigate(route)
}
)
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun SwipeToDelete(
dismissState: DismissState,
pet: Pet,
onClick: (uid: Int) -> Unit
) {
SwipeToDismiss(
state = dismissState,
directions = setOf(
DismissDirection.EndToStart
),
background = {
val backgroundColor by animateColorAsState(
when (dismissState.targetValue) {
DismissValue.DismissedToStart -> Color.Red.copy(alpha = 0.8f)
else -> Color.White
}, label = ""
)
val iconScale by animateFloatAsState(
targetValue = if (dismissState.targetValue == DismissValue.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 = {
PetUserListItem(pet = pet,
modifier = Modifier
.padding(vertical = 7.dp)
.clickable { onClick(pet.uid) })
}
)
}
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
@Composable
private fun PetUserList(
modifier: Modifier = Modifier,
petList: LazyPagingItems<Pet>,
onClick: (uid: Int) -> Unit,
) {
val refreshScope = rememberCoroutineScope()
var refreshing by remember { mutableStateOf(false) }
fun refresh() = refreshScope.launch {
refreshing = true
petList.refresh()
refreshing = false
}
val state = rememberPullRefreshState(refreshing, ::refresh)
Box(
modifier = modifier.pullRefresh(state)
) {
Column(
modifier = modifier
) {
LazyColumn(
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
items(
count = petList.itemCount,
key = petList.itemKey(),
contentType = petList.itemContentType()
) { index ->
val pet = petList[index]
pet?.let {
var show by remember { mutableStateOf(true) }
val dismissState = rememberDismissState(
confirmValueChange = {
if (it == DismissValue.DismissedToStart ||
it == DismissValue.DismissedToEnd
) {
show = false
true
} else false
}, positionalThreshold = { 200.dp.toPx() }
)
AnimatedVisibility(
show, exit = fadeOut(spring())
) {
SwipeToDelete(
dismissState = dismissState,
pet = pet,
onClick = onClick
)
}
}
}
}
PullRefreshIndicator(
refreshing, state,
Modifier
.align(CenterHorizontally)
.zIndex(100f)
)
}
}
}
@Composable
private fun PetUserListItem(
pet: Pet,
modifier: Modifier = Modifier
) {
Column(
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally,
modifier = Modifier.fillMaxSize()
) {
Card(
modifier = modifier
.padding(8.dp)
.width(100.dp)
.height(150.dp), // Устанавливаем ширину и высоту карточки
elevation = CardDefaults.cardElevation(defaultElevation = 2.dp)
) {
Image(
painter = painterResource(id = pet.imageResourceId),
contentDescription = null,
modifier = Modifier
.size(100.dp)
.padding(8.dp)
)
Text(
text = String.format("%s%n%s", pet.name, pet.birthday),
textAlign = TextAlign.Center,
modifier = Modifier.fillMaxWidth()
)
}
}
}

213
app/src/main/java/ru/ulstu/is/pmu/ui/pet/list/UserList.kt
View File

@ -1,213 +0,0 @@
package ru.ulstu.`is`.pmu.ui.pet.list
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.spring
import androidx.compose.animation.fadeOut
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement
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.material.ExperimentalMaterialApi
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Delete
import androidx.compose.material.pullrefresh.PullRefreshIndicator
import androidx.compose.material.pullrefresh.pullRefresh
import androidx.compose.material.pullrefresh.rememberPullRefreshState
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
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.Icon
import androidx.compose.material3.Scaffold
import androidx.compose.material3.SwipeToDismiss
import androidx.compose.material3.Text
import androidx.compose.material3.rememberDismissState
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.Alignment
import androidx.compose.ui.Alignment.Companion.CenterHorizontally
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.unit.dp
import androidx.compose.ui.zIndex
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
import androidx.paging.compose.LazyPagingItems
import androidx.paging.compose.collectAsLazyPagingItems
import androidx.paging.compose.itemContentType
import androidx.paging.compose.itemKey
import kotlinx.coroutines.launch
import ru.ulstu.`is`.pmu.common.AppViewModelProvider
import ru.ulstu.`is`.pmu.database.entyties.model.User
import ru.ulstu.`is`.pmu.ui.navigation.Screen
@Composable
fun UserList(
navController: NavController,
viewModel: UserListViewModel = viewModel(factory = AppViewModelProvider.Factory)
) {
val petListUiState = viewModel.userListUiState.collectAsLazyPagingItems()
Scaffold(
topBar = {}
) { innerPadding ->
UserList(
modifier = Modifier
.padding(innerPadding)
.fillMaxSize(),
userList = petListUiState,
onClick = { uid: Int ->
val route = Screen.PetUserList.route.replace("{id}", uid.toString())
navController.navigate(route)
}
)
}
}
@OptIn(ExperimentalMaterial3Api::class)
@Composable
private fun SwipeToDelete(
dismissState: DismissState,
user: User,
onClick: (uid: Int) -> Unit
) {
SwipeToDismiss(
state = dismissState,
directions = setOf(
DismissDirection.EndToStart
),
background = {
val backgroundColor by animateColorAsState(
when (dismissState.targetValue) {
DismissValue.DismissedToStart -> Color.Red.copy(alpha = 0.8f)
else -> Color.White
}, label = ""
)
val iconScale by animateFloatAsState(
targetValue = if (dismissState.targetValue == DismissValue.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 = {
UserListItem(user = user,
modifier = Modifier
.padding(vertical = 7.dp)
.clickable { onClick(user.uid) })
}
)
}
@OptIn(ExperimentalMaterial3Api::class, ExperimentalMaterialApi::class)
@Composable
private fun UserList(
modifier: Modifier = Modifier,
userList: LazyPagingItems<User>,
onClick: (uid: Int) -> Unit,
) {
val refreshScope = rememberCoroutineScope()
var refreshing by remember { mutableStateOf(false) }
fun refresh() = refreshScope.launch {
refreshing = true
userList.refresh()
refreshing = false
}
val state = rememberPullRefreshState(refreshing, ::refresh)
Box(
modifier = modifier.pullRefresh(state)
) {
Column(
modifier = modifier
) {
LazyColumn(
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
) {
items(
count = userList.itemCount,
key = userList.itemKey(),
contentType = userList.itemContentType()
) { index ->
val user = userList[index]
user?.let {
var show by remember { mutableStateOf(true) }
val dismissState = rememberDismissState(
confirmValueChange = {
if (it == DismissValue.DismissedToStart ||
it == DismissValue.DismissedToEnd
) {
show = false
true
} else false
}, positionalThreshold = { 200.dp.toPx() }
)
AnimatedVisibility(
show, exit = fadeOut(spring())
) {
SwipeToDelete(
dismissState = dismissState,
user = user,
onClick = onClick
)
}
}
}
}
PullRefreshIndicator(
refreshing, state,
Modifier
.align(CenterHorizontally)
.zIndex(100f)
)
}
}
}
@Composable
private fun UserListItem(
user: User,
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 %s)", user.login, user.nameFirst, user.nameLast)
)
}
}
}

16
app/src/main/java/ru/ulstu/is/pmu/ui/pet/list/UserListViewModel.kt
View File

@ -1,16 +0,0 @@
package ru.ulstu.`is`.pmu.ui.pet.list
import androidx.paging.PagingData
import kotlinx.coroutines.flow.Flow
import ru.ulstu.`is`.pmu.common.MyViewModel
import ru.ulstu.`is`.pmu.common.UserRepository
import ru.ulstu.`is`.pmu.database.entyties.model.User
class UserListViewModel(
private val userRepository: UserRepository
) : MyViewModel() {
var userListUiState: Flow<PagingData<User>> = userRepository.getAllUsers()
}

197
app/src/main/java/ru/ulstu/is/pmu/ui/pet/report/ReportPage.kt
View File

@ -1,197 +0,0 @@
package ru.ulstu.`is`.pmu.ui.pet.report
import android.content.ContentResolver
import android.content.ContentValues
import android.content.Context
import android.content.Intent
import android.graphics.Paint
import android.graphics.pdf.PdfDocument
import android.net.Uri
import android.os.Environment
import android.provider.MediaStore
import android.widget.CalendarView
import androidx.compose.foundation.background
import androidx.compose.foundation.border
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.RowScope
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.foundation.rememberScrollState
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.verticalScroll
import androidx.compose.material3.Button
import androidx.compose.material3.ButtonDefaults
import androidx.compose.material3.ExperimentalMaterial3Api
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.unit.dp
import androidx.compose.ui.viewinterop.AndroidView
import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
import kotlinx.coroutines.withContext
import ru.ulstu.`is`.pmu.R
import ru.ulstu.`is`.pmu.api.report.ReportRemote
import ru.ulstu.`is`.pmu.common.AppViewModelProvider
import java.io.IOException
import java.io.OutputStream
import java.text.SimpleDateFormat
import java.util.Calendar
import java.util.Date
@OptIn(ExperimentalMaterial3Api::class)
@Composable
fun ReportPage (navController: NavController?, viewModel: ReportViewModel = viewModel(factory = AppViewModelProvider.Factory))
{
val context = LocalContext.current
val coroutineScope = rememberCoroutineScope()
val reportResultPageState = viewModel.reportResultPageUiState
// Здесь вы можете определить startDate и endDate
val startDate = viewModel.reportPageUiState.reportDetails.startDate
val endDate = viewModel.reportPageUiState.reportDetails.endDate
Column(
modifier = Modifier
.verticalScroll(rememberScrollState()),
verticalArrangement = Arrangement.Center,
horizontalAlignment = Alignment.CenterHorizontally
)
{
Text(
text = stringResource(id = R.string.startDate),
style = MaterialTheme.typography.headlineLarge
)
CustomCalendarView(selectedDate = startDate) { selectedDate ->
viewModel.onUpdate(viewModel.reportPageUiState.reportDetails.copy(startDate = selectedDate))
}
Text(
text = stringResource(id = R.string.endDate),
style = MaterialTheme.typography.headlineLarge
)
CustomCalendarView(selectedDate = endDate) { selectedDate ->
viewModel.onUpdate(viewModel.reportPageUiState.reportDetails.copy(endDate = selectedDate))
}
Spacer(modifier = Modifier.height(16.dp))
Button(
onClick = {coroutineScope.launch { viewModel.getReport()} },
enabled = viewModel.reportPageUiState.isEntryValid,
modifier = Modifier
.fillMaxWidth()
.padding(all = 10.dp)
.border(4.dp, MaterialTheme.colorScheme.onPrimary, shape = RoundedCornerShape(10.dp)),
shape = RoundedCornerShape(10.dp),
colors = ButtonDefaults.buttonColors(containerColor = MaterialTheme.colorScheme.primary)
) {
Text("Сформировать отчет")
}
Spacer(modifier = Modifier.height(32.dp))
Text(
text = "Результат",
style = MaterialTheme.typography.headlineLarge
)
TableScreen(reportData = reportResultPageState.resReport)
Spacer(modifier = Modifier.height(16.dp))
}
}
@Composable
fun CustomCalendarView(
selectedDate: Date,
onDateSelected: (Date) -> Unit
) {
AndroidView(
modifier = Modifier.wrapContentSize(),
factory = { context ->
CalendarView(context).apply {
// Настройка CalendarView
val calendar = Calendar.getInstance()
calendar.time = selectedDate
// Установка начальной выбранной даты
date = calendar.timeInMillis
setOnDateChangeListener { _, year, month, dayOfMonth ->
calendar.set(Calendar.YEAR, year)
calendar.set(Calendar.MONTH, month)
calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth)
val newSelectedDate = calendar.time
// Установка новой выбранной даты
date = calendar.timeInMillis
// Вызов колбэка для передачи выбранной даты в родительский компонент
onDateSelected(newSelectedDate)
}
}
}
)
}
@Composable
fun RowScope.TableCell(
text: String,
weight: Float
) {
Text(
text = text,
Modifier
.border(1.dp, Color.Black)
.weight(weight)
.padding(8.dp)
)
}
@Composable
fun TableScreen(reportData: List<ReportRemote>) {
Column(
Modifier
.padding(16.dp)) {
Row(Modifier.background(Color.White)) {
TableCell(text = "№", weight = 1f)
TableCell(text = "Id питомца", weight = 1f)
TableCell(text = "Имя", weight = 1f)
TableCell(text = "Д/р", weight = 1f)
TableCell(text = "Id хозяина", weight = 1f)
TableCell(text = "Логин", weight = 1f)
}
// Here are all the lines of your table.
reportData.forEach {
val (reportId, petid, petname, birthday, userid, login) = it
Row(Modifier.fillMaxWidth()) {
TableCell(text = reportId.toString(), weight = 1f)
TableCell(text = petid.toString(), weight = 1f)
TableCell(text = petname, weight = 1f)
TableCell(text = birthday, weight = 1f)
TableCell(text = userid.toString(), weight = 1f)
TableCell(text = login, weight = 1f)
}
}
}
}

53
app/src/main/java/ru/ulstu/is/pmu/ui/pet/report/ReportViewModel.kt
View File

@ -1,53 +0,0 @@
package ru.ulstu.`is`.pmu.ui.pet.report
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.setValue
import androidx.lifecycle.ViewModel
import ru.ulstu.`is`.pmu.api.pet.RestPetRepository
import ru.ulstu.`is`.pmu.api.report.ReportRemote
import java.text.SimpleDateFormat
import java.util.Calendar
import java.util.Date
class ReportViewModel(private val restPetRepository: RestPetRepository): ViewModel() {
var reportPageUiState by mutableStateOf(ReportPageUiState())
private set
var reportResultPageUiState by mutableStateOf(ReportResultPageUiState())
private set
fun onUpdate(reportDetails: ReportDetails) {
reportPageUiState = ReportPageUiState(reportDetails = reportDetails, isEntryValid = validateInput(reportDetails))
}
private fun validateInput(uiState: ReportDetails = reportPageUiState.reportDetails): Boolean {
return with(uiState) {
startDate != Date(0) && endDate != Date(0) && startDate < endDate
}
}
suspend fun getReport() {
val startDateQueryParam = SimpleDateFormat("dd.MM.yyyy").format(reportPageUiState.reportDetails.startDate)
val endDateQueryParam = SimpleDateFormat("dd.MM.yyyy").format(reportPageUiState.reportDetails.endDate)
// Вызов репозитория с отформатированными датами
val res = restPetRepository.getReport(startDateQueryParam, endDateQueryParam)
reportResultPageUiState = ReportResultPageUiState(res)
}
}
data class ReportDetails(
val startDate: Date = Calendar.getInstance().time,
val endDate: Date = Calendar.getInstance().time
)
data class ReportPageUiState(
val reportDetails: ReportDetails = ReportDetails(),
val isEntryValid: Boolean = false
)
data class ReportResultPageUiState(
var resReport: List<ReportRemote> = emptyList()
)

BIN
app/src/main/res/drawable/avatar.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.4 KiB

170
app/src/main/res/drawable/ic_launcher_background.xml
View File

@ -1,170 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path
android:fillColor="#3DDC84"
android:pathData="M0,0h108v108h-108z" />
<path
android:fillColor="#00000000"
android:pathData="M9,0L9,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,0L19,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,0L29,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,0L39,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,0L49,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,0L59,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,0L69,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,0L79,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M89,0L89,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M99,0L99,108"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,9L108,9"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,19L108,19"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,29L108,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,39L108,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,49L108,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,59L108,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,69L108,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,79L108,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,89L108,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M0,99L108,99"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,29L89,29"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,39L89,39"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,49L89,49"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,59L89,59"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,69L89,69"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M19,79L89,79"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M29,19L29,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M39,19L39,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M49,19L49,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M59,19L59,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M69,19L69,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
<path
android:fillColor="#00000000"
android:pathData="M79,19L79,89"
android:strokeWidth="0.8"
android:strokeColor="#33FFFFFF" />
</vector>

30
app/src/main/res/drawable/ic_launcher_foreground.xml
View File

@ -1,30 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportWidth="108"
android:viewportHeight="108">
<path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
<aapt:attr name="android:fillColor">
<gradient
android:endX="85.84757"
android:endY="92.4963"
android:startX="42.9492"
android:startY="49.59793"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
android:strokeWidth="1"
android:strokeColor="#00000000" />
</vector>

BIN
app/src/main/res/drawable/pet1.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 33 KiB

BIN
app/src/main/res/drawable/pet2.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 40 KiB

BIN
app/src/main/res/drawable/pet3.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 46 KiB

BIN
app/src/main/res/drawable/pet4.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 45 KiB

BIN
app/src/main/res/drawable/pet5.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 46 KiB

BIN
app/src/main/res/drawable/pet6.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 41 KiB

BIN
app/src/main/res/drawable/pet7.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 31 KiB

BIN
app/src/main/res/drawable/pet8.jpg
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 41 KiB

6
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

6
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
</adaptive-icon>

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.4 KiB

BIN
app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-mdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 982 B

BIN
app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.7 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 1.9 KiB

BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.8 KiB

BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.8 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 3.8 KiB

BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 7.6 KiB

10
app/src/main/res/values/colors.xml
View File

@ -1,10 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="purple_200">#FFBB86FC</color>
<color name="purple_500">#FF6200EE</color>
<color name="purple_700">#FF3700B3</color>
<color name="teal_200">#FF03DAC5</color>
<color name="teal_700">#FF018786</color>
<color name="black">#FF000000</color>
<color name="white">#FFFFFFFF</color>
</resources>

16
app/src/main/res/values/strings.xml
View File

@ -1,16 +0,0 @@
<resources>
<string name="app_name">pmu-demo</string>
<string name="name">Имя</string>
<string name="note">Заметка</string>
<string name="list_pet">Питомцы</string>
<string name="list_user">Пользователи</string>
<string name="back">Назад</string>
<string name="loading">Загрузка…</string>
<string name="report">Отчёт</string>
<string name="pet_view">Питомец</string>
<string name="pet_empty_description">Записи о питомцых отсутствуют</string>
<string name="user_is_not_selested">Хозяин не указан</string>
<string name="save">Сохранить</string>
<string name="startDate">Дата начала</string>
<string name="endDate">Дата конца</string>
</resources>

5
app/src/main/res/values/themes.xml
View File

@ -1,5 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.Pmudemo" parent="android:Theme.Material.Light.NoActionBar" />
</resources>

13
app/src/main/res/xml/backup_rules.xml
View File

@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?><!--
Sample backup rules file; uncomment and customize as necessary.
See https://developer.android.com/guide/topics/data/autobackup
for details.
Note: This file is ignored for devices older that API 31
See https://developer.android.com/about/versions/12/backup-restore
-->
<full-backup-content>
<!--
<include domain="sharedpref" path="."/>
<exclude domain="sharedpref" path="device.xml"/>
-->
</full-backup-content>

19
app/src/main/res/xml/data_extraction_rules.xml
View File

@ -1,19 +0,0 @@
<?xml version="1.0" encoding="utf-8"?><!--
Sample data extraction rules file; uncomment and customize as necessary.
See https://developer.android.com/about/versions/12/backup-restore#xml-changes
for details.
-->
<data-extraction-rules>
<cloud-backup>
<!-- TODO: Use <include> and <exclude> to control what is backed up.
<include .../>
<exclude .../>
-->
</cloud-backup>
<!--
<device-transfer>
<include .../>
<exclude .../>
</device-transfer>
-->
</data-extraction-rules>

6
app/src/main/res/xml/network_security_config.xml
View File

@ -1,6 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<network-security-config>
<domain-config cleartextTrafficPermitted="true">
<domain includeSubdomains="true">10.0.2.2</domain>
</domain-config>
</network-security-config>

16
app/src/test/java/ru/ulstu/is/pmu/ExampleUnitTest.kt
View File

@ -1,16 +0,0 @@
package ru.ulstu.`is`.pmu
import org.junit.Assert.assertEquals
import org.junit.Test
/**
* Example local unit test, which will execute on the development machine (host).
*
* See [testing documentation](http://d.android.com/tools/testing).
*/
class ExampleUnitTest {
@Test
fun addition_isCorrect() {
assertEquals(4, 2 + 2)
}
}

7
build.gradle.kts
View File

@ -1,7 +0,0 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
plugins {
id("com.android.application") version "8.1.4" apply false
id("org.jetbrains.kotlin.android") version "1.8.20" apply false
id("com.google.devtools.ksp") version "1.8.20-1.0.11" apply false
id("org.jetbrains.kotlin.plugin.serialization") version "1.8.20" apply false
}

23
gradle.properties
View File

@ -1,23 +0,0 @@
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
# any settings specified in this file.
# For more details on how to configure your build environment visit
# http://www.gradle.org/docs/current/userguide/build_environment.html
# Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings.
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
# When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true
# AndroidX package structure to make it clearer which packages are bundled with the
# Android operating system, and which are packaged with your app's APK
# https://developer.android.com/topic/libraries/support-library/androidx-rn
android.useAndroidX=true
# Kotlin code style for this project: "official" or "obsolete":
kotlin.code.style=official
# Enables namespacing of each library's R class so that its R class includes only the
# resources declared in the library itself and none from the library's dependencies,
# thereby reducing the size of the R class for that library
android.nonTransitiveRClass=true

BIN
gradle/wrapper/gradle-wrapper.jar vendored
View File

Binary file not shown.

6
gradle/wrapper/gradle-wrapper.properties vendored
View File

@ -1,6 +0,0 @@
#Mon Sep 25 15:50:37 SAMT 2023
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists

185
gradlew vendored
View File

@ -1,185 +0,0 @@
#!/usr/bin/env sh
#
# Copyright 2015 the original author or 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.
#
##############################################################################
##
## Gradle start up script for UN*X
##
##############################################################################
# Attempt to set APP_HOME
# Resolve links: $0 may be a link
PRG="$0"
# Need this for relative symlinks.
while [ -h "$PRG" ] ; do
ls=`ls -ld "$PRG"`
link=`expr "$ls" : '.*-> \(.*\)$'`
if expr "$link" : '/.*' > /dev/null; then
PRG="$link"
else
PRG=`dirname "$PRG"`"/$link"
fi
done
SAVED="`pwd`"
cd "`dirname \"$PRG\"`/" >/dev/null
APP_HOME="`pwd -P`"
cd "$SAVED" >/dev/null
APP_NAME="Gradle"
APP_BASE_NAME=`basename "$0"`
# 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"'
# Use the maximum available, or set MAX_FD != -1 to use that value.
MAX_FD="maximum"
warn () {
echo "$*"
}
die () {
echo
echo "$*"
echo
exit 1
}
# 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
;;
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"
which java >/dev/null 2>&1 || 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
# Increase the maximum file descriptors if we can.
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
MAX_FD_LIMIT=`ulimit -H -n`
if [ $? -eq 0 ] ; then
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
MAX_FD="$MAX_FD_LIMIT"
fi
ulimit -n $MAX_FD
if [ $? -ne 0 ] ; then
warn "Could not set maximum file descriptor limit: $MAX_FD"
fi
else
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
fi
fi
# For Darwin, add options to specify how the application appears in the dock
if $darwin; then
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
fi
# For Cygwin or MSYS, switch paths to Windows format before running java
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
JAVACMD=`cygpath --unix "$JAVACMD"`
# We build the pattern for arguments to be converted via cygpath
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
SEP=""
for dir in $ROOTDIRSRAW ; do
ROOTDIRS="$ROOTDIRS$SEP$dir"
SEP="|"
done
OURCYGPATTERN="(^($ROOTDIRS))"
# Add a user-defined pattern to the cygpath arguments
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
fi
# Now convert the arguments - kludge to limit ourselves to /bin/sh
i=0
for arg in "$@" ; do
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
else
eval `echo args$i`="\"$arg\""
fi
i=`expr $i + 1`
done
case $i in
0) set -- ;;
1) set -- "$args0" ;;
2) set -- "$args0" "$args1" ;;
3) set -- "$args0" "$args1" "$args2" ;;
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
esac
fi
# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=`save "$@"`
# Collect all arguments for the java command, following the shell quoting and substitution rules
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
exec "$JAVACMD" "$@"

89
gradlew.bat vendored
View File

@ -1,89 +0,0 @@
@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
@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=.
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%" == "0" goto execute
echo.
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
goto fail
:findJavaFromJavaHome
set JAVA_HOME=%JAVA_HOME:"=%
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
if exist "%JAVA_EXE%" goto execute
echo.
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
echo.
echo Please set the JAVA_HOME variable in your environment to match the
echo location of your Java installation.
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%"=="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!
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
exit /b 1
:mainEnd
if "%OS%"=="Windows_NT" endlocal
:omega

1
links
View File

@ -1 +0,0 @@
https://developer.android.com/codelabs/basic-android-kotlin-compose-persisting-data-room#0

BIN
report/ReportLab1.docx
View File

Binary file not shown.

BIN
report/ReportLab2.docx
View File

Binary file not shown.

BIN
report/ReportLab3.docx
View File

Binary file not shown.

BIN
report/ReportLab4.docx
View File

Binary file not shown.

BIN
report/ReportLab5.docx
View File

Binary file not shown.

BIN
report/Отчет по курсовой.doc
View File

Binary file not shown.

BIN
server.rar
View File

Binary file not shown.

42
server/.gitignore vendored
View File

@ -1,42 +0,0 @@
# See http://help.github.com/ignore-files/ for more about ignoring files.
# Compiled output
/dist
/tmp
/out-tsc
/bazel-out
# Node
/node_modules
npm-debug.log
yarn-error.log
# IDEs and editors
.idea/
.project
.classpath
.c9/
*.launch
.settings/
*.sublime-workspace
# Visual Studio Code
.vscode/*
!.vscode/settings.json
!.vscode/tasks.json
!.vscode/launch.json
!.vscode/extensions.json
.history/*
# Miscellaneous
/.angular/cache
.sass-cache/
/connect.lock
/coverage
/libpeerconnection.log
testem.log
/typings
# System files
.DS_Store
Thumbs.db

42
server/data.json
View File

@ -1,42 +0,0 @@
{
"users": [
{
"id": 1,
"login": "ivan",
"nameFirst": "Иван",
"nameLast": "Иванов"
},
{
"id": 2,
"login": "ann",
"nameFirst": "Анна",
"nameLast": "Аннова"
}
],
"pets": [
{
"id": 1,
"name": "pet1",
"note": "note",
"birthday": "10.11.2023",
"userId": 2,
"imageResourceId": 2130968592
},
{
"name": "pet2",
"note": "note",
"birthday": "24.12.2023",
"userId": 2,
"imageResourceId": 2130968593,
"id": 2
},
{
"id": 3,
"name": "pet3",
"note": "note",
"birthday": "14.12.2023",
"userId": 1,
"imageResourceId": 2130968592
}
]
}

1940
server/package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

13
server/package.json
View File

@ -1,13 +0,0 @@
{
"name": "fake-db",
"version": "1.0.0",
"scripts": {
"start": "json-server --watch data.json --middlewares ./router.js --host 0.0.0.0 -p 8079"
},
"dependencies": {
"pdfkit": "^0.14.0"
},
"devDependencies": {
"json-server": "0.17.4"
}
}

26
server/readme.md
View File

@ -1,26 +0,0 @@
Установка nodejs:
1. Заходим на сайт https://nodejs.org/en/
2. Скачиваем LTS версию
3. Устанавливаем
Переход в каталог с сервером:
```commandline
cd ./server
```
Установка зависимостей:
```commandline
npm install
```
Запуск:
```commandline
npm start
```
Примеры:
- http://localhost:8079
- http://localhost:8079/students
- http://localhost:8079/students?_expand=group
Документация -- https://www.npmjs.com/package/json-server

76
server/router.js
View File

@ -1,76 +0,0 @@
const fs = require('fs');
const path = require('path');
module.exports = (req, res, next) => {
const data = JSON.parse(fs.readFileSync(path.join(__dirname, 'data.json'), 'utf8'));
if (req.url.startsWith('/search') && req.method === 'GET') {
try {
const searchText = req.query.name;
const searched = data.pets.filter(
(pet) =>
pet.name.toLowerCase().includes(searchText.toLowerCase())
);
return res.json(searched);
} catch (error) {
console.error('Error loading data:', error);
res.status(500).json({ message: 'Internal Server Error' });
}
} else if (req.url.startsWith('/report') && req.method === 'GET') {
try {
// Добавляем фильтрацию по дате рождения
const fromDate = req.query.fromDate;
const toDate = req.query.toDate;
const filteredData = filterByBirthday(data.pets, fromDate, toDate);
// Возвращаем отфильтрованные данные в формате отчета
const reportData = generateReport(filteredData);
res.json(reportData);
} catch (error) {
console.error('Error loading data:', error);
return res.status(500).json({ message: 'Internal Server Error' });
}
} else {
next();
}
};
// Функция generateReport для создания отчета с id
function generateReport(pets) {
return pets.map((pet, index) => ({
reportId: index + 1, // Уникальный id отчета (можете использовать другую логику)
petid: pet.id,
petname: pet.name,
birthday: pet.birthday,
userid: pet.userId,
login: getUserLogin(pet.userId)
}));
}
// Функция для фильтрации по дате рождения
function filterByBirthday(pets, fromDate, toDate) {
if (!fromDate && !toDate) {
return pets;
}
const filteredPets = pets.filter((pet) => {
const petBirthday = parseDate(pet.birthday);
return (!fromDate || petBirthday >= parseDate(fromDate)) &&
(!toDate || petBirthday <= parseDate(toDate));
});
return filteredPets;
}
// Функция для парсинга даты из строки в формате "dd.MM.yyyy"
function parseDate(dateString) {
const [day, month, year] = dateString.split('.').map(Number);
return new Date(year, month - 1, day);
}
// Функция для получения логина пользователя по userId
function getUserLogin(userId) {
const data = JSON.parse(fs.readFileSync(path.join(__dirname, 'data.json'), 'utf8'));
const user = data.users.find((user) => user.id === userId);
return user ? user.login : 'Unknown';
}

17
settings.gradle.kts
View File

@ -1,17 +0,0 @@
pluginManagement {
repositories {
google()
mavenCentral()
gradlePluginPortal()
}
}
dependencyResolutionManagement {
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
repositories {
google()
mavenCentral()
}
}
rootProject.name = "pmu-demo"
include(":app")