Compare commits
No commits in common. "lab5" and "main" have entirely different histories.
48
.gitignore
vendored
48
.gitignore
vendored
@ -1,15 +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
|
||||
|
||||
# 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
|
||||
|
||||
|
||||
3
.idea/.gitignore
vendored
3
.idea/.gitignore
vendored
@ -1,3 +0,0 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
@ -1 +0,0 @@
|
||||
My Application
|
||||
@ -1,123 +0,0 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<code_scheme name="Project" version="173">
|
||||
<JetCodeStyleSettings>
|
||||
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||
</JetCodeStyleSettings>
|
||||
<codeStyleSettings language="XML">
|
||||
<option name="FORCE_REARRANGE_MODE" value="1" />
|
||||
<indentOptions>
|
||||
<option name="CONTINUATION_INDENT_SIZE" value="4" />
|
||||
</indentOptions>
|
||||
<arrangement>
|
||||
<rules>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:android</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>xmlns:.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:id</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*:name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>name</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>style</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>^$</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>ANDROID_ATTRIBUTE_ORDER</order>
|
||||
</rule>
|
||||
</section>
|
||||
<section>
|
||||
<rule>
|
||||
<match>
|
||||
<AND>
|
||||
<NAME>.*</NAME>
|
||||
<XML_ATTRIBUTE />
|
||||
<XML_NAMESPACE>.*</XML_NAMESPACE>
|
||||
</AND>
|
||||
</match>
|
||||
<order>BY_NAME</order>
|
||||
</rule>
|
||||
</section>
|
||||
</rules>
|
||||
</arrangement>
|
||||
</codeStyleSettings>
|
||||
<codeStyleSettings language="kotlin">
|
||||
<option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
|
||||
</codeStyleSettings>
|
||||
</code_scheme>
|
||||
</component>
|
||||
@ -1,5 +0,0 @@
|
||||
<component name="ProjectCodeStyleConfiguration">
|
||||
<state>
|
||||
<option name="USE_PER_PROJECT_SETTINGS" value="true" />
|
||||
</state>
|
||||
</component>
|
||||
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<bytecodeTargetLevel target="17" />
|
||||
</component>
|
||||
</project>
|
||||
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GradleMigrationSettings" migrationVersion="1" />
|
||||
<component name="GradleSettings">
|
||||
<option name="linkedExternalProjectsSettings">
|
||||
<GradleProjectSettings>
|
||||
<option name="testRunner" value="GRADLE" />
|
||||
<option name="distributionType" value="DEFAULT_WRAPPED" />
|
||||
<option name="externalProjectPath" value="$PROJECT_DIR$" />
|
||||
<option name="gradleJvm" value="jbr-17" />
|
||||
<option name="modules">
|
||||
<set>
|
||||
<option value="$PROJECT_DIR$" />
|
||||
<option value="$PROJECT_DIR$/app" />
|
||||
</set>
|
||||
</option>
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
@ -1,42 +0,0 @@
|
||||
<component name="InspectionProjectProfileManager">
|
||||
<profile version="1.0">
|
||||
<option name="myName" value="Project Default" />
|
||||
<inspection_tool class="PreviewAnnotationInFunctionWithParameters" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
<option name="previewFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
<option name="previewFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
<option name="previewFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
<option name="previewFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
<option name="previewFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
<option name="previewFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
<option name="previewFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
<option name="previewFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
<option name="previewFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="UnusedEquals" enabled="false" level="WARNING" enabled_by_default="false" />
|
||||
</profile>
|
||||
</component>
|
||||
@ -1,6 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="KotlinJpsPluginSettings">
|
||||
<option name="version" value="1.8.20" />
|
||||
</component>
|
||||
</project>
|
||||
@ -1,9 +0,0 @@
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/build/classes" />
|
||||
</component>
|
||||
<component name="ProjectType">
|
||||
<option name="id" value="Android" />
|
||||
</component>
|
||||
</project>
|
||||
@ -1,13 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="GitSharedSettings">
|
||||
<option name="FORCE_PUSH_PROHIBITED_PATTERNS">
|
||||
<list>
|
||||
<option value="main" />
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
8931
Server/data.json
8931
Server/data.json
File diff suppressed because it is too large
Load Diff
1335
Server/package-lock.json
generated
1335
Server/package-lock.json
generated
File diff suppressed because it is too large
Load Diff
@ -1,12 +0,0 @@
|
||||
{
|
||||
"name": "fake-db",
|
||||
"version": "1.0.0",
|
||||
"scripts": {
|
||||
"start": "json-server --watch data.json --host 0.0.0.0 -p 8079"
|
||||
},
|
||||
"dependencies": {
|
||||
},
|
||||
"devDependencies": {
|
||||
"json-server": "0.17.4"
|
||||
}
|
||||
}
|
||||
1
app/.gitignore
vendored
1
app/.gitignore
vendored
@ -1 +0,0 @@
|
||||
/build
|
||||
@ -1,94 +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 = "com.example.myapplication"
|
||||
compileSdk = 33
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "com.example.myapplication"
|
||||
minSdk = 24
|
||||
targetSdk = 33
|
||||
versionCode = 1
|
||||
versionName = "1.0"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables {
|
||||
useSupportLibrary = true
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
release {
|
||||
isMinifyEnabled = false
|
||||
proguardFiles(getDefaultProguardFile("proguard-android-optimize.txt"), "proguard-rules.pro")
|
||||
}
|
||||
}
|
||||
compileOptions {
|
||||
sourceCompatibility = JavaVersion.VERSION_17
|
||||
targetCompatibility = JavaVersion.VERSION_17
|
||||
}
|
||||
kotlinOptions {
|
||||
jvmTarget = "17"
|
||||
}
|
||||
buildFeatures {
|
||||
compose = true
|
||||
}
|
||||
composeOptions {
|
||||
kotlinCompilerExtensionVersion = "1.4.5"
|
||||
}
|
||||
packaging {
|
||||
resources {
|
||||
excludes += "/META-INF/{AL2.0,LGPL2.1}"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
dependencies {
|
||||
|
||||
implementation("androidx.core:core-ktx:1.9.0")
|
||||
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.1")
|
||||
implementation("androidx.activity:activity-compose:1.7.0")
|
||||
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")
|
||||
|
||||
|
||||
implementation("dev.materii.pullrefresh:pullrefresh:1.0.0")
|
||||
val room_version = "2.5.2"
|
||||
implementation("androidx.room:room-runtime:$room_version")
|
||||
annotationProcessor("androidx.room:room-compiler:$room_version")
|
||||
ksp("androidx.room:room-compiler:$room_version")
|
||||
implementation("androidx.room:room-ktx:$room_version")
|
||||
implementation("androidx.room:room-paging:$room_version")
|
||||
|
||||
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")
|
||||
|
||||
// Paging
|
||||
val paging_version = "3.2.0-rc01"
|
||||
implementation("androidx.paging:paging-runtime:$paging_version")
|
||||
implementation("androidx.paging:paging-compose:$paging_version")
|
||||
|
||||
// retrofit
|
||||
val retrofitVersion = "2.9.0"
|
||||
implementation("com.squareup.retrofit2:retrofit:$retrofitVersion")
|
||||
implementation("com.squareup.okhttp3:logging-interceptor:4.11.0")
|
||||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.5.1")
|
||||
implementation("com.jakewharton.retrofit:retrofit2-kotlinx-serialization-converter:1.0.0")
|
||||
|
||||
// LiveData | +
|
||||
implementation("androidx.compose.runtime:runtime-livedata:1.5.4")
|
||||
}
|
||||
21
app/proguard-rules.pro
vendored
21
app/proguard-rules.pro
vendored
@ -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
|
||||
@ -1,24 +0,0 @@
|
||||
package com.example.myapplication
|
||||
|
||||
import androidx.test.platform.app.InstrumentationRegistry
|
||||
import androidx.test.ext.junit.runners.AndroidJUnit4
|
||||
|
||||
import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
|
||||
import org.junit.Assert.*
|
||||
|
||||
/**
|
||||
* 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("com.example.myapplication", appContext.packageName)
|
||||
}
|
||||
}
|
||||
@ -1,34 +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=".MyApplication"
|
||||
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.MyApplication"
|
||||
tools:targetApi="31"
|
||||
android:networkSecurityConfig="@xml/network_security_config"
|
||||
android:vmSafeMode="true">
|
||||
<activity
|
||||
android:screenOrientation="portrait"
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/Theme.MyApplication">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
</intent-filter>
|
||||
</activity>
|
||||
</application>
|
||||
|
||||
</manifest>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.0 KiB |
@ -1,50 +0,0 @@
|
||||
package com.example.myapplication
|
||||
|
||||
import android.content.Context
|
||||
import android.content.res.Configuration
|
||||
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.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import com.example.myapplication.composeui.navigation.MainNavbar
|
||||
import com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
MainActivity.appContext = applicationContext
|
||||
setContent {
|
||||
MyApplicationTheme {
|
||||
Surface(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
MainNavbar()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
companion object {
|
||||
|
||||
lateinit var appContext: Context
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
fun MainNavbarPreview() {
|
||||
MyApplicationTheme {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
MainNavbar()
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package com.example.myapplication
|
||||
|
||||
import android.app.Application
|
||||
import com.example.myapplication.db.database.AppContainer
|
||||
import com.example.myapplication.db.database.AppDataContainer
|
||||
|
||||
class MyApplication : Application() {
|
||||
lateinit var container: AppContainer
|
||||
|
||||
override fun onCreate() {
|
||||
super.onCreate()
|
||||
container = AppDataContainer(this)
|
||||
}
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package com.example.myapplication
|
||||
|
||||
class SingletonClass{
|
||||
var _userId = 2
|
||||
var _role = "USER"
|
||||
fun getUserId(): Int{ return _userId }
|
||||
fun setUserId(userId: Int){
|
||||
_userId = userId
|
||||
}
|
||||
fun getRole(): String{ return _role }
|
||||
fun setRole(role: String){
|
||||
_role = role
|
||||
}
|
||||
}
|
||||
@ -1,143 +0,0 @@
|
||||
package com.example.myapplication.api
|
||||
|
||||
import com.jakewharton.retrofit2.converter.kotlinx.serialization.asConverterFactory
|
||||
import com.example.myapplication.api.model.AuthorRemote
|
||||
import com.example.myapplication.api.model.BookRemote
|
||||
import com.example.myapplication.api.model.UserRemote
|
||||
import kotlinx.serialization.json.Json
|
||||
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
|
||||
|
||||
interface ServerService{
|
||||
@GET("books")
|
||||
suspend fun getBooks(): List<BookRemote>
|
||||
|
||||
@GET("books/{id}")
|
||||
suspend fun getBook(
|
||||
@Path("id") id: Int,
|
||||
): BookRemote
|
||||
|
||||
@GET("books")
|
||||
suspend fun getBySearch(
|
||||
@Query("title") searchStr: String,
|
||||
): List<BookRemote>
|
||||
|
||||
@GET("books")
|
||||
suspend fun getByAuthor(
|
||||
@Query("authorId") auth: Int,
|
||||
): List<BookRemote>
|
||||
|
||||
@GET("books")
|
||||
suspend fun getByUser(
|
||||
@Query("userId") user: Int,
|
||||
): List<BookRemote>
|
||||
|
||||
@GET("books")
|
||||
suspend fun getBooks(
|
||||
@Query("_page") page: Int,
|
||||
@Query("_limit") limit: Int,
|
||||
): List<BookRemote>
|
||||
|
||||
@POST("books")
|
||||
suspend fun createBook(
|
||||
@Body book: BookRemote,
|
||||
): BookRemote
|
||||
|
||||
@PUT("books/{id}")
|
||||
suspend fun updateBook(
|
||||
@Path("id") id: Int,
|
||||
@Body book: BookRemote,
|
||||
): BookRemote
|
||||
|
||||
@DELETE("books/{id}")
|
||||
suspend fun deleteBook(
|
||||
@Path("id") id: Int,
|
||||
): BookRemote
|
||||
|
||||
@GET("authors")
|
||||
suspend fun getAuthors(): List<AuthorRemote>
|
||||
@GET("authors")
|
||||
suspend fun getAuthors(
|
||||
@Query("_page") page: Int,
|
||||
@Query("_limit") limit: Int,
|
||||
): List<AuthorRemote>
|
||||
@GET("authors/{id}")
|
||||
suspend fun getAuthor(
|
||||
@Path("id") id: Int,
|
||||
): AuthorRemote
|
||||
@POST("authors")
|
||||
suspend fun createAuthor(
|
||||
@Body author: AuthorRemote,
|
||||
): AuthorRemote
|
||||
|
||||
@PUT("authors/{id}")
|
||||
suspend fun updateAuthor(
|
||||
@Path("id") id: Int,
|
||||
@Body author: AuthorRemote,
|
||||
): AuthorRemote
|
||||
|
||||
@DELETE("authors/{id}")
|
||||
suspend fun deleteAuthor(
|
||||
@Path("id") id: Int,
|
||||
): AuthorRemote
|
||||
|
||||
@GET("users")
|
||||
suspend fun getUsers(): List<UserRemote>
|
||||
@GET("users/{id}")
|
||||
suspend fun getUser(
|
||||
@Path("id") id: Int,
|
||||
): UserRemote
|
||||
@GET("users")
|
||||
suspend fun getUserByLoginPass(
|
||||
@Query("login") login: String,
|
||||
@Query("password") password: String
|
||||
): UserRemote
|
||||
@POST("users")
|
||||
suspend fun createUser(
|
||||
@Body user: UserRemote,
|
||||
): UserRemote
|
||||
|
||||
@PUT("users/{id}")
|
||||
suspend fun updateUser(
|
||||
@Path("id") id: Int,
|
||||
@Body user: UserRemote,
|
||||
): UserRemote
|
||||
|
||||
@DELETE("users/{id}")
|
||||
suspend fun deleteUser(
|
||||
@Path("id") id: Int,
|
||||
): UserRemote
|
||||
companion object {
|
||||
private const val BASE_URL = "http://89.239.172.45:8079/"
|
||||
|
||||
@Volatile
|
||||
private var INSTANCE: ServerService? = null
|
||||
|
||||
fun getInstance(): ServerService {
|
||||
return INSTANCE ?: synchronized(this) {
|
||||
val logger = HttpLoggingInterceptor()
|
||||
logger.level = HttpLoggingInterceptor.Level.BASIC
|
||||
val client = OkHttpClient.Builder()
|
||||
.addInterceptor(logger)
|
||||
.build()
|
||||
val json = Json { ignoreUnknownKeys = true } // Создаем экземпляр Json с ignoreUnknownKeys = true
|
||||
return Retrofit.Builder()
|
||||
.baseUrl(BASE_URL)
|
||||
.client(client)
|
||||
.addConverterFactory(json.asConverterFactory("application/json".toMediaType())) // Применяем конфигурацию Json
|
||||
.build()
|
||||
.create(ServerService::class.java)
|
||||
.also { INSTANCE = it }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,38 +0,0 @@
|
||||
package com.example.myapplication.api.model
|
||||
|
||||
import com.example.myapplication.db.model.Author
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class AuthorRemote(
|
||||
val id: Int = 0,
|
||||
val name: String = "",
|
||||
){
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (this === other) return true
|
||||
if (javaClass != other?.javaClass) return false
|
||||
|
||||
other as AuthorRemote
|
||||
|
||||
if (id != other.id) return false
|
||||
if (name != other.name) return false
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
var result = id
|
||||
result = 31 * result + name.hashCode()
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
fun AuthorRemote.toAuthor(): Author = Author(
|
||||
id,
|
||||
name
|
||||
)
|
||||
|
||||
fun Author.toAuthorRemote(): AuthorRemote = AuthorRemote(
|
||||
id,
|
||||
name
|
||||
)
|
||||
@ -1,68 +0,0 @@
|
||||
package com.example.myapplication.api.model
|
||||
|
||||
import com.example.myapplication.db.database.Converters
|
||||
import com.example.myapplication.db.model.Book
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
private val __converters = Converters()
|
||||
@Serializable
|
||||
data class BookRemote(
|
||||
val id: Int = 0,
|
||||
val title: String = "",
|
||||
val description: String = "",
|
||||
val content: String = "",
|
||||
val cover: ByteArray? = null,
|
||||
val authorId: Int = 0,
|
||||
val userId: Int = 0
|
||||
){
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (this === other) return true
|
||||
if (javaClass != other?.javaClass) return false
|
||||
|
||||
other as BookRemote
|
||||
|
||||
if (id != other.id) return false
|
||||
if (title != other.title) return false
|
||||
if (description != other.description) return false
|
||||
if (content != other.content) return false
|
||||
if (cover != null) {
|
||||
if (other.cover == null) return false
|
||||
if (!cover.contentEquals(other.cover)) return false
|
||||
} else if (other.cover != null) return false
|
||||
if (authorId != other.authorId) return false
|
||||
if (userId != other.userId) return false
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
var result = id
|
||||
result = 31 * result + title.hashCode()
|
||||
result = 31 * result + description.hashCode()
|
||||
result = 31 * result + content.hashCode()
|
||||
result = 31 * result + (cover?.contentHashCode() ?: 0)
|
||||
result = 31 * result + authorId
|
||||
result = 31 * result + userId
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
fun BookRemote.toBook(): Book = Book(
|
||||
id,
|
||||
title,
|
||||
description,
|
||||
content,
|
||||
cover?.let { __converters.toBitmap(it) },
|
||||
authorId,
|
||||
userId
|
||||
)
|
||||
|
||||
fun Book.toBookRemote(): BookRemote = BookRemote(
|
||||
id,
|
||||
title,
|
||||
description,
|
||||
content,
|
||||
cover?.let { __converters.fromBitmap(it) },
|
||||
authorId,
|
||||
userId
|
||||
)
|
||||
@ -1,54 +0,0 @@
|
||||
package com.example.myapplication.api.model
|
||||
|
||||
import com.example.myapplication.db.model.User
|
||||
import kotlinx.serialization.Serializable
|
||||
|
||||
@Serializable
|
||||
data class UserRemote(
|
||||
val id: Int = 0,
|
||||
val login: String = "",
|
||||
val password: String = "",
|
||||
val email: String = "",
|
||||
val role: String = ""
|
||||
){
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (this === other) return true
|
||||
if (javaClass != other?.javaClass) return false
|
||||
|
||||
other as UserRemote
|
||||
|
||||
if (id != other.id) return false
|
||||
if (login != other.login) return false
|
||||
if (password != other.password) return false
|
||||
if (email != other.email) return false
|
||||
if (role != other.role) return false
|
||||
|
||||
return true
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
var result = id
|
||||
result = 31 * result + login.hashCode()
|
||||
result = 31 * result + password.hashCode()
|
||||
result = 31 * result + email.hashCode()
|
||||
result = 31 * result + role.hashCode()
|
||||
|
||||
return result
|
||||
}
|
||||
}
|
||||
|
||||
fun UserRemote.toUser(): User = User(
|
||||
id,
|
||||
login,
|
||||
password,
|
||||
email,
|
||||
role
|
||||
)
|
||||
|
||||
fun User.toUserRemote(): UserRemote = UserRemote(
|
||||
uid,
|
||||
login,
|
||||
password,
|
||||
email,
|
||||
role
|
||||
)
|
||||
@ -1,116 +0,0 @@
|
||||
package com.example.myapplication.api.respositories.Mediator
|
||||
|
||||
import android.util.Log
|
||||
import androidx.paging.ExperimentalPagingApi
|
||||
import androidx.paging.LoadType
|
||||
import androidx.paging.PagingState
|
||||
import androidx.paging.RemoteMediator
|
||||
import androidx.room.withTransaction
|
||||
import com.example.myapplication.api.ServerService
|
||||
import com.example.myapplication.api.model.toAuthor
|
||||
import com.example.myapplication.api.model.toBook
|
||||
import com.example.myapplication.db.database.AppDatabase
|
||||
import com.example.myapplication.db.model.Author
|
||||
import com.example.myapplication.db.model.RemoteKeyType
|
||||
import com.example.myapplication.db.model.RemoteKeys
|
||||
import com.example.myapplication.db.respository.OfflineAuthorRepository
|
||||
import com.example.myapplication.db.respository.OfflineBookRepository
|
||||
import com.example.myapplication.db.respository.OfflineRemoteKeyRepository
|
||||
import retrofit2.HttpException
|
||||
import java.io.IOException
|
||||
@OptIn(ExperimentalPagingApi::class)
|
||||
class AuthorRemoteMediator(
|
||||
private val service: ServerService,
|
||||
private val dbAuthorRepository: OfflineAuthorRepository,
|
||||
private val dbBookRepository: OfflineBookRepository,
|
||||
private val dbRemoteKeyRepository: OfflineRemoteKeyRepository,
|
||||
private val database: AppDatabase
|
||||
): RemoteMediator<Int, Author>() {
|
||||
override suspend fun initialize(): RemoteMediator.InitializeAction {
|
||||
return RemoteMediator.InitializeAction.LAUNCH_INITIAL_REFRESH
|
||||
}
|
||||
|
||||
override suspend fun load(
|
||||
loadType: LoadType,
|
||||
state: PagingState<Int, Author>
|
||||
): RemoteMediator.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 RemoteMediator.MediatorResult.Success(endOfPaginationReached = remoteKeys != null)
|
||||
}
|
||||
|
||||
LoadType.APPEND -> {
|
||||
val remoteKeys = getRemoteKeyForLastItem(state)
|
||||
remoteKeys?.nextKey
|
||||
?: return RemoteMediator.MediatorResult.Success(endOfPaginationReached = remoteKeys != null)
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
val authors = service.getAuthors(page, state.config.pageSize).map{it.toAuthor()}
|
||||
val books = service.getBooks().map { it.toBook() }
|
||||
Log.i("Authors info", authors.toString())
|
||||
Log.i("Books info", books.toString())
|
||||
val endOfPaginationReached = authors.isEmpty()
|
||||
database.withTransaction {
|
||||
if (loadType == LoadType.REFRESH) {
|
||||
dbRemoteKeyRepository.deleteRemoteKey(RemoteKeyType.AUTHOR)
|
||||
dbBookRepository.clearAll()
|
||||
dbAuthorRepository.clearAll()
|
||||
}
|
||||
val prevKey = if (page == 1) null else page - 1
|
||||
val nextKey = if (endOfPaginationReached) null else page + 1
|
||||
val keys = authors.map {
|
||||
RemoteKeys(
|
||||
entityId = it.id,
|
||||
type = RemoteKeyType.AUTHOR,
|
||||
prevKey = prevKey,
|
||||
nextKey = nextKey
|
||||
)
|
||||
}
|
||||
dbRemoteKeyRepository.createRemoteKeys(keys)
|
||||
dbAuthorRepository.insertAuthors(authors)
|
||||
|
||||
try{
|
||||
dbBookRepository.insertBooks(books)
|
||||
}catch (_: Exception){ }
|
||||
}
|
||||
return RemoteMediator.MediatorResult.Success(endOfPaginationReached = endOfPaginationReached)
|
||||
} catch (exception: IOException) {
|
||||
return RemoteMediator.MediatorResult.Error(exception)
|
||||
} catch (exception: HttpException) {
|
||||
return RemoteMediator.MediatorResult.Error(exception)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getRemoteKeyForLastItem(state: PagingState<Int, Author>): RemoteKeys? {
|
||||
return state.pages.lastOrNull { it.data.isNotEmpty() }?.data?.lastOrNull()
|
||||
?.let { author ->
|
||||
dbRemoteKeyRepository.getAllRemoteKeys(author.id, RemoteKeyType.AUTHOR)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getRemoteKeyForFirstItem(state: PagingState<Int, Author>): RemoteKeys? {
|
||||
return state.pages.firstOrNull { it.data.isNotEmpty() }?.data?.firstOrNull()
|
||||
?.let { author ->
|
||||
dbRemoteKeyRepository.getAllRemoteKeys(author.id, RemoteKeyType.AUTHOR)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getRemoteKeyClosestToCurrentPosition(
|
||||
state: PagingState<Int, Author>
|
||||
): RemoteKeys? {
|
||||
return state.anchorPosition?.let { position ->
|
||||
state.closestItemToPosition(position)?.id?.let { authorUid ->
|
||||
dbRemoteKeyRepository.getAllRemoteKeys(authorUid, RemoteKeyType.AUTHOR)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,125 +0,0 @@
|
||||
package com.example.myapplication.api.respositories.Mediator
|
||||
|
||||
import android.util.Log
|
||||
import androidx.paging.ExperimentalPagingApi
|
||||
import androidx.paging.LoadType
|
||||
import androidx.paging.PagingState
|
||||
import androidx.paging.RemoteMediator
|
||||
import androidx.room.withTransaction
|
||||
import com.example.myapplication.api.ServerService
|
||||
import com.example.myapplication.api.model.toAuthor
|
||||
import com.example.myapplication.api.model.toBook
|
||||
import com.example.myapplication.api.model.toUser
|
||||
import com.example.myapplication.api.respositories.RestAuthorRepository
|
||||
import com.example.myapplication.api.respositories.RestUserRepository
|
||||
import com.example.myapplication.db.database.AppDatabase
|
||||
import com.example.myapplication.db.model.Book
|
||||
import com.example.myapplication.db.model.RemoteKeyType
|
||||
import com.example.myapplication.db.model.RemoteKeys
|
||||
import com.example.myapplication.db.respository.OfflineAuthorRepository
|
||||
import com.example.myapplication.db.respository.OfflineBookRepository
|
||||
import com.example.myapplication.db.respository.OfflineRemoteKeyRepository
|
||||
import com.example.myapplication.db.respository.OfflineUserRepository
|
||||
import retrofit2.HttpException
|
||||
import java.io.IOException
|
||||
|
||||
@OptIn(ExperimentalPagingApi::class)
|
||||
class BookRemoteMediator(
|
||||
private val service: ServerService,
|
||||
private val dbBookRepository: OfflineBookRepository,
|
||||
private val dbAuthorRepository: OfflineAuthorRepository,
|
||||
private val dbUserRepository: OfflineUserRepository,
|
||||
private val dbRemoteKeyRepository: OfflineRemoteKeyRepository,
|
||||
private val database: AppDatabase
|
||||
) : RemoteMediator<Int, Book>() {
|
||||
override suspend fun initialize(): InitializeAction {
|
||||
return InitializeAction.LAUNCH_INITIAL_REFRESH
|
||||
}
|
||||
|
||||
override suspend fun load(
|
||||
loadType: LoadType,
|
||||
state: PagingState<Int, Book>
|
||||
): 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 books = service.getBooks(page, state.config.pageSize).map { it.toBook() }
|
||||
val authors = service.getAuthors().map { it.toAuthor() }
|
||||
val users = service.getUsers().map { it.toUser() }
|
||||
Log.i("Books info", books.toString())
|
||||
val endOfPaginationReached = books.isEmpty()
|
||||
database.withTransaction {
|
||||
if (loadType == LoadType.REFRESH) {
|
||||
dbRemoteKeyRepository.deleteRemoteKey(RemoteKeyType.BOOK)
|
||||
dbBookRepository.clearAll()
|
||||
dbAuthorRepository.clearAll()
|
||||
dbUserRepository.clearAll()
|
||||
}
|
||||
val prevKey = if (page == 1) null else page - 1
|
||||
val nextKey = if (endOfPaginationReached) null else page + 1
|
||||
val keys = books.map {
|
||||
RemoteKeys(
|
||||
entityId = it.id,
|
||||
type = RemoteKeyType.BOOK,
|
||||
prevKey = prevKey,
|
||||
nextKey = nextKey
|
||||
)
|
||||
}
|
||||
dbRemoteKeyRepository.createRemoteKeys(keys)
|
||||
try{
|
||||
dbAuthorRepository.insertAuthors(authors)
|
||||
}catch (_: Exception){ }
|
||||
try{
|
||||
dbUserRepository.insertUsers(users)
|
||||
}catch (_: Exception){ }
|
||||
dbBookRepository.insertBooks(books)
|
||||
}
|
||||
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, Book>): RemoteKeys? {
|
||||
return state.pages.lastOrNull { it.data.isNotEmpty() }?.data?.lastOrNull()
|
||||
?.let { book ->
|
||||
dbRemoteKeyRepository.getAllRemoteKeys(book.id, RemoteKeyType.BOOK)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getRemoteKeyForFirstItem(state: PagingState<Int, Book>): RemoteKeys? {
|
||||
return state.pages.firstOrNull { it.data.isNotEmpty() }?.data?.firstOrNull()
|
||||
?.let { book ->
|
||||
dbRemoteKeyRepository.getAllRemoteKeys(book.id, RemoteKeyType.BOOK)
|
||||
}
|
||||
}
|
||||
|
||||
private suspend fun getRemoteKeyClosestToCurrentPosition(
|
||||
state: PagingState<Int, Book>
|
||||
): RemoteKeys? {
|
||||
return state.anchorPosition?.let { position ->
|
||||
state.closestItemToPosition(position)?.id?.let { bookUid ->
|
||||
dbRemoteKeyRepository.getAllRemoteKeys(bookUid, RemoteKeyType.BOOK)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,75 +0,0 @@
|
||||
package com.example.myapplication.api.respositories
|
||||
|
||||
import android.util.Log
|
||||
import androidx.paging.ExperimentalPagingApi
|
||||
import androidx.paging.Pager
|
||||
import androidx.paging.PagingConfig
|
||||
import androidx.paging.PagingData
|
||||
import com.example.myapplication.api.ServerService
|
||||
import com.example.myapplication.db.database.AppDatabase
|
||||
import com.example.myapplication.db.database.AppContainer
|
||||
import com.example.myapplication.db.respository.OfflineAuthorRepository
|
||||
import com.example.myapplication.db.respository.OfflineRemoteKeyRepository
|
||||
import com.example.myapplication.db.respository.AuthorRepository
|
||||
import com.example.myapplication.api.model.toAuthor
|
||||
import com.example.myapplication.api.model.toAuthorRemote
|
||||
import com.example.myapplication.db.model.Author
|
||||
import com.example.myapplication.api.respositories.Mediator.AuthorRemoteMediator
|
||||
import com.example.myapplication.db.respository.OfflineBookRepository
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
class RestAuthorRepository(
|
||||
private val service: ServerService,
|
||||
private val dbAuthorRepository: OfflineAuthorRepository,
|
||||
private val dbBookRepository: OfflineBookRepository,
|
||||
private val dbRemoteKeyRepository: OfflineRemoteKeyRepository,
|
||||
private val database: AppDatabase
|
||||
): AuthorRepository {
|
||||
override suspend fun getAll(): List<Author> {
|
||||
return service.getAuthors().map{x -> x.toAuthor()}
|
||||
}
|
||||
|
||||
override suspend fun getAllDrop(): List<Author> {
|
||||
return service.getAuthors().map{x -> x.toAuthor()}
|
||||
}
|
||||
|
||||
override suspend fun getByUid(uid: Int): Author {
|
||||
return service.getAuthor(uid).toAuthor()
|
||||
}
|
||||
|
||||
override suspend fun insertAuthor(author: Author) {
|
||||
dbAuthorRepository.insertAuthor(service.createAuthor(author.toAuthorRemote()).toAuthor())
|
||||
}
|
||||
|
||||
override suspend fun updateAuthor(author: Author) {
|
||||
service.updateAuthor(author.id, author.toAuthorRemote())
|
||||
dbAuthorRepository.updateAuthor(author)
|
||||
}
|
||||
|
||||
override suspend fun deleteAuthor(author: Author) {
|
||||
service.deleteAuthor(author.id)
|
||||
dbAuthorRepository.deleteAuthor(author)
|
||||
}
|
||||
|
||||
override fun loadAllAuthorsPaged(): Flow<PagingData<Author>> {
|
||||
Log.d(RestAuthorRepository::class.simpleName, "Get authors")
|
||||
|
||||
val pagingSourceFactory = { dbAuthorRepository.loadAuthorsPaged() }
|
||||
|
||||
@OptIn(ExperimentalPagingApi::class)
|
||||
return Pager(
|
||||
config = PagingConfig(
|
||||
pageSize = AppContainer.LIMIT,
|
||||
enablePlaceholders = false
|
||||
),
|
||||
remoteMediator = AuthorRemoteMediator(
|
||||
service,
|
||||
dbAuthorRepository,
|
||||
dbBookRepository,
|
||||
dbRemoteKeyRepository,
|
||||
database,
|
||||
),
|
||||
pagingSourceFactory = pagingSourceFactory
|
||||
).flow
|
||||
}
|
||||
}
|
||||
@ -1,88 +0,0 @@
|
||||
package com.example.myapplication.api.respositories
|
||||
|
||||
import android.util.Log
|
||||
import androidx.paging.ExperimentalPagingApi
|
||||
import androidx.paging.Pager
|
||||
import androidx.paging.PagingConfig
|
||||
import androidx.paging.PagingData
|
||||
import com.example.myapplication.api.ServerService
|
||||
import com.example.myapplication.db.respository.OfflineBookRepository
|
||||
import com.example.myapplication.db.respository.OfflineRemoteKeyRepository
|
||||
import com.example.myapplication.db.database.AppDatabase
|
||||
import com.example.myapplication.db.respository.BookRepository
|
||||
import com.example.myapplication.api.model.toBook
|
||||
import com.example.myapplication.api.model.toBookRemote
|
||||
import com.example.myapplication.api.respositories.Mediator.BookRemoteMediator
|
||||
import com.example.myapplication.db.database.AppContainer
|
||||
import com.example.myapplication.db.model.Book
|
||||
import com.example.myapplication.db.respository.OfflineAuthorRepository
|
||||
import com.example.myapplication.db.respository.OfflineUserRepository
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
class RestBookRepository(
|
||||
private val service: ServerService,
|
||||
private val dbBookRepository: OfflineBookRepository,
|
||||
private val dbAuthorRepository: OfflineAuthorRepository,
|
||||
private val dbUserRepository: OfflineUserRepository,
|
||||
private val dbRemoteKeyRepository: OfflineRemoteKeyRepository,
|
||||
private val database: AppDatabase
|
||||
):BookRepository {
|
||||
override suspend fun getAll(): List<Book> {
|
||||
return service.getBooks().map{x -> x.toBook()}
|
||||
}
|
||||
|
||||
override suspend fun getByUid(uid: Int): Book {
|
||||
return service.getBook(uid).toBook()
|
||||
}
|
||||
|
||||
override suspend fun getBySearch(searchStr: String): List<Book> {
|
||||
return service.getBySearch(searchStr).map{x -> x.toBook()}
|
||||
}
|
||||
|
||||
override suspend fun getByAuthorId(authorId: Int): List<Book> {
|
||||
return service.getByAuthor(authorId).map{ x -> x.toBook()}
|
||||
}
|
||||
|
||||
override suspend fun getByUserId(userId: Int): List<Book> {
|
||||
return service.getByUser(userId).map{ x -> x.toBook()}
|
||||
}
|
||||
|
||||
override fun loadAllBooksPaged(): Flow<PagingData<Book>> {
|
||||
Log.d(RestBookRepository::class.simpleName, "Get books")
|
||||
|
||||
val pagingSourceFactory = { dbBookRepository.loadBooksPaged() }
|
||||
|
||||
@OptIn(ExperimentalPagingApi::class)
|
||||
return Pager(
|
||||
config = PagingConfig(
|
||||
pageSize = AppContainer.LIMIT,
|
||||
enablePlaceholders = false
|
||||
),
|
||||
remoteMediator = BookRemoteMediator(
|
||||
service,
|
||||
dbBookRepository,
|
||||
dbAuthorRepository,
|
||||
dbUserRepository,
|
||||
dbRemoteKeyRepository,
|
||||
database,
|
||||
),
|
||||
pagingSourceFactory = pagingSourceFactory
|
||||
).flow
|
||||
}
|
||||
|
||||
override suspend fun insertBook(book: Book) {
|
||||
dbBookRepository.insertBook(service.createBook(book.toBookRemote()).toBook())
|
||||
}
|
||||
|
||||
override suspend fun updateBook(book: Book) {
|
||||
service.updateBook(book.id, book.toBookRemote())
|
||||
dbBookRepository.updateBook(book)
|
||||
}
|
||||
|
||||
override suspend fun deleteBook(book: Book) {
|
||||
service.deleteBook(book.id)
|
||||
dbBookRepository.deleteBook(book)
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -1,47 +0,0 @@
|
||||
package com.example.myapplication.api.respositories
|
||||
|
||||
import com.example.myapplication.api.ServerService
|
||||
import com.example.myapplication.api.model.toUser
|
||||
import com.example.myapplication.api.model.toBook
|
||||
import com.example.myapplication.api.model.toUserRemote
|
||||
import com.example.myapplication.db.database.AppDatabase
|
||||
import com.example.myapplication.db.model.Book
|
||||
import com.example.myapplication.db.model.User
|
||||
import com.example.myapplication.db.respository.OfflineUserRepository
|
||||
import com.example.myapplication.db.respository.UserRepository
|
||||
|
||||
class RestUserRepository(
|
||||
private val service: ServerService,
|
||||
private val dbUserRepository: OfflineUserRepository,
|
||||
private val database: AppDatabase
|
||||
): UserRepository {
|
||||
override suspend fun getAll(): List<User> {
|
||||
return service.getUsers().map{x -> x.toUser()}
|
||||
}
|
||||
|
||||
override suspend fun getByUid(uid: Int): User {
|
||||
return service.getUser(uid).toUser()
|
||||
}
|
||||
|
||||
override suspend fun getUserBooks(userid: Int): List<Book> {
|
||||
return service.getByUser(userid).map{x -> x.toBook()}
|
||||
}
|
||||
|
||||
override suspend fun tryLogin(login: String, password: String): User? {
|
||||
return service.getUserByLoginPass(login, password).toUser()
|
||||
}
|
||||
|
||||
override suspend fun insert(user: User) {
|
||||
dbUserRepository.insert(service.createUser(user.toUserRemote()).toUser())
|
||||
}
|
||||
|
||||
override suspend fun update(user: User) {
|
||||
service.updateUser(user.uid, user.toUserRemote())
|
||||
dbUserRepository.update(user)
|
||||
}
|
||||
|
||||
override suspend fun delete(user: User) {
|
||||
service.deleteUser(user.uid)
|
||||
dbUserRepository.delete(user)
|
||||
}
|
||||
}
|
||||
@ -1,76 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import androidx.lifecycle.ViewModelProvider
|
||||
import androidx.lifecycle.createSavedStateHandle
|
||||
import androidx.lifecycle.viewmodel.CreationExtras
|
||||
import androidx.lifecycle.viewmodel.initializer
|
||||
import androidx.lifecycle.viewmodel.viewModelFactory
|
||||
import com.example.myapplication.MyApplication
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorDropDownViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorEditViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorListViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.BookEditViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.BookListViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.BookPageViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.SearchPageViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.UserEditViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.UserPageViewModel
|
||||
|
||||
object AppViewModelProvider {
|
||||
val Factory = viewModelFactory {
|
||||
initializer {
|
||||
UserPageViewModel(
|
||||
this.createSavedStateHandle(),
|
||||
myApplication().container.userRestRepository
|
||||
)
|
||||
}
|
||||
initializer {
|
||||
UserEditViewModel(
|
||||
this.createSavedStateHandle(),
|
||||
myApplication().container.userRestRepository
|
||||
)
|
||||
}
|
||||
initializer {
|
||||
SearchPageViewModel(
|
||||
myApplication().container.bookRestRepository,
|
||||
this.createSavedStateHandle()
|
||||
)
|
||||
}
|
||||
initializer {
|
||||
BookPageViewModel(
|
||||
myApplication().container.bookRestRepository,
|
||||
this.createSavedStateHandle()
|
||||
)
|
||||
}
|
||||
initializer {
|
||||
BookListViewModel(
|
||||
myApplication().container.bookRestRepository
|
||||
)
|
||||
}
|
||||
initializer {
|
||||
BookEditViewModel(
|
||||
this.createSavedStateHandle(),
|
||||
myApplication().container.bookRestRepository
|
||||
)
|
||||
}
|
||||
initializer {
|
||||
AuthorListViewModel(
|
||||
myApplication().container.authorRestRepository
|
||||
)
|
||||
}
|
||||
initializer {
|
||||
AuthorEditViewModel(
|
||||
this.createSavedStateHandle(),
|
||||
myApplication().container.authorRestRepository
|
||||
)
|
||||
}
|
||||
initializer {
|
||||
AuthorDropDownViewModel(
|
||||
myApplication().container.authorRestRepository
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun CreationExtras.myApplication(): MyApplication =
|
||||
(this[ViewModelProvider.AndroidViewModelFactory.APPLICATION_KEY] as MyApplication)
|
||||
@ -1,88 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.util.Log
|
||||
import android.widget.Toast
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.border
|
||||
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.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.requiredSize
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Create
|
||||
import androidx.compose.material.icons.filled.Delete
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.asImageBitmap
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.MainActivity
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorListViewModel
|
||||
import com.example.myapplication.composeui.navigation.Screen
|
||||
import com.example.myapplication.db.database.AppDatabase
|
||||
import com.example.myapplication.db.model.Author
|
||||
import kotlinx.coroutines.flow.first
|
||||
import kotlinx.coroutines.flow.firstOrNull
|
||||
import kotlinx.coroutines.launch
|
||||
import java.lang.Exception
|
||||
|
||||
@Composable
|
||||
fun AuthorCell(navController: NavController?, author: Author, viewModel: AuthorListViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val scope = rememberCoroutineScope()
|
||||
val context = LocalContext.current
|
||||
Column(modifier = Modifier
|
||||
.padding(all = 5.dp)
|
||||
.requiredSize(170.dp, 100.dp)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.border(1.dp, Color.LightGray, shape = RoundedCornerShape(10.dp))
|
||||
) {
|
||||
Text("${author.name}")
|
||||
Row{
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.padding(all = 5.dp),
|
||||
onClick = {
|
||||
val route = Screen.AuthorEdit.route.replace("{id}", author.id.toString())
|
||||
navController!!.navigate(route)
|
||||
},
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Create,
|
||||
contentDescription = "Изменить",
|
||||
tint = Color.White
|
||||
)
|
||||
}
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.padding(all = 5.dp),
|
||||
onClick = {
|
||||
scope.launch {
|
||||
viewModel.deleteAuthor(author)
|
||||
}
|
||||
},
|
||||
colors = ButtonDefaults.buttonColors(containerColor = Color.Red),
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Delete,
|
||||
contentDescription = "Удалить",
|
||||
tint = Color.White
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,90 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.graphics.Bitmap
|
||||
import androidx.compose.foundation.ScrollState
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
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
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextField
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.SingletonClass
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorsListUiState
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorsUiState
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorDetails
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorEditViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorUiState
|
||||
import com.example.myapplication.composeui.ViewModel.ImageUploader
|
||||
import com.example.myapplication.db.model.Author
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Composable
|
||||
fun AuthorEdit(navController: NavController, viewModel: AuthorEditViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
AuthorEdit(
|
||||
authorUiState = viewModel.authorUiState,
|
||||
onClick = {
|
||||
coroutineScope.launch {
|
||||
viewModel.saveAuthor()
|
||||
navController.popBackStack()
|
||||
}
|
||||
},
|
||||
onUpdate = viewModel::updateUiState,
|
||||
)
|
||||
}
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
private fun AuthorEdit(
|
||||
authorUiState: AuthorUiState,
|
||||
onClick: () -> Unit,
|
||||
onUpdate: (AuthorDetails) -> Unit,
|
||||
) {
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp)
|
||||
.verticalScroll(ScrollState(1))
|
||||
) {
|
||||
Spacer(modifier = Modifier.size(10.dp))
|
||||
OutlinedTextField(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
value = authorUiState.authorDetails.name,
|
||||
onValueChange = { onUpdate(authorUiState.authorDetails.copy(name = it)) },
|
||||
label = { Text("Имя автора") },
|
||||
singleLine = true
|
||||
)
|
||||
Button(
|
||||
onClick = onClick,
|
||||
enabled = authorUiState.isEntryValid,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
) {
|
||||
Text(text = "Сохранить")
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,112 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.border
|
||||
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.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.requiredSize
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Create
|
||||
import androidx.compose.material.icons.filled.Delete
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.asImageBitmap
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.composeui.ViewModel.BookListViewModel
|
||||
import com.example.myapplication.composeui.navigation.Screen
|
||||
import com.example.myapplication.db.model.Book
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Composable
|
||||
fun BookCell(navController: NavController?, book: Book, viewModel: BookListViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val scope = rememberCoroutineScope()
|
||||
Column(modifier = Modifier
|
||||
.padding(all = 5.dp)
|
||||
.requiredSize(170.dp, 300.dp)
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.border(1.dp, Color.LightGray, shape = RoundedCornerShape(10.dp))
|
||||
.clickable(onClick = {
|
||||
navController?.navigate(
|
||||
Screen.BookView.route.replace(
|
||||
"{id}",
|
||||
book.id.toString()
|
||||
)
|
||||
)
|
||||
})
|
||||
) {
|
||||
Button(modifier = Modifier
|
||||
.fillMaxWidth(),
|
||||
shape = RoundedCornerShape(0.dp),
|
||||
contentPadding = PaddingValues(0.dp),
|
||||
onClick = {
|
||||
navController?.navigate(
|
||||
Screen.BookView.route.replace(
|
||||
"{id}",
|
||||
book.id.toString()
|
||||
)
|
||||
)
|
||||
}) {
|
||||
Image(
|
||||
bitmap = book.cover!!.asImageBitmap(),
|
||||
contentDescription = book.title,
|
||||
contentScale = ContentScale.Crop,
|
||||
modifier = Modifier
|
||||
.requiredSize(170.dp)
|
||||
.clip(RoundedCornerShape(0.dp))
|
||||
)
|
||||
}
|
||||
Column(modifier = Modifier.padding(all=5.dp)) {
|
||||
Text("${book.title}")
|
||||
Row{
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.padding(all = 5.dp),
|
||||
onClick = {
|
||||
val route = Screen.BookEdit.route.replace("{id}", book.id.toString())
|
||||
navController!!.navigate(route)
|
||||
},
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Create,
|
||||
contentDescription = "Изменить",
|
||||
tint = Color.White
|
||||
)
|
||||
}
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.padding(all = 5.dp),
|
||||
onClick = {
|
||||
scope.launch {
|
||||
viewModel.deleteBook(book)
|
||||
}
|
||||
},
|
||||
colors = ButtonDefaults.buttonColors(containerColor = Color.Red),
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Delete,
|
||||
contentDescription = "Удалить",
|
||||
tint = Color.White
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,173 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.graphics.Bitmap
|
||||
import androidx.compose.foundation.ScrollState
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
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
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextField
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.SingletonClass
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorDropDownViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorsListUiState
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorsUiState
|
||||
import com.example.myapplication.composeui.ViewModel.BookDetails
|
||||
import com.example.myapplication.composeui.ViewModel.BookEditViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.BookUiState
|
||||
import com.example.myapplication.composeui.ViewModel.ImageUploader
|
||||
import com.example.myapplication.db.model.Author
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Composable
|
||||
fun BookEdit(navController: NavController, viewModel: BookEditViewModel = viewModel(factory = AppViewModelProvider.Factory), authorViewModel: AuthorDropDownViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
authorViewModel.setCurrentAuthor(viewModel.bookUiState.bookDetails.authorId)
|
||||
BookEdit(
|
||||
bookUiState = viewModel.bookUiState,
|
||||
authorUiState = authorViewModel.authorsUiState,
|
||||
onClick = {
|
||||
coroutineScope.launch {
|
||||
viewModel.saveBook()
|
||||
navController.popBackStack()
|
||||
}
|
||||
},
|
||||
authorsListUiState = authorViewModel.authorsListUiState,
|
||||
onUpdate = viewModel::updateUiState,
|
||||
onAuthorUpdate = authorViewModel::updateUiState
|
||||
)
|
||||
}
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
private fun AuthorDropDown(
|
||||
authorUiState: AuthorsUiState,
|
||||
authorsListUiState: AuthorsListUiState,
|
||||
onAuthorUpdate: (Author) -> Unit
|
||||
) {
|
||||
var expanded: Boolean by remember { mutableStateOf(false) }
|
||||
ExposedDropdownMenuBox(
|
||||
modifier = Modifier
|
||||
.padding(top = 7.dp),
|
||||
expanded = expanded,
|
||||
onExpandedChange = {
|
||||
expanded = !expanded
|
||||
}
|
||||
) {
|
||||
TextField(
|
||||
value =authorUiState.author?.name ?: stringResource(id = R.string.author_name),
|
||||
onValueChange = {},
|
||||
readOnly = true,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.menuAnchor()
|
||||
)
|
||||
DropdownMenu(
|
||||
expanded = expanded,
|
||||
onDismissRequest = { expanded = false },
|
||||
modifier = Modifier
|
||||
.background(Color.White)
|
||||
.exposedDropdownSize()
|
||||
) {
|
||||
authorsListUiState.authorList.forEach { author ->
|
||||
DropdownMenuItem(
|
||||
text = {
|
||||
Text(text = author.name)
|
||||
},
|
||||
onClick = {
|
||||
onAuthorUpdate(author)
|
||||
expanded = false
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
private fun BookEdit(
|
||||
bookUiState: BookUiState,
|
||||
authorUiState: AuthorsUiState,
|
||||
authorsListUiState: AuthorsListUiState,
|
||||
onClick: () -> Unit,
|
||||
onUpdate: (BookDetails) -> Unit,
|
||||
onAuthorUpdate: (Author) -> Unit
|
||||
) {
|
||||
fun handleImageUpload(bitmap: Bitmap) {
|
||||
onUpdate(
|
||||
bookUiState.bookDetails.copy(
|
||||
cover = bitmap
|
||||
)
|
||||
)
|
||||
}
|
||||
var SingletonClass = SingletonClass()
|
||||
onUpdate(bookUiState.bookDetails.copy(userId = SingletonClass.getUserId()))
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp)
|
||||
.verticalScroll(ScrollState(1))
|
||||
) {
|
||||
Spacer(modifier = Modifier.size(10.dp))
|
||||
OutlinedTextField(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
value = bookUiState.bookDetails.title,
|
||||
onValueChange = { onUpdate(bookUiState.bookDetails.copy(title = it)) },
|
||||
label = { Text("Название книги") },
|
||||
singleLine = true
|
||||
)
|
||||
AuthorDropDown(
|
||||
authorUiState = authorUiState,
|
||||
authorsListUiState = authorsListUiState,
|
||||
onAuthorUpdate = {
|
||||
onUpdate(bookUiState.bookDetails.copy(authorId = it.id))
|
||||
onAuthorUpdate(it)
|
||||
}
|
||||
)
|
||||
OutlinedTextField(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
value = bookUiState.bookDetails.description,
|
||||
onValueChange = { onUpdate(bookUiState.bookDetails.copy(description = it)) },
|
||||
label = { Text("Описание") },
|
||||
)
|
||||
ImageUploader(bitmap = bookUiState.bookDetails.cover, onResult = { bitmap: Bitmap -> handleImageUpload(bitmap)} )
|
||||
OutlinedTextField(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
value = bookUiState.bookDetails.content,
|
||||
onValueChange = { onUpdate(bookUiState.bookDetails.copy(content = it)) },
|
||||
label = { Text("Содержание") },
|
||||
)
|
||||
Button(
|
||||
onClick = onClick,
|
||||
enabled = bookUiState.isEntryValid,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
) {
|
||||
Text(text = "Сохранить")
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ -1,58 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.content.res.Configuration
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.composeui.ViewModel.BookPageViewModel
|
||||
import com.example.myapplication.db.database.AppDatabase
|
||||
import com.example.myapplication.db.model.BookWithAuthor
|
||||
import com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
@Composable
|
||||
fun BookRead(id: Int, viewModel: BookPageViewModel = viewModel(factory = AppViewModelProvider.Factory)) {
|
||||
val scope = rememberCoroutineScope()
|
||||
val book = viewModel.bookPageUiState
|
||||
LaunchedEffect(Unit) {
|
||||
withContext(Dispatchers.IO) {
|
||||
viewModel.refreshState()
|
||||
}
|
||||
}
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp)
|
||||
){
|
||||
Text(text = book?.book?.content ?: "", fontSize=22.sp)
|
||||
}
|
||||
}
|
||||
|
||||
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
fun BookReadPreview() {
|
||||
MyApplicationTheme {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
BookRead(id = 0)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,74 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.content.res.Configuration
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.lazy.grid.GridCells
|
||||
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
|
||||
import androidx.compose.foundation.lazy.grid.items
|
||||
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.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.key
|
||||
import androidx.compose.runtime.mutableStateListOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
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.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import androidx.paging.compose.LazyPagingItems
|
||||
import androidx.paging.compose.collectAsLazyPagingItems
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.composeui.ViewModel.SearchPageViewModel
|
||||
import com.example.myapplication.composeui.navigation.Screen
|
||||
import com.example.myapplication.db.database.AppDatabase
|
||||
import com.example.myapplication.db.model.Book
|
||||
import com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
@Composable
|
||||
fun BookSearch(navController: NavController, searchStr: String, viewModel: SearchPageViewModel = viewModel(factory = AppViewModelProvider.Factory)) {
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
val searchPageUiState = viewModel.searchPageUiState
|
||||
val pagingBook: LazyPagingItems<Book> = viewModel.bookPagedData.collectAsLazyPagingItems()
|
||||
LaunchedEffect(Unit) {
|
||||
viewModel.refreshState()
|
||||
}
|
||||
fun refresh(){
|
||||
coroutineScope.launch { viewModel.refreshState() }
|
||||
}
|
||||
LazyVerticalGrid(columns = GridCells.Adaptive(minSize = 180.dp)){
|
||||
items (pagingBook.itemCount){
|
||||
index -> BookCell(navController = navController, book = pagingBook[index]!!.copy())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
fun BookSearchPreview() {
|
||||
MyApplicationTheme {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
BookSearch(navController = rememberNavController(), "")
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,104 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.content.Context
|
||||
import android.content.res.Configuration
|
||||
import android.graphics.Bitmap
|
||||
import android.graphics.BitmapFactory
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.material3.Surface
|
||||
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.layout.requiredSize
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.asImageBitmap
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.composeui.ViewModel.BookPageViewModel
|
||||
import com.example.myapplication.composeui.navigation.Screen
|
||||
import com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
|
||||
private fun getBookImage(context: Context, imageId: String): Bitmap {
|
||||
val inputStream = context.assets.open("${imageId}.jpg")
|
||||
val bitmap = BitmapFactory.decodeStream(inputStream)
|
||||
return bitmap
|
||||
}
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun BookView(navController: NavController, id: Int, viewModel: BookPageViewModel = viewModel(factory = AppViewModelProvider.Factory)) {
|
||||
val scope = rememberCoroutineScope()
|
||||
val book = viewModel.bookPageUiState
|
||||
val context = LocalContext.current
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp)
|
||||
.verticalScroll(rememberScrollState())
|
||||
) {
|
||||
Image(
|
||||
bitmap = book.book?.cover?.asImageBitmap() ?: getBookImage(context, "img").asImageBitmap(),
|
||||
contentDescription = book.book?.title,
|
||||
contentScale = ContentScale.FillBounds,
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.requiredSize(400.dp, 400.dp)
|
||||
.padding(0.dp, 10.dp)
|
||||
)
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp)
|
||||
) {
|
||||
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||
value = book.book?.title ?: "", onValueChange = {}, readOnly = true,
|
||||
label = {
|
||||
Text(stringResource(id = R.string.book_title))
|
||||
}
|
||||
)
|
||||
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||
value = book.book?.description ?: "", onValueChange = {}, readOnly = true,
|
||||
label = {
|
||||
Text(stringResource(id = R.string.description))
|
||||
}
|
||||
)
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp),
|
||||
onClick = { navController?.navigate(Screen.BookRead.route.replace("{id}", id.toString())) }) {
|
||||
Text(stringResource(id = R.string.read_book))
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
fun BookViewPreview() {
|
||||
MyApplicationTheme {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
BookView(navController = rememberNavController(), id = 0)
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,71 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.content.res.Configuration
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.navigation.NavController
|
||||
import androidx.compose.foundation.lazy.grid.GridCells
|
||||
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Add
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import androidx.paging.compose.LazyPagingItems
|
||||
import androidx.paging.compose.collectAsLazyPagingItems
|
||||
import com.example.myapplication.composeui.ViewModel.BookListViewModel
|
||||
import com.example.myapplication.composeui.navigation.Screen
|
||||
import com.example.myapplication.db.model.Book
|
||||
import com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
|
||||
@Composable
|
||||
fun Catalog(navController: NavController, viewModel: BookListViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
val bookListUiState = viewModel.bookListUiState
|
||||
val pagingBook: LazyPagingItems<Book> = viewModel.bookPagedData.collectAsLazyPagingItems()
|
||||
Column() {
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp),
|
||||
onClick = {
|
||||
val route = Screen.BookEdit.route.replace("{id}", 0.toString())
|
||||
navController.navigate(route)
|
||||
}
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Add,
|
||||
contentDescription = "Добавить",
|
||||
)
|
||||
Text("Добавить")
|
||||
}
|
||||
LazyVerticalGrid(columns = GridCells.Adaptive(minSize = 180.dp)) {
|
||||
items(pagingBook.itemCount) { index ->
|
||||
BookCell(navController = navController, book = pagingBook[index]!!.copy())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@Preview(name = "Light Mode", uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
private fun CatalogPreview(){
|
||||
MyApplicationTheme{
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
Main(navController = rememberNavController())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,98 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.content.res.Configuration
|
||||
import android.widget.Toast
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.R
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import com.example.myapplication.MainActivity
|
||||
import com.example.myapplication.SingletonClass
|
||||
import com.example.myapplication.api.ServerService
|
||||
import com.example.myapplication.composeui.navigation.Screen
|
||||
import com.example.myapplication.db.database.AppDatabase
|
||||
import com.example.myapplication.db.model.User
|
||||
import com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.GlobalScope
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun Enter(navController: NavController) {
|
||||
var SingletonClass = SingletonClass()
|
||||
val scope = rememberCoroutineScope()
|
||||
val context = LocalContext.current
|
||||
val service: ServerService
|
||||
var login by remember{mutableStateOf("")}
|
||||
var password by remember{mutableStateOf("")}
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 40.dp)) {
|
||||
Text(stringResource(id = R.string.login))
|
||||
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||
value = login, onValueChange = { login = it },
|
||||
)
|
||||
Spacer(Modifier.padding(bottom = 10.dp))
|
||||
Text(stringResource(id = R.string.password))
|
||||
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||
value = password, onValueChange = { password = it },
|
||||
)
|
||||
Spacer(Modifier.padding(bottom = 20.dp))
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp),
|
||||
onClick = {
|
||||
scope.launch {
|
||||
//if( AppDatabase.getInstance(context).userDao().tryLogin(login.toString(), password.toString()) != null){
|
||||
// SingletonClass.setUserId(AppDatabase.getInstance(context).userDao().tryLogin(login.toString(), password.toString())?.uid!!)
|
||||
//SingletonClass.setRole(AppDatabase.getInstance(context).userDao().tryLogin(login.toString(), password.toString())?.role!!)
|
||||
navController?.navigate(Screen.Profile.route)
|
||||
//}
|
||||
//else{
|
||||
// val toast = Toast.makeText(MainActivity.appContext, "Неверный логин или пароль", Toast.LENGTH_SHORT)
|
||||
// toast.show()
|
||||
//}
|
||||
}
|
||||
}) {
|
||||
Text(stringResource(id = R.string.enter))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
fun EnterPreview() {
|
||||
MyApplicationTheme {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
Enter(navController = rememberNavController())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,70 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.content.res.Configuration
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.lazy.grid.GridCells
|
||||
import androidx.compose.foundation.lazy.grid.LazyVerticalGrid
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Add
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import androidx.paging.compose.LazyPagingItems
|
||||
import androidx.paging.compose.collectAsLazyPagingItems
|
||||
import com.example.myapplication.composeui.ViewModel.AuthorListViewModel
|
||||
import com.example.myapplication.composeui.navigation.Screen
|
||||
import com.example.myapplication.db.model.Author
|
||||
import com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
|
||||
@Composable
|
||||
fun ListAuthors(navController: NavController, viewModel: AuthorListViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
val authorListUiState = viewModel.authorListUiState
|
||||
val pagingAuthor: LazyPagingItems<Author> = viewModel.authorPagedData.collectAsLazyPagingItems()
|
||||
Column() {
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp),
|
||||
onClick = {
|
||||
val route = Screen.AuthorEdit.route.replace("{id}", 0.toString())
|
||||
navController.navigate(route)
|
||||
}
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Add,
|
||||
contentDescription = "Добавить",
|
||||
)
|
||||
Text("Добавить")
|
||||
}
|
||||
LazyVerticalGrid(columns = GridCells.Adaptive(minSize = 180.dp)) {
|
||||
items(pagingAuthor.itemCount) { index ->
|
||||
AuthorCell(navController = navController, author = pagingAuthor[index]!!.copy())
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@Preview(name = "Light Mode", uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
private fun ListAuthorsPreview(){
|
||||
MyApplicationTheme{
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
Main(navController = rememberNavController())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,71 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.content.res.Configuration
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxHeight
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.composeui.navigation.Screen
|
||||
import com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.unit.sp
|
||||
import com.example.myapplication.R
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
|
||||
@Composable
|
||||
fun Main(navController: NavController) {
|
||||
Column(Modifier.padding(all = 40.dp)) {
|
||||
Text(stringResource(id = R.string.welcome), modifier = Modifier.fillMaxWidth(), fontSize = 24.sp, textAlign = TextAlign.Center)
|
||||
Spacer(Modifier.padding(bottom = 20.dp))
|
||||
Image(
|
||||
painter = painterResource(id = R.drawable.logo),
|
||||
contentDescription = "logo",
|
||||
contentScale = ContentScale.FillWidth,
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
)
|
||||
Spacer(Modifier.padding(bottom = 20.dp))
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp),
|
||||
onClick = { navController?.navigate(Screen.Enter.route) }) {
|
||||
Text(stringResource(id = R.string.enter))
|
||||
}
|
||||
Spacer(Modifier.padding(bottom = 20.dp))
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp),
|
||||
onClick = { navController?.navigate(Screen.Registration.route) }) {
|
||||
Text(stringResource(id = R.string.create_acc))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
fun MainPreview() {
|
||||
MyApplicationTheme {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
Main(navController = rememberNavController())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,99 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import android.content.res.Configuration
|
||||
import androidx.compose.foundation.BorderStroke
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Close
|
||||
import androidx.compose.material.icons.filled.Create
|
||||
import androidx.compose.material.icons.filled.Edit
|
||||
import androidx.compose.material.icons.outlined.Clear
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedButton
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
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.layout.ContentScale
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import com.example.myapplication.composeui.navigation.Screen
|
||||
import com.example.myapplication.db.database.AppDatabase
|
||||
import com.example.myapplication.db.model.User
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.SingletonClass
|
||||
import com.example.myapplication.composeui.ViewModel.UserPageViewModel
|
||||
import com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
|
||||
@Composable
|
||||
fun Profile(navController: NavController) {
|
||||
var SingletonClass = SingletonClass()
|
||||
Column(Modifier.padding(all = 40.dp)) {
|
||||
Image(
|
||||
painter = painterResource(id = R.drawable.user),
|
||||
contentDescription = "logo",
|
||||
contentScale = ContentScale.FillWidth,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
.clickable(
|
||||
enabled = true,
|
||||
onClick = {
|
||||
navController?.navigate(
|
||||
Screen.ProfileEdit.route.replace(
|
||||
"{id}",
|
||||
SingletonClass.getUserId().toString()
|
||||
)
|
||||
)
|
||||
}
|
||||
)
|
||||
)
|
||||
Spacer (Modifier.padding(bottom = 10.dp))
|
||||
Text("Открыть профиль", modifier = Modifier.fillMaxWidth(), textAlign = TextAlign.Center)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
fun ProfilePreview() {
|
||||
MyApplicationTheme {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
Profile(navController = rememberNavController())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,97 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.lifecycle.viewmodel.compose.viewModel
|
||||
import androidx.navigation.NavController
|
||||
import com.example.myapplication.composeui.ViewModel.UserDetails
|
||||
import com.example.myapplication.composeui.ViewModel.UserEditViewModel
|
||||
import com.example.myapplication.composeui.ViewModel.UserUiState
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@Composable
|
||||
fun ProfileEdit(navController: NavController, viewModel: UserEditViewModel = viewModel(factory = AppViewModelProvider.Factory)){
|
||||
val scope = rememberCoroutineScope()
|
||||
viewModel.userUiState.userDetails.login.isBlank()
|
||||
ProfileEdit(
|
||||
navController = navController,
|
||||
userUiState = viewModel.userUiState,
|
||||
onClick = {
|
||||
scope.launch {
|
||||
viewModel.saveUser()
|
||||
navController.popBackStack()
|
||||
}
|
||||
},
|
||||
onUpdate = viewModel::updateUiState
|
||||
)
|
||||
}
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
private fun ProfileEdit(
|
||||
navController: NavController,
|
||||
userUiState: UserUiState,
|
||||
onClick: () -> Unit,
|
||||
onUpdate: (UserDetails) -> Unit
|
||||
){
|
||||
LazyColumn() {
|
||||
item {
|
||||
OutlinedTextField(
|
||||
value = userUiState.userDetails.email,
|
||||
onValueChange = { onUpdate(userUiState.userDetails.copy(email = it)) },
|
||||
singleLine = true,
|
||||
label = { Text("Почта", fontSize = 20.sp) },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(10.dp, 5.dp)
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = userUiState.userDetails.login,
|
||||
onValueChange = { onUpdate(userUiState.userDetails.copy(login = it)) },
|
||||
label = { Text("Логин", fontSize = 20.sp) },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(10.dp, 5.dp)
|
||||
)
|
||||
OutlinedTextField(
|
||||
value = userUiState.userDetails.password,
|
||||
onValueChange = { onUpdate(userUiState.userDetails.copy(password = it)) },
|
||||
singleLine = true,
|
||||
label = { Text("Пароль", fontSize = 20.sp) },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(10.dp, 5.dp)
|
||||
)
|
||||
Button(
|
||||
onClick = onClick,
|
||||
enabled = userUiState.isEntryValid,
|
||||
modifier = Modifier.fillMaxWidth()
|
||||
.padding(10.dp, 0.dp),
|
||||
) {
|
||||
Text("Изменить")
|
||||
}
|
||||
Button(
|
||||
onClick = { navController.popBackStack() },
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(10.dp, 0.dp),
|
||||
colors = ButtonDefaults.buttonColors(containerColor = Color.LightGray, contentColor = Color.Black))
|
||||
{
|
||||
Text("Назад")
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,84 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.content.res.Configuration
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.OutlinedTextField
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.navigation.NavController
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import com.example.myapplication.composeui.navigation.Screen
|
||||
import com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.db.database.AppDatabase
|
||||
import com.example.myapplication.db.model.User
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun Registration(navController: NavController) {
|
||||
val scope = rememberCoroutineScope()
|
||||
val context = LocalContext.current
|
||||
Column(Modifier.fillMaxWidth().padding(all = 40.dp)) {
|
||||
var mail by remember{mutableStateOf("")}
|
||||
Text(stringResource(id = R.string.email))
|
||||
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||
value = mail, onValueChange = { mail = it },
|
||||
)
|
||||
Spacer(Modifier.padding(bottom = 10.dp))
|
||||
var login by remember{mutableStateOf("")}
|
||||
Text(stringResource(id = R.string.login))
|
||||
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||
value = login, onValueChange = { login = it },
|
||||
)
|
||||
Spacer(Modifier.padding(bottom = 10.dp))
|
||||
var password by remember{mutableStateOf("")}
|
||||
Text(stringResource(id = R.string.password))
|
||||
OutlinedTextField(modifier = Modifier.fillMaxWidth(),
|
||||
value = password, onValueChange = { password = it },
|
||||
)
|
||||
Spacer(Modifier.padding(bottom = 20.dp))
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp),
|
||||
onClick = {
|
||||
scope.launch{
|
||||
//AppDatabase.getInstance(context).userDao().insert(User(0, login.toString(), password.toString(), mail.toString(), "USER"))
|
||||
}
|
||||
navController?.navigate(Screen.Enter.route)
|
||||
}) {
|
||||
Text(stringResource(id = R.string.create_acc))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
fun RegistrationPreview() {
|
||||
MyApplicationTheme {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
Registration(navController = rememberNavController())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,86 +0,0 @@
|
||||
package com.example.myapplication.composeui
|
||||
|
||||
import android.content.res.Configuration
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextField
|
||||
import androidx.compose.material3.TextFieldDefaults
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.colorResource
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.navigation.NavController
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import com.example.myapplication.composeui.navigation.Screen
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun Search(navController: NavController?) {
|
||||
var searchStr by remember { mutableStateOf("") }
|
||||
Column(
|
||||
Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 40.dp)) {
|
||||
Column(
|
||||
Modifier
|
||||
.background(color = colorResource(R.color.green_200))
|
||||
.padding(all = 20.dp)) {
|
||||
Text(stringResource(id = R.string.welcome), color = Color.White)
|
||||
Text(stringResource(id = R.string.book_world), color = Color.White)
|
||||
}
|
||||
Spacer(Modifier.padding(bottom = 20.dp))
|
||||
TextField(modifier = Modifier.fillMaxWidth(),
|
||||
value = searchStr, onValueChange = { searchStr = it }, singleLine = true,
|
||||
placeholder = { Text("Поиск", fontSize = 22.sp) }
|
||||
)
|
||||
Spacer(Modifier.padding(bottom = 10.dp))
|
||||
Button(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(all = 10.dp),
|
||||
onClick = {
|
||||
if(!searchStr.isEmpty()){
|
||||
navController?.navigate(
|
||||
Screen.BookSearch.route.replace(
|
||||
"{searchStr}",
|
||||
searchStr
|
||||
)
|
||||
)
|
||||
}
|
||||
}) {
|
||||
Text(stringResource(id = R.string.search_book))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
fun SearchPreview() {
|
||||
MyApplicationTheme {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
Search(navController = rememberNavController())
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,46 +0,0 @@
|
||||
package com.example.myapplication.composeui.ViewModel
|
||||
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.example.myapplication.db.model.Author
|
||||
import kotlinx.coroutines.launch
|
||||
import com.example.myapplication.db.respository.AuthorRepository
|
||||
|
||||
class AuthorDropDownViewModel(
|
||||
private val authorRepository: AuthorRepository
|
||||
) : ViewModel() {
|
||||
var authorsListUiState by mutableStateOf(AuthorsListUiState())
|
||||
private set
|
||||
|
||||
var authorsUiState by mutableStateOf(AuthorsUiState())
|
||||
private set
|
||||
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
authorsListUiState = AuthorsListUiState(authorRepository.getAllDrop())
|
||||
}
|
||||
}
|
||||
|
||||
fun setCurrentAuthor(authorId: Int) {
|
||||
val author: Author? =
|
||||
authorsListUiState.authorList.firstOrNull { author -> author.id == authorId }
|
||||
author?.let { updateUiState(it) }
|
||||
}
|
||||
|
||||
fun updateUiState(author: Author) {
|
||||
authorsUiState = AuthorsUiState(
|
||||
author = author
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
data class AuthorsListUiState(val authorList: List<Author> = listOf())
|
||||
|
||||
data class AuthorsUiState(
|
||||
val author: Author? = null
|
||||
)
|
||||
|
||||
fun Author.toUiState() = AuthorsUiState(author = Author(id = id, name = name))
|
||||
@ -1,71 +0,0 @@
|
||||
package com.example.myapplication.composeui.ViewModel
|
||||
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.example.myapplication.db.model.Author
|
||||
import com.example.myapplication.db.respository.AuthorRepository
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
class AuthorEditViewModel(savedStateHandle: SavedStateHandle,
|
||||
private val authorRepository: AuthorRepository
|
||||
) : ViewModel(){
|
||||
var authorUiState by mutableStateOf(AuthorUiState())
|
||||
private set
|
||||
|
||||
private val authorUid: Int = checkNotNull(savedStateHandle["id"])
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
if (authorUid > 0) {
|
||||
authorUiState = authorRepository.getByUid(authorUid)
|
||||
.toUiState(true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun updateUiState(authorDetails: AuthorDetails) {
|
||||
authorUiState = AuthorUiState(
|
||||
authorDetails = authorDetails,
|
||||
isEntryValid = validateInput(authorDetails)
|
||||
)
|
||||
}
|
||||
|
||||
suspend fun saveAuthor() {
|
||||
if (validateInput()) {
|
||||
if (authorUid > 0) {
|
||||
authorRepository.updateAuthor(authorUiState.authorDetails.toAuthor(authorUid))
|
||||
} else {
|
||||
authorRepository.insertAuthor(authorUiState.authorDetails.toAuthor())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun validateInput(uiState: AuthorDetails = authorUiState.authorDetails): Boolean {
|
||||
return with(uiState) {
|
||||
name.isNotBlank()
|
||||
}
|
||||
}
|
||||
}
|
||||
data class AuthorUiState(
|
||||
val authorDetails: AuthorDetails = AuthorDetails(),
|
||||
val isEntryValid: Boolean = false
|
||||
)
|
||||
data class AuthorDetails(
|
||||
val name: String = ""
|
||||
)
|
||||
fun AuthorDetails.toAuthor(uid: Int = 0): Author = Author(
|
||||
id = uid,
|
||||
name = name
|
||||
)
|
||||
|
||||
fun Author.toDetails(): AuthorDetails = AuthorDetails(
|
||||
name = name
|
||||
)
|
||||
|
||||
fun Author.toUiState(isEntryValid: Boolean = false): AuthorUiState = AuthorUiState(
|
||||
authorDetails = this.toDetails(),
|
||||
isEntryValid = isEntryValid
|
||||
)
|
||||
@ -1,32 +0,0 @@
|
||||
package com.example.myapplication.composeui.ViewModel
|
||||
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import androidx.paging.PagingData
|
||||
import com.example.myapplication.db.model.Author
|
||||
import com.example.myapplication.db.respository.AuthorRepository
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
class AuthorListViewModel(
|
||||
private val authorRepository: AuthorRepository
|
||||
) : ViewModel(){
|
||||
var authorListUiState by mutableStateOf(AuthorListUiState())
|
||||
private set
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
refreshState()
|
||||
}
|
||||
}
|
||||
suspend fun refreshState() {
|
||||
authorListUiState = AuthorListUiState(authorRepository.getAll())
|
||||
}
|
||||
val authorPagedData: Flow<PagingData<Author>> = authorRepository.loadAllAuthorsPaged()
|
||||
suspend fun deleteAuthor(author: Author) {
|
||||
authorRepository.deleteAuthor(author)
|
||||
}
|
||||
}
|
||||
data class AuthorListUiState(val authorList: List<Author> = listOf())
|
||||
@ -1,91 +0,0 @@
|
||||
package com.example.myapplication.composeui.ViewModel
|
||||
|
||||
import android.graphics.Bitmap
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
import androidx.lifecycle.ViewModel
|
||||
import com.example.myapplication.db.respository.BookRepository
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.example.myapplication.db.model.Book
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
class BookEditViewModel(savedStateHandle: SavedStateHandle,
|
||||
private val bookRepository: BookRepository) : ViewModel(){
|
||||
var bookUiState by mutableStateOf(BookUiState())
|
||||
private set
|
||||
|
||||
private val bookUid: Int = checkNotNull(savedStateHandle["id"])
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
if (bookUid > 0) {
|
||||
bookUiState = bookRepository.getByUid(bookUid)
|
||||
.toUiState(true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun updateUiState(bookDetails: BookDetails) {
|
||||
bookUiState = BookUiState(
|
||||
bookDetails = bookDetails,
|
||||
isEntryValid = validateInput(bookDetails)
|
||||
)
|
||||
}
|
||||
|
||||
suspend fun saveBook() {
|
||||
if (validateInput()) {
|
||||
if (bookUid > 0) {
|
||||
bookRepository.updateBook(bookUiState.bookDetails.toBook(bookUid))
|
||||
} else {
|
||||
bookRepository.insertBook(bookUiState.bookDetails.toBook())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun validateInput(uiState: BookDetails = bookUiState.bookDetails): Boolean {
|
||||
return with(uiState) {
|
||||
title.isNotBlank()
|
||||
&& description.isNotBlank()
|
||||
&& content.isNotBlank()
|
||||
&& cover != null
|
||||
&& authorId >= 0
|
||||
&& userId >= 0
|
||||
}
|
||||
}
|
||||
}
|
||||
data class BookUiState(
|
||||
val bookDetails: BookDetails = BookDetails(),
|
||||
val isEntryValid: Boolean = false
|
||||
)
|
||||
data class BookDetails(
|
||||
val title: String = "",
|
||||
val description: String = "",
|
||||
val content: String = "",
|
||||
val cover: Bitmap? = null,
|
||||
val authorId: Int = 0,
|
||||
val userId: Int = 0,
|
||||
)
|
||||
fun BookDetails.toBook(uid: Int = 0): Book = Book(
|
||||
id = uid,
|
||||
title = title,
|
||||
description = description,
|
||||
content = content,
|
||||
cover = cover,
|
||||
authorId = authorId,
|
||||
userId = userId
|
||||
)
|
||||
|
||||
fun Book.toDetails(): BookDetails = BookDetails(
|
||||
title = title,
|
||||
description = description,
|
||||
content = content,
|
||||
cover = cover,
|
||||
authorId = authorId,
|
||||
userId = userId
|
||||
)
|
||||
|
||||
fun Book.toUiState(isEntryValid: Boolean = false): BookUiState = BookUiState(
|
||||
bookDetails = this.toDetails(),
|
||||
isEntryValid = isEntryValid
|
||||
)
|
||||
@ -1,33 +0,0 @@
|
||||
package com.example.myapplication.composeui.ViewModel
|
||||
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import androidx.paging.PagingData
|
||||
import com.example.myapplication.db.model.Book
|
||||
import com.example.myapplication.db.respository.BookRepository
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
class BookListViewModel(
|
||||
private val bookRepository: BookRepository
|
||||
) : ViewModel() {
|
||||
var bookListUiState by mutableStateOf(BookListUiState())
|
||||
private set
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
refreshState()
|
||||
}
|
||||
}
|
||||
suspend fun refreshState() {
|
||||
bookListUiState = BookListUiState(bookRepository.getAll())
|
||||
}
|
||||
val bookPagedData: Flow<PagingData<Book>> = bookRepository.loadAllBooksPaged()
|
||||
suspend fun deleteBook(book: Book) {
|
||||
bookRepository.deleteBook(book)
|
||||
}
|
||||
}
|
||||
|
||||
data class BookListUiState(val bookList: List<Book> = listOf())
|
||||
@ -1,43 +0,0 @@
|
||||
package com.example.myapplication.composeui.ViewModel
|
||||
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
import com.example.myapplication.db.model.Book
|
||||
import com.example.myapplication.db.model.BookWithAuthor
|
||||
import com.example.myapplication.db.respository.BookRepository
|
||||
import kotlinx.coroutines.flow.StateFlow
|
||||
import kotlinx.coroutines.launch
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.example.myapplication.db.database.AppContainer
|
||||
import kotlinx.coroutines.flow.SharingStarted
|
||||
import kotlinx.coroutines.flow.flow
|
||||
import kotlinx.coroutines.flow.map
|
||||
import kotlinx.coroutines.flow.stateIn
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
class BookPageViewModel(private val bookRespository: BookRepository, savedStateHandle: SavedStateHandle) : ViewModel(){
|
||||
private val bookId: Int = checkNotNull(savedStateHandle["id"])
|
||||
var bookPageUiState by mutableStateOf(BookPageUiState())
|
||||
private set
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
if (bookId > 0) {
|
||||
refreshState()
|
||||
}
|
||||
}
|
||||
}
|
||||
suspend fun refreshState() {
|
||||
bookPageUiState = BookPageUiState(bookRespository.getByUid(bookId))
|
||||
}
|
||||
suspend fun deleteBook(book: Book) {
|
||||
bookRespository.deleteBook(book)
|
||||
}
|
||||
}
|
||||
|
||||
data class BookPageUiState(val book: Book? = null)
|
||||
@ -1,126 +0,0 @@
|
||||
package com.example.myapplication.composeui.ViewModel
|
||||
|
||||
import android.content.res.Configuration
|
||||
import android.graphics.Bitmap
|
||||
import android.graphics.BitmapFactory
|
||||
import android.net.Uri
|
||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||
import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.IntrinsicSize
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.aspectRatio
|
||||
import androidx.compose.foundation.layout.fillMaxHeight
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
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.asImageBitmap
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.example.myapplication.R
|
||||
|
||||
@Composable
|
||||
fun ImageUploader(
|
||||
bitmap: Bitmap?,
|
||||
onResult: (Bitmap) -> Unit
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val title: String = if (bitmap == null) {
|
||||
"Не загружено"
|
||||
} else {
|
||||
"Размер: " + bitmap.width + " " + bitmap.height
|
||||
}
|
||||
|
||||
val launcher = rememberLauncherForActivityResult(
|
||||
contract = ActivityResultContracts.GetContent(),
|
||||
onResult = { uri: Uri? ->
|
||||
uri?.let {
|
||||
val inputStream = context.contentResolver.openInputStream(uri)
|
||||
val newBitmap: Bitmap = BitmapFactory.decodeStream(inputStream)
|
||||
val scaledBitmap = resizeBitmapWithAspectRatio(newBitmap, 200)
|
||||
onResult(scaledBitmap)
|
||||
}
|
||||
}
|
||||
)
|
||||
|
||||
Row(
|
||||
modifier = Modifier.height(IntrinsicSize.Min)
|
||||
) {
|
||||
Box(
|
||||
contentAlignment = Alignment.Center,
|
||||
modifier = Modifier
|
||||
.background(
|
||||
color = MaterialTheme.colorScheme.surface,
|
||||
shape = RoundedCornerShape(10.dp)
|
||||
)
|
||||
.weight(0.25F)
|
||||
.aspectRatio(1F)
|
||||
) {
|
||||
if (bitmap != null) {
|
||||
Image(
|
||||
bitmap = bitmap.asImageBitmap(),
|
||||
contentDescription = null,
|
||||
modifier = Modifier.width(100.dp)
|
||||
)
|
||||
} else {
|
||||
Icon(
|
||||
painter = painterResource(R.drawable.ic_camera),
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.onBackground
|
||||
)
|
||||
}
|
||||
}
|
||||
Spacer(modifier = Modifier.width(10.dp))
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.background(
|
||||
color = MaterialTheme.colorScheme.surface,
|
||||
shape = RoundedCornerShape(10.dp)
|
||||
)
|
||||
.fillMaxHeight()
|
||||
.padding(10.dp)
|
||||
.weight(0.75F)
|
||||
) {
|
||||
Text(
|
||||
text = title,
|
||||
color = MaterialTheme.colorScheme.onBackground,
|
||||
style = MaterialTheme.typography.labelMedium
|
||||
)
|
||||
Spacer(modifier = Modifier.weight(1F))
|
||||
Button(
|
||||
onClick = { launcher.launch("image/*") },
|
||||
){
|
||||
Text(text = "+")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
fun resizeBitmapWithAspectRatio(bitmap: Bitmap, maxHeight: Int): Bitmap {
|
||||
if (bitmap.height <= maxHeight) {
|
||||
return bitmap
|
||||
}
|
||||
|
||||
val aspectRatio = bitmap.width.toFloat() / bitmap.height
|
||||
val newWidth = (maxHeight * aspectRatio).toInt()
|
||||
|
||||
return Bitmap.createScaledBitmap(bitmap, newWidth, maxHeight, true)
|
||||
}
|
||||
@Preview(name = "Light Mode", uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
private fun CuteImageLoaderPreview() {
|
||||
}
|
||||
@ -1,38 +0,0 @@
|
||||
package com.example.myapplication.composeui.ViewModel
|
||||
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import androidx.paging.PagingData
|
||||
import androidx.paging.filter
|
||||
import com.example.myapplication.db.model.Book
|
||||
import com.example.myapplication.db.respository.BookRepository
|
||||
import kotlinx.coroutines.launch
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import kotlinx.coroutines.flow.map
|
||||
import java.util.Locale
|
||||
|
||||
class SearchPageViewModel(private val bookRepository: BookRepository, savedStateHandle: SavedStateHandle) : ViewModel(){
|
||||
private val searchStr: String = checkNotNull(savedStateHandle["searchStr"])
|
||||
var searchPageUiState by mutableStateOf(SearchPageUiState())
|
||||
private set
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
refreshState()
|
||||
}
|
||||
}
|
||||
suspend fun refreshState() {
|
||||
searchPageUiState = SearchPageUiState(bookRepository.getBySearch(searchStr))
|
||||
}
|
||||
|
||||
val bookPagedData: Flow<PagingData<Book>> = bookRepository.loadAllBooksPaged().map{
|
||||
x -> x.filter{
|
||||
y-> (y.title.lowercase(Locale.ROOT)).contains(searchStr.lowercase(Locale.ROOT))
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
data class SearchPageUiState(val bookList: List<Book> = listOf())
|
||||
@ -1,84 +0,0 @@
|
||||
package com.example.myapplication.composeui.ViewModel
|
||||
|
||||
import android.graphics.Bitmap
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
import androidx.lifecycle.ViewModel
|
||||
import com.example.myapplication.db.respository.UserRepository
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import com.example.myapplication.db.model.User
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
class UserEditViewModel(savedStateHandle: SavedStateHandle,
|
||||
private val userRepository: UserRepository
|
||||
) : ViewModel(){
|
||||
var userUiState by mutableStateOf(UserUiState())
|
||||
private set
|
||||
|
||||
private val userUid: Int = checkNotNull(savedStateHandle["id"])
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
if (userUid > 0) {
|
||||
userUiState = userRepository.getByUid(userUid)!!
|
||||
.toUiState(true)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fun updateUiState(userDetails: UserDetails) {
|
||||
userUiState = UserUiState(
|
||||
userDetails = userDetails,
|
||||
isEntryValid = validateInput(userDetails)
|
||||
)
|
||||
}
|
||||
|
||||
suspend fun saveUser() {
|
||||
if (validateInput()) {
|
||||
if (userUid > 0) {
|
||||
userRepository.update(userUiState.userDetails.toUser(userUid))
|
||||
} else {
|
||||
userRepository.insert(userUiState.userDetails.toUser())
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private fun validateInput(uiState: UserDetails = userUiState.userDetails): Boolean {
|
||||
return with(uiState) {
|
||||
login.isNotBlank()
|
||||
&& password.isNotBlank()
|
||||
&& email.isNotBlank()
|
||||
&& role.isNotBlank()
|
||||
}
|
||||
}
|
||||
}
|
||||
data class UserUiState(
|
||||
val userDetails: UserDetails = UserDetails(),
|
||||
val isEntryValid: Boolean = false
|
||||
)
|
||||
data class UserDetails(
|
||||
val login: String = "",
|
||||
val password: String = "",
|
||||
val email: String = "",
|
||||
val role: String = ""
|
||||
)
|
||||
fun UserDetails.toUser(uid: Int = 0): User = User(
|
||||
uid = uid,
|
||||
login = login,
|
||||
password = password,
|
||||
email = email,
|
||||
role = role
|
||||
)
|
||||
|
||||
fun User.toDetails(): UserDetails = UserDetails(
|
||||
login = login,
|
||||
password = password,
|
||||
email = email,
|
||||
role = role
|
||||
)
|
||||
|
||||
fun User.toUiState(isEntryValid: Boolean = false): UserUiState = UserUiState(
|
||||
userDetails = this.toDetails(),
|
||||
isEntryValid = isEntryValid
|
||||
)
|
||||
@ -1,31 +0,0 @@
|
||||
package com.example.myapplication.composeui.ViewModel
|
||||
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.lifecycle.ViewModel
|
||||
import androidx.lifecycle.viewModelScope
|
||||
import androidx.lifecycle.SavedStateHandle
|
||||
import com.example.myapplication.db.model.User
|
||||
import kotlinx.coroutines.launch
|
||||
import com.example.myapplication.db.respository.UserRepository
|
||||
|
||||
|
||||
class UserPageViewModel(savedStateHandle: SavedStateHandle, private val userRepository: UserRepository) : ViewModel(){
|
||||
private val userId: Int = checkNotNull(savedStateHandle["id"])
|
||||
var userPageUiState by mutableStateOf(UserPageUiState())
|
||||
private set
|
||||
init {
|
||||
viewModelScope.launch {
|
||||
if (userId > 0) {
|
||||
refreshState()
|
||||
}
|
||||
}
|
||||
}
|
||||
suspend fun refreshState() {
|
||||
userPageUiState = UserPageUiState(userRepository.getByUid(userId))
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
data class UserPageUiState(val user: User? = null)
|
||||
@ -1,202 +0,0 @@
|
||||
package com.example.myapplication.composeui.navigation
|
||||
|
||||
import android.content.res.Configuration
|
||||
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.foundation.layout.Box
|
||||
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.Surface
|
||||
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.draw.shadow
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
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 com.example.myapplication.ui.theme.MyApplicationTheme
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.composeui.Main
|
||||
import com.example.myapplication.composeui.Registration
|
||||
import com.example.myapplication.composeui.Enter
|
||||
import com.example.myapplication.composeui.Profile
|
||||
import com.example.myapplication.composeui.ProfileEdit
|
||||
import com.example.myapplication.composeui.Search
|
||||
import com.example.myapplication.composeui.Catalog
|
||||
import com.example.myapplication.composeui.BookView
|
||||
import com.example.myapplication.composeui.BookRead
|
||||
import com.example.myapplication.composeui.BookEdit
|
||||
import com.example.myapplication.composeui.BookSearch
|
||||
import com.example.myapplication.composeui.ListAuthors
|
||||
import com.example.myapplication.composeui.AuthorEdit
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun Topbar(
|
||||
navController: NavHostController,
|
||||
currentScreen: Screen?
|
||||
) {
|
||||
Box(modifier = Modifier.shadow(1.dp)) {
|
||||
TopAppBar(
|
||||
colors = TopAppBarDefaults.smallTopAppBarColors(
|
||||
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.Main.route,
|
||||
modifier.padding(innerPadding)
|
||||
) {
|
||||
composable(Screen.Main.route) { Main(navController) }
|
||||
composable(Screen.Registration.route) { Registration(navController) }
|
||||
composable(Screen.Enter.route) { Enter(navController) }
|
||||
composable(Screen.Profile.route) { Profile(navController) }
|
||||
composable(
|
||||
Screen.ProfileEdit.route,
|
||||
arguments = listOf(navArgument("id") { type = NavType.IntType })
|
||||
) { backStackEntry ->
|
||||
backStackEntry.arguments?.let { ProfileEdit(navController) }
|
||||
}
|
||||
composable(Screen.Search.route) { Search(navController) }
|
||||
composable(Screen.Catalog.route) { Catalog(navController) }
|
||||
composable(
|
||||
Screen.BookView.route,
|
||||
arguments = listOf(navArgument("id") { type = NavType.IntType })
|
||||
) { backStackEntry ->
|
||||
backStackEntry.arguments?.let { BookView(navController, it.getInt("id")) }
|
||||
}
|
||||
composable(
|
||||
Screen.BookRead.route,
|
||||
arguments = listOf(navArgument("id") { type = NavType.IntType })
|
||||
) { backStackEntry ->
|
||||
backStackEntry.arguments?.let { BookRead(it.getInt("id")) }
|
||||
}
|
||||
composable(
|
||||
Screen.BookEdit.route,
|
||||
arguments = listOf(navArgument("id") { type = NavType.IntType })
|
||||
) { backStackEntry ->
|
||||
backStackEntry.arguments?.let { BookEdit(navController) }
|
||||
}
|
||||
composable(Screen.ListAuthors.route) { ListAuthors(navController) }
|
||||
composable(
|
||||
Screen.AuthorEdit.route,
|
||||
arguments = listOf(navArgument("id") { type = NavType.IntType })
|
||||
) { backStackEntry ->
|
||||
backStackEntry.arguments?.let { AuthorEdit(navController) }
|
||||
}
|
||||
composable(
|
||||
Screen.BookSearch.route,
|
||||
arguments = listOf(navArgument("searchStr") { type = NavType.StringType })
|
||||
) { backStackEntry ->
|
||||
backStackEntry.arguments?.let { BookSearch(navController = navController ,it.getString ("searchStr", "")) }
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@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)
|
||||
}
|
||||
}
|
||||
|
||||
@Preview(name = "Light Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_NO)
|
||||
@Preview(name = "Dark Mode", showBackground = true, uiMode = Configuration.UI_MODE_NIGHT_YES)
|
||||
@Composable
|
||||
fun MainNavbarPreview() {
|
||||
MyApplicationTheme {
|
||||
Surface(
|
||||
color = MaterialTheme.colorScheme.background
|
||||
) {
|
||||
MainNavbar()
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,71 +0,0 @@
|
||||
package com.example.myapplication.composeui.navigation
|
||||
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.AccountCircle
|
||||
import androidx.compose.material.icons.filled.Face
|
||||
import androidx.compose.material.icons.filled.Favorite
|
||||
import androidx.compose.material.icons.filled.List
|
||||
import androidx.compose.material.icons.filled.Search
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import com.example.myapplication.R
|
||||
|
||||
enum class Screen(
|
||||
val route: String,
|
||||
@StringRes val resourceId: Int,
|
||||
val icon: ImageVector = Icons.Filled.Favorite,
|
||||
val showInBottomBar: Boolean = true
|
||||
) {
|
||||
Main(
|
||||
"main", R.string.main_title, showInBottomBar = false
|
||||
),
|
||||
Registration(
|
||||
"registration", R.string.registration_title, showInBottomBar = false
|
||||
),
|
||||
Enter(
|
||||
"enter", R.string.enter_title, showInBottomBar = false
|
||||
),
|
||||
Profile(
|
||||
"profile", R.string.profile, Icons.Filled.AccountCircle
|
||||
),
|
||||
ProfileEdit(
|
||||
"profile-edit/{id}", R.string.profile, showInBottomBar = false
|
||||
),
|
||||
Search(
|
||||
"search", R.string.search, Icons.Filled.Search
|
||||
),
|
||||
Catalog(
|
||||
"catalog", R.string.catalog, Icons.Filled.List
|
||||
),
|
||||
ListAuthors(
|
||||
"listauthors", R.string.listauthors, Icons.Filled.Face
|
||||
),
|
||||
AuthorEdit(
|
||||
"author-edit/{id}", R.string.author, showInBottomBar = false
|
||||
),
|
||||
BookSearch(
|
||||
"book-search/{searchStr}", R.string.search, showInBottomBar = false
|
||||
),
|
||||
BookView(
|
||||
"book-view/{id}", R.string.book_view_title, showInBottomBar = false
|
||||
),
|
||||
BookEdit(
|
||||
"book-edit/{id}", R.string.book_view_title, showInBottomBar = false
|
||||
),
|
||||
BookRead(
|
||||
"book-read/{id}", R.string.book_view_title, showInBottomBar = false
|
||||
);
|
||||
|
||||
companion object {
|
||||
val bottomBarItems = listOf(
|
||||
Profile,
|
||||
Search,
|
||||
Catalog,
|
||||
ListAuthors
|
||||
)
|
||||
fun getItem(route: String): Screen? {
|
||||
val findRoute = route.split("/").first()
|
||||
return values().find { value -> value.route.startsWith(findRoute) }
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
package com.example.myapplication.db.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 com.example.myapplication.db.model.Author
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
@Dao
|
||||
interface AuthorDao {
|
||||
@Query("select * from authors order by author_name collate nocase asc")
|
||||
suspend fun getAll(): List<Author>
|
||||
@Query("select * from authors order by author_name collate nocase asc")
|
||||
suspend fun getAllDrop(): List<Author>
|
||||
@Query("select * from authors where authors.id = :uid")
|
||||
suspend fun getByUid(uid: Int): Author
|
||||
@Query("select * from authors order by author_name collate nocase asc")
|
||||
fun loadAllAuthorsPaged(): PagingSource<Int, Author>
|
||||
@Query("DELETE FROM authors")
|
||||
suspend fun clearAll()
|
||||
|
||||
@Insert
|
||||
suspend fun insert(vararg author: Author)
|
||||
|
||||
@Update
|
||||
suspend fun update(author: Author)
|
||||
|
||||
@Delete
|
||||
suspend fun delete(author: Author)
|
||||
}
|
||||
@ -1,43 +0,0 @@
|
||||
package com.example.myapplication.db.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 com.example.myapplication.db.model.Book;
|
||||
import com.example.myapplication.db.model.BookWithAuthor;
|
||||
|
||||
@Dao
|
||||
interface BookDao {
|
||||
@Query("select * from books order by title collate nocase asc")
|
||||
suspend fun getAll(): List<Book>
|
||||
|
||||
@Query("select * from books where books.id = :uid")
|
||||
suspend fun getByUid(uid: Int): Book
|
||||
|
||||
@Query("select * from books where books.title LIKE '%' || :searchStr || '%'")
|
||||
suspend fun getBySearch(searchStr: String): List<Book>
|
||||
|
||||
@Query("select * from books where books.user_id = :userId")
|
||||
suspend fun getByUserId(userId: Int): List<Book>
|
||||
|
||||
@Query("select * from books where books.author_id = :authorId")
|
||||
suspend fun getByAuthorId(authorId: Int): List<Book>
|
||||
|
||||
@Query("select * from books order by title collate nocase asc")
|
||||
fun loadAllBooksPaged(): PagingSource<Int, Book>
|
||||
@Query("DELETE FROM books")
|
||||
suspend fun clearAll()
|
||||
|
||||
@Insert
|
||||
suspend fun insert(vararg book: Book)
|
||||
|
||||
@Update
|
||||
suspend fun update(book: Book)
|
||||
|
||||
@Delete
|
||||
suspend fun delete(book: Book)
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
package com.example.myapplication.db.dao
|
||||
|
||||
import androidx.room.Dao
|
||||
import androidx.room.Insert
|
||||
import androidx.room.OnConflictStrategy
|
||||
import androidx.room.Query
|
||||
import com.example.myapplication.db.model.RemoteKeyType
|
||||
import com.example.myapplication.db.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)
|
||||
}
|
||||
@ -1,36 +0,0 @@
|
||||
package com.example.myapplication.db.dao
|
||||
|
||||
import androidx.room.Dao
|
||||
import androidx.room.Delete
|
||||
import androidx.room.Insert
|
||||
import androidx.room.Query
|
||||
import androidx.room.Update
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
import com.example.myapplication.db.model.User;
|
||||
import com.example.myapplication.db.model.Book;
|
||||
|
||||
@Dao
|
||||
interface UserDao {
|
||||
@Query("select * from users")
|
||||
suspend fun getAll(): List<User>
|
||||
|
||||
@Query("select * from users where users.uid = :uid")
|
||||
suspend fun getByUid(uid: Int): User?
|
||||
|
||||
@Query("select * from books where books.user_id = :userid")
|
||||
suspend fun getUserBooks(userid: Int): List<Book>
|
||||
|
||||
@Query("select * from users where login = :login and password = :password")
|
||||
suspend fun tryLogin(login: String, password: String): User?
|
||||
@Query("DELETE FROM users")
|
||||
suspend fun clearAll()
|
||||
|
||||
@Insert
|
||||
suspend fun insert(vararg user: User)
|
||||
|
||||
@Update
|
||||
suspend fun update(user: User)
|
||||
|
||||
@Delete
|
||||
suspend fun delete(user: User)
|
||||
}
|
||||
@ -1,74 +0,0 @@
|
||||
package com.example.myapplication.db.database
|
||||
|
||||
import android.content.Context
|
||||
import com.example.myapplication.db.dao.BookDao
|
||||
import com.example.myapplication.db.dao.AuthorDao
|
||||
import com.example.myapplication.db.dao.UserDao
|
||||
import com.example.myapplication.db.respository.BookRepository
|
||||
import com.example.myapplication.db.respository.AuthorRepository
|
||||
import com.example.myapplication.db.respository.UserRepository
|
||||
import com.example.myapplication.db.respository.OfflineBookRepository
|
||||
import com.example.myapplication.db.respository.OfflineAuthorRepository
|
||||
import com.example.myapplication.db.respository.OfflineRemoteKeyRepository
|
||||
import com.example.myapplication.db.respository.OfflineUserRepository
|
||||
import com.example.myapplication.api.respositories.RestBookRepository
|
||||
import com.example.myapplication.api.respositories.RestAuthorRepository
|
||||
import com.example.myapplication.api.respositories.RestUserRepository
|
||||
import com.example.myapplication.api.ServerService
|
||||
|
||||
interface AppContainer {
|
||||
val bookRestRepository: RestBookRepository
|
||||
val authorRestRepository: RestAuthorRepository
|
||||
val userRestRepository: RestUserRepository
|
||||
companion object {
|
||||
const val TIMEOUT = 5000L
|
||||
const val LIMIT = 10
|
||||
}
|
||||
}
|
||||
|
||||
class AppDataContainer(private val context: Context) : AppContainer {
|
||||
private val bookRepository: OfflineBookRepository by lazy {
|
||||
OfflineBookRepository(AppDatabase.getInstance(context).bookDao())
|
||||
}
|
||||
private val authorRepository: OfflineAuthorRepository by lazy {
|
||||
OfflineAuthorRepository(AppDatabase.getInstance(context).authorDao())
|
||||
}
|
||||
private val userRepository: OfflineUserRepository by lazy {
|
||||
OfflineUserRepository(AppDatabase.getInstance(context).userDao())
|
||||
}
|
||||
private val remoteKeyRepository: OfflineRemoteKeyRepository by lazy {
|
||||
OfflineRemoteKeyRepository(AppDatabase.getInstance(context).remoteKeysDao())
|
||||
}
|
||||
|
||||
override val bookRestRepository: RestBookRepository by lazy {
|
||||
RestBookRepository(
|
||||
ServerService.getInstance(),
|
||||
bookRepository,
|
||||
authorRepository,
|
||||
userRepository,
|
||||
remoteKeyRepository,
|
||||
AppDatabase.getInstance(context)
|
||||
)
|
||||
}
|
||||
|
||||
override val authorRestRepository: RestAuthorRepository by lazy {
|
||||
RestAuthorRepository(
|
||||
ServerService.getInstance(),
|
||||
authorRepository,
|
||||
bookRepository,
|
||||
remoteKeyRepository,
|
||||
AppDatabase.getInstance(context)
|
||||
)
|
||||
}
|
||||
override val userRestRepository: RestUserRepository by lazy{
|
||||
RestUserRepository(
|
||||
ServerService.getInstance(),
|
||||
userRepository,
|
||||
AppDatabase.getInstance(context)
|
||||
)
|
||||
}
|
||||
|
||||
companion object {
|
||||
const val TIMEOUT = 5000L
|
||||
}
|
||||
}
|
||||
@ -1,92 +0,0 @@
|
||||
package com.example.myapplication.db.database
|
||||
|
||||
import android.content.Context
|
||||
import android.graphics.Bitmap
|
||||
import android.graphics.BitmapFactory
|
||||
import androidx.room.Database
|
||||
import androidx.room.Room
|
||||
import androidx.room.RoomDatabase
|
||||
import androidx.room.TypeConverters
|
||||
import androidx.sqlite.db.SupportSQLiteDatabase
|
||||
import kotlinx.coroutines.CoroutineScope
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.launch
|
||||
import com.example.myapplication.db.dao.UserDao;
|
||||
import com.example.myapplication.db.dao.BookDao;
|
||||
import com.example.myapplication.db.dao.AuthorDao;
|
||||
import com.example.myapplication.db.model.User;
|
||||
import com.example.myapplication.db.model.Book;
|
||||
import com.example.myapplication.db.model.Author;
|
||||
import com.example.myapplication.R
|
||||
import com.example.myapplication.db.dao.RemoteKeysDao
|
||||
import com.example.myapplication.db.model.RemoteKeys
|
||||
|
||||
@Database(entities = [Book::class, Author::class, User::class, RemoteKeys::class], version = 1, exportSchema = false)
|
||||
@TypeConverters(Converters::class)
|
||||
abstract class AppDatabase : RoomDatabase() {
|
||||
abstract fun bookDao(): BookDao
|
||||
abstract fun authorDao(): AuthorDao
|
||||
abstract fun userDao(): UserDao
|
||||
abstract fun remoteKeysDao(): RemoteKeysDao
|
||||
|
||||
companion object {
|
||||
private const val DB_NAME: String = "PMU4"
|
||||
|
||||
@Volatile
|
||||
private var INSTANCE: AppDatabase? = null
|
||||
|
||||
private suspend fun populateDatabase(context: Context) {
|
||||
INSTANCE?.let { database ->
|
||||
/* //Users
|
||||
val userDao = database.userDao()
|
||||
val user1 = User(1, "Admin", "Admin", "admin@mail.ru", "ADMIN")
|
||||
val user2 = User(2, "User1", "123", "u1@mail.ru", "USER")
|
||||
userDao.insert(user1)
|
||||
userDao.insert(user2)
|
||||
// Authors
|
||||
val authorDao = database.authorDao()
|
||||
val author1 = Author(1, "Дж. Оруэлл")
|
||||
val author2 = Author(2, "М.А. Булгаков")
|
||||
val author3 = Author(3, "Р. Брэдбери")
|
||||
authorDao.insert(author1)
|
||||
authorDao.insert(author2)
|
||||
authorDao.insert(author3)
|
||||
// Books
|
||||
val bookDao = database.bookDao()
|
||||
val book1 = Book(1,"1984", "Роман о том, как репрессивная машина тоталитарного государства может уничтожить любую личность.", "Был холодный ясный апрельский день, и часы пробили тринадцать.\n" + "Уинстон Смит, прижав подбородок к груди и ежась от омерзительного ветра, быстро скользнул в стеклянные двери Дома Победы, но все же вихрь песка и пыли успел ворваться вместе с ним.", getBookImage(context,"or1984"), 1, 1)
|
||||
val book2 = Book(2,"Собачье сердце", "Роман о бродячем псе Шарике, превращенном в человека.", "У‑у-у-у-у-гу-гуг-гуу! О, гляньте на меня, я погибаю.\n" + "Вьюга в подворотне ревёт мне отходную, и я вою с ней.\n" + "Пропал я, пропал.", getBookImage(context,"dogsheart"), 2, 1)
|
||||
val book3 = Book(3,"Вельд", "Рассказ о зависимости от технических устройств, потере человечности.", "— Джорджи, пожалуйста, посмотри детскую комнату.\n" + "— А что с ней?\n" + "— Не знаю.\n" + "— Так в чем же дело?", getBookImage(context,"veld"), 3, 1)
|
||||
val book4 = Book(4,"Роковые яйца", "Рассказ, критикующий стремление к прогрессу без учета последствий.","16 апреля 1928 года, вечером, профессор зоологии IV государственного университета и директор зооинститута в Москве Персиков вошел в свой кабинет, помещающийся в зооинституте, что на улице Герцена.\n" + "Профессор зажег верхний матовый шар и огляделся.", getBookImage(context,"eggs"), 2, 2)
|
||||
bookDao.insert(book1)
|
||||
bookDao.insert(book2)
|
||||
bookDao.insert(book3)
|
||||
bookDao.insert(book4) */
|
||||
}
|
||||
}
|
||||
|
||||
fun getInstance(appContext: Context): AppDatabase {
|
||||
return INSTANCE ?: synchronized(this) {
|
||||
Room.databaseBuilder(
|
||||
appContext,
|
||||
AppDatabase::class.java,
|
||||
DB_NAME
|
||||
)
|
||||
.addCallback(object : Callback() {
|
||||
override fun onCreate(db: SupportSQLiteDatabase) {
|
||||
super.onCreate(db)
|
||||
CoroutineScope(Dispatchers.IO).launch {
|
||||
populateDatabase(appContext)
|
||||
}
|
||||
}
|
||||
})
|
||||
.build()
|
||||
.also { INSTANCE = it }
|
||||
}
|
||||
}
|
||||
private fun getBookImage(context: Context, imageId: String): Bitmap {
|
||||
val inputStream = context.assets.open("${imageId}.jpg")
|
||||
val bitmap = BitmapFactory.decodeStream(inputStream)
|
||||
return bitmap
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,20 +0,0 @@
|
||||
package com.example.myapplication.db.database
|
||||
|
||||
import android.graphics.Bitmap
|
||||
import android.graphics.BitmapFactory
|
||||
import androidx.room.TypeConverter
|
||||
import java.io.ByteArrayOutputStream
|
||||
|
||||
class Converters {
|
||||
@TypeConverter
|
||||
fun fromBitmap(bitmap: Bitmap): ByteArray {
|
||||
val outputStream = ByteArrayOutputStream()
|
||||
bitmap.compress(Bitmap.CompressFormat.JPEG, 1, outputStream)
|
||||
return outputStream.toByteArray()
|
||||
}
|
||||
|
||||
@TypeConverter
|
||||
fun toBitmap(byteArray: ByteArray): Bitmap {
|
||||
return BitmapFactory.decodeByteArray(byteArray, 0, byteArray.size)
|
||||
}
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
package com.example.myapplication.db.model
|
||||
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Entity
|
||||
import androidx.room.Ignore
|
||||
import androidx.room.PrimaryKey
|
||||
|
||||
@Entity(tableName = "authors")
|
||||
data class Author(
|
||||
@PrimaryKey(autoGenerate = true)
|
||||
val id: Int = 0,
|
||||
@ColumnInfo(name = "author_name")
|
||||
val name: String
|
||||
) {
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (this === other) return true
|
||||
if (javaClass != other?.javaClass) return false
|
||||
other as Author
|
||||
if (id != other.id) return false
|
||||
return true
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
return id ?: -1
|
||||
}
|
||||
}
|
||||
@ -1,57 +0,0 @@
|
||||
package com.example.myapplication.db.model
|
||||
|
||||
import android.graphics.Bitmap
|
||||
import androidx.annotation.DrawableRes
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Entity
|
||||
import androidx.room.ForeignKey
|
||||
import androidx.room.PrimaryKey
|
||||
import androidx.room.Ignore
|
||||
|
||||
@Entity(
|
||||
tableName = "books", foreignKeys = [
|
||||
ForeignKey(
|
||||
entity = Author::class,
|
||||
parentColumns = ["id"],
|
||||
childColumns = ["author_id"],
|
||||
onDelete = ForeignKey.CASCADE,
|
||||
onUpdate = ForeignKey.CASCADE
|
||||
),
|
||||
ForeignKey(
|
||||
entity = User::class,
|
||||
parentColumns = ["uid"],
|
||||
childColumns = ["user_id"],
|
||||
onDelete = ForeignKey.CASCADE,
|
||||
onUpdate = ForeignKey.CASCADE
|
||||
)
|
||||
]
|
||||
)
|
||||
data class Book(
|
||||
@PrimaryKey(autoGenerate = true)
|
||||
val id: Int = 0,
|
||||
@ColumnInfo(name = "title")
|
||||
val title: String,
|
||||
@ColumnInfo(name = "description")
|
||||
val description: String,
|
||||
@ColumnInfo(name = "content")
|
||||
val content: String,
|
||||
@ColumnInfo(name = "cover")
|
||||
val cover: Bitmap?,
|
||||
@ColumnInfo(name = "author_id", index = true)
|
||||
val authorId: Int,
|
||||
@ColumnInfo(name = "user_id", index = true)
|
||||
val userId: Int
|
||||
) {
|
||||
|
||||
override fun equals(other: Any?): Boolean {
|
||||
if (this === other) return true
|
||||
if (javaClass != other?.javaClass) return false
|
||||
other as Book
|
||||
if (id != other.id) return false
|
||||
return true
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
return id ?: -1
|
||||
}
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
package com.example.myapplication.db.model
|
||||
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Embedded
|
||||
|
||||
data class BookWithAuthor(
|
||||
@Embedded
|
||||
val book: Book,
|
||||
@ColumnInfo(name = "author_name")
|
||||
val authorName: String
|
||||
)
|
||||
@ -1,26 +0,0 @@
|
||||
package com.example.myapplication.db.model
|
||||
|
||||
import androidx.room.Entity
|
||||
import androidx.room.PrimaryKey
|
||||
import androidx.room.TypeConverter
|
||||
import androidx.room.TypeConverters
|
||||
|
||||
enum class RemoteKeyType(private val type: String) {
|
||||
BOOK(Book::class.simpleName ?: "Book"),
|
||||
AUTHOR(Author::class.simpleName ?: "Author");
|
||||
|
||||
@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?
|
||||
)
|
||||
@ -1,34 +0,0 @@
|
||||
package com.example.myapplication.db.model
|
||||
|
||||
import androidx.room.ColumnInfo
|
||||
import androidx.room.Entity
|
||||
import androidx.room.PrimaryKey
|
||||
import androidx.room.Ignore
|
||||
import androidx.room.Index
|
||||
|
||||
@Entity(tableName = "users", indices = [(Index(value = ["login"], unique = true))])
|
||||
data class User(
|
||||
@PrimaryKey(autoGenerate = true)
|
||||
val uid: Int = 0,
|
||||
@ColumnInfo(name = "login")
|
||||
var login: String,
|
||||
@ColumnInfo(name = "password")
|
||||
var password: String,
|
||||
@ColumnInfo(name = "email")
|
||||
var email: String,
|
||||
@ColumnInfo(name = "admin")
|
||||
var role: String,
|
||||
) {
|
||||
|
||||
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
|
||||
return true
|
||||
}
|
||||
|
||||
override fun hashCode(): Int {
|
||||
return uid ?: -1
|
||||
}
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
package com.example.myapplication.db.respository
|
||||
|
||||
import androidx.paging.PagingData
|
||||
import com.example.myapplication.db.model.Author
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
interface AuthorRepository {
|
||||
suspend fun getAll(): List<Author>
|
||||
suspend fun getAllDrop(): List<Author>
|
||||
suspend fun getByUid(uid: Int): Author
|
||||
fun loadAllAuthorsPaged(): Flow<PagingData<Author>>
|
||||
suspend fun insertAuthor(author: Author)
|
||||
suspend fun updateAuthor(author: Author)
|
||||
suspend fun deleteAuthor(author: Author)
|
||||
}
|
||||
@ -1,19 +0,0 @@
|
||||
package com.example.myapplication.db.respository
|
||||
|
||||
import androidx.paging.PagingData
|
||||
import androidx.paging.PagingSource
|
||||
import com.example.myapplication.db.model.Book
|
||||
import com.example.myapplication.db.model.BookWithAuthor
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
interface BookRepository {
|
||||
suspend fun getAll(): List<Book>
|
||||
suspend fun getByUid(uid: Int): Book
|
||||
suspend fun getBySearch(searchStr: String): List<Book>
|
||||
suspend fun getByUserId(userId: Int): List<Book>
|
||||
suspend fun getByAuthorId(authorId: Int): List<Book>
|
||||
fun loadAllBooksPaged(): Flow<PagingData<Book>>
|
||||
suspend fun insertBook(book: Book)
|
||||
suspend fun updateBook(book: Book)
|
||||
suspend fun deleteBook(book: Book)
|
||||
}
|
||||
@ -1,32 +0,0 @@
|
||||
package com.example.myapplication.db.respository
|
||||
|
||||
import androidx.paging.Pager
|
||||
import androidx.paging.PagingConfig
|
||||
import androidx.paging.PagingData
|
||||
import androidx.paging.PagingSource
|
||||
import com.example.myapplication.db.database.AppContainer
|
||||
import com.example.myapplication.db.dao.AuthorDao
|
||||
import com.example.myapplication.db.model.Author
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
class OfflineAuthorRepository(private val authorDao: AuthorDao) : AuthorRepository {
|
||||
override suspend fun getAll(): List<Author> = authorDao.getAll()
|
||||
override suspend fun getAllDrop(): List<Author> = authorDao.getAllDrop()
|
||||
override suspend fun getByUid(uid: Int): Author = authorDao.getByUid(uid)
|
||||
suspend fun insertAuthors(authors: List<Author>) =
|
||||
authorDao.insert(*authors.toTypedArray())
|
||||
override fun loadAllAuthorsPaged(): Flow<PagingData<Author>> = Pager(
|
||||
config = PagingConfig(
|
||||
pageSize = AppContainer.LIMIT,
|
||||
enablePlaceholders = false
|
||||
),
|
||||
pagingSourceFactory = authorDao::loadAllAuthorsPaged
|
||||
).flow
|
||||
fun loadAuthorsPaged(): PagingSource<Int, Author> = authorDao.loadAllAuthorsPaged()
|
||||
suspend fun clearAll() = authorDao.clearAll()
|
||||
override suspend fun insertAuthor(author: Author) = authorDao.insert(author)
|
||||
|
||||
override suspend fun updateAuthor(author: Author) = authorDao.update(author)
|
||||
|
||||
override suspend fun deleteAuthor(author: Author) = authorDao.delete(author)
|
||||
}
|
||||
@ -1,37 +0,0 @@
|
||||
package com.example.myapplication.db.respository
|
||||
|
||||
import androidx.paging.Pager
|
||||
import androidx.paging.PagingConfig
|
||||
import androidx.paging.PagingData
|
||||
import androidx.paging.PagingSource
|
||||
import com.example.myapplication.db.database.AppContainer
|
||||
import com.example.myapplication.db.dao.BookDao
|
||||
import com.example.myapplication.db.model.Book
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
class OfflineBookRepository(private val bookDao: BookDao) : BookRepository {
|
||||
override suspend fun getAll(): List<Book> = bookDao.getAll()
|
||||
|
||||
override suspend fun getByUid(uid: Int): Book = bookDao.getByUid(uid)
|
||||
|
||||
override suspend fun getBySearch(searchStr: String): List<Book> = bookDao.getBySearch(searchStr)
|
||||
|
||||
override suspend fun getByUserId(userId: Int): List<Book> = bookDao.getByUserId(userId)
|
||||
override suspend fun getByAuthorId(authorId: Int): List<Book> = bookDao.getByAuthorId(authorId)
|
||||
suspend fun insertBooks(books: List<Book>) =
|
||||
bookDao.insert(*books.toTypedArray())
|
||||
override fun loadAllBooksPaged(): Flow<PagingData<Book>> = Pager(
|
||||
config = PagingConfig(
|
||||
pageSize = AppContainer.LIMIT,
|
||||
enablePlaceholders = false
|
||||
),
|
||||
pagingSourceFactory = bookDao::loadAllBooksPaged
|
||||
).flow
|
||||
fun loadBooksPaged(): PagingSource<Int, Book> = bookDao.loadAllBooksPaged()
|
||||
suspend fun clearAll() = bookDao.clearAll()
|
||||
override suspend fun insertBook(book: Book) = bookDao.insert(book)
|
||||
|
||||
override suspend fun updateBook(book: Book) = bookDao.update(book)
|
||||
|
||||
override suspend fun deleteBook(book: Book) = bookDao.delete(book)
|
||||
}
|
||||
@ -1,16 +0,0 @@
|
||||
package com.example.myapplication.db.respository
|
||||
|
||||
import com.example.myapplication.db.dao.RemoteKeysDao
|
||||
import com.example.myapplication.db.model.RemoteKeyType
|
||||
import com.example.myapplication.db.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)
|
||||
}
|
||||
@ -1,26 +0,0 @@
|
||||
package com.example.myapplication.db.respository
|
||||
|
||||
import com.example.myapplication.db.dao.UserDao;
|
||||
import com.example.myapplication.db.model.User;
|
||||
import com.example.myapplication.db.model.Book;
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
|
||||
class OfflineUserRepository(private val userDao: UserDao) : UserRepository {
|
||||
override suspend fun getAll(): List<User> = userDao.getAll()
|
||||
|
||||
override suspend fun getByUid(uid: Int): User? = userDao.getByUid(uid)
|
||||
|
||||
override suspend fun getUserBooks(userid: Int): List<Book> = userDao.getUserBooks(userid)
|
||||
|
||||
override suspend fun tryLogin(login: String, password: String): User? = userDao.tryLogin(login, password)
|
||||
suspend fun insertUsers(users: List<User>) =
|
||||
userDao.insert(*users.toTypedArray())
|
||||
|
||||
suspend fun clearAll() = userDao.clearAll()
|
||||
|
||||
override suspend fun insert(user: User) = userDao.insert(user)
|
||||
|
||||
override suspend fun update(user: User) = userDao.update(user)
|
||||
|
||||
override suspend fun delete(user: User) = userDao.delete(user)
|
||||
}
|
||||
@ -1,10 +0,0 @@
|
||||
package com.example.myapplication.db.respository
|
||||
|
||||
import com.example.myapplication.db.model.RemoteKeyType
|
||||
import com.example.myapplication.db.model.RemoteKeys
|
||||
|
||||
interface RemoteKeyRepository {
|
||||
suspend fun getAllRemoteKeys(id: Int, type: RemoteKeyType): RemoteKeys?
|
||||
suspend fun createRemoteKeys(remoteKeys: List<RemoteKeys>)
|
||||
suspend fun deleteRemoteKey(type: RemoteKeyType)
|
||||
}
|
||||
@ -1,14 +0,0 @@
|
||||
package com.example.myapplication.db.respository
|
||||
|
||||
import com.example.myapplication.db.model.User;
|
||||
import com.example.myapplication.db.model.Book;
|
||||
import kotlinx.coroutines.flow.Flow
|
||||
interface UserRepository {
|
||||
suspend fun getAll(): List<User>
|
||||
suspend fun getByUid(uid: Int): User?
|
||||
suspend fun getUserBooks(userid: Int): List<Book>
|
||||
suspend fun tryLogin(login: String, password: String): User?
|
||||
suspend fun insert(user: User)
|
||||
suspend fun update(user: User)
|
||||
suspend fun delete(user: User)
|
||||
}
|
||||
@ -1,11 +0,0 @@
|
||||
package com.example.myapplication.ui.theme
|
||||
|
||||
import androidx.compose.ui.graphics.Color
|
||||
|
||||
val Purple80 = Color(0xFFD0BCFF)
|
||||
val PurpleGrey80 = Color(0xFFCCC2DC)
|
||||
val Pink80 = Color(0xFFEFB8C8)
|
||||
|
||||
val Green = Color(0xFF07B618)
|
||||
val Grey = Color(0xFF686769)
|
||||
val Pink40 = Color(0xFF7D5260)
|
||||
@ -1,71 +0,0 @@
|
||||
package com.example.myapplication.ui.theme
|
||||
|
||||
import android.app.Activity
|
||||
import android.os.Build
|
||||
import androidx.compose.foundation.isSystemInDarkTheme
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.darkColorScheme
|
||||
import androidx.compose.material3.dynamicDarkColorScheme
|
||||
import androidx.compose.material3.dynamicLightColorScheme
|
||||
import androidx.compose.material3.lightColorScheme
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.SideEffect
|
||||
import androidx.compose.ui.graphics.toArgb
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalView
|
||||
import androidx.core.view.WindowCompat
|
||||
|
||||
private val DarkColorScheme = darkColorScheme(
|
||||
primary = Green,
|
||||
secondary = Grey,
|
||||
tertiary = Pink40,
|
||||
)
|
||||
|
||||
private val LightColorScheme = lightColorScheme(
|
||||
primary = Green,
|
||||
secondary = Grey,
|
||||
tertiary = Pink40,
|
||||
|
||||
// Other default colors to override
|
||||
background = Color(0xFFD8E2F1),
|
||||
surface = Color(0xFFFFFBFE),
|
||||
onPrimary = Color.White,
|
||||
onSecondary = Color.White,
|
||||
onTertiary = Color.White,
|
||||
onBackground = Color(0xFF1C1B1F),
|
||||
onSurface = Color(0xFF1C1B1F),
|
||||
|
||||
)
|
||||
|
||||
@Composable
|
||||
fun MyApplicationTheme(
|
||||
darkTheme: Boolean = isSystemInDarkTheme(),
|
||||
// Dynamic color is available on Android 12+
|
||||
dynamicColor: Boolean = false,
|
||||
content: @Composable () -> Unit
|
||||
) {
|
||||
val colorScheme = when {
|
||||
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
|
||||
val context = LocalContext.current
|
||||
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
|
||||
}
|
||||
|
||||
darkTheme -> DarkColorScheme
|
||||
else -> LightColorScheme
|
||||
}
|
||||
val view = LocalView.current
|
||||
if (!view.isInEditMode) {
|
||||
SideEffect {
|
||||
val window = (view.context as Activity).window
|
||||
window.statusBarColor = colorScheme.primary.toArgb()
|
||||
WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
|
||||
}
|
||||
}
|
||||
|
||||
MaterialTheme(
|
||||
colorScheme = colorScheme,
|
||||
typography = Typography,
|
||||
content = content
|
||||
)
|
||||
}
|
||||
@ -1,33 +0,0 @@
|
||||
package com.example.myapplication.ui.theme
|
||||
|
||||
import androidx.compose.material3.Typography
|
||||
import androidx.compose.ui.text.TextStyle
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.sp
|
||||
|
||||
// Set of Material typography styles to start with
|
||||
val Typography = Typography(
|
||||
bodyLarge = TextStyle(
|
||||
fontFamily = FontFamily.Default,
|
||||
fontWeight = FontWeight.Normal,
|
||||
fontSize = 20.sp,
|
||||
lineHeight = 28.sp,
|
||||
letterSpacing = 0.5.sp
|
||||
),
|
||||
//Other default text styles to override
|
||||
titleLarge = TextStyle(
|
||||
fontFamily = FontFamily.Default,
|
||||
fontWeight = FontWeight.Normal,
|
||||
fontSize = 32.sp,
|
||||
lineHeight = 40.sp,
|
||||
letterSpacing = 0.sp
|
||||
),
|
||||
labelLarge = TextStyle(
|
||||
fontFamily = FontFamily.Default,
|
||||
fontWeight = FontWeight.Normal,
|
||||
fontSize = 20.sp,
|
||||
lineHeight = 28.sp,
|
||||
letterSpacing = 0.5.sp
|
||||
)
|
||||
)
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 17 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 30 KiB |
@ -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>
|
||||
@ -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>
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 20 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 49 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 16 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.0 KiB |
@ -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>
|
||||
@ -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>
|
||||
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in New Issue
Block a user