Compare commits
No commits in common. "master" and "main" have entirely different histories.
48
.gitignore
vendored
48
.gitignore
vendored
@ -1,15 +1,35 @@
|
|||||||
*.iml
|
# ---> Android
|
||||||
.gradle
|
# Gradle files
|
||||||
/local.properties
|
.gradle/
|
||||||
/.idea/caches
|
build/
|
||||||
/.idea/libraries
|
|
||||||
/.idea/modules.xml
|
# Local configuration file (sdk path, etc)
|
||||||
/.idea/workspace.xml
|
|
||||||
/.idea/navEditor.xml
|
|
||||||
/.idea/assetWizardSettings.xml
|
|
||||||
.DS_Store
|
|
||||||
/build
|
|
||||||
/captures
|
|
||||||
.externalNativeBuild
|
|
||||||
.cxx
|
|
||||||
local.properties
|
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,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,41 +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>
|
|
||||||
</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.10" />
|
|
||||||
</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,6 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="VcsDirectoryMappings">
|
|
||||||
<mapping directory="$PROJECT_DIR$" vcs="Git" />
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
1
app/.gitignore
vendored
1
app/.gitignore
vendored
@ -1 +0,0 @@
|
|||||||
/build
|
|
||||||
@ -1,71 +0,0 @@
|
|||||||
plugins {
|
|
||||||
id("com.android.application")
|
|
||||||
id("org.jetbrains.kotlin.android")
|
|
||||||
}
|
|
||||||
|
|
||||||
android {
|
|
||||||
namespace = "com.example.mobileapp"
|
|
||||||
compileSdk = 34
|
|
||||||
|
|
||||||
defaultConfig {
|
|
||||||
applicationId = "com.example.mobileapp"
|
|
||||||
minSdk = 24
|
|
||||||
targetSdk = 34
|
|
||||||
versionCode = 1
|
|
||||||
versionName = "1.0"
|
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
|
||||||
vectorDrawables {
|
|
||||||
useSupportLibrary = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
buildTypes {
|
|
||||||
release {
|
|
||||||
isMinifyEnabled = false
|
|
||||||
proguardFiles(
|
|
||||||
getDefaultProguardFile("proguard-android-optimize.txt"),
|
|
||||||
"proguard-rules.pro"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
compileOptions {
|
|
||||||
sourceCompatibility = JavaVersion.VERSION_1_8
|
|
||||||
targetCompatibility = JavaVersion.VERSION_1_8
|
|
||||||
}
|
|
||||||
kotlinOptions {
|
|
||||||
jvmTarget = "1.8"
|
|
||||||
}
|
|
||||||
buildFeatures {
|
|
||||||
compose = true
|
|
||||||
}
|
|
||||||
composeOptions {
|
|
||||||
kotlinCompilerExtensionVersion = "1.4.3"
|
|
||||||
}
|
|
||||||
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.2")
|
|
||||||
implementation("androidx.activity:activity-compose:1.8.0")
|
|
||||||
implementation(platform("androidx.compose:compose-bom:2023.03.00"))
|
|
||||||
implementation("androidx.compose.ui:ui")
|
|
||||||
implementation("androidx.compose.ui:ui-graphics")
|
|
||||||
implementation("androidx.compose.ui:ui-tooling-preview")
|
|
||||||
implementation("androidx.compose.material3:material3")
|
|
||||||
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")
|
|
||||||
|
|
||||||
implementation("androidx.navigation:navigation-compose:2.7.3")
|
|
||||||
}
|
|
||||||
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.mobileapp
|
|
||||||
|
|
||||||
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.mobileapp", appContext.packageName)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,28 +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">
|
|
||||||
|
|
||||||
<application
|
|
||||||
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.MobileApp"
|
|
||||||
tools:targetApi="31">
|
|
||||||
<activity
|
|
||||||
android:name=".MainActivity"
|
|
||||||
android:exported="true"
|
|
||||||
android:label="@string/app_name"
|
|
||||||
android:theme="@style/Theme.MobileApp">
|
|
||||||
<intent-filter>
|
|
||||||
<action android:name="android.intent.action.MAIN" />
|
|
||||||
|
|
||||||
<category android:name="android.intent.category.LAUNCHER" />
|
|
||||||
</intent-filter>
|
|
||||||
</activity>
|
|
||||||
</application>
|
|
||||||
|
|
||||||
</manifest>
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
package com.example.mobileapp
|
|
||||||
|
|
||||||
import android.os.Bundle
|
|
||||||
import androidx.activity.ComponentActivity
|
|
||||||
import androidx.activity.compose.setContent
|
|
||||||
import com.example.mobileapp.navigation.AppNavigation
|
|
||||||
|
|
||||||
class MainActivity : ComponentActivity() {
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
setContent {
|
|
||||||
AppNavigation()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
package com.example.mobileapp.models
|
|
||||||
|
|
||||||
data class Cart(
|
|
||||||
val id: Int,
|
|
||||||
val userId: Int,
|
|
||||||
val price: Int?,
|
|
||||||
)
|
|
||||||
|
|
||||||
fun getCarts(): List<Cart> {
|
|
||||||
return listOf(
|
|
||||||
Cart(1,1, getCartProductsByCartId(1).sumOf { getProductById(it.productId).price * it.amount }),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getCartByUserId(id: Int): Cart{
|
|
||||||
return getCarts().find { it.userId == id }!!
|
|
||||||
}
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
package com.example.mobileapp.models
|
|
||||||
|
|
||||||
data class CartProduct(
|
|
||||||
val cartId: Int,
|
|
||||||
val productId: Int,
|
|
||||||
val amount: Int,
|
|
||||||
)
|
|
||||||
|
|
||||||
fun getAllCartProducts(): List<CartProduct> {
|
|
||||||
return listOf(
|
|
||||||
CartProduct(1, 1, 2),
|
|
||||||
CartProduct(1, 4, 1),
|
|
||||||
CartProduct(1, 7, 1),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getCartProductsByCartId(id: Int): List<CartProduct> {
|
|
||||||
return getAllCartProducts().filter { it.cartId == id }
|
|
||||||
}
|
|
||||||
@ -1,18 +0,0 @@
|
|||||||
package com.example.mobileapp.models
|
|
||||||
|
|
||||||
data class Category(
|
|
||||||
val id: Int,
|
|
||||||
val title: String,
|
|
||||||
)
|
|
||||||
|
|
||||||
fun getCategories():List<Category>{
|
|
||||||
return listOf(
|
|
||||||
Category(1, "Бургеры"),
|
|
||||||
Category(2, "Картошка"),
|
|
||||||
Category(3, "Напитки"),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getCategoryById(id: Int):String{
|
|
||||||
return getCategories().find{ it.id == id }!!.title
|
|
||||||
}
|
|
||||||
@ -1,21 +0,0 @@
|
|||||||
package com.example.mobileapp.models
|
|
||||||
|
|
||||||
data class Order(
|
|
||||||
val id: Int,
|
|
||||||
val userId: Int,
|
|
||||||
val price: Int,
|
|
||||||
val status: String
|
|
||||||
|
|
||||||
)
|
|
||||||
|
|
||||||
fun getOrders(): List<Order> {
|
|
||||||
return listOf(
|
|
||||||
Order(1,1, getOrderProductsByOrderId(1).sumOf { getProductById(it.productId).price * it.amount }, "Принят"),
|
|
||||||
Order(2,1, getOrderProductsByOrderId(2).sumOf { getProductById(it.productId).price * it.amount }, "Принят"),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
fun getOrdersByUserId(id: Int): List<Order>{
|
|
||||||
return getOrders().filter { it.userId == id }
|
|
||||||
}
|
|
||||||
@ -1,22 +0,0 @@
|
|||||||
package com.example.mobileapp.models
|
|
||||||
|
|
||||||
data class OrderProduct(
|
|
||||||
val orderId: Int,
|
|
||||||
val productId: Int,
|
|
||||||
val amount: Int,
|
|
||||||
)
|
|
||||||
|
|
||||||
fun getAllOrderProducts(): List<OrderProduct> {
|
|
||||||
return listOf(
|
|
||||||
OrderProduct(1, 1, 2),
|
|
||||||
OrderProduct(1, 4, 1),
|
|
||||||
OrderProduct(1, 7, 1),
|
|
||||||
OrderProduct(2, 1, 2),
|
|
||||||
OrderProduct(2, 4, 1),
|
|
||||||
OrderProduct(2, 7, 1),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getOrderProductsByOrderId(id: Int): List<OrderProduct> {
|
|
||||||
return getAllOrderProducts().filter { it.orderId == id }
|
|
||||||
}
|
|
||||||
@ -1,32 +0,0 @@
|
|||||||
package com.example.mobileapp.models
|
|
||||||
|
|
||||||
data class Product(
|
|
||||||
val id: Int,
|
|
||||||
val picture: String,
|
|
||||||
val title: String,
|
|
||||||
val category: Int,
|
|
||||||
val price: Int,
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
fun getProducts() :List<Product> {
|
|
||||||
return listOf(
|
|
||||||
Product(1, "Бургер", "Бургер1", 1,150),
|
|
||||||
Product(2, "Бургер", "Бургер2", 1,300),
|
|
||||||
Product(3, "Бургер", "Бургер3", 1,450),
|
|
||||||
Product(4, "Картошка", "Картошка1", 2,100),
|
|
||||||
Product(5, "Картошка", "Картошка2", 2,200),
|
|
||||||
Product(6, "Картошка", "Картошка3", 2,300),
|
|
||||||
Product(7, "Пепси", "Пепси1", 3,50),
|
|
||||||
Product(8, "Пепси", "Пепси2", 3,100),
|
|
||||||
Product(9, "Пепси", "Пепси3", 3,150),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getProductsByCategoryId(id: Int) :List<Product> {
|
|
||||||
return getProducts().filter { it.category == id }
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getProductById(id: Int) : Product {
|
|
||||||
return getProducts().find{ it.id == id }!!
|
|
||||||
}
|
|
||||||
@ -1,30 +0,0 @@
|
|||||||
package com.example.mobileapp.models
|
|
||||||
|
|
||||||
enum class Roles(val roleId: Int) {
|
|
||||||
admin(0),
|
|
||||||
worker(1),
|
|
||||||
user(2);
|
|
||||||
|
|
||||||
companion object{
|
|
||||||
fun fromId(id: Int): Roles? {
|
|
||||||
return values().find { it.roleId == id }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data class Role(
|
|
||||||
val id: Int,
|
|
||||||
val title: String,
|
|
||||||
)
|
|
||||||
|
|
||||||
fun getRoles():List<Role>{
|
|
||||||
return listOf(
|
|
||||||
Role(1, "admin"),
|
|
||||||
Role(2, "worker"),
|
|
||||||
Role(3, "user"),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun getRoleById(id: Int):String{
|
|
||||||
return getRoles().find{ it.id == id }!!.title
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
package com.example.mobileapp.models
|
|
||||||
|
|
||||||
data class User(
|
|
||||||
val id: Int,
|
|
||||||
val login: String,
|
|
||||||
val password: String,
|
|
||||||
val role: Roles
|
|
||||||
)
|
|
||||||
|
|
||||||
fun getAllUsers():List<User>{
|
|
||||||
return listOf(
|
|
||||||
User(1, "admin", "admin", Roles.admin),
|
|
||||||
User(2, "worker", "worker", Roles.worker),
|
|
||||||
User(3, "user", "user", Roles.user),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun currentUser():User{
|
|
||||||
return getAllUsers()[0]
|
|
||||||
}
|
|
||||||
@ -1,121 +0,0 @@
|
|||||||
package com.example.mobileapp.navigation
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
|
||||||
import androidx.compose.material3.Icon
|
|
||||||
import androidx.compose.material3.OutlinedButton
|
|
||||||
import androidx.compose.material3.Scaffold
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.navigation.NavController
|
|
||||||
import androidx.navigation.compose.NavHost
|
|
||||||
import androidx.navigation.compose.composable
|
|
||||||
import androidx.navigation.compose.currentBackStackEntryAsState
|
|
||||||
import androidx.navigation.compose.rememberNavController
|
|
||||||
import com.example.mobileapp.models.Roles
|
|
||||||
import com.example.mobileapp.models.currentUser
|
|
||||||
import com.example.mobileapp.screens.AuthorizationScreen
|
|
||||||
import com.example.mobileapp.screens.CartScreen
|
|
||||||
import com.example.mobileapp.screens.CreateProductScreen
|
|
||||||
import com.example.mobileapp.screens.EditMenuScreen
|
|
||||||
import com.example.mobileapp.screens.EditProductScreen
|
|
||||||
import com.example.mobileapp.screens.ManagmentScreen
|
|
||||||
import com.example.mobileapp.screens.MenuScreen
|
|
||||||
import com.example.mobileapp.screens.OrderScreen
|
|
||||||
import com.example.mobileapp.screens.ProfileScreen
|
|
||||||
import com.example.mobileapp.screens.RegistrationScreen
|
|
||||||
import com.example.mobileapp.screens.UsersScreen
|
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
|
||||||
fun AppNavigation(){
|
|
||||||
val navController = rememberNavController()
|
|
||||||
Scaffold(
|
|
||||||
bottomBar = {
|
|
||||||
val navBackStackEntry by navController.currentBackStackEntryAsState()
|
|
||||||
val currentRoute = navBackStackEntry?.destination?.route
|
|
||||||
if (currentRoute != Screens.AuthorizationScreen.name && currentRoute != Screens.RegistrationScreen.name) {
|
|
||||||
CustomNavigationBar(navController)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
){
|
|
||||||
paddingValues ->
|
|
||||||
NavHost(
|
|
||||||
navController = navController,
|
|
||||||
startDestination = Screens.AuthorizationScreen.name,
|
|
||||||
modifier = Modifier.padding(paddingValues)
|
|
||||||
){
|
|
||||||
composable(route = Screens.MenuScreen.name){ MenuScreen() }
|
|
||||||
composable(route = Screens.ProfileScreen.name){ ProfileScreen(navController) }
|
|
||||||
composable(route = Screens.CartScreen.name){ CartScreen() }
|
|
||||||
composable(route = Screens.ManagmentScreen.name){ ManagmentScreen(navController) }
|
|
||||||
composable(route = Screens.OrderScreen.name){ OrderScreen() }
|
|
||||||
|
|
||||||
composable(route = Screens.AuthorizationScreen.name){ AuthorizationScreen(navController) }
|
|
||||||
composable(route = Screens.CreateProductScreen.name){ CreateProductScreen() }
|
|
||||||
composable(route = Screens.EditMenuScreen.name){ EditMenuScreen(navController) }
|
|
||||||
composable(route = Screens.RegistrationScreen.name){ RegistrationScreen(navController) }
|
|
||||||
composable(route = Screens.UsersScreen.name){ UsersScreen() }
|
|
||||||
composable(route = Screens.EditProductScreen.name + "/{productId}"){ backStackEntry ->
|
|
||||||
val productId = backStackEntry.arguments?.getString("productId")
|
|
||||||
EditProductScreen(productId.toString().toInt())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun CustomNavigationBar(navController: NavController) {
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.fillMaxHeight(0.1f)
|
|
||||||
.background(Color(212, 206, 203))
|
|
||||||
) {
|
|
||||||
var listOfNavItems : List<NavItem>? = null
|
|
||||||
|
|
||||||
when (currentUser().role.name) {
|
|
||||||
Roles.admin.name -> listOfNavItems = listOfAdminNavItems
|
|
||||||
Roles.worker.name -> listOfNavItems = listOfWorkerNavItems
|
|
||||||
Roles.user.name -> listOfNavItems = listOfUserNavItems
|
|
||||||
}
|
|
||||||
|
|
||||||
listOfNavItems?.forEachIndexed { index, navItem ->
|
|
||||||
OutlinedButton(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight()
|
|
||||||
.weight(1f),
|
|
||||||
onClick = {
|
|
||||||
navController.navigate(navItem.route) {
|
|
||||||
popUpTo(navController.graph.startDestinationId)
|
|
||||||
launchSingleTop = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(
|
|
||||||
topStart = if (index == 0) 30.dp else 0.dp,
|
|
||||||
topEnd = if (index == listOfNavItems.size - 1) 30.dp else 0.dp
|
|
||||||
),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
|
|
||||||
){
|
|
||||||
Icon(
|
|
||||||
painterResource(id = navItem.icon),
|
|
||||||
contentDescription = null,
|
|
||||||
tint = Color.Black
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,78 +0,0 @@
|
|||||||
package com.example.mobileapp.navigation
|
|
||||||
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
|
|
||||||
data class NavItem(
|
|
||||||
val label: String,
|
|
||||||
val icon: Int,
|
|
||||||
val route: String
|
|
||||||
)
|
|
||||||
|
|
||||||
val listOfAdminNavItems = listOf(
|
|
||||||
NavItem(
|
|
||||||
label = "Order",
|
|
||||||
icon = R.drawable.icon_order,
|
|
||||||
route = Screens.OrderScreen.name
|
|
||||||
),
|
|
||||||
NavItem(
|
|
||||||
label = "Profile",
|
|
||||||
icon = R.drawable.icon_profile,
|
|
||||||
route = Screens.ProfileScreen.name
|
|
||||||
),
|
|
||||||
NavItem(
|
|
||||||
label = "Menu",
|
|
||||||
icon = R.drawable.icon_menu,
|
|
||||||
route = Screens.MenuScreen.name
|
|
||||||
),
|
|
||||||
NavItem(
|
|
||||||
label = "Cart",
|
|
||||||
icon = R.drawable.icon_cart,
|
|
||||||
route = Screens.CartScreen.name
|
|
||||||
),
|
|
||||||
NavItem(
|
|
||||||
label = "Managment",
|
|
||||||
icon = R.drawable.icon_managment,
|
|
||||||
route = Screens.ManagmentScreen.name
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
val listOfUserNavItems = listOf(
|
|
||||||
NavItem(
|
|
||||||
label = "Profile",
|
|
||||||
icon = R.drawable.icon_profile,
|
|
||||||
route = Screens.ProfileScreen.name
|
|
||||||
),
|
|
||||||
NavItem(
|
|
||||||
label = "Menu",
|
|
||||||
icon = R.drawable.icon_menu,
|
|
||||||
route = Screens.MenuScreen.name
|
|
||||||
),
|
|
||||||
NavItem(
|
|
||||||
label = "Cart",
|
|
||||||
icon = R.drawable.icon_cart,
|
|
||||||
route = Screens.CartScreen.name
|
|
||||||
),
|
|
||||||
)
|
|
||||||
|
|
||||||
val listOfWorkerNavItems = listOf(
|
|
||||||
NavItem(
|
|
||||||
label = "Order",
|
|
||||||
icon = R.drawable.icon_order,
|
|
||||||
route = Screens.OrderScreen.name
|
|
||||||
),
|
|
||||||
NavItem(
|
|
||||||
label = "Profile",
|
|
||||||
icon = R.drawable.icon_profile,
|
|
||||||
route = Screens.ProfileScreen.name
|
|
||||||
),
|
|
||||||
NavItem(
|
|
||||||
label = "Menu",
|
|
||||||
icon = R.drawable.icon_menu,
|
|
||||||
route = Screens.MenuScreen.name
|
|
||||||
),
|
|
||||||
NavItem(
|
|
||||||
label = "Cart",
|
|
||||||
icon = R.drawable.icon_cart,
|
|
||||||
route = Screens.CartScreen.name
|
|
||||||
),
|
|
||||||
)
|
|
||||||
@ -1,15 +0,0 @@
|
|||||||
package com.example.mobileapp.navigation
|
|
||||||
|
|
||||||
enum class Screens {
|
|
||||||
CartScreen,
|
|
||||||
ManagmentScreen,
|
|
||||||
MenuScreen,
|
|
||||||
OrderScreen,
|
|
||||||
ProfileScreen,
|
|
||||||
AuthorizationScreen,
|
|
||||||
CreateProductScreen,
|
|
||||||
EditMenuScreen,
|
|
||||||
EditProductScreen,
|
|
||||||
RegistrationScreen,
|
|
||||||
UsersScreen,
|
|
||||||
}
|
|
||||||
@ -1,171 +0,0 @@
|
|||||||
package com.example.mobileapp.screens
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
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.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.Button
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.Card
|
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
|
||||||
import androidx.compose.material3.OutlinedTextField
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.material3.TextFieldDefaults
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.text.TextStyle
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.input.TextFieldValue
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import androidx.navigation.NavController
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
import com.example.mobileapp.navigation.Screens
|
|
||||||
import com.example.mobileapp.widgets.Header
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun AuthorizationScreen(navController: NavController) {
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Header(Color.White)
|
|
||||||
AuthorizationCard(navController)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
|
||||||
fun AuthorizationCard(navController: NavController){
|
|
||||||
val login = remember { mutableStateOf(TextFieldValue("")) }
|
|
||||||
val password = remember { mutableStateOf(TextFieldValue("")) }
|
|
||||||
|
|
||||||
Column(
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(30.dp),
|
|
||||||
modifier = Modifier.padding(top = 30.dp)
|
|
||||||
) {
|
|
||||||
|
|
||||||
Column (
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
modifier = Modifier
|
|
||||||
.background(Color(212, 206, 203))
|
|
||||||
.fillMaxWidth(0.9f)
|
|
||||||
) {
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(90.dp, 90.dp, 30.dp, 30.dp),
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 30.dp, start = 20.dp, end = 20.dp)
|
|
||||||
){
|
|
||||||
Text(
|
|
||||||
text = "Авторизация",
|
|
||||||
color = Color.White,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_bold)),
|
|
||||||
fontSize = 30.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.background(Color(255, 186, 83))
|
|
||||||
.padding(top = 20.dp, bottom = 20.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
OutlinedTextField(
|
|
||||||
value = login.value,
|
|
||||||
onValueChange = {login.value = it},
|
|
||||||
placeholder = { Text(text = "Логин", fontSize = 20.sp, color = Color.LightGray) },
|
|
||||||
singleLine = true,
|
|
||||||
|
|
||||||
shape = RoundedCornerShape(30.dp, 30.dp, 30.dp, 30.dp),
|
|
||||||
textStyle = TextStyle(fontSize = 20.sp),
|
|
||||||
colors = TextFieldDefaults.outlinedTextFieldColors(
|
|
||||||
textColor = Color.Black,
|
|
||||||
disabledTextColor = Color.Transparent,
|
|
||||||
containerColor = Color.White,
|
|
||||||
focusedBorderColor = Color.Yellow,
|
|
||||||
unfocusedBorderColor = Color.Yellow,
|
|
||||||
),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
)
|
|
||||||
|
|
||||||
OutlinedTextField(
|
|
||||||
value = password.value,
|
|
||||||
onValueChange = {password.value = it},
|
|
||||||
placeholder = { Text(text = "Пароль", fontSize = 20.sp, color = Color.LightGray) },
|
|
||||||
singleLine = true,
|
|
||||||
shape = RoundedCornerShape(30.dp, 30.dp, 30.dp, 30.dp),
|
|
||||||
textStyle = TextStyle(fontSize = 20.sp),
|
|
||||||
colors = TextFieldDefaults.outlinedTextFieldColors(
|
|
||||||
textColor = Color.Black,
|
|
||||||
disabledTextColor = Color.Transparent,
|
|
||||||
containerColor = Color.White,
|
|
||||||
focusedBorderColor = Color(183,97,48),
|
|
||||||
unfocusedBorderColor = Color(183,97,48),
|
|
||||||
),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
)
|
|
||||||
|
|
||||||
Button(
|
|
||||||
onClick = {
|
|
||||||
navController.navigate(Screens.MenuScreen.name) {
|
|
||||||
popUpTo(navController.graph.startDestinationId)
|
|
||||||
launchSingleTop = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
colors = ButtonDefaults.buttonColors(Color(255,186,83), Color.White),
|
|
||||||
shape = RoundedCornerShape(30.dp, 30.dp, 30.dp, 30.dp),
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp)
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Войти",
|
|
||||||
color = Color.White,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_bold)),
|
|
||||||
fontSize = 30.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Button(
|
|
||||||
onClick = {
|
|
||||||
navController.navigate(Screens.RegistrationScreen.name) {
|
|
||||||
popUpTo(navController.graph.startDestinationId)
|
|
||||||
launchSingleTop = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
colors = ButtonDefaults.buttonColors(Color(212,206,203)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp, start = 20.dp, end = 20.dp)
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Создать аккаунт",
|
|
||||||
color = Color.White,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_bold)),
|
|
||||||
fontSize = 20.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,247 +0,0 @@
|
|||||||
package com.example.mobileapp.screens
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.Image
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.layout.size
|
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
|
||||||
import androidx.compose.foundation.lazy.items
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.Card
|
|
||||||
import androidx.compose.material3.OutlinedButton
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.input.TextFieldValue
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
import com.example.mobileapp.models.currentUser
|
|
||||||
import com.example.mobileapp.models.getCartByUserId
|
|
||||||
import com.example.mobileapp.models.getCartProductsByCartId
|
|
||||||
import com.example.mobileapp.models.getProductById
|
|
||||||
import com.example.mobileapp.widgets.Header
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun CartScreen(){
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Header(Color(212, 206, 203))
|
|
||||||
CartCard()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun CartCard(){
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color(212, 206, 203)),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
|
|
||||||
) {
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight()
|
|
||||||
.fillMaxWidth(0.9f)
|
|
||||||
.background(Color.White),
|
|
||||||
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Корзина",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
val cart = getCartByUserId(currentUser().id)
|
|
||||||
val cartProducts = getCartProductsByCartId(cart.id)
|
|
||||||
|
|
||||||
LazyColumn(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
) {
|
|
||||||
items(cartProducts){ cartProduct ->
|
|
||||||
val amount = remember { mutableStateOf(TextFieldValue(cartProduct.amount.toString())) }
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(3.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.padding(top = 15.dp, start = 5.dp, end = 5.dp)
|
|
||||||
){
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color.White),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.SpaceEvenly,
|
|
||||||
){
|
|
||||||
if (getProductById(cartProduct.productId).picture == "Бургер"){
|
|
||||||
Image(
|
|
||||||
painterResource(
|
|
||||||
id = R.drawable.burger
|
|
||||||
),
|
|
||||||
contentDescription = null,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(100.dp, 100.dp)
|
|
||||||
.padding(5.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (getProductById(cartProduct.productId).picture == "Картошка"){
|
|
||||||
Image(
|
|
||||||
painterResource(
|
|
||||||
id = R.drawable.potato
|
|
||||||
),
|
|
||||||
contentDescription = null,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(100.dp, 100.dp)
|
|
||||||
.padding(5.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (getProductById(cartProduct.productId).picture == "Пепси"){
|
|
||||||
Image(
|
|
||||||
painterResource(
|
|
||||||
id = R.drawable.pepsi
|
|
||||||
),
|
|
||||||
contentDescription = null,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(100.dp, 100.dp)
|
|
||||||
.padding(5.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Column (
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
verticalArrangement = Arrangement.SpaceAround
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = getProductById(cartProduct.productId).title,
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 17.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
Text(
|
|
||||||
text = getProductById(cartProduct.productId).price.toString() + " р.",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 17.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
Row(
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.Center,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth(0.8f)
|
|
||||||
){
|
|
||||||
OutlinedButton(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight(),
|
|
||||||
onClick = {
|
|
||||||
/*TODO*/
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(topStart = 30.dp, bottomStart = 30.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
) {
|
|
||||||
Text(text = "-", fontSize = 20.sp, color = Color.Black)
|
|
||||||
}
|
|
||||||
|
|
||||||
Card(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight(),
|
|
||||||
border = BorderStroke(3.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(0.dp),
|
|
||||||
){
|
|
||||||
Text(
|
|
||||||
modifier = Modifier
|
|
||||||
.background(Color.White)
|
|
||||||
.fillMaxHeight()
|
|
||||||
.padding(start = 20.dp, end = 20.dp, top = 7.dp, bottom = 7.dp),
|
|
||||||
text = amount.value.text,
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_bold)),
|
|
||||||
fontSize = 20.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
OutlinedButton(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight(),
|
|
||||||
onClick = {
|
|
||||||
/*TODO*/
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(topEnd = 30.dp, bottomEnd = 30.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
) {
|
|
||||||
Text(text = "+", fontSize = 20.sp, color = Color.Black)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(3.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.padding(top = 15.dp, start = 5.dp, end = 5.dp)
|
|
||||||
){
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.background(Color.White),
|
|
||||||
horizontalArrangement = Arrangement.SpaceBetween,
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
){
|
|
||||||
Text(
|
|
||||||
text = "Итого: " + cart.price.toString() + " р.",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 20.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
modifier = Modifier.padding(start = 5.dp),
|
|
||||||
)
|
|
||||||
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = {
|
|
||||||
/*TODO*/
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
modifier = Modifier.padding(5.dp)
|
|
||||||
) {
|
|
||||||
Text(text = "Заказать", fontSize = 20.sp, color = Color.White)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,230 +0,0 @@
|
|||||||
package com.example.mobileapp.screens
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Box
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.Card
|
|
||||||
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.OutlinedButton
|
|
||||||
import androidx.compose.material3.OutlinedTextField
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.material3.TextField
|
|
||||||
import androidx.compose.material3.TextFieldDefaults
|
|
||||||
import androidx.compose.material3.lightColorScheme
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.text.TextStyle
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.input.TextFieldValue
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
import com.example.mobileapp.models.getCategories
|
|
||||||
import com.example.mobileapp.widgets.Header
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun CreateProductScreen(){
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Header(Color(212, 206, 203))
|
|
||||||
CreateProductCard()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
|
||||||
fun CreateProductCard(){
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color(212, 206, 203)),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
|
|
||||||
) {
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight()
|
|
||||||
.fillMaxWidth(0.9f)
|
|
||||||
.background(Color.White),
|
|
||||||
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Создание блюда",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
val picture = remember { mutableStateOf(TextFieldValue("")) }
|
|
||||||
val title = remember { mutableStateOf(TextFieldValue("")) }
|
|
||||||
val price = remember { mutableStateOf(TextFieldValue("")) }
|
|
||||||
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(3.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.padding(top = 15.dp, start = 5.dp, end = 5.dp)
|
|
||||||
){
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.background(Color.White)
|
|
||||||
) {
|
|
||||||
OutlinedTextField(
|
|
||||||
value = picture.value,
|
|
||||||
onValueChange = {picture.value = it},
|
|
||||||
placeholder = { Text(text = "Фото", fontSize = 20.sp, color = Color.LightGray) },
|
|
||||||
singleLine = true,
|
|
||||||
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
textStyle = TextStyle(fontSize = 20.sp),
|
|
||||||
colors = TextFieldDefaults.outlinedTextFieldColors(
|
|
||||||
textColor = Color.Black,
|
|
||||||
disabledTextColor = Color.Transparent,
|
|
||||||
containerColor = Color.White,
|
|
||||||
focusedBorderColor = Color(222,161,69),
|
|
||||||
unfocusedBorderColor = Color(222,161,69),
|
|
||||||
),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = title.value,
|
|
||||||
onValueChange = {title.value = it},
|
|
||||||
placeholder = { Text(text = "Название", fontSize = 20.sp, color = Color.LightGray) },
|
|
||||||
singleLine = true,
|
|
||||||
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
textStyle = TextStyle(fontSize = 20.sp),
|
|
||||||
colors = TextFieldDefaults.outlinedTextFieldColors(
|
|
||||||
textColor = Color.Black,
|
|
||||||
disabledTextColor = Color.Transparent,
|
|
||||||
containerColor = Color.White,
|
|
||||||
focusedBorderColor = Color(222,161,69),
|
|
||||||
unfocusedBorderColor = Color(222,161,69),
|
|
||||||
),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
)
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(1.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier.fillMaxWidth().padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
){
|
|
||||||
val dataList = getCategories().map { it.title }
|
|
||||||
var expanded by remember { mutableStateOf(false) }
|
|
||||||
var selectedItem by remember { mutableStateOf(dataList[0]) }
|
|
||||||
MaterialTheme(
|
|
||||||
colorScheme = lightColorScheme(
|
|
||||||
surfaceVariant= Color.White,
|
|
||||||
surface = Color.White,
|
|
||||||
onSurface = Color.Gray
|
|
||||||
)
|
|
||||||
){
|
|
||||||
ExposedDropdownMenuBox(
|
|
||||||
expanded = expanded,
|
|
||||||
onExpandedChange = {
|
|
||||||
expanded = !expanded
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
TextField(
|
|
||||||
modifier = Modifier
|
|
||||||
.menuAnchor().fillMaxWidth(),
|
|
||||||
readOnly = true,
|
|
||||||
value = selectedItem,
|
|
||||||
onValueChange = {},
|
|
||||||
label = { Text("Категория") },
|
|
||||||
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
|
|
||||||
)
|
|
||||||
|
|
||||||
ExposedDropdownMenu(
|
|
||||||
expanded = expanded,
|
|
||||||
onDismissRequest = {
|
|
||||||
expanded = false
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
dataList.forEach { selectionOption ->
|
|
||||||
DropdownMenuItem(
|
|
||||||
text = { Text(selectionOption) },
|
|
||||||
onClick = {
|
|
||||||
selectedItem = selectionOption
|
|
||||||
expanded = false
|
|
||||||
},
|
|
||||||
contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OutlinedTextField(
|
|
||||||
value = price.value,
|
|
||||||
onValueChange = {price.value = it},
|
|
||||||
placeholder = { Text(text = "Цена", fontSize = 20.sp, color = Color.LightGray) },
|
|
||||||
singleLine = true,
|
|
||||||
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
textStyle = TextStyle(fontSize = 20.sp),
|
|
||||||
colors = TextFieldDefaults.outlinedTextFieldColors(
|
|
||||||
textColor = Color.Black,
|
|
||||||
disabledTextColor = Color.Transparent,
|
|
||||||
containerColor = Color.White,
|
|
||||||
focusedBorderColor = Color(222,161,69),
|
|
||||||
unfocusedBorderColor = Color(222,161,69),
|
|
||||||
),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
)
|
|
||||||
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = {
|
|
||||||
/*TODO*/
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(20.dp),
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Сохранить",
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 30.sp,
|
|
||||||
color = Color.White
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,200 +0,0 @@
|
|||||||
package com.example.mobileapp.screens
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.Image
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.layout.size
|
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
|
||||||
import androidx.compose.foundation.lazy.items
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.Card
|
|
||||||
import androidx.compose.material3.Icon
|
|
||||||
import androidx.compose.material3.OutlinedButton
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import androidx.navigation.NavController
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
import com.example.mobileapp.models.getCategories
|
|
||||||
import com.example.mobileapp.models.getProductsByCategoryId
|
|
||||||
import com.example.mobileapp.navigation.Screens
|
|
||||||
import com.example.mobileapp.widgets.Header
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun EditMenuScreen(navController: NavController){
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Header(Color(212, 206, 203))
|
|
||||||
EditMenuCard(navController)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun EditMenuCard(navController: NavController){
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color(212, 206, 203)),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
|
|
||||||
) {
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight()
|
|
||||||
.fillMaxWidth(0.9f)
|
|
||||||
.background(Color.White),
|
|
||||||
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
val categories = getCategories()
|
|
||||||
LazyColumn(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
) {
|
|
||||||
items(categories){ category ->
|
|
||||||
Text(
|
|
||||||
text = category.title,
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
|
|
||||||
val products = getProductsByCategoryId(category.id)
|
|
||||||
|
|
||||||
products.forEach{ product ->
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(3.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.padding(top = 15.dp, start = 5.dp, end = 5.dp)
|
|
||||||
){
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color.White),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.SpaceEvenly,
|
|
||||||
){
|
|
||||||
if (product.picture == "Бургер"){
|
|
||||||
Image(
|
|
||||||
painterResource(
|
|
||||||
id = R.drawable.burger
|
|
||||||
),
|
|
||||||
contentDescription = null,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(100.dp, 100.dp)
|
|
||||||
.padding(5.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (product.picture == "Картошка"){
|
|
||||||
Image(
|
|
||||||
painterResource(
|
|
||||||
id = R.drawable.potato
|
|
||||||
),
|
|
||||||
contentDescription = null,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(100.dp, 100.dp)
|
|
||||||
.padding(5.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (product.picture == "Пепси"){
|
|
||||||
Image(
|
|
||||||
painterResource(
|
|
||||||
id = R.drawable.pepsi
|
|
||||||
),
|
|
||||||
contentDescription = null,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(100.dp, 100.dp)
|
|
||||||
.padding(5.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Column (
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
verticalArrangement = Arrangement.SpaceAround
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = product.title,
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 17.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
Row(
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.spacedBy(10.dp),
|
|
||||||
){
|
|
||||||
Text(
|
|
||||||
text = product.price.toString() + " р.",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 17.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = {
|
|
||||||
navController.navigate(Screens.EditProductScreen.name + "/${product.id}") {
|
|
||||||
popUpTo(navController.graph.startDestinationId)
|
|
||||||
launchSingleTop = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(10.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
|
|
||||||
){
|
|
||||||
Icon(
|
|
||||||
painterResource(id = R.drawable.icon_settings),
|
|
||||||
contentDescription = null,
|
|
||||||
Modifier.size(30.dp),
|
|
||||||
tint = Color.Black
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = { /*TODO*/},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(10.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
|
|
||||||
){
|
|
||||||
Icon(
|
|
||||||
painterResource(id = R.drawable.icon_trash),
|
|
||||||
contentDescription = null,
|
|
||||||
Modifier.size(30.dp),
|
|
||||||
tint = Color.Black
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,230 +0,0 @@
|
|||||||
package com.example.mobileapp.screens
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.Card
|
|
||||||
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.OutlinedButton
|
|
||||||
import androidx.compose.material3.OutlinedTextField
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.material3.TextField
|
|
||||||
import androidx.compose.material3.TextFieldDefaults
|
|
||||||
import androidx.compose.material3.lightColorScheme
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.text.TextStyle
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.input.TextFieldValue
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
import com.example.mobileapp.models.getCategories
|
|
||||||
import com.example.mobileapp.models.getCategoryById
|
|
||||||
import com.example.mobileapp.models.getProductById
|
|
||||||
import com.example.mobileapp.widgets.Header
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun EditProductScreen(id: Int){
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Header(Color(212, 206, 203))
|
|
||||||
EditProductCard(id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
|
||||||
fun EditProductCard(id: Int){
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color(212, 206, 203)),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
|
|
||||||
) {
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight()
|
|
||||||
.fillMaxWidth(0.9f)
|
|
||||||
.background(Color.White),
|
|
||||||
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Редактирование блюда",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
val product = getProductById(id)
|
|
||||||
|
|
||||||
val picture = remember { mutableStateOf(TextFieldValue(product.picture)) }
|
|
||||||
val title = remember { mutableStateOf(TextFieldValue(product.title)) }
|
|
||||||
val price = remember { mutableStateOf(TextFieldValue(product.price.toString())) }
|
|
||||||
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(3.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.padding(top = 15.dp, start = 5.dp, end = 5.dp)
|
|
||||||
){
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.background(Color.White)
|
|
||||||
) {
|
|
||||||
OutlinedTextField(
|
|
||||||
value = picture.value,
|
|
||||||
onValueChange = {picture.value = it},
|
|
||||||
placeholder = { Text(text = "Фото", fontSize = 20.sp, color = Color.LightGray) },
|
|
||||||
singleLine = true,
|
|
||||||
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
textStyle = TextStyle(fontSize = 20.sp),
|
|
||||||
colors = TextFieldDefaults.outlinedTextFieldColors(
|
|
||||||
textColor = Color.Black,
|
|
||||||
disabledTextColor = Color.Transparent,
|
|
||||||
containerColor = Color.White,
|
|
||||||
focusedBorderColor = Color(222,161,69),
|
|
||||||
unfocusedBorderColor = Color(222,161,69),
|
|
||||||
),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
)
|
|
||||||
OutlinedTextField(
|
|
||||||
value = title.value,
|
|
||||||
onValueChange = {title.value = it},
|
|
||||||
placeholder = { Text(text = "Название", fontSize = 20.sp, color = Color.LightGray) },
|
|
||||||
singleLine = true,
|
|
||||||
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
textStyle = TextStyle(fontSize = 20.sp),
|
|
||||||
colors = TextFieldDefaults.outlinedTextFieldColors(
|
|
||||||
textColor = Color.Black,
|
|
||||||
disabledTextColor = Color.Transparent,
|
|
||||||
containerColor = Color.White,
|
|
||||||
focusedBorderColor = Color(222,161,69),
|
|
||||||
unfocusedBorderColor = Color(222,161,69),
|
|
||||||
),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
)
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(1.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier.fillMaxWidth().padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
){
|
|
||||||
val dataList = getCategories().map { it.title }
|
|
||||||
var expanded by remember { mutableStateOf(false) }
|
|
||||||
var selectedItem by remember { mutableStateOf(getCategoryById(product.category)) }
|
|
||||||
MaterialTheme(
|
|
||||||
colorScheme = lightColorScheme(
|
|
||||||
surfaceVariant= Color.White,
|
|
||||||
surface = Color.White,
|
|
||||||
onSurface = Color.Gray
|
|
||||||
)
|
|
||||||
){
|
|
||||||
ExposedDropdownMenuBox(
|
|
||||||
expanded = expanded,
|
|
||||||
onExpandedChange = {
|
|
||||||
expanded = !expanded
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
TextField(
|
|
||||||
modifier = Modifier
|
|
||||||
.menuAnchor().fillMaxWidth(),
|
|
||||||
readOnly = true,
|
|
||||||
value = selectedItem,
|
|
||||||
onValueChange = {},
|
|
||||||
label = { Text("Категория") },
|
|
||||||
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
|
|
||||||
)
|
|
||||||
|
|
||||||
ExposedDropdownMenu(
|
|
||||||
expanded = expanded,
|
|
||||||
onDismissRequest = {
|
|
||||||
expanded = false
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
dataList.forEach { selectionOption ->
|
|
||||||
DropdownMenuItem(
|
|
||||||
text = { Text(selectionOption) },
|
|
||||||
onClick = {
|
|
||||||
selectedItem = selectionOption
|
|
||||||
expanded = false
|
|
||||||
},
|
|
||||||
contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OutlinedTextField(
|
|
||||||
value = price.value,
|
|
||||||
onValueChange = {price.value = it},
|
|
||||||
placeholder = { Text(text = "Цена", fontSize = 20.sp, color = Color.LightGray) },
|
|
||||||
singleLine = true,
|
|
||||||
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
textStyle = TextStyle(fontSize = 20.sp),
|
|
||||||
colors = TextFieldDefaults.outlinedTextFieldColors(
|
|
||||||
textColor = Color.Black,
|
|
||||||
disabledTextColor = Color.Transparent,
|
|
||||||
containerColor = Color.White,
|
|
||||||
focusedBorderColor = Color(222,161,69),
|
|
||||||
unfocusedBorderColor = Color(222,161,69),
|
|
||||||
),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
)
|
|
||||||
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = {
|
|
||||||
/*TODO*/
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(20.dp),
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Сохранить",
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 30.sp,
|
|
||||||
color = Color.White
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,158 +0,0 @@
|
|||||||
package com.example.mobileapp.screens
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.layout.size
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.Icon
|
|
||||||
import androidx.compose.material3.OutlinedButton
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import androidx.navigation.NavController
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
import com.example.mobileapp.navigation.Screens
|
|
||||||
import com.example.mobileapp.widgets.Header
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun ManagmentScreen(navController: NavController){
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Header(Color(212, 206, 203))
|
|
||||||
ManagmentCard(navController)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun ManagmentCard(navController: NavController){
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color(212, 206, 203)),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
|
|
||||||
) {
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight()
|
|
||||||
.fillMaxWidth(0.9f)
|
|
||||||
.background(Color.White),
|
|
||||||
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Блюда",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
Row(
|
|
||||||
horizontalArrangement = Arrangement.spacedBy(5.dp),
|
|
||||||
modifier = Modifier.padding(top = 10.dp),
|
|
||||||
){
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = {
|
|
||||||
navController.navigate(Screens.CreateProductScreen.name) {
|
|
||||||
popUpTo(navController.graph.startDestinationId)
|
|
||||||
launchSingleTop = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
|
|
||||||
){
|
|
||||||
Icon(
|
|
||||||
painterResource(id = R.drawable.icon_add),
|
|
||||||
contentDescription = null,
|
|
||||||
Modifier.size(50.dp),
|
|
||||||
tint = Color.Black
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = {
|
|
||||||
navController.navigate(Screens.EditMenuScreen.name) {
|
|
||||||
popUpTo(navController.graph.startDestinationId)
|
|
||||||
launchSingleTop = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
|
|
||||||
){
|
|
||||||
Icon(
|
|
||||||
painterResource(id = R.drawable.icon_settings),
|
|
||||||
contentDescription = null,
|
|
||||||
Modifier.size(50.dp),
|
|
||||||
tint = Color.Black
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Text(
|
|
||||||
text = "Пользователи",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = {
|
|
||||||
navController.navigate(Screens.UsersScreen.name) {
|
|
||||||
popUpTo(navController.graph.startDestinationId)
|
|
||||||
launchSingleTop = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
modifier = Modifier.padding(top = 10.dp)
|
|
||||||
){
|
|
||||||
Icon(
|
|
||||||
painterResource(id = R.drawable.icon_profile),
|
|
||||||
contentDescription = null,
|
|
||||||
Modifier.size(50.dp),
|
|
||||||
tint = Color.Black
|
|
||||||
)
|
|
||||||
Icon(
|
|
||||||
painterResource(id = R.drawable.icon_order),
|
|
||||||
contentDescription = null,
|
|
||||||
Modifier.size(50.dp),
|
|
||||||
tint = Color.Black
|
|
||||||
)
|
|
||||||
Icon(
|
|
||||||
painterResource(id = R.drawable.icon_managment),
|
|
||||||
contentDescription = null,
|
|
||||||
Modifier.size(50.dp),
|
|
||||||
tint = Color.Black
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,171 +0,0 @@
|
|||||||
package com.example.mobileapp.screens
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.Image
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.layout.size
|
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
|
||||||
import androidx.compose.foundation.lazy.items
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.Card
|
|
||||||
import androidx.compose.material3.OutlinedButton
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
import com.example.mobileapp.models.getCategories
|
|
||||||
import com.example.mobileapp.models.getProductsByCategoryId
|
|
||||||
import com.example.mobileapp.widgets.Header
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun MenuScreen(){
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Header(Color(212, 206, 203))
|
|
||||||
MenuCard()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun MenuCard(){
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color(212, 206, 203)),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
|
|
||||||
) {
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight()
|
|
||||||
.fillMaxWidth(0.9f)
|
|
||||||
.background(Color.White),
|
|
||||||
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
val categories = getCategories()
|
|
||||||
LazyColumn(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
) {
|
|
||||||
items(categories){ category ->
|
|
||||||
Text(
|
|
||||||
text = category.title,
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
|
|
||||||
val products = getProductsByCategoryId(category.id)
|
|
||||||
|
|
||||||
products.forEach{ product ->
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(3.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.padding(top = 15.dp, start = 5.dp, end = 5.dp)
|
|
||||||
){
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color.White),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.SpaceEvenly,
|
|
||||||
){
|
|
||||||
if (product.picture == "Бургер"){
|
|
||||||
Image(
|
|
||||||
painterResource(
|
|
||||||
id = R.drawable.burger
|
|
||||||
),
|
|
||||||
contentDescription = null,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(100.dp, 100.dp)
|
|
||||||
.padding(5.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (product.picture == "Картошка"){
|
|
||||||
Image(
|
|
||||||
painterResource(
|
|
||||||
id = R.drawable.potato
|
|
||||||
),
|
|
||||||
contentDescription = null,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(100.dp, 100.dp)
|
|
||||||
.padding(5.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
if (product.picture == "Пепси"){
|
|
||||||
Image(
|
|
||||||
painterResource(
|
|
||||||
id = R.drawable.pepsi
|
|
||||||
),
|
|
||||||
contentDescription = null,
|
|
||||||
modifier = Modifier
|
|
||||||
.size(100.dp, 100.dp)
|
|
||||||
.padding(5.dp),
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Column (
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
verticalArrangement = Arrangement.SpaceAround
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = product.title,
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 17.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
Row(
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.spacedBy(10.dp),
|
|
||||||
){
|
|
||||||
Text(
|
|
||||||
text = product.price.toString() + " р.",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 17.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = {/*TODO*/},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(30.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
) {
|
|
||||||
Text(text = "+", fontSize = 20.sp, color = Color.Black)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,159 +0,0 @@
|
|||||||
package com.example.mobileapp.screens
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
|
||||||
import androidx.compose.foundation.lazy.items
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.Card
|
|
||||||
import androidx.compose.material3.OutlinedButton
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
import com.example.mobileapp.models.currentUser
|
|
||||||
import com.example.mobileapp.models.getOrderProductsByOrderId
|
|
||||||
import com.example.mobileapp.models.getOrdersByUserId
|
|
||||||
import com.example.mobileapp.models.getProductById
|
|
||||||
import com.example.mobileapp.widgets.Header
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun OrderScreen(){
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Header(Color(212, 206, 203))
|
|
||||||
OrderCard()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun OrderCard(){
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color(212, 206, 203)),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
|
|
||||||
) {
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight()
|
|
||||||
.fillMaxWidth(0.9f)
|
|
||||||
.background(Color.White),
|
|
||||||
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Заказы",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
|
|
||||||
val orders = getOrdersByUserId(currentUser().id)
|
|
||||||
|
|
||||||
LazyColumn(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
) {
|
|
||||||
items(orders){ order ->
|
|
||||||
val orderProducts = getOrderProductsByOrderId(order.id)
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(3.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.padding(top = 15.dp, start = 5.dp, end = 5.dp)
|
|
||||||
){
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.background(Color.White),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.SpaceEvenly,
|
|
||||||
){
|
|
||||||
Text(
|
|
||||||
text = "№" + order.id.toString(),
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
|
|
||||||
Text(
|
|
||||||
text = "Статус: " + order.status,
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 20.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.background(Color.White),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.SpaceAround,
|
|
||||||
){
|
|
||||||
Column {
|
|
||||||
orderProducts.forEach{ orderProduct ->
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.background(Color.White),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.Center,
|
|
||||||
){
|
|
||||||
Text(
|
|
||||||
text = getProductById(orderProduct.productId).title + " x" + orderProduct.amount.toString(),
|
|
||||||
color = Color.Gray,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_bold)),
|
|
||||||
fontSize = 20.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = {
|
|
||||||
/*TODO*/
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Готов",
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 30.sp,
|
|
||||||
color = Color.White
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,173 +0,0 @@
|
|||||||
package com.example.mobileapp.screens
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
|
||||||
import androidx.compose.foundation.lazy.items
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.Card
|
|
||||||
import androidx.compose.material3.OutlinedButton
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import androidx.navigation.NavController
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
import com.example.mobileapp.models.currentUser
|
|
||||||
import com.example.mobileapp.models.getOrderProductsByOrderId
|
|
||||||
import com.example.mobileapp.models.getOrdersByUserId
|
|
||||||
import com.example.mobileapp.models.getProductById
|
|
||||||
import com.example.mobileapp.navigation.Screens
|
|
||||||
import com.example.mobileapp.widgets.Header
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun ProfileScreen(navController: NavController){
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Header(Color(212, 206, 203))
|
|
||||||
ProfileCard(navController)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun ProfileCard(navController: NavController){
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color(212, 206, 203)),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
|
|
||||||
) {
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight()
|
|
||||||
.fillMaxWidth(0.9f)
|
|
||||||
.background(Color.White),
|
|
||||||
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
OutlinedButton(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 15.dp, start = 5.dp, end = 5.dp),
|
|
||||||
onClick = {
|
|
||||||
navController.navigate(Screens.AuthorizationScreen.name) {
|
|
||||||
popUpTo(navController.graph.startDestinationId)
|
|
||||||
launchSingleTop = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
border = BorderStroke(4.dp, Color(255,86,86)),
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,86,86)),
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Выйти из аккаунта",
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 30.sp,
|
|
||||||
color = Color.White
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Text(
|
|
||||||
text = "Активные заказы",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
|
|
||||||
val orders = getOrdersByUserId(currentUser().id)
|
|
||||||
|
|
||||||
LazyColumn(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
) {
|
|
||||||
items(orders){ order ->
|
|
||||||
val orderProducts = getOrderProductsByOrderId(order.id)
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(3.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.padding(top = 15.dp, start = 5.dp, end = 5.dp)
|
|
||||||
){
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.background(Color.White),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.SpaceEvenly,
|
|
||||||
){
|
|
||||||
Text(
|
|
||||||
text = "№" + order.id.toString(),
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
|
|
||||||
Text(
|
|
||||||
text = "Статус: " + order.status,
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 20.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
orderProducts.forEach{ orderProduct ->
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.background(Color.White),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.Center,
|
|
||||||
){
|
|
||||||
Text(
|
|
||||||
text = getProductById(orderProduct.productId).title + " " + getProductById(orderProduct.productId).price.toString() + "р. x" + orderProduct.amount.toString(),
|
|
||||||
color = Color.Gray,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_bold)),
|
|
||||||
fontSize = 20.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.background(Color.White),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.Start,
|
|
||||||
){
|
|
||||||
Text(
|
|
||||||
text = "К оплате: " + order.price.toString() + " р.",
|
|
||||||
modifier = Modifier.padding(start = 20.dp),
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 20.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,193 +0,0 @@
|
|||||||
package com.example.mobileapp.screens
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
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.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.Button
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.Card
|
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
|
||||||
import androidx.compose.material3.OutlinedTextField
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.material3.TextFieldDefaults
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.text.TextStyle
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.input.TextFieldValue
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import androidx.navigation.NavController
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
import com.example.mobileapp.navigation.Screens
|
|
||||||
import com.example.mobileapp.widgets.Header
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun RegistrationScreen(navController: NavController) {
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Header(Color.White)
|
|
||||||
RegistrationCard(navController)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
|
||||||
fun RegistrationCard(navController: NavController){
|
|
||||||
val login = remember { mutableStateOf(TextFieldValue("")) }
|
|
||||||
val password = remember { mutableStateOf(TextFieldValue("")) }
|
|
||||||
val passwordRepeat = remember { mutableStateOf(TextFieldValue("")) }
|
|
||||||
|
|
||||||
Column(
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(30.dp),
|
|
||||||
modifier = Modifier.padding(top = 30.dp)
|
|
||||||
) {
|
|
||||||
|
|
||||||
Column (
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
modifier = Modifier
|
|
||||||
.background(Color(212, 206, 203))
|
|
||||||
.fillMaxWidth(0.9f)
|
|
||||||
) {
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(90.dp, 90.dp, 30.dp, 30.dp),
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 30.dp, start = 20.dp, end = 20.dp)
|
|
||||||
){
|
|
||||||
Text(
|
|
||||||
text = "Регистрация",
|
|
||||||
color = Color.White,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_bold)),
|
|
||||||
fontSize = 30.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.background(Color(255, 186, 83))
|
|
||||||
.padding(top = 20.dp, bottom = 20.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
OutlinedTextField(
|
|
||||||
value = login.value,
|
|
||||||
onValueChange = {login.value = it},
|
|
||||||
placeholder = { Text(text = "Логин", fontSize = 20.sp, color = Color.LightGray) },
|
|
||||||
singleLine = true,
|
|
||||||
|
|
||||||
shape = RoundedCornerShape(30.dp, 30.dp, 30.dp, 30.dp),
|
|
||||||
textStyle = TextStyle(fontSize = 20.sp),
|
|
||||||
colors = TextFieldDefaults.outlinedTextFieldColors(
|
|
||||||
textColor = Color.Black,
|
|
||||||
disabledTextColor = Color.Transparent,
|
|
||||||
containerColor = Color.White,
|
|
||||||
focusedBorderColor = Color.Yellow,
|
|
||||||
unfocusedBorderColor = Color.Yellow,
|
|
||||||
),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
)
|
|
||||||
|
|
||||||
OutlinedTextField(
|
|
||||||
value = password.value,
|
|
||||||
onValueChange = {password.value = it},
|
|
||||||
placeholder = { Text(text = "Пароль", fontSize = 20.sp, color = Color.LightGray) },
|
|
||||||
singleLine = true,
|
|
||||||
|
|
||||||
shape = RoundedCornerShape(30.dp, 30.dp, 30.dp, 30.dp),
|
|
||||||
textStyle = TextStyle(fontSize = 20.sp),
|
|
||||||
colors = TextFieldDefaults.outlinedTextFieldColors(
|
|
||||||
textColor = Color.Black,
|
|
||||||
disabledTextColor = Color.Transparent,
|
|
||||||
containerColor = Color.White,
|
|
||||||
focusedBorderColor = Color(183,97,48),
|
|
||||||
unfocusedBorderColor = Color(183,97,48),
|
|
||||||
),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
)
|
|
||||||
|
|
||||||
OutlinedTextField(
|
|
||||||
value = passwordRepeat.value,
|
|
||||||
onValueChange = {passwordRepeat.value = it},
|
|
||||||
placeholder = { Text(text = "Логин повторно", fontSize = 20.sp, color = Color.LightGray) },
|
|
||||||
singleLine = true,
|
|
||||||
|
|
||||||
shape = RoundedCornerShape(30.dp, 30.dp, 30.dp, 30.dp),
|
|
||||||
textStyle = TextStyle(fontSize = 20.sp),
|
|
||||||
colors = TextFieldDefaults.outlinedTextFieldColors(
|
|
||||||
textColor = Color.Black,
|
|
||||||
disabledTextColor = Color.Transparent,
|
|
||||||
containerColor = Color.White,
|
|
||||||
focusedBorderColor = Color.Red,
|
|
||||||
unfocusedBorderColor = Color.Red,
|
|
||||||
),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp),
|
|
||||||
)
|
|
||||||
|
|
||||||
Button(
|
|
||||||
onClick = {
|
|
||||||
navController.navigate(Screens.MenuScreen.name) {
|
|
||||||
popUpTo(navController.graph.startDestinationId)
|
|
||||||
launchSingleTop = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
colors = ButtonDefaults.buttonColors(Color(255,186,83), Color.White),
|
|
||||||
shape = RoundedCornerShape(30.dp, 30.dp, 30.dp, 30.dp),
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 20.dp, start = 20.dp, end = 20.dp)
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Продолжить",
|
|
||||||
color = Color.White,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_bold)),
|
|
||||||
fontSize = 30.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
Button(
|
|
||||||
onClick = {
|
|
||||||
navController.navigate(Screens.AuthorizationScreen.name) {
|
|
||||||
popUpTo(navController.graph.startDestinationId)
|
|
||||||
launchSingleTop = true
|
|
||||||
}
|
|
||||||
},
|
|
||||||
colors = ButtonDefaults.buttonColors(Color(212,206,203)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp, start = 20.dp, end = 20.dp)
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Есть аккаунт",
|
|
||||||
color = Color.White,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_bold)),
|
|
||||||
fontSize = 20.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,213 +0,0 @@
|
|||||||
package com.example.mobileapp.screens
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxHeight
|
|
||||||
import androidx.compose.foundation.layout.fillMaxSize
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.layout.size
|
|
||||||
import androidx.compose.foundation.lazy.LazyColumn
|
|
||||||
import androidx.compose.foundation.lazy.items
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.ButtonDefaults
|
|
||||||
import androidx.compose.material3.Card
|
|
||||||
import androidx.compose.material3.DropdownMenuItem
|
|
||||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
|
||||||
import androidx.compose.material3.ExposedDropdownMenuBox
|
|
||||||
import androidx.compose.material3.ExposedDropdownMenuDefaults
|
|
||||||
import androidx.compose.material3.Icon
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
|
||||||
import androidx.compose.material3.OutlinedButton
|
|
||||||
import androidx.compose.material3.OutlinedTextField
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.material3.TextField
|
|
||||||
import androidx.compose.material3.TextFieldDefaults
|
|
||||||
import androidx.compose.material3.lightColorScheme
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.getValue
|
|
||||||
import androidx.compose.runtime.mutableStateOf
|
|
||||||
import androidx.compose.runtime.remember
|
|
||||||
import androidx.compose.runtime.setValue
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.text.TextStyle
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.input.TextFieldValue
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.tooling.preview.Preview
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
import com.example.mobileapp.models.currentUser
|
|
||||||
import com.example.mobileapp.models.getAllUsers
|
|
||||||
import com.example.mobileapp.models.getCategories
|
|
||||||
import com.example.mobileapp.models.getRoleById
|
|
||||||
import com.example.mobileapp.models.getRoles
|
|
||||||
import com.example.mobileapp.widgets.Header
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun UsersScreen() {
|
|
||||||
Column (
|
|
||||||
modifier = Modifier.fillMaxSize(),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Header(Color(212, 206, 203))
|
|
||||||
UsersCard()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@Preview
|
|
||||||
@OptIn(ExperimentalMaterial3Api::class)
|
|
||||||
@Composable
|
|
||||||
fun UsersCard(){
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color(212, 206, 203)),
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
|
|
||||||
) {
|
|
||||||
Column(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxHeight()
|
|
||||||
.fillMaxWidth(0.9f)
|
|
||||||
.background(Color.White),
|
|
||||||
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Редактирование пользователей",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.padding(top = 10.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
val users = getAllUsers()
|
|
||||||
LazyColumn(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
) {
|
|
||||||
items(users){ user ->
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(3.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.padding(top = 15.dp, start = 5.dp, end = 5.dp)
|
|
||||||
){
|
|
||||||
Row(
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxSize()
|
|
||||||
.background(Color.White),
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
horizontalArrangement = Arrangement.SpaceEvenly,
|
|
||||||
){
|
|
||||||
Column (
|
|
||||||
horizontalAlignment = Alignment.CenterHorizontally,
|
|
||||||
verticalArrangement = Arrangement.SpaceAround,
|
|
||||||
modifier = Modifier.fillMaxWidth(0.4f)
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Логин: " + user.login,
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 17.sp,
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
modifier = Modifier.padding(top = 5.dp)
|
|
||||||
)
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(20.dp),
|
|
||||||
border = BorderStroke(1.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier.fillMaxWidth().padding(bottom = 10.dp),
|
|
||||||
){
|
|
||||||
val dataList = getRoles().map { it.title }
|
|
||||||
var expanded by remember { mutableStateOf(false) }
|
|
||||||
var selectedItem by remember { mutableStateOf (dataList[0]) }
|
|
||||||
MaterialTheme(
|
|
||||||
colorScheme = lightColorScheme(
|
|
||||||
surfaceVariant= Color.White,
|
|
||||||
surface = Color.White,
|
|
||||||
onSurface = Color.Gray
|
|
||||||
)
|
|
||||||
){
|
|
||||||
ExposedDropdownMenuBox(
|
|
||||||
expanded = expanded,
|
|
||||||
onExpandedChange = {
|
|
||||||
expanded = !expanded
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
TextField(
|
|
||||||
modifier = Modifier
|
|
||||||
.menuAnchor().fillMaxWidth(),
|
|
||||||
readOnly = true,
|
|
||||||
value = selectedItem,
|
|
||||||
onValueChange = {},
|
|
||||||
trailingIcon = { ExposedDropdownMenuDefaults.TrailingIcon(expanded = expanded) },
|
|
||||||
)
|
|
||||||
|
|
||||||
ExposedDropdownMenu(
|
|
||||||
expanded = expanded,
|
|
||||||
onDismissRequest = {
|
|
||||||
expanded = false
|
|
||||||
},
|
|
||||||
) {
|
|
||||||
dataList.forEach { selectionOption ->
|
|
||||||
DropdownMenuItem(
|
|
||||||
text = { Text(selectionOption) },
|
|
||||||
onClick = {
|
|
||||||
selectedItem = selectionOption
|
|
||||||
expanded = false
|
|
||||||
},
|
|
||||||
contentPadding = ExposedDropdownMenuDefaults.ItemContentPadding,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = { /*TODO*/},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(10.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
|
|
||||||
){
|
|
||||||
Icon(
|
|
||||||
painterResource(id = R.drawable.icon_settings),
|
|
||||||
contentDescription = null,
|
|
||||||
Modifier.size(30.dp),
|
|
||||||
tint = Color.Black
|
|
||||||
)
|
|
||||||
}
|
|
||||||
OutlinedButton(
|
|
||||||
onClick = { /*TODO*/},
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
shape = RoundedCornerShape(10.dp),
|
|
||||||
colors = ButtonDefaults.outlinedButtonColors(Color(255,186,83)),
|
|
||||||
|
|
||||||
){
|
|
||||||
Icon(
|
|
||||||
painterResource(id = R.drawable.icon_trash),
|
|
||||||
contentDescription = null,
|
|
||||||
Modifier.size(30.dp),
|
|
||||||
tint = Color.Black
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,11 +0,0 @@
|
|||||||
package com.example.mobileapp.ui.theme
|
|
||||||
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
|
|
||||||
val Purple80 = Color(0xFFD0BCFF)
|
|
||||||
val PurpleGrey80 = Color(0xFFCCC2DC)
|
|
||||||
val Pink80 = Color(0xFFEFB8C8)
|
|
||||||
|
|
||||||
val Purple40 = Color(0xFF6650a4)
|
|
||||||
val PurpleGrey40 = Color(0xFF625b71)
|
|
||||||
val Pink40 = Color(0xFF7D5260)
|
|
||||||
@ -1,70 +0,0 @@
|
|||||||
package com.example.mobileapp.ui.theme
|
|
||||||
|
|
||||||
import android.app.Activity
|
|
||||||
import android.os.Build
|
|
||||||
import androidx.compose.foundation.isSystemInDarkTheme
|
|
||||||
import androidx.compose.material3.MaterialTheme
|
|
||||||
import androidx.compose.material3.darkColorScheme
|
|
||||||
import androidx.compose.material3.dynamicDarkColorScheme
|
|
||||||
import androidx.compose.material3.dynamicLightColorScheme
|
|
||||||
import androidx.compose.material3.lightColorScheme
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.runtime.SideEffect
|
|
||||||
import androidx.compose.ui.graphics.toArgb
|
|
||||||
import androidx.compose.ui.platform.LocalContext
|
|
||||||
import androidx.compose.ui.platform.LocalView
|
|
||||||
import androidx.core.view.WindowCompat
|
|
||||||
|
|
||||||
private val DarkColorScheme = darkColorScheme(
|
|
||||||
primary = Purple80,
|
|
||||||
secondary = PurpleGrey80,
|
|
||||||
tertiary = Pink80
|
|
||||||
)
|
|
||||||
|
|
||||||
private val LightColorScheme = lightColorScheme(
|
|
||||||
primary = Purple40,
|
|
||||||
secondary = PurpleGrey40,
|
|
||||||
tertiary = Pink40
|
|
||||||
|
|
||||||
/* Other default colors to override
|
|
||||||
background = Color(0xFFFFFBFE),
|
|
||||||
surface = Color(0xFFFFFBFE),
|
|
||||||
onPrimary = Color.White,
|
|
||||||
onSecondary = Color.White,
|
|
||||||
onTertiary = Color.White,
|
|
||||||
onBackground = Color(0xFF1C1B1F),
|
|
||||||
onSurface = Color(0xFF1C1B1F),
|
|
||||||
*/
|
|
||||||
)
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun MobileAppTheme(
|
|
||||||
darkTheme: Boolean = isSystemInDarkTheme(),
|
|
||||||
// Dynamic color is available on Android 12+
|
|
||||||
dynamicColor: Boolean = true,
|
|
||||||
content: @Composable () -> Unit
|
|
||||||
) {
|
|
||||||
val colorScheme = when {
|
|
||||||
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
|
|
||||||
val context = LocalContext.current
|
|
||||||
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
|
|
||||||
}
|
|
||||||
|
|
||||||
darkTheme -> DarkColorScheme
|
|
||||||
else -> LightColorScheme
|
|
||||||
}
|
|
||||||
val view = LocalView.current
|
|
||||||
if (!view.isInEditMode) {
|
|
||||||
SideEffect {
|
|
||||||
val window = (view.context as Activity).window
|
|
||||||
window.statusBarColor = colorScheme.primary.toArgb()
|
|
||||||
WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
MaterialTheme(
|
|
||||||
colorScheme = colorScheme,
|
|
||||||
typography = Typography,
|
|
||||||
content = content
|
|
||||||
)
|
|
||||||
}
|
|
||||||
@ -1,34 +0,0 @@
|
|||||||
package com.example.mobileapp.ui.theme
|
|
||||||
|
|
||||||
import androidx.compose.material3.Typography
|
|
||||||
import androidx.compose.ui.text.TextStyle
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.font.FontWeight
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
|
|
||||||
// Set of Material typography styles to start with
|
|
||||||
val Typography = Typography(
|
|
||||||
bodyLarge = TextStyle(
|
|
||||||
fontFamily = FontFamily.Default,
|
|
||||||
fontWeight = FontWeight.Normal,
|
|
||||||
fontSize = 16.sp,
|
|
||||||
lineHeight = 24.sp,
|
|
||||||
letterSpacing = 0.5.sp
|
|
||||||
)
|
|
||||||
/* Other default text styles to override
|
|
||||||
titleLarge = TextStyle(
|
|
||||||
fontFamily = FontFamily.Default,
|
|
||||||
fontWeight = FontWeight.Normal,
|
|
||||||
fontSize = 22.sp,
|
|
||||||
lineHeight = 28.sp,
|
|
||||||
letterSpacing = 0.sp
|
|
||||||
),
|
|
||||||
labelSmall = TextStyle(
|
|
||||||
fontFamily = FontFamily.Default,
|
|
||||||
fontWeight = FontWeight.Medium,
|
|
||||||
fontSize = 11.sp,
|
|
||||||
lineHeight = 16.sp,
|
|
||||||
letterSpacing = 0.5.sp
|
|
||||||
)
|
|
||||||
*/
|
|
||||||
)
|
|
||||||
@ -1,77 +0,0 @@
|
|||||||
package com.example.mobileapp.widgets
|
|
||||||
|
|
||||||
import androidx.compose.foundation.BorderStroke
|
|
||||||
import androidx.compose.foundation.Image
|
|
||||||
import androidx.compose.foundation.background
|
|
||||||
import androidx.compose.foundation.layout.Arrangement
|
|
||||||
import androidx.compose.foundation.layout.Column
|
|
||||||
import androidx.compose.foundation.layout.Row
|
|
||||||
import androidx.compose.foundation.layout.fillMaxWidth
|
|
||||||
import androidx.compose.foundation.layout.padding
|
|
||||||
import androidx.compose.foundation.layout.size
|
|
||||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
|
||||||
import androidx.compose.material3.Card
|
|
||||||
import androidx.compose.material3.CardDefaults
|
|
||||||
import androidx.compose.material3.Text
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.compose.ui.Alignment
|
|
||||||
import androidx.compose.ui.Modifier
|
|
||||||
import androidx.compose.ui.graphics.Color
|
|
||||||
import androidx.compose.ui.res.painterResource
|
|
||||||
import androidx.compose.ui.text.font.Font
|
|
||||||
import androidx.compose.ui.text.font.FontFamily
|
|
||||||
import androidx.compose.ui.text.style.TextAlign
|
|
||||||
import androidx.compose.ui.unit.dp
|
|
||||||
import androidx.compose.ui.unit.sp
|
|
||||||
import com.example.mobileapp.R
|
|
||||||
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun Header(backColor: Color){
|
|
||||||
Column {
|
|
||||||
Card(
|
|
||||||
shape = RoundedCornerShape(bottomStart = 30.dp, bottomEnd = 30.dp),
|
|
||||||
border = BorderStroke(4.dp, Color(222,161,69)),
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth()
|
|
||||||
.background(backColor),
|
|
||||||
colors = CardDefaults.cardColors(
|
|
||||||
containerColor = Color(255, 186, 83)
|
|
||||||
)
|
|
||||||
) {
|
|
||||||
Row (
|
|
||||||
verticalAlignment = Alignment.CenterVertically,
|
|
||||||
modifier = Modifier
|
|
||||||
.fillMaxWidth(),
|
|
||||||
horizontalArrangement = Arrangement.Center,
|
|
||||||
) {
|
|
||||||
Text(
|
|
||||||
text = "Вкусно",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.padding(top = 20.dp, bottom = 20.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
Image(
|
|
||||||
painterResource(
|
|
||||||
id = R.drawable.icon
|
|
||||||
),
|
|
||||||
contentDescription = "Logo",
|
|
||||||
modifier = Modifier
|
|
||||||
.size(60.dp, 60.dp),
|
|
||||||
)
|
|
||||||
Text(
|
|
||||||
text = "ладно",
|
|
||||||
color = Color.Black,
|
|
||||||
fontFamily = FontFamily(Font(R.font.nunito_extrabold_italic)),
|
|
||||||
fontSize = 34.sp,
|
|
||||||
modifier = Modifier
|
|
||||||
.padding(top = 20.dp, bottom = 20.dp),
|
|
||||||
textAlign = TextAlign.Center,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 164 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: 26 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 13 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 12 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 24 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 19 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 9.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 250 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 62 KiB |
Binary file not shown.
Binary file not shown.
@ -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>
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 1.4 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 982 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 1.9 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 2.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 5.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 3.8 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 7.6 KiB |
@ -1,10 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
<color name="purple_200">#FFBB86FC</color>
|
|
||||||
<color name="purple_500">#FF6200EE</color>
|
|
||||||
<color name="purple_700">#FF3700B3</color>
|
|
||||||
<color name="teal_200">#FF03DAC5</color>
|
|
||||||
<color name="teal_700">#FF018786</color>
|
|
||||||
<color name="black">#FF000000</color>
|
|
||||||
<color name="white">#FFFFFFFF</color>
|
|
||||||
</resources>
|
|
||||||
@ -1,3 +0,0 @@
|
|||||||
<resources>
|
|
||||||
<string name="app_name">MobileApp</string>
|
|
||||||
</resources>
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
|
||||||
<resources>
|
|
||||||
|
|
||||||
<style name="Theme.MobileApp" parent="android:Theme.Material.Light.NoActionBar" />
|
|
||||||
</resources>
|
|
||||||
@ -1,13 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?><!--
|
|
||||||
Sample backup rules file; uncomment and customize as necessary.
|
|
||||||
See https://developer.android.com/guide/topics/data/autobackup
|
|
||||||
for details.
|
|
||||||
Note: This file is ignored for devices older that API 31
|
|
||||||
See https://developer.android.com/about/versions/12/backup-restore
|
|
||||||
-->
|
|
||||||
<full-backup-content>
|
|
||||||
<!--
|
|
||||||
<include domain="sharedpref" path="."/>
|
|
||||||
<exclude domain="sharedpref" path="device.xml"/>
|
|
||||||
-->
|
|
||||||
</full-backup-content>
|
|
||||||
@ -1,19 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?><!--
|
|
||||||
Sample data extraction rules file; uncomment and customize as necessary.
|
|
||||||
See https://developer.android.com/about/versions/12/backup-restore#xml-changes
|
|
||||||
for details.
|
|
||||||
-->
|
|
||||||
<data-extraction-rules>
|
|
||||||
<cloud-backup>
|
|
||||||
<!-- TODO: Use <include> and <exclude> to control what is backed up.
|
|
||||||
<include .../>
|
|
||||||
<exclude .../>
|
|
||||||
-->
|
|
||||||
</cloud-backup>
|
|
||||||
<!--
|
|
||||||
<device-transfer>
|
|
||||||
<include .../>
|
|
||||||
<exclude .../>
|
|
||||||
</device-transfer>
|
|
||||||
-->
|
|
||||||
</data-extraction-rules>
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
package com.example.mobileapp
|
|
||||||
|
|
||||||
import org.junit.Test
|
|
||||||
|
|
||||||
import org.junit.Assert.*
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Example local unit test, which will execute on the development machine (host).
|
|
||||||
*
|
|
||||||
* See [testing documentation](http://d.android.com/tools/testing).
|
|
||||||
*/
|
|
||||||
class ExampleUnitTest {
|
|
||||||
@Test
|
|
||||||
fun addition_isCorrect() {
|
|
||||||
assertEquals(4, 2 + 2)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@ -1,5 +0,0 @@
|
|||||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
|
||||||
plugins {
|
|
||||||
id("com.android.application") version "8.1.1" apply false
|
|
||||||
id("org.jetbrains.kotlin.android") version "1.8.10" apply false
|
|
||||||
}
|
|
||||||
@ -1,23 +0,0 @@
|
|||||||
# Project-wide Gradle settings.
|
|
||||||
# IDE (e.g. Android Studio) users:
|
|
||||||
# Gradle settings configured through the IDE *will override*
|
|
||||||
# any settings specified in this file.
|
|
||||||
# For more details on how to configure your build environment visit
|
|
||||||
# http://www.gradle.org/docs/current/userguide/build_environment.html
|
|
||||||
# Specifies the JVM arguments used for the daemon process.
|
|
||||||
# The setting is particularly useful for tweaking memory settings.
|
|
||||||
org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
|
|
||||||
# When configured, Gradle will run in incubating parallel mode.
|
|
||||||
# This option should only be used with decoupled projects. More details, visit
|
|
||||||
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
|
|
||||||
# org.gradle.parallel=true
|
|
||||||
# AndroidX package structure to make it clearer which packages are bundled with the
|
|
||||||
# Android operating system, and which are packaged with your app's APK
|
|
||||||
# https://developer.android.com/topic/libraries/support-library/androidx-rn
|
|
||||||
android.useAndroidX=true
|
|
||||||
# Kotlin code style for this project: "official" or "obsolete":
|
|
||||||
kotlin.code.style=official
|
|
||||||
# Enables namespacing of each library's R class so that its R class includes only the
|
|
||||||
# resources declared in the library itself and none from the library's dependencies,
|
|
||||||
# thereby reducing the size of the R class for that library
|
|
||||||
android.nonTransitiveRClass=true
|
|
||||||
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
BIN
gradle/wrapper/gradle-wrapper.jar
vendored
Binary file not shown.
6
gradle/wrapper/gradle-wrapper.properties
vendored
6
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,6 +0,0 @@
|
|||||||
#Tue Nov 07 22:31:41 GMT+04:00 2023
|
|
||||||
distributionBase=GRADLE_USER_HOME
|
|
||||||
distributionPath=wrapper/dists
|
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
|
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
|
||||||
zipStorePath=wrapper/dists
|
|
||||||
185
gradlew
vendored
185
gradlew
vendored
@ -1,185 +0,0 @@
|
|||||||
#!/usr/bin/env sh
|
|
||||||
|
|
||||||
#
|
|
||||||
# Copyright 2015 the original author or authors.
|
|
||||||
#
|
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
# you may not use this file except in compliance with the License.
|
|
||||||
# You may obtain a copy of the License at
|
|
||||||
#
|
|
||||||
# https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
#
|
|
||||||
# Unless required by applicable law or agreed to in writing, software
|
|
||||||
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
# See the License for the specific language governing permissions and
|
|
||||||
# limitations under the License.
|
|
||||||
#
|
|
||||||
|
|
||||||
##############################################################################
|
|
||||||
##
|
|
||||||
## Gradle start up script for UN*X
|
|
||||||
##
|
|
||||||
##############################################################################
|
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
|
||||||
# Resolve links: $0 may be a link
|
|
||||||
PRG="$0"
|
|
||||||
# Need this for relative symlinks.
|
|
||||||
while [ -h "$PRG" ] ; do
|
|
||||||
ls=`ls -ld "$PRG"`
|
|
||||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
|
||||||
if expr "$link" : '/.*' > /dev/null; then
|
|
||||||
PRG="$link"
|
|
||||||
else
|
|
||||||
PRG=`dirname "$PRG"`"/$link"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
SAVED="`pwd`"
|
|
||||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
|
||||||
APP_HOME="`pwd -P`"
|
|
||||||
cd "$SAVED" >/dev/null
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
|
||||||
APP_BASE_NAME=`basename "$0"`
|
|
||||||
|
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
|
||||||
MAX_FD="maximum"
|
|
||||||
|
|
||||||
warn () {
|
|
||||||
echo "$*"
|
|
||||||
}
|
|
||||||
|
|
||||||
die () {
|
|
||||||
echo
|
|
||||||
echo "$*"
|
|
||||||
echo
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
|
||||||
cygwin=false
|
|
||||||
msys=false
|
|
||||||
darwin=false
|
|
||||||
nonstop=false
|
|
||||||
case "`uname`" in
|
|
||||||
CYGWIN* )
|
|
||||||
cygwin=true
|
|
||||||
;;
|
|
||||||
Darwin* )
|
|
||||||
darwin=true
|
|
||||||
;;
|
|
||||||
MINGW* )
|
|
||||||
msys=true
|
|
||||||
;;
|
|
||||||
NONSTOP* )
|
|
||||||
nonstop=true
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
# Determine the Java command to use to start the JVM.
|
|
||||||
if [ -n "$JAVA_HOME" ] ; then
|
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
|
||||||
else
|
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
|
||||||
fi
|
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
JAVACMD="java"
|
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
location of your Java installation."
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
|
||||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
|
||||||
MAX_FD_LIMIT=`ulimit -H -n`
|
|
||||||
if [ $? -eq 0 ] ; then
|
|
||||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
|
||||||
MAX_FD="$MAX_FD_LIMIT"
|
|
||||||
fi
|
|
||||||
ulimit -n $MAX_FD
|
|
||||||
if [ $? -ne 0 ] ; then
|
|
||||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Darwin, add options to specify how the application appears in the dock
|
|
||||||
if $darwin; then
|
|
||||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
|
||||||
|
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
|
||||||
|
|
||||||
# We build the pattern for arguments to be converted via cygpath
|
|
||||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
|
||||||
SEP=""
|
|
||||||
for dir in $ROOTDIRSRAW ; do
|
|
||||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
|
||||||
SEP="|"
|
|
||||||
done
|
|
||||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
|
||||||
# Add a user-defined pattern to the cygpath arguments
|
|
||||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
|
||||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
|
||||||
fi
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
i=0
|
|
||||||
for arg in "$@" ; do
|
|
||||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
|
||||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
|
||||||
|
|
||||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
|
||||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
|
||||||
else
|
|
||||||
eval `echo args$i`="\"$arg\""
|
|
||||||
fi
|
|
||||||
i=`expr $i + 1`
|
|
||||||
done
|
|
||||||
case $i in
|
|
||||||
0) set -- ;;
|
|
||||||
1) set -- "$args0" ;;
|
|
||||||
2) set -- "$args0" "$args1" ;;
|
|
||||||
3) set -- "$args0" "$args1" "$args2" ;;
|
|
||||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
|
||||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
|
||||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
|
||||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
|
||||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
|
||||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Escape application args
|
|
||||||
save () {
|
|
||||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
|
||||||
echo " "
|
|
||||||
}
|
|
||||||
APP_ARGS=`save "$@"`
|
|
||||||
|
|
||||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
|
||||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
|
||||||
89
gradlew.bat
vendored
89
gradlew.bat
vendored
@ -1,89 +0,0 @@
|
|||||||
@rem
|
|
||||||
@rem Copyright 2015 the original author or authors.
|
|
||||||
@rem
|
|
||||||
@rem Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
@rem you may not use this file except in compliance with the License.
|
|
||||||
@rem You may obtain a copy of the License at
|
|
||||||
@rem
|
|
||||||
@rem https://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
@rem
|
|
||||||
@rem Unless required by applicable law or agreed to in writing, software
|
|
||||||
@rem distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
@rem See the License for the specific language governing permissions and
|
|
||||||
@rem limitations under the License.
|
|
||||||
@rem
|
|
||||||
|
|
||||||
@if "%DEBUG%" == "" @echo off
|
|
||||||
@rem ##########################################################################
|
|
||||||
@rem
|
|
||||||
@rem Gradle startup script for Windows
|
|
||||||
@rem
|
|
||||||
@rem ##########################################################################
|
|
||||||
|
|
||||||
@rem Set local scope for the variables with windows NT shell
|
|
||||||
if "%OS%"=="Windows_NT" setlocal
|
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.
|
|
||||||
set APP_BASE_NAME=%~n0
|
|
||||||
set APP_HOME=%DIRNAME%
|
|
||||||
|
|
||||||
@rem Resolve any "." and ".." in APP_HOME to make it shorter.
|
|
||||||
for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
|
|
||||||
|
|
||||||
@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
|
||||||
set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
|
|
||||||
|
|
||||||
@rem Find java.exe
|
|
||||||
if defined JAVA_HOME goto findJavaFromJavaHome
|
|
||||||
|
|
||||||
set JAVA_EXE=java.exe
|
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:findJavaFromJavaHome
|
|
||||||
set JAVA_HOME=%JAVA_HOME:"=%
|
|
||||||
set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|
||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
|
||||||
|
|
||||||
echo.
|
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
|
||||||
echo.
|
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
|
||||||
echo location of your Java installation.
|
|
||||||
|
|
||||||
goto fail
|
|
||||||
|
|
||||||
:execute
|
|
||||||
@rem Setup the command line
|
|
||||||
|
|
||||||
set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|
||||||
|
|
||||||
|
|
||||||
@rem Execute Gradle
|
|
||||||
"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
|
|
||||||
|
|
||||||
:end
|
|
||||||
@rem End local scope for the variables with windows NT shell
|
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
|
||||||
|
|
||||||
:fail
|
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
|
||||||
rem the _cmd.exe /c_ return code!
|
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
|
||||||
exit /b 1
|
|
||||||
|
|
||||||
:mainEnd
|
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
|
||||||
|
|
||||||
:omega
|
|
||||||
@ -1,17 +0,0 @@
|
|||||||
pluginManagement {
|
|
||||||
repositories {
|
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
gradlePluginPortal()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
dependencyResolutionManagement {
|
|
||||||
repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS)
|
|
||||||
repositories {
|
|
||||||
google()
|
|
||||||
mavenCentral()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
rootProject.name = "MobileApp"
|
|
||||||
include(":app")
|
|
||||||
Loading…
Reference in New Issue
Block a user