lab2
This commit is contained in:
parent
5007344461
commit
5934717cb6
48
.gitignore
vendored
48
.gitignore
vendored
@ -1,35 +1,15 @@
|
||||
# ---> Android
|
||||
# Gradle files
|
||||
.gradle/
|
||||
build/
|
||||
|
||||
# Local configuration file (sdk path, etc)
|
||||
local.properties
|
||||
|
||||
# Log/OS Files
|
||||
*.log
|
||||
|
||||
# Android Studio generated files and folders
|
||||
captures/
|
||||
.externalNativeBuild/
|
||||
.cxx/
|
||||
*.apk
|
||||
output.json
|
||||
|
||||
# IntelliJ
|
||||
*.iml
|
||||
.idea/
|
||||
misc.xml
|
||||
deploymentTargetDropDown.xml
|
||||
render.experimental.xml
|
||||
|
||||
# Keystore files
|
||||
*.jks
|
||||
*.keystore
|
||||
|
||||
# Google Services (e.g. APIs or Firebase)
|
||||
google-services.json
|
||||
|
||||
# Android Profiling
|
||||
*.hprof
|
||||
|
||||
.gradle
|
||||
/local.properties
|
||||
/.idea/caches
|
||||
/.idea/libraries
|
||||
/.idea/modules.xml
|
||||
/.idea/workspace.xml
|
||||
/.idea/navEditor.xml
|
||||
/.idea/assetWizardSettings.xml
|
||||
.DS_Store
|
||||
/build
|
||||
/captures
|
||||
.externalNativeBuild
|
||||
.cxx
|
||||
local.properties
|
||||
|
||||
3
.idea/.gitignore
vendored
Normal file
3
.idea/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
6
.idea/compiler.xml
Normal file
6
.idea/compiler.xml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="CompilerConfiguration">
|
||||
<bytecodeTargetLevel target="17" />
|
||||
</component>
|
||||
</project>
|
||||
20
.idea/gradle.xml
Normal file
20
.idea/gradle.xml
Normal file
@ -0,0 +1,20 @@
|
||||
<?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>
|
||||
32
.idea/inspectionProfiles/Project_Default.xml
Normal file
32
.idea/inspectionProfiles/Project_Default.xml
Normal file
@ -0,0 +1,32 @@
|
||||
<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" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewApiLevelMustBeValid" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewDimensionRespectsLimit" enabled="true" level="WARNING" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewFontScaleMustBeGreaterThanZero" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewMultipleParameterProviders" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewMustBeTopLevelFunction" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewNeedsComposableAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
</inspection_tool>
|
||||
<inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
|
||||
<option name="composableFile" value="true" />
|
||||
</inspection_tool>
|
||||
</profile>
|
||||
</component>
|
||||
6
.idea/kotlinc.xml
Normal file
6
.idea/kotlinc.xml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="KotlinJpsPluginSettings">
|
||||
<option name="version" value="1.8.10" />
|
||||
</component>
|
||||
</project>
|
||||
9
.idea/misc.xml
Normal file
9
.idea/misc.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<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>
|
||||
6
.idea/vcs.xml
Normal file
6
.idea/vcs.xml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="" vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
3
app/.idea/.gitignore
vendored
Normal file
3
app/.idea/.gitignore
vendored
Normal file
@ -0,0 +1,3 @@
|
||||
# Default ignored files
|
||||
/shelf/
|
||||
/workspace.xml
|
||||
14
app/.idea/gradle.xml
Normal file
14
app/.idea/gradle.xml
Normal file
@ -0,0 +1,14 @@
|
||||
<?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" />
|
||||
</GradleProjectSettings>
|
||||
</option>
|
||||
</component>
|
||||
</project>
|
||||
9
app/.idea/misc.xml
Normal file
9
app/.idea/misc.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<project version="4">
|
||||
<component name="ExternalStorageConfigurationManager" enabled="true" />
|
||||
<component name="ProjectRootManager" version="2" 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>
|
||||
6
app/.idea/vcs.xml
Normal file
6
app/.idea/vcs.xml
Normal file
@ -0,0 +1,6 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<project version="4">
|
||||
<component name="VcsDirectoryMappings">
|
||||
<mapping directory="$PROJECT_DIR$/.." vcs="Git" />
|
||||
</component>
|
||||
</project>
|
||||
@ -4,17 +4,20 @@ plugins {
|
||||
}
|
||||
|
||||
android {
|
||||
namespace = "com.example.flowershop"
|
||||
compileSdk = 33
|
||||
namespace = "com.example.flowershopapp"
|
||||
compileSdk = 34
|
||||
|
||||
defaultConfig {
|
||||
applicationId = "com.example.flowershop"
|
||||
minSdk = 24
|
||||
applicationId = "com.example.flowershopapp"
|
||||
minSdk = 25
|
||||
targetSdk = 33
|
||||
versionCode = 1
|
||||
versionName = "1.0"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
vectorDrawables {
|
||||
useSupportLibrary = true
|
||||
}
|
||||
}
|
||||
|
||||
buildTypes {
|
||||
@ -34,21 +37,37 @@ android {
|
||||
jvmTarget = "1.8"
|
||||
}
|
||||
buildFeatures {
|
||||
viewBinding = true
|
||||
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.appcompat:appcompat:1.6.1")
|
||||
implementation("com.google.android.material:material:1.8.0")
|
||||
implementation("androidx.constraintlayout:constraintlayout:2.1.4")
|
||||
implementation("androidx.lifecycle:lifecycle-livedata-ktx:2.6.2")
|
||||
implementation("androidx.lifecycle:lifecycle-viewmodel-ktx:2.6.2")
|
||||
implementation("androidx.navigation:navigation-fragment-ktx:2.7.3")
|
||||
implementation("androidx.navigation:navigation-ui-ktx:2.7.3")
|
||||
implementation("com.google.accompanist:accompanist-systemuicontroller:0.28.0")
|
||||
implementation("com.google.accompanist:accompanist-pager:0.18.0")
|
||||
implementation("androidx.navigation:navigation-compose:2.7.4")
|
||||
implementation("androidx.core:core-ktx:1.12.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.10.01"))
|
||||
implementation("androidx.compose.ui:ui")
|
||||
implementation("androidx.compose.ui:ui-graphics")
|
||||
implementation("androidx.compose.ui:ui-tooling-preview")
|
||||
implementation("androidx.compose.material3:material3")
|
||||
implementation("androidx.navigation:navigation-runtime-ktx:2.7.4")
|
||||
implementation("androidx.wear.compose:compose-material3:1.0.0-alpha14")
|
||||
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.10.01"))
|
||||
androidTestImplementation("androidx.compose.ui:ui-test-junit4")
|
||||
debugImplementation("androidx.compose.ui:ui-tooling")
|
||||
debugImplementation("androidx.compose.ui:ui-test-manifest")
|
||||
}
|
||||
@ -0,0 +1,24 @@
|
||||
package com.example.flowershopapp
|
||||
|
||||
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.flowershopapp", appContext.packageName)
|
||||
}
|
||||
}
|
||||
@ -10,12 +10,13 @@
|
||||
android:label="@string/app_name"
|
||||
android:roundIcon="@mipmap/ic_launcher_round"
|
||||
android:supportsRtl="true"
|
||||
android:theme="@style/Theme.FlowerShop"
|
||||
android:theme="@style/Theme.FlowerShopApp"
|
||||
tools:targetApi="31">
|
||||
<activity
|
||||
android:name=".MainActivity"
|
||||
android:exported="true"
|
||||
android:label="@string/app_name">
|
||||
android:label="@string/app_name"
|
||||
android:theme="@style/Theme.FlowerShopApp">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
|
||||
|
||||
@ -0,0 +1,125 @@
|
||||
package com.example.flowershopapp.Bouquet.ComposeUI
|
||||
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.wrapContentWidth
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.LazyRow
|
||||
import androidx.compose.foundation.lazy.items
|
||||
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.CardDefaults
|
||||
import androidx.compose.material3.CardElevation
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.res.colorResource
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.navigation.NavController
|
||||
import com.example.flowershopapp.Bouquet.Model.Bouquet
|
||||
import com.example.flowershopapp.ComposeUI.Navigation.Screen
|
||||
import com.example.flowershopapp.Bouquet.Model.getBouquets
|
||||
import com.example.flowershopapp.R
|
||||
|
||||
@Composable
|
||||
fun BouquetCatalog(navController: NavController) {
|
||||
val bouquets = getBouquets()
|
||||
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Text(text = "Каталог букетов", fontFamily = FontFamily.Serif, fontSize = 40.sp,fontWeight = FontWeight.W600)
|
||||
LazyColumn(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
items(bouquets) { bouquet ->
|
||||
Row(modifier = Modifier.padding(top = 20.dp), horizontalArrangement = Arrangement.SpaceBetween) {
|
||||
BouquetCard(bouquet = bouquet)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun BouquetCard(bouquet: Bouquet) {
|
||||
Card(
|
||||
modifier = Modifier
|
||||
.padding(16.dp),
|
||||
elevation = CardDefaults.cardElevation(
|
||||
defaultElevation = 10.dp
|
||||
),
|
||||
colors = CardDefaults.cardColors(
|
||||
containerColor = Color.White
|
||||
)
|
||||
) {
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Box(contentAlignment = Alignment.TopEnd) {
|
||||
Image(
|
||||
painter = painterResource(id = bouquet.imageResourceId),
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.height(250.dp)
|
||||
.width(250.dp)
|
||||
.clip(shape = RoundedCornerShape(10.dp)),
|
||||
contentScale = ContentScale.Crop
|
||||
)
|
||||
Box(Modifier.clip(RoundedCornerShape(10.dp)).clickable { }) {
|
||||
Icon(
|
||||
painter = painterResource(id = R.drawable.icon_heart),
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.size(40.dp)
|
||||
.clip(shape = RoundedCornerShape(10.dp))
|
||||
)
|
||||
}
|
||||
}
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
Text(text = bouquet.name, fontFamily = FontFamily.Serif, fontSize = 25.sp)
|
||||
//Spacer(modifier = Modifier.height(1.dp))
|
||||
Text(text = "${bouquet.quantityOfFlowers} цветов", fontFamily = FontFamily.Serif, fontSize = 19.sp)
|
||||
//Spacer(modifier = Modifier.height(8.dp))
|
||||
Text(text = "${bouquet.price}", fontFamily = FontFamily.Serif, fontSize = 19.sp)
|
||||
Row(horizontalArrangement = Arrangement.Center) {
|
||||
Button(modifier = Modifier
|
||||
.width(115.dp), shape = RoundedCornerShape(8.dp), onClick = { },
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = colorResource(id = R.color.button)
|
||||
)) {
|
||||
Text("Купить")
|
||||
}
|
||||
Spacer(modifier = Modifier.width(8.dp))
|
||||
Button(modifier = Modifier
|
||||
.width(115.dp), shape = RoundedCornerShape(8.dp), onClick = { },
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = colorResource(id = R.color.button)
|
||||
)) {
|
||||
Text("В корзину")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,31 @@
|
||||
package com.example.flowershopapp.Bouquet.Model
|
||||
|
||||
import com.example.flowershopapp.R
|
||||
import java.io.Serializable
|
||||
|
||||
data class Bouquet(
|
||||
val id: Int,
|
||||
val name: String,
|
||||
val quantityOfFlowers: Int,
|
||||
val price: Int,
|
||||
val imageResourceId: Int,
|
||||
val quantityInCart: Int = 0
|
||||
) : Serializable
|
||||
|
||||
fun getBouquets(): List<Bouquet> {
|
||||
return listOf(
|
||||
Bouquet(1, "Нежная Роза", 12, 2500, R.drawable.image_bouquet1),
|
||||
Bouquet(2, "Лилия Элегия", 15, 2900, R.drawable.image_bouquet2),
|
||||
Bouquet(5, "Обаятельный Гвоздик", 18, 1999, R.drawable.image_bouquet4),
|
||||
Bouquet(6, "Мечта о Маргаритке", 25, 3999, R.drawable.image_bouquet5),
|
||||
Bouquet(7, "Сияние Подсолнуха", 8, 2799, R.drawable.image_bouquet6),
|
||||
Bouquet(8, "Разнообразие Сада", 30, 4999, R.drawable.image_bouquet7),
|
||||
Bouquet(9, "Лесной Букет", 22, 3399, R.drawable.image_bouquet8)
|
||||
)
|
||||
}
|
||||
fun getBouquetsFromCart(): List<Bouquet> {
|
||||
return listOf(
|
||||
Bouquet(1, "Нежная Роза", 12, 2500, R.drawable.image_bouquet1, 1),
|
||||
Bouquet(2, "Лилия Элегия", 15, 2900, R.drawable.image_bouquet2, 2),
|
||||
)
|
||||
}
|
||||
@ -0,0 +1,33 @@
|
||||
package com.example.flowershopapp.ComposeUI
|
||||
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.navigation.NavController
|
||||
import com.example.flowershopapp.R
|
||||
import kotlinx.coroutines.delay
|
||||
|
||||
@Composable
|
||||
fun Boot(navController: NavController){
|
||||
LaunchedEffect(Unit) {
|
||||
delay(2000)
|
||||
navController.navigate("Login")
|
||||
}
|
||||
Box(modifier = Modifier.fillMaxSize()) {
|
||||
Image(
|
||||
painter = painterResource(id = R.drawable.image_boot),
|
||||
contentDescription = "",
|
||||
contentScale = ContentScale.FillBounds,
|
||||
modifier = Modifier.fillMaxSize()
|
||||
)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,160 @@
|
||||
package com.example.flowershopapp.ComposeUI
|
||||
|
||||
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.wrapContentSize
|
||||
import androidx.compose.foundation.layout.wrapContentWidth
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.LazyRow
|
||||
import androidx.compose.foundation.lazy.items
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Card
|
||||
import androidx.compose.material3.CardDefaults
|
||||
import androidx.compose.material3.CardElevation
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
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.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.layout.HorizontalAlignmentLine
|
||||
import androidx.compose.ui.res.colorResource
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.style.TextOverflow
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.navigation.NavController
|
||||
import com.example.flowershopapp.Bouquet.Model.Bouquet
|
||||
import com.example.flowershopapp.ComposeUI.Navigation.Screen
|
||||
import com.example.flowershopapp.Bouquet.Model.getBouquets
|
||||
import com.example.flowershopapp.R
|
||||
|
||||
@Composable
|
||||
fun Favorite(navController: NavController) {
|
||||
val bouquets = getBouquets()
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Text(text = "Избранное", fontFamily = FontFamily.Serif, fontSize = 40.sp,fontWeight = FontWeight.W600)
|
||||
LazyColumn(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
items(bouquets.chunked(2)) { bouquetPair ->
|
||||
Row(modifier = Modifier
|
||||
.padding(top = 20.dp, bottom = 20.dp)
|
||||
.fillMaxWidth(), horizontalArrangement = Arrangement.SpaceBetween) {
|
||||
var k: Float = 0.5f
|
||||
bouquetPair.forEach { bouquet ->
|
||||
Box(modifier = Modifier
|
||||
.fillMaxWidth(k)
|
||||
.padding(start = 10.dp, end = 10.dp)) {
|
||||
BouquetCard(bouquet = bouquet) }
|
||||
k += 0.5f;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun BouquetCard(bouquet: Bouquet) {
|
||||
var showDialog by remember { mutableStateOf(false) }
|
||||
var expandedName by remember { mutableStateOf(false) }
|
||||
Card(
|
||||
elevation = CardDefaults.cardElevation(
|
||||
defaultElevation = 10.dp
|
||||
),
|
||||
colors = CardDefaults.cardColors(
|
||||
containerColor = Color.White
|
||||
)
|
||||
) {
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Box(contentAlignment = Alignment.TopEnd) {
|
||||
Image(
|
||||
painter = painterResource(id = bouquet.imageResourceId),
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.height(180.dp)
|
||||
.clip(shape = RoundedCornerShape(10.dp)),
|
||||
contentScale = ContentScale.Crop
|
||||
)
|
||||
Box(Modifier.clip(RoundedCornerShape(10.dp)).clickable { }) {
|
||||
Icon(
|
||||
painter = painterResource(id = R.drawable.icon_heart),
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.size(40.dp)
|
||||
.clip(shape = RoundedCornerShape(10.dp))
|
||||
)
|
||||
}
|
||||
}
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
if (expandedName) {
|
||||
AlertDialog(
|
||||
onDismissRequest = { expandedName = false },
|
||||
title = {
|
||||
Text(text = bouquet.name, fontFamily = FontFamily.Serif, fontSize = 25.sp)
|
||||
},
|
||||
confirmButton = {
|
||||
Button(
|
||||
onClick = { expandedName = false }
|
||||
) {
|
||||
Text("Закрыть")
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
Text(text = bouquet.name,
|
||||
fontFamily = FontFamily.Serif,
|
||||
fontSize = 20.sp,
|
||||
maxLines = 1,
|
||||
overflow = TextOverflow.Ellipsis,
|
||||
modifier = Modifier
|
||||
.padding(start = 5.dp, end = 5.dp)
|
||||
.clickable { expandedName = true })
|
||||
//Spacer(modifier = Modifier.height(1.dp))
|
||||
Text(text = "${bouquet.quantityOfFlowers} цветов", fontFamily = FontFamily.Serif, fontSize = 19.sp)
|
||||
//Spacer(modifier = Modifier.height(8.dp))
|
||||
Text(text = "${bouquet.price}", fontFamily = FontFamily.Serif, fontSize = 19.sp)
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center) {
|
||||
Button(modifier = Modifier.width(115.dp), shape = RoundedCornerShape(5.dp), onClick = { },
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = colorResource(id = R.color.button)
|
||||
)) {
|
||||
Text("Купить")
|
||||
}
|
||||
Button(modifier = Modifier.width(115.dp), shape = RoundedCornerShape(5.dp), onClick = { },
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = colorResource(id = R.color.button)
|
||||
)) {
|
||||
Text("В корзину")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
111
app/src/main/java/com/example/flowershopapp/ComposeUI/Login.kt
Normal file
111
app/src/main/java/com/example/flowershopapp/ComposeUI/Login.kt
Normal file
@ -0,0 +1,111 @@
|
||||
package com.example.flowershopapp.ComposeUI
|
||||
|
||||
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.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonColors
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.material3.TextField
|
||||
import androidx.compose.material3.TextFieldDefaults
|
||||
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.colorResource
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.navigation.NavController
|
||||
import com.example.flowershopapp.ComposeUI.Navigation.Screen
|
||||
import com.example.flowershopapp.R
|
||||
|
||||
@Composable
|
||||
fun Login(navController: NavController) {
|
||||
var username by remember { mutableStateOf("") }
|
||||
var password by remember { mutableStateOf("") }
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(color = colorResource(id = R.color.backgroundWindow)),
|
||||
verticalArrangement = Arrangement.Top, horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.weight(1f),
|
||||
horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Image(painter = painterResource(id = R.drawable.logo), contentDescription = "", Modifier.size(180.dp))
|
||||
}
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.weight(2f)
|
||||
.padding(bottom = 10.dp),
|
||||
verticalArrangement = Arrangement.Top,
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Text(
|
||||
text = stringResource(id = R.string.login_title),
|
||||
fontSize = 26.sp,
|
||||
fontWeight = FontWeight.Medium
|
||||
)
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
TextField(
|
||||
value = username,
|
||||
onValueChange = { username = it },
|
||||
label = { Text("Имя пользователя") },
|
||||
colors = TextFieldDefaults.colors(
|
||||
unfocusedContainerColor = colorResource(id = R.color.textFieldContainer),
|
||||
focusedContainerColor = colorResource(id = R.color.textFieldContainer)
|
||||
)
|
||||
)
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
TextField(
|
||||
value = password,
|
||||
onValueChange = { password = it },
|
||||
label = { Text("Пароль") },
|
||||
visualTransformation = PasswordVisualTransformation(),
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
|
||||
colors = TextFieldDefaults.colors(
|
||||
unfocusedContainerColor = colorResource(id = R.color.textFieldContainer),
|
||||
focusedContainerColor = colorResource(id = R.color.textFieldContainer)
|
||||
)
|
||||
)
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
Button(shape = RoundedCornerShape(5.dp), onClick = { navController.navigate(Screen.BouquetCatalog.route)},
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = colorResource(id = R.color.button)
|
||||
)) {
|
||||
Text("Вход")
|
||||
}
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
TextButton(onClick = { navController.navigate(Screen.Signup.route) }) {
|
||||
Text(text = "У меня нет учетной записи")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,322 @@
|
||||
package com.example.flowershopapp.ComposeUI.Navigation
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
import androidx.compose.animation.AnimatedVisibility
|
||||
import androidx.compose.animation.Crossfade
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.PaddingValues
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.wrapContentHeight
|
||||
import androidx.compose.foundation.layout.wrapContentWidth
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||
import androidx.compose.material3.AlertDialogDefaults.containerColor
|
||||
import androidx.compose.material3.AlertDialogDefaults.shape
|
||||
import androidx.compose.material3.Card
|
||||
import androidx.compose.material3.CardDefaults
|
||||
import androidx.compose.material3.CardElevation
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.LocalContentColor
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.NavigationBar
|
||||
import androidx.compose.material3.NavigationBarDefaults
|
||||
import androidx.compose.material3.NavigationBarItem
|
||||
import androidx.compose.material3.NavigationBarItemColors
|
||||
import androidx.compose.material3.NavigationBarItemDefaults
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.material3.TopAppBarDefaults
|
||||
import androidx.compose.material3.contentColorFor
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.draw.shadow
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.graphics.graphicsLayer
|
||||
import androidx.compose.ui.res.colorResource
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.navigation.NavDestination
|
||||
import androidx.navigation.NavDestination.Companion.hierarchy
|
||||
import androidx.navigation.NavGraph.Companion.findStartDestination
|
||||
import androidx.navigation.NavHostController
|
||||
import androidx.navigation.NavType
|
||||
import androidx.navigation.compose.NavHost
|
||||
import androidx.navigation.compose.composable
|
||||
import androidx.navigation.compose.currentBackStackEntryAsState
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import androidx.navigation.navArgument
|
||||
import com.example.flowershopapp.Bouquet.ComposeUI.BouquetCatalog
|
||||
import com.example.flowershopapp.Bouquet.ComposeUI.ShoppingCart
|
||||
import com.example.flowershopapp.ComposeUI.Boot
|
||||
import com.example.flowershopapp.ComposeUI.Favorite
|
||||
import com.example.flowershopapp.ComposeUI.Login
|
||||
import com.example.flowershopapp.ComposeUI.Profile
|
||||
import com.example.flowershopapp.ComposeUI.Signup
|
||||
import com.example.flowershopapp.R
|
||||
import kotlinx.coroutines.delay
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun Topbar(
|
||||
navController: NavHostController,
|
||||
currentScreen: Screen?
|
||||
) {
|
||||
var showImage by remember { mutableStateOf(true) }
|
||||
TopAppBar(
|
||||
|
||||
title = {
|
||||
if (showImage) {
|
||||
Row(modifier = Modifier.fillMaxWidth(), horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically) {
|
||||
// Column(horizontalAlignment = Alignment.Start, verticalArrangement = Arrangement.Bottom) {
|
||||
// Text(stringResource(currentScreen?.resourceId ?: R.string.app_name), fontSize = 32.sp, fontWeight = FontWeight.Bold)
|
||||
// }
|
||||
Column(horizontalAlignment = Alignment.End) {
|
||||
Image(
|
||||
painter = painterResource(id = R.drawable.logo),
|
||||
contentDescription = "ivi",
|
||||
Modifier
|
||||
.padding(end = 14.dp)
|
||||
.size(180.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
},
|
||||
navigationIcon = {
|
||||
if (
|
||||
navController.previousBackStackEntry != null
|
||||
&& (currentScreen == null || !currentScreen.showInBottomBar)
|
||||
) {
|
||||
showImage = false
|
||||
IconButton(onClick = { navController.navigateUp() }) {
|
||||
Icon(
|
||||
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.onPrimary
|
||||
)
|
||||
}
|
||||
}
|
||||
else{
|
||||
showImage = true
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun Navbar1(
|
||||
navController: NavHostController,
|
||||
currentDestination: NavDestination?,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
NavigationBar(
|
||||
modifier = modifier
|
||||
.height(55.dp)
|
||||
.clip(RoundedCornerShape(20.dp))
|
||||
) {
|
||||
Screen.bottomBarItems.forEach { screen ->
|
||||
NavigationBarItem(
|
||||
colors = NavigationBarItemDefaults.colors(
|
||||
indicatorColor = Color.LightGray
|
||||
),
|
||||
modifier = modifier.padding(10.dp),
|
||||
icon = { Icon(painter = painterResource(screen.icon!!), contentDescription = null) },
|
||||
//label = { Text(stringResource(screen.resourceId)) },
|
||||
selected = currentDestination?.hierarchy?.any { it.route == screen.route } == true,
|
||||
onClick = {
|
||||
navController.navigate(screen.route) {
|
||||
popUpTo(navController.graph.findStartDestination().id) {
|
||||
saveState = true
|
||||
}
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
@Composable
|
||||
fun Navbar(
|
||||
navController: NavHostController,
|
||||
currentDestination: NavDestination?,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.height(75.dp),
|
||||
horizontalArrangement = Arrangement.SpaceEvenly, verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Screen.bottomBarItems.forEach { screen ->
|
||||
val isSelected = currentDestination?.hierarchy?.any { it.route == screen.route } == true
|
||||
val contentColor =
|
||||
if (isSelected) MaterialTheme.colorScheme.primary else Color.Gray.copy(alpha = 0.8f)
|
||||
Box(
|
||||
contentAlignment = Alignment.Center,
|
||||
modifier = Modifier
|
||||
.clip(RoundedCornerShape(15.dp))
|
||||
.wrapContentHeight()
|
||||
//.background(colorResource(id = R.color.backgroundNavBarColor))
|
||||
.clickable(onClick = {
|
||||
navController.navigate(screen.route) {
|
||||
popUpTo(navController.graph.findStartDestination().id) {
|
||||
saveState = true
|
||||
}
|
||||
launchSingleTop = true
|
||||
restoreState = true
|
||||
}
|
||||
})
|
||||
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.padding(12.dp)
|
||||
.wrapContentWidth(),//.background(Color.Red),
|
||||
verticalArrangement = Arrangement.Center,
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
screen.icon?.let {
|
||||
Icon(
|
||||
modifier = Modifier.size(30.dp),
|
||||
painter = painterResource(screen.icon),
|
||||
contentDescription = null,
|
||||
tint = contentColor
|
||||
)
|
||||
}
|
||||
// AnimatedVisibility(
|
||||
// visible = isSelected
|
||||
// ) {
|
||||
Text(
|
||||
text = stringResource(screen.resourceId),
|
||||
color = contentColor,
|
||||
fontSize = 15.sp
|
||||
)
|
||||
// }
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
//@Composable
|
||||
//fun CustomBottomNavigationItem(
|
||||
// item : Screen,
|
||||
// isSelected : Boolean,
|
||||
// onClick:()->Unit,
|
||||
//) {
|
||||
// val background = if (isSelected) MaterialTheme.colors.primary.copy(alpha = 0.1f) else Color.Transparent
|
||||
// val contentColor = if (isSelected) MaterialTheme.colors.primary else MaterialTheme.colors.onBackground
|
||||
//
|
||||
// Box(
|
||||
// modifier = Modifier
|
||||
// .clip(CircleShape)
|
||||
// .background(background)
|
||||
// .clickable(onClick = onClick)
|
||||
//
|
||||
// ) {
|
||||
// Row(
|
||||
// modifier = Modifier
|
||||
// .padding(12.dp),
|
||||
// verticalAlignment = Alignment.CenterVertically,
|
||||
// horizontalArrangement = Arrangement.spacedBy(4.dp)
|
||||
// ) {
|
||||
// Icon(
|
||||
// imageVector = item.icon,
|
||||
// contentDescription = null,
|
||||
// tint = contentColor
|
||||
// )
|
||||
// AnimatedVisibility(
|
||||
// visible = isSelected
|
||||
// ) {
|
||||
// Text(
|
||||
// text = item.title,
|
||||
// color = contentColor
|
||||
// )
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
|
||||
@Composable
|
||||
fun Navhost(
|
||||
navController: NavHostController,
|
||||
innerPadding: PaddingValues,
|
||||
startScreen : String,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
NavHost(
|
||||
navController,
|
||||
startDestination = startScreen,
|
||||
modifier.padding(innerPadding)
|
||||
) {
|
||||
composable(Screen.Signup.route) { Signup(navController) }
|
||||
composable(Screen.Login.route) { Login(navController) }
|
||||
composable(Screen.Boot.route) { Boot(navController) }
|
||||
composable(Screen.BouquetCatalog.route) { BouquetCatalog(navController) }
|
||||
composable(Screen.Favorite.route) { Favorite(navController) }
|
||||
composable(Screen.ShoppingCart.route) { ShoppingCart(navController) }
|
||||
composable(Screen.Profile.route) { Profile() }
|
||||
// composable(Screen.Profile.route) { Profile() }
|
||||
// composable(Screen.Search.route) { Search(navController) }
|
||||
// composable(
|
||||
// Screen.MovieView.route,
|
||||
// arguments = listOf(navArgument("id") { type = NavType.IntType })
|
||||
// ) { backStackEntry ->
|
||||
// backStackEntry.arguments?.let { MovieView(it.getInt("id")) }
|
||||
// }
|
||||
}
|
||||
}
|
||||
|
||||
@SuppressLint("CoroutineCreationDuringComposition")
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun MainNavbar() {
|
||||
val navController = rememberNavController()
|
||||
val navBackStackEntry by navController.currentBackStackEntryAsState()
|
||||
val currentDestination = navBackStackEntry?.destination
|
||||
val currentScreen = currentDestination?.route?.let { Screen.getItem(it) }
|
||||
|
||||
Scaffold(modifier = Modifier,
|
||||
topBar = {
|
||||
if (currentScreen == null || (currentScreen.showInBottomBar && currentScreen.showTopBarAndNavBar)) {
|
||||
Topbar(navController, currentScreen)
|
||||
}
|
||||
},
|
||||
bottomBar = {
|
||||
if (currentScreen == null || (currentScreen.showInBottomBar && currentScreen.showTopBarAndNavBar)) {
|
||||
Navbar(navController, currentDestination)
|
||||
//Navbar(navController, currentDestination)
|
||||
}
|
||||
}
|
||||
) { innerPadding ->
|
||||
Navhost(navController, innerPadding, Screen.Boot.route)
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,48 @@
|
||||
package com.example.flowershopapp.ComposeUI.Navigation
|
||||
|
||||
import androidx.annotation.StringRes
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.AccountCircle
|
||||
import androidx.compose.material.icons.filled.Favorite
|
||||
import androidx.compose.material.icons.filled.Home
|
||||
import androidx.compose.material.icons.filled.List
|
||||
import androidx.compose.material.icons.filled.Search
|
||||
import androidx.compose.material.icons.rounded.Favorite
|
||||
import androidx.compose.material.icons.rounded.Home
|
||||
import androidx.compose.ui.graphics.vector.ImageVector
|
||||
import androidx.compose.ui.res.colorResource
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import com.example.flowershopapp.R
|
||||
|
||||
enum class Screen (
|
||||
val route: String,
|
||||
@StringRes val resourceId: Int,
|
||||
val icon: Int?,
|
||||
val showInBottomBar: Boolean = true,
|
||||
val showTopBarAndNavBar: Boolean = true
|
||||
){
|
||||
Signup("signup", R.string.signup_title, null, showInBottomBar = false, showTopBarAndNavBar = false),
|
||||
Login("login", R.string.login_title, null, showInBottomBar = false, showTopBarAndNavBar = false),
|
||||
Boot("boot", R.string.boot_title, null, showInBottomBar = false, showTopBarAndNavBar = false),
|
||||
BouquetCatalog("bouquet-catalog", R.string.bouquet_catalog_title, R.drawable.icons8_home),
|
||||
ShoppingCart("shopping-cart", R.string.shoppingCart_title, R.drawable.icons8_cart),
|
||||
Profile("profile", R.string.profile_title, R.drawable.icons8_user),
|
||||
Favorite("favorite", R.string.favorite_title, R.drawable.icons8_favorite);
|
||||
// Search("search", R.string.search_title, Icons.Filled.Search),
|
||||
// MovieView("movie-view/{id}", R.string.movie_view_title, Icons.Filled.List, showInBottomBar = false);
|
||||
companion object {
|
||||
val bottomBarItems = listOf(
|
||||
BouquetCatalog,
|
||||
Favorite,
|
||||
ShoppingCart,
|
||||
Profile
|
||||
// Profile,
|
||||
// Search,
|
||||
)
|
||||
|
||||
fun getItem(route: String): Screen? {
|
||||
val findRoute = route.split("/").first()
|
||||
return values().find { value -> value.route.startsWith(findRoute) }
|
||||
}
|
||||
}
|
||||
}
|
||||
114
app/src/main/java/com/example/flowershopapp/ComposeUI/Profile.kt
Normal file
114
app/src/main/java/com/example/flowershopapp/ComposeUI/Profile.kt
Normal file
@ -0,0 +1,114 @@
|
||||
package com.example.flowershopapp.ComposeUI
|
||||
|
||||
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.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonColors
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.material3.TextField
|
||||
import androidx.compose.material3.TextFieldDefaults
|
||||
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.colorResource
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.navigation.NavController
|
||||
import com.example.flowershopapp.ComposeUI.Navigation.Screen
|
||||
import com.example.flowershopapp.R
|
||||
|
||||
|
||||
@Composable
|
||||
fun Profile(){
|
||||
var phoneNumber by remember { mutableStateOf("Имя пользователя") }
|
||||
var FIO by remember { mutableStateOf("01-01-2000") }
|
||||
var dateOfBirth by remember { mutableStateOf("Ваш номер телефона") }
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(color = colorResource(id = R.color.backgroundWindow)),
|
||||
verticalArrangement = Arrangement.Center,
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.weight(2f)
|
||||
.padding(bottom = 10.dp),
|
||||
verticalArrangement = Arrangement.Center,
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Text(
|
||||
text = "Профиль",
|
||||
fontSize = 26.sp,
|
||||
fontWeight = FontWeight.Medium
|
||||
)
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
Image(painter = painterResource(id = R.drawable.icons8_profile), contentDescription = "", Modifier.size(140.dp))
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
TextField(
|
||||
value = FIO,
|
||||
onValueChange = { FIO = it },
|
||||
label = { Text("Имя пользователя") },
|
||||
colors = TextFieldDefaults.colors(
|
||||
unfocusedContainerColor = colorResource(id = R.color.textFieldContainer),
|
||||
focusedContainerColor = colorResource(id = R.color.textFieldContainer)
|
||||
)
|
||||
)
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
TextField(
|
||||
value = dateOfBirth,
|
||||
onValueChange = { dateOfBirth = it },
|
||||
label = { Text("Дата рождения") },
|
||||
colors = TextFieldDefaults.colors(
|
||||
unfocusedContainerColor = colorResource(id = R.color.textFieldContainer),
|
||||
focusedContainerColor = colorResource(id = R.color.textFieldContainer)
|
||||
)
|
||||
)
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
TextField(
|
||||
value = phoneNumber,
|
||||
onValueChange = { phoneNumber = it },
|
||||
label = { Text("Номер телефона") },
|
||||
colors = TextFieldDefaults.colors(
|
||||
unfocusedContainerColor = colorResource(id = R.color.textFieldContainer),
|
||||
focusedContainerColor = colorResource(id = R.color.textFieldContainer)
|
||||
)
|
||||
)
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
Button(
|
||||
shape = RoundedCornerShape(5.dp),
|
||||
onClick = { /* Handle button click */ },
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = colorResource(id = R.color.button)
|
||||
)
|
||||
) {
|
||||
Text("Сохранить")
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@ -0,0 +1,173 @@
|
||||
package com.example.flowershopapp.Bouquet.ComposeUI
|
||||
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxHeight
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.layout.wrapContentHeight
|
||||
import androidx.compose.foundation.layout.wrapContentWidth
|
||||
import androidx.compose.foundation.lazy.LazyColumn
|
||||
import androidx.compose.foundation.lazy.LazyRow
|
||||
import androidx.compose.foundation.lazy.items
|
||||
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.CardDefaults
|
||||
import androidx.compose.material3.CardElevation
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateListOf
|
||||
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.draw.clip
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.layout.ContentScale
|
||||
import androidx.compose.ui.res.colorResource
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.text.font.FontFamily
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.navigation.NavController
|
||||
import com.example.flowershopapp.Bouquet.Model.Bouquet
|
||||
import com.example.flowershopapp.ComposeUI.Navigation.Screen
|
||||
import com.example.flowershopapp.Bouquet.Model.getBouquets
|
||||
import com.example.flowershopapp.Bouquet.Model.getBouquetsFromCart
|
||||
import com.example.flowershopapp.R
|
||||
|
||||
@Composable
|
||||
fun ShoppingCart(navController: NavController) {
|
||||
var totalCost by remember { mutableStateOf(getTotalCostOfItemsInCart()) }
|
||||
val bouquets = remember { mutableStateListOf<Bouquet>() }
|
||||
bouquets.addAll(getBouquetsFromCart())
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Text(text = "Корзина", fontFamily = FontFamily.Serif, fontSize = 40.sp,fontWeight = FontWeight.W600)
|
||||
LazyColumn(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
items(bouquets) { bouquet ->
|
||||
Row(modifier = Modifier.padding(top = 20.dp), horizontalArrangement = Arrangement.SpaceBetween) {
|
||||
CartBouquetCard(bouquet = bouquet) { price ->
|
||||
totalCost += price
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
item{
|
||||
Text(text = "Общая сумма: $totalCost", fontSize = 25.sp, fontWeight = FontWeight.Bold)
|
||||
Button(
|
||||
modifier = Modifier.padding(bottom = 20.dp),
|
||||
shape = RoundedCornerShape(5.dp), onClick = { },
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = colorResource(id = R.color.button)
|
||||
)) {
|
||||
Text("Оформить")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@Composable
|
||||
fun CartBouquetCard(bouquet: Bouquet, onPriceChanged: (Int) -> Unit){
|
||||
var quantity by remember { mutableStateOf(1) }
|
||||
Card(
|
||||
modifier = Modifier
|
||||
.padding(16.dp),
|
||||
//.fillMaxWidth(),
|
||||
elevation = CardDefaults.cardElevation(
|
||||
defaultElevation = 10.dp
|
||||
),
|
||||
colors = CardDefaults.cardColors(
|
||||
containerColor = Color.White
|
||||
)
|
||||
//modifier = Modifier.padding(start = 5.dp, end = 5.dp),
|
||||
//horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Column(horizontalAlignment = Alignment.CenterHorizontally) {
|
||||
Box(contentAlignment = Alignment.TopEnd) {
|
||||
Image(
|
||||
painter = painterResource(id = bouquet.imageResourceId),
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.width(250.dp)
|
||||
.height(250.dp)
|
||||
.clip(shape = RoundedCornerShape(10.dp)),
|
||||
contentScale = ContentScale.Crop
|
||||
)
|
||||
Box(
|
||||
Modifier
|
||||
.clip(RoundedCornerShape(10.dp))
|
||||
.clickable { }) {
|
||||
Icon(
|
||||
painter = painterResource(id = R.drawable.icon_heart),
|
||||
contentDescription = null,
|
||||
modifier = Modifier
|
||||
.size(40.dp)
|
||||
.clip(shape = RoundedCornerShape(10.dp))
|
||||
)
|
||||
}
|
||||
}
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
Text(text = bouquet.name, fontFamily = FontFamily.Serif, fontSize = 25.sp)
|
||||
//Spacer(modifier = Modifier.height(1.dp))
|
||||
Text(text = "${bouquet.quantityOfFlowers} цветов", fontFamily = FontFamily.Serif, fontSize = 19.sp)
|
||||
//Spacer(modifier = Modifier.height(8.dp))
|
||||
Text(text = "${bouquet.price}", fontFamily = FontFamily.Serif, fontSize = 19.sp)
|
||||
Row(verticalAlignment = Alignment.CenterVertically, horizontalArrangement = Arrangement.SpaceAround, modifier = Modifier.height(50.dp)) {
|
||||
Box(modifier = Modifier.fillMaxHeight(0.5f)){
|
||||
Icon(
|
||||
painter = painterResource(id = R.drawable.icon_minus_cirlce),
|
||||
contentDescription = "",
|
||||
modifier = Modifier.clickable {
|
||||
if (quantity >= 1) {
|
||||
quantity--
|
||||
onPriceChanged(-bouquet.price)
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
Box(){
|
||||
Text(text = "$quantity")
|
||||
}
|
||||
Box(modifier = Modifier.fillMaxHeight(0.5f)){
|
||||
Icon(
|
||||
painter = painterResource(id = R.drawable.icon_add_circle),
|
||||
contentDescription = "",
|
||||
modifier = Modifier.clickable {
|
||||
quantity++
|
||||
onPriceChanged(bouquet.price)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
fun getTotalCostOfItemsInCart(): Int {
|
||||
val bouquetsInCart = getBouquetsFromCart()
|
||||
var totalCost = 0
|
||||
for (bouquet in bouquetsInCart) {
|
||||
totalCost += bouquet.price
|
||||
}
|
||||
return totalCost
|
||||
}
|
||||
123
app/src/main/java/com/example/flowershopapp/ComposeUI/Signup.kt
Normal file
123
app/src/main/java/com/example/flowershopapp/ComposeUI/Signup.kt
Normal file
@ -0,0 +1,123 @@
|
||||
package com.example.flowershopapp.ComposeUI
|
||||
|
||||
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.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.foundation.text.KeyboardOptions
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.ButtonColors
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
import androidx.compose.material3.TextField
|
||||
import androidx.compose.material3.TextFieldDefaults
|
||||
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.colorResource
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.text.input.KeyboardType
|
||||
import androidx.compose.ui.text.input.PasswordVisualTransformation
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.unit.sp
|
||||
import androidx.navigation.NavController
|
||||
import com.example.flowershopapp.ComposeUI.Navigation.Screen
|
||||
import com.example.flowershopapp.R
|
||||
|
||||
@Composable
|
||||
fun Signup(navController: NavController) {
|
||||
var username by remember { mutableStateOf("") }
|
||||
var password by remember { mutableStateOf("") }
|
||||
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
.background(color = colorResource(id = R.color.backgroundWindow)),
|
||||
verticalArrangement = Arrangement.Top, horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.weight(1f),
|
||||
horizontalArrangement = Arrangement.Center, verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Image(painter = painterResource(id = R.drawable.logo), contentDescription = "", Modifier.size(180.dp))
|
||||
}
|
||||
Column(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.weight(2f)
|
||||
.padding(bottom = 10.dp),
|
||||
verticalArrangement = Arrangement.Top,
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Text(
|
||||
text = stringResource(id = R.string.signup_title),
|
||||
fontSize = 26.sp,
|
||||
fontWeight = FontWeight.Medium
|
||||
)
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
TextField(
|
||||
value = username,
|
||||
onValueChange = { username = it },
|
||||
label = { Text("Имя пользователя") },
|
||||
colors = TextFieldDefaults.colors(
|
||||
unfocusedContainerColor = colorResource(id = R.color.textFieldContainer),
|
||||
focusedContainerColor = colorResource(id = R.color.textFieldContainer)
|
||||
)
|
||||
)
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
TextField(
|
||||
value = password,
|
||||
onValueChange = { password = it },
|
||||
label = { Text("Пароль") },
|
||||
visualTransformation = PasswordVisualTransformation(),
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
|
||||
colors = TextFieldDefaults.colors(
|
||||
unfocusedContainerColor = colorResource(id = R.color.textFieldContainer),
|
||||
focusedContainerColor = colorResource(id = R.color.textFieldContainer)
|
||||
)
|
||||
)
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
TextField(
|
||||
value = password,
|
||||
onValueChange = { password = it },
|
||||
label = { Text("Подтвердите пароль") },
|
||||
visualTransformation = PasswordVisualTransformation(),
|
||||
keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password),
|
||||
colors = TextFieldDefaults.colors(
|
||||
unfocusedContainerColor = colorResource(id = R.color.textFieldContainer),
|
||||
focusedContainerColor = colorResource(id = R.color.textFieldContainer)
|
||||
)
|
||||
)
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
Button(shape = RoundedCornerShape(5.dp), onClick = { navController.navigate(Screen.Login.route) },
|
||||
colors = ButtonDefaults.buttonColors(
|
||||
containerColor = colorResource(id = R.color.button)
|
||||
)) {
|
||||
Text("Создать")
|
||||
}
|
||||
Spacer(modifier = Modifier.height(16.dp))
|
||||
TextButton(onClick = { navController.navigate(Screen.Login.route) }) {
|
||||
Text(text = "У меня есть учетная запись")
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
33
app/src/main/java/com/example/flowershopapp/MainActivity.kt
Normal file
33
app/src/main/java/com/example/flowershopapp/MainActivity.kt
Normal file
@ -0,0 +1,33 @@
|
||||
package com.example.flowershopapp
|
||||
|
||||
import android.os.Bundle
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.colorResource
|
||||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import com.example.flowershopapp.ComposeUI.Navigation.MainNavbar
|
||||
import com.example.flowershopapp.ui.theme.FlowerShopAppTheme
|
||||
|
||||
class MainActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
setContent {
|
||||
FlowerShopAppTheme {
|
||||
Surface(
|
||||
modifier = Modifier
|
||||
.fillMaxSize()
|
||||
) {
|
||||
MainNavbar()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,13 @@
|
||||
package com.example.flowershopapp.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)
|
||||
|
||||
val Color1 = Color(0xFF2e3350);
|
||||
@ -0,0 +1,74 @@
|
||||
package com.example.flowershopapp.ui.theme
|
||||
|
||||
import android.annotation.SuppressLint
|
||||
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.Color
|
||||
import androidx.compose.ui.graphics.toArgb
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.platform.LocalView
|
||||
import androidx.compose.ui.res.colorResource
|
||||
import androidx.core.view.WindowCompat
|
||||
import com.example.flowershopapp.R
|
||||
|
||||
private val DarkColorScheme = darkColorScheme(
|
||||
primary = Purple80,
|
||||
secondary = PurpleGrey80,
|
||||
tertiary = Pink80
|
||||
)
|
||||
|
||||
private val LightColorScheme = lightColorScheme(
|
||||
primary = Color1,
|
||||
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 FlowerShopAppTheme(
|
||||
darkTheme: Boolean = false,
|
||||
// Dynamic color is available on Android 12+
|
||||
dynamicColor: Boolean = false,
|
||||
content: @Composable () -> Unit
|
||||
) {
|
||||
val colorScheme = when {
|
||||
dynamicColor && Build.VERSION.SDK_INT >= Build.VERSION_CODES.S -> {
|
||||
val context = LocalContext.current
|
||||
if (darkTheme) dynamicDarkColorScheme(context) else dynamicLightColorScheme(context)
|
||||
}
|
||||
|
||||
darkTheme -> DarkColorScheme
|
||||
else -> LightColorScheme
|
||||
}
|
||||
val view = LocalView.current
|
||||
if (!view.isInEditMode) {
|
||||
SideEffect {
|
||||
val window = (view.context as Activity).window
|
||||
window.statusBarColor = colorScheme.primary.toArgb()
|
||||
WindowCompat.getInsetsController(window, view).isAppearanceLightStatusBars = darkTheme
|
||||
}
|
||||
}
|
||||
|
||||
MaterialTheme(
|
||||
colorScheme = colorScheme,
|
||||
typography = Typography,
|
||||
content = content
|
||||
)
|
||||
}
|
||||
34
app/src/main/java/com/example/flowershopapp/ui/theme/Type.kt
Normal file
34
app/src/main/java/com/example/flowershopapp/ui/theme/Type.kt
Normal file
@ -0,0 +1,34 @@
|
||||
package com.example.flowershopapp.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
|
||||
)
|
||||
*/
|
||||
)
|
||||
14
app/src/main/res/drawable/icon_add_circle.xml
Normal file
14
app/src/main/res/drawable/icon_add_circle.xml
Normal file
@ -0,0 +1,14 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="800dp"
|
||||
android:height="800dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M12,22C17.523,22 22,17.523 22,12C22,6.477 17.523,2 12,2C6.477,2 2,6.477 2,12C2,17.523 6.477,22 12,22Z"
|
||||
android:strokeAlpha="0.4"
|
||||
android:fillColor="#292D32"
|
||||
android:fillAlpha="0.4"/>
|
||||
<path
|
||||
android:pathData="M16,11.25H12.75V8C12.75,7.59 12.41,7.25 12,7.25C11.59,7.25 11.25,7.59 11.25,8V11.25H8C7.59,11.25 7.25,11.59 7.25,12C7.25,12.41 7.59,12.75 8,12.75H11.25V16C11.25,16.41 11.59,16.75 12,16.75C12.41,16.75 12.75,16.41 12.75,16V12.75H16C16.41,12.75 16.75,12.41 16.75,12C16.75,11.59 16.41,11.25 16,11.25Z"
|
||||
android:fillColor="#292D32"/>
|
||||
</vector>
|
||||
BIN
app/src/main/res/drawable/icon_heart.png
Normal file
BIN
app/src/main/res/drawable/icon_heart.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.5 KiB |
BIN
app/src/main/res/drawable/icon_home.png
Normal file
BIN
app/src/main/res/drawable/icon_home.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.4 KiB |
14
app/src/main/res/drawable/icon_minus_cirlce.xml
Normal file
14
app/src/main/res/drawable/icon_minus_cirlce.xml
Normal file
@ -0,0 +1,14 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="800dp"
|
||||
android:height="800dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M12,22C17.523,22 22,17.523 22,12C22,6.477 17.523,2 12,2C6.477,2 2,6.477 2,12C2,17.523 6.477,22 12,22Z"
|
||||
android:strokeAlpha="0.4"
|
||||
android:fillColor="#292D32"
|
||||
android:fillAlpha="0.4"/>
|
||||
<path
|
||||
android:pathData="M15.92,12.75H7.92C7.51,12.75 7.17,12.41 7.17,12C7.17,11.59 7.51,11.25 7.92,11.25H15.92C16.33,11.25 16.67,11.59 16.67,12C16.67,12.41 16.34,12.75 15.92,12.75Z"
|
||||
android:fillColor="#292D32"/>
|
||||
</vector>
|
||||
BIN
app/src/main/res/drawable/icon_search.png
Normal file
BIN
app/src/main/res/drawable/icon_search.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 KiB |
BIN
app/src/main/res/drawable/icon_user.png
Normal file
BIN
app/src/main/res/drawable/icon_user.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.1 KiB |
16
app/src/main/res/drawable/icons8_cart.xml
Normal file
16
app/src/main/res/drawable/icons8_cart.xml
Normal file
@ -0,0 +1,16 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="800dp"
|
||||
android:height="800dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M1,1C0.448,1 0,1.448 0,2C0,2.552 0.448,3 1,3H3.206L5.985,14.909C6.399,16.682 7.955,17.946 9.765,17.998V18H17.587C19.536,18 21.201,16.596 21.53,14.675L22.786,7.337C22.995,6.116 22.054,5 20.814,5H5.727L4.974,1.773C4.868,1.32 4.465,1 4,1H1ZM6.194,7L7.933,14.455C8.144,15.36 8.951,16 9.881,16H17.587C18.562,16 19.394,15.298 19.559,14.337L20.814,7H6.194Z"
|
||||
android:fillColor="#000000"
|
||||
android:fillType="evenOdd"/>
|
||||
<path
|
||||
android:pathData="M8,23C9.105,23 10,22.105 10,21C10,19.895 9.105,19 8,19C6.895,19 6,19.895 6,21C6,22.105 6.895,23 8,23Z"
|
||||
android:fillColor="#000000"/>
|
||||
<path
|
||||
android:pathData="M19,23C20.105,23 21,22.105 21,21C21,19.895 20.105,19 19,19C17.895,19 17,19.895 17,21C17,22.105 17.895,23 19,23Z"
|
||||
android:fillColor="#000000"/>
|
||||
</vector>
|
||||
9
app/src/main/res/drawable/icons8_favorite.xml
Normal file
9
app/src/main/res/drawable/icons8_favorite.xml
Normal file
@ -0,0 +1,9 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="800dp"
|
||||
android:height="800dp"
|
||||
android:viewportWidth="512"
|
||||
android:viewportHeight="512">
|
||||
<path
|
||||
android:pathData="M365.71,3.47c-42.49,0 -82.14,18.18 -109.71,49.5C228.43,21.65 188.77,3.47 146.29,3.47C65.62,3.47 0,69.09 0,149.76c0,33.75 11.78,66.69 33.16,92.74L256,508.53l222.74,-265.91l0.1,-0.12C500.22,216.45 512,183.51 512,149.76C512,69.09 446.38,3.47 365.71,3.47zM454.66,222.55L256,459.71L57.34,222.55c-16.76,-20.45 -25.99,-46.3 -25.99,-72.8c0,-63.38 51.56,-114.94 114.94,-114.94c39.15,0 75.25,19.65 96.56,52.57L256,107.71l13.16,-20.32c21.31,-32.92 57.41,-52.57 96.56,-52.57c63.38,0 114.94,51.56 114.94,114.94C480.65,176.25 471.42,202.1 454.66,222.55z"
|
||||
android:fillColor="#000000"/>
|
||||
</vector>
|
||||
12
app/src/main/res/drawable/icons8_home.xml
Normal file
12
app/src/main/res/drawable/icons8_home.xml
Normal file
@ -0,0 +1,12 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="800dp"
|
||||
android:height="800dp"
|
||||
android:viewportWidth="34"
|
||||
android:viewportHeight="34">
|
||||
<path
|
||||
android:pathData="M2.503,16.822C1.397,16.822 0.5,15.967 0.5,14.913C0.5,14.387 0.728,13.884 1.13,13.523L15.627,0.519C16.399,-0.173 17.601,-0.173 18.373,0.519L32.87,13.523C33.675,14.246 33.714,15.454 32.956,16.221C32.577,16.605 32.05,16.822 31.497,16.822L31.018,16.822L31.018,30.183C31.018,32.291 29.225,34 27.013,34L23.004,34C21.347,34 20.004,32.657 20.004,31L20.004,24.457L20.004,24.457C20.004,23.444 19.174,22.609 18.149,22.552L18.001,22.548L15.999,22.548C14.937,22.548 14.061,23.339 14.001,24.316L13.996,24.457L13.996,31C13.996,32.657 12.653,34 10.996,34L6.987,34L6.987,34C4.775,34 2.982,32.291 2.982,30.183L2.982,16.822L2.503,16.822ZM23.607,32.091L27.013,32.091L27.013,32.091C28.119,32.091 29.016,31.237 29.016,30.183L29.016,15.113C29.016,15.003 29.105,14.913 29.216,14.913L30.975,14.913C31.085,14.913 31.175,14.824 31.175,14.713C31.175,14.656 31.151,14.602 31.108,14.564L17.668,2.508C17.288,2.167 16.712,2.167 16.332,2.508L2.892,14.564C2.809,14.638 2.802,14.765 2.876,14.847C2.914,14.889 2.968,14.913 3.025,14.913L4.784,14.913C4.895,14.913 4.984,15.003 4.984,15.113L4.984,30.183L4.984,30.183C4.984,31.237 5.881,32.091 6.987,32.091L10.393,32.091C11.277,32.091 11.993,31.375 11.994,30.491L11.994,24.429L11.994,24.429L12,24.233C12.123,22.22 13.874,20.639 15.999,20.639L18.03,20.64L18.236,20.646C20.348,20.762 22.007,22.432 22.007,24.457L22.007,30.491C22.007,31.375 22.723,32.091 23.607,32.091Z"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#252528"
|
||||
android:fillType="nonZero"
|
||||
android:strokeColor="#00000000"/>
|
||||
</vector>
|
||||
12
app/src/main/res/drawable/icons8_profile.xml
Normal file
12
app/src/main/res/drawable/icons8_profile.xml
Normal file
@ -0,0 +1,12 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="800dp"
|
||||
android:height="800dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24">
|
||||
<path
|
||||
android:pathData="M12,2C6.477,2 2,6.477 2,12C2,17.523 6.477,22 12,22C17.523,22 22,17.523 22,12C22,6.477 17.523,2 12,2ZM8.5,8.5C8.5,6.567 10.067,5 12,5C13.933,5 15.5,6.567 15.5,8.5C15.5,10.433 13.933,12 12,12C10.067,12 8.5,10.433 8.5,8.5ZM5.278,16.34C6.927,14.992 9.335,14 12,14C14.665,14 17.073,14.992 18.722,16.34C17.297,18.542 14.819,20 12,20C9.181,20 6.703,18.542 5.278,16.34Z"
|
||||
android:strokeWidth="1"
|
||||
android:fillColor="#09244B"
|
||||
android:fillType="evenOdd"
|
||||
android:strokeColor="#00000000"/>
|
||||
</vector>
|
||||
12
app/src/main/res/drawable/icons8_user.xml
Normal file
12
app/src/main/res/drawable/icons8_user.xml
Normal file
@ -0,0 +1,12 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="32dp"
|
||||
android:height="32dp"
|
||||
android:viewportWidth="32"
|
||||
android:viewportHeight="32">
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M16,16A7,7 0,1 0,9 9,7 7,0 0,0 16,16ZM16,4a5,5 0,1 1,-5 5A5,5 0,0 1,16 4Z"/>
|
||||
<path
|
||||
android:fillColor="#FF000000"
|
||||
android:pathData="M17,18H15A11,11 0,0 0,4 29a1,1 0,0 0,1 1H27a1,1 0,0 0,1 -1A11,11 0,0 0,17 18ZM6.06,28A9,9 0,0 1,15 20h2a9,9 0,0 1,8.94 8Z"/>
|
||||
</vector>
|
||||
5
app/src/main/res/drawable/image1.xml
Normal file
5
app/src/main/res/drawable/image1.xml
Normal file
@ -0,0 +1,5 @@
|
||||
<vector android:height="24dp" android:tint="#000000"
|
||||
android:viewportHeight="24" android:viewportWidth="24"
|
||||
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
<path android:fillColor="@android:color/white" android:pathData="M22,11h-4.17l3.24,-3.24 -1.41,-1.42L15,11h-2V9l4.66,-4.66 -1.42,-1.41L13,6.17V2h-2v4.17L7.76,2.93 6.34,4.34 11,9v2H9L4.34,6.34 2.93,7.76 6.17,11H2v2h4.17l-3.24,3.24 1.41,1.42L9,13h2v2l-4.66,4.66 1.42,1.41L11,17.83V22h2v-4.17l3.24,3.24 1.42,-1.41L13,15v-2h2l4.66,4.66 1.41,-1.42L17.83,13H22z"/>
|
||||
</vector>
|
||||
BIN
app/src/main/res/drawable/image_boot.jpg
Normal file
BIN
app/src/main/res/drawable/image_boot.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 132 KiB |
BIN
app/src/main/res/drawable/image_bouquet1.png
Normal file
BIN
app/src/main/res/drawable/image_bouquet1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 696 KiB |
BIN
app/src/main/res/drawable/image_bouquet2.png
Normal file
BIN
app/src/main/res/drawable/image_bouquet2.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 482 KiB |
BIN
app/src/main/res/drawable/image_bouquet4.png
Normal file
BIN
app/src/main/res/drawable/image_bouquet4.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 608 KiB |
BIN
app/src/main/res/drawable/image_bouquet5.png
Normal file
BIN
app/src/main/res/drawable/image_bouquet5.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 633 KiB |
BIN
app/src/main/res/drawable/image_bouquet6.png
Normal file
BIN
app/src/main/res/drawable/image_bouquet6.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 511 KiB |
BIN
app/src/main/res/drawable/image_bouquet7.png
Normal file
BIN
app/src/main/res/drawable/image_bouquet7.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 564 KiB |
BIN
app/src/main/res/drawable/image_bouquet8.png
Normal file
BIN
app/src/main/res/drawable/image_bouquet8.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 529 KiB |
BIN
app/src/main/res/drawable/logo.jpg
Normal file
BIN
app/src/main/res/drawable/logo.jpg
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.9 KiB |
BIN
app/src/main/res/drawable/logo1.png
Normal file
BIN
app/src/main/res/drawable/logo1.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.1 KiB |
@ -7,4 +7,8 @@
|
||||
<color name="teal_700">#FF018786</color>
|
||||
<color name="black">#FF000000</color>
|
||||
<color name="white">#FFFFFFFF</color>
|
||||
<color name="backgroundWindow">#FBFBFB</color>
|
||||
<color name="backgroundNavbar">#F6F6F6</color>
|
||||
<color name="button">#2e3350</color>
|
||||
<color name="textFieldContainer">#EEF0FF</color>
|
||||
</resources>
|
||||
@ -1,6 +1,10 @@
|
||||
<resources>
|
||||
<string name="app_name">FlowerShop</string>
|
||||
<string name="title_home">Home</string>
|
||||
<string name="title_dashboard">Dashboard</string>
|
||||
<string name="title_notifications">Notifications</string>
|
||||
<string name="app_name">FlowerShopApp</string>
|
||||
<string name="signup_title">Регистрация</string>
|
||||
<string name="login_title">Вход</string>
|
||||
<string name="boot_title">Загрузочный экран</string>
|
||||
<string name="bouquet_catalog_title">Каталог</string>
|
||||
<string name="favorite_title">Избранное</string>
|
||||
<string name="shoppingCart_title">Корзина</string>
|
||||
<string name="profile_title">Профиль</string>
|
||||
</resources>
|
||||
@ -1,16 +1,5 @@
|
||||
<resources xmlns:tools="http://schemas.android.com/tools">
|
||||
<!-- Base application theme. -->
|
||||
<style name="Theme.FlowerShop" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
|
||||
<!-- Primary brand color. -->
|
||||
<item name="colorPrimary">@color/purple_500</item>
|
||||
<item name="colorPrimaryVariant">@color/purple_700</item>
|
||||
<item name="colorOnPrimary">@color/white</item>
|
||||
<!-- Secondary brand color. -->
|
||||
<item name="colorSecondary">@color/teal_200</item>
|
||||
<item name="colorSecondaryVariant">@color/teal_700</item>
|
||||
<item name="colorOnSecondary">@color/black</item>
|
||||
<!-- Status bar color. -->
|
||||
<item name="android:statusBarColor">?attr/colorPrimaryVariant</item>
|
||||
<!-- Customize your theme here. -->
|
||||
</style>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="Theme.FlowerShopApp" parent="android:Theme.Material.Light.NoActionBar" />
|
||||
</resources>
|
||||
@ -0,0 +1,17 @@
|
||||
package com.example.flowershopapp
|
||||
|
||||
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 +1,5 @@
|
||||
// Top-level build file where you can add configuration options common to all sub-projects/modules.
|
||||
plugins {
|
||||
id("com.android.application") version "8.1.2" apply false
|
||||
id("org.jetbrains.kotlin.android") version "1.9.0" apply false
|
||||
id("org.jetbrains.kotlin.android") version "1.8.10" apply false
|
||||
}
|
||||
2
gradle/wrapper/gradle-wrapper.properties
vendored
2
gradle/wrapper/gradle-wrapper.properties
vendored
@ -1,4 +1,4 @@
|
||||
#Tue Oct 03 09:38:03 SAMT 2023
|
||||
#Sat Oct 28 18:21:38 MSK 2023
|
||||
distributionBase=GRADLE_USER_HOME
|
||||
distributionPath=wrapper/dists
|
||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-bin.zip
|
||||
|
||||
@ -13,6 +13,6 @@ dependencyResolutionManagement {
|
||||
}
|
||||
}
|
||||
|
||||
rootProject.name = "FlowerShop"
|
||||
rootProject.name = "FlowerShopApp"
|
||||
include(":app")
|
||||
|
||||
Loading…
Reference in New Issue
Block a user