Ver código fonte

добавил изображения на фон исправил сьезжание полей добавил иконку приложения

AlexMin 1 semana atrás
pai
commit
14a6f5a410
50 arquivos alterados com 228 adições e 238 exclusões
  1. BIN
      .gradle/8.7/executionHistory/executionHistory.bin
  2. BIN
      .gradle/8.7/executionHistory/executionHistory.lock
  3. BIN
      .gradle/8.7/fileHashes/fileHashes.bin
  4. BIN
      .gradle/8.7/fileHashes/fileHashes.lock
  5. BIN
      .gradle/8.7/fileHashes/resourceHashesCache.bin
  6. BIN
      .gradle/buildOutputCleanup/buildOutputCleanup.lock
  7. BIN
      .gradle/file-system.probe
  8. BIN
      app/src/main/ic_launcher-playstore.png
  9. 9 0
      app/src/main/java/com/example/iplace/main/viewModel/dataView/FavouritesV.kt
  10. 8 0
      app/src/main/java/com/example/iplace/main/viewModel/dataView/MenuV.kt
  11. 10 4
      app/src/main/java/com/example/iplace/main/viewModel/dataView/PlaceV.kt
  12. 10 4
      app/src/main/java/com/example/iplace/main/viewModel/dataView/PolicyConditionality.kt
  13. 9 4
      app/src/main/java/com/example/iplace/main/viewModel/dataView/Profile.kt
  14. 24 8
      app/src/main/java/com/example/iplace/main/viewModel/dataView/SplashScreen.kt
  15. 10 3
      app/src/main/java/com/example/iplace/main/viewModel/mainView/AddPlace.kt
  16. 13 5
      app/src/main/java/com/example/iplace/main/viewModel/mainView/Auth.kt
  17. 1 1
      app/src/main/java/com/example/iplace/main/viewModel/mainView/ChangingPassword.kt
  18. 10 2
      app/src/main/java/com/example/iplace/main/viewModel/mainView/CreatingUser.kt
  19. 13 5
      app/src/main/java/com/example/iplace/main/viewModel/mainView/PasswordRecovery.kt
  20. 1 1
      app/src/main/java/com/example/iplace/main/viewModel/mainView/PasswordVerification.kt
  21. 13 5
      app/src/main/java/com/example/iplace/main/viewModel/mainView/Registration.kt
  22. 13 5
      app/src/main/java/com/example/iplace/main/viewModel/mainView/SelectEnter.kt
  23. 10 4
      app/src/main/java/com/example/iplace/main/viewModel/mainView/UserSettings.kt
  24. BIN
      app/src/main/res/drawable/au3.jpg
  25. BIN
      app/src/main/res/drawable/cu6.jpg
  26. BIN
      app/src/main/res/drawable/fon.png
  27. 70 181
      app/src/main/res/drawable/ic_launcher_background.xml
  28. BIN
      app/src/main/res/drawable/pc7.jpg
  29. BIN
      app/src/main/res/drawable/pr4.jpg
  30. BIN
      app/src/main/res/drawable/re5.jpg
  31. BIN
      app/src/main/res/drawable/se2.jpg
  32. BIN
      app/src/main/res/drawable/sp1.jpg
  33. 2 3
      app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  34. 2 3
      app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  35. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher.webp
  36. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp
  37. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
  38. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher.webp
  39. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp
  40. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
  41. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher.webp
  42. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp
  43. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
  44. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
  45. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp
  46. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
  47. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
  48. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp
  49. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
  50. BIN
      documentation/logoIPlace.png

BIN
.gradle/8.7/executionHistory/executionHistory.bin


BIN
.gradle/8.7/executionHistory/executionHistory.lock


BIN
.gradle/8.7/fileHashes/fileHashes.bin


BIN
.gradle/8.7/fileHashes/fileHashes.lock


BIN
.gradle/8.7/fileHashes/resourceHashesCache.bin


BIN
.gradle/buildOutputCleanup/buildOutputCleanup.lock


BIN
.gradle/file-system.probe


BIN
app/src/main/ic_launcher-playstore.png


+ 9 - 0
app/src/main/java/com/example/iplace/main/viewModel/dataView/FavouritesV.kt

@@ -1,5 +1,6 @@
 package com.example.iplace.main.viewModel.dataView
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -32,6 +33,8 @@ 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.layout.ContentScale
+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.font.FontWeight
@@ -54,6 +57,12 @@ fun FavouritesV(navController: NavHostController) {
     val basicNunitosans = FontFamily(
         Font(resId = R.font.basic_nunitosans)
     )
+    Image(
+        painter = painterResource(id = R.drawable.fon),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
     Scaffold(
         topBar = {
             TopAppBar(

+ 8 - 0
app/src/main/java/com/example/iplace/main/viewModel/dataView/MenuV.kt

@@ -60,6 +60,8 @@ import androidx.compose.runtime.*
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.layout.ContentScale
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 
@@ -75,6 +77,12 @@ fun MenuV(navController: NavHostController) {
     val basicNunitosans = FontFamily(
         Font(resId = R.font.basic_nunitosans)
     )
+    Image(
+        painter = painterResource(id = R.drawable.fon),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
     // Шторка (Drawer)
     AnimatedVisibility(
         visible = showDrawer,

+ 10 - 4
app/src/main/java/com/example/iplace/main/viewModel/dataView/PlaceV.kt

@@ -1,5 +1,6 @@
 package com.example.iplace.main.viewModel.dataView
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -28,6 +29,8 @@ 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.painterResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -48,18 +51,22 @@ fun PlaceV(navController: NavHostController) {
     val basicNunitosans = FontFamily(
         Font(resId = R.font.basic_nunitosans)
     )
-
+    Image(
+        painter = painterResource(id = R.drawable.fon),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(Color.White)
     ) {
         Spacer(modifier = Modifier.height(20.dp))
         // Верхний блок (2/5 размера экрана)
         Box(
             modifier = Modifier
                 .weight(2f)
-                .background(Color.LightGray)
+                .background(Color.LightGray.copy(alpha = 0.6f))
                 .padding(16.dp)
         ) {
             // Кнопки назад и автора
@@ -108,7 +115,6 @@ fun PlaceV(navController: NavHostController) {
             modifier = Modifier
                 .weight(3f)
                 .fillMaxSize()
-                .background(Color.White)
         ) {
             Column(
                 modifier = Modifier

+ 10 - 4
app/src/main/java/com/example/iplace/main/viewModel/dataView/PolicyConditionality.kt

@@ -41,7 +41,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -67,11 +69,15 @@ fun PolicyConditionality(navController: NavHostController) {
         Font(resId = R.font.basic_nunitosans)
     )
 
-
+    Image(
+        painter = painterResource(id = R.drawable.pc7),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
     Column(
         modifier = Modifier
-            .fillMaxSize()
-            .background(Color.White),
+            .fillMaxSize(),
         verticalArrangement = Arrangement.Top,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -88,7 +94,7 @@ fun PolicyConditionality(navController: NavHostController) {
                 .width(350.dp)
                 .height(700.dp)
                 .clip(RoundedCornerShape(40.dp))
-                .background(beige_white)
+                .background(beige_white.copy(alpha = 0.6f))
 //        .alpha(0.8f) //возможная прозрачность формы
         ) {
 

+ 9 - 4
app/src/main/java/com/example/iplace/main/viewModel/dataView/Profile.kt

@@ -31,6 +31,8 @@ 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.painterResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -56,18 +58,22 @@ fun Profile(navController: NavHostController) {
     val basicNunitosans = FontFamily(
         Font(resId = R.font.basic_nunitosans)
     )
-
+    Image(
+        painter = painterResource(id = R.drawable.fon),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(Color.White)
     ) {
         Spacer(modifier = Modifier.height(20.dp))
         // Верхний блок (2/5 размера экрана)
         Box(
             modifier = Modifier
                 .weight(2f)
-                .background(Color.LightGray)
+                .background(Color.LightGray.copy(alpha = 0.6f))
                 .padding(16.dp),
             contentAlignment = Alignment.TopCenter
         ) {
@@ -131,7 +137,6 @@ fun Profile(navController: NavHostController) {
             modifier = Modifier
                 .weight(3f)
                 .fillMaxSize()
-                .background(Color.White)
         ) {
             Column(
                 modifier = Modifier

+ 24 - 8
app/src/main/java/com/example/iplace/main/viewModel/dataView/SplashScreen.kt

@@ -1,5 +1,6 @@
 package com.example.iplace.main.viewModel.dataView
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
 import androidx.compose.foundation.clickable
@@ -30,6 +31,8 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.graphicsLayer
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
@@ -47,6 +50,7 @@ import com.example.iplace.ui.theme.beige_white
 import com.example.iplace.ui.theme.brown_contrast
 import io.github.jan.supabase.storage.storage
 
+
 @Composable
 fun SplashScreen(navController: NavHostController){
     val viewModel = MainViewModel()
@@ -56,29 +60,41 @@ fun SplashScreen(navController: NavHostController){
     val basicNunitosans = FontFamily(
         Font(resId = R.font.basic_nunitosans)
     )
-
+    val otherInter = FontFamily(
+        Font(resId = R.font.other_inter)
+    )
+    Image(
+        painter = painterResource(id = R.drawable.sp1),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
     Column(
         modifier = Modifier
-            .fillMaxSize()
-            .background(Color.White),
+            .fillMaxSize(),
         verticalArrangement = Arrangement.SpaceBetween,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
-        Spacer(modifier = Modifier.height(80.dp)) //отступы между блоками
+        Spacer(modifier = Modifier.height(120.dp)) //отступы между блоками
         Text(
             text = "I.PLACE",
             fontSize = 55.sp,
             fontWeight = FontWeight.Bold,
-            fontFamily = headlinesOswald
+            fontFamily = headlinesOswald,
+            color = Color.White
         )
         Card(
             modifier = Modifier
                 .fillMaxWidth()
 
-                .height(180.dp)
+                .height(210.dp)
                 .width(400.dp)
                 .clip(RoundedCornerShape(40.dp)) //закругление углов формы
-                .background(beige_white)
+                .background(beige_white.copy(alpha = 0.6f))
+//                .alpha(0.5f)
+//                .graphicsLayer {
+//                    this.alpha = 0.5f
+//                }
 //                .alpha(0.8f) //прозрачность формы
         ) {
             Column(
@@ -102,7 +118,7 @@ fun SplashScreen(navController: NavHostController){
                 ) {
                     Text( text = "Начать",
                         fontSize = 24.sp,
-                        fontFamily = basicNunitosans)
+                        fontFamily = otherInter)
                 }
             }
         }

+ 10 - 3
app/src/main/java/com/example/iplace/main/viewModel/mainView/AddPlace.kt

@@ -1,5 +1,6 @@
 package com.example.iplace.main.viewModel.mainView
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Arrangement
@@ -35,6 +36,8 @@ 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.painterResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -56,17 +59,22 @@ fun AddPlace(navController: NavHostController) {
         Font(resId = R.font.basic_nunitosans)
     )
     var expanded by remember { mutableStateOf(false) }
+    Image(
+        painter = painterResource(id = R.drawable.fon),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(Color.White)
     ) {
         Spacer(modifier = Modifier.height(20.dp))
         // Верхний блок (2/5 размера экрана)
         Box(
             modifier = Modifier
                 .weight(1f)
-                .background(Color.LightGray)
+                .background(Color.LightGray.copy(alpha = 0.6f))
                 .padding(16.dp),
             contentAlignment = Alignment.TopCenter
         ) {
@@ -112,7 +120,6 @@ fun AddPlace(navController: NavHostController) {
             modifier = Modifier
                 .weight(3f)
                 .fillMaxSize()
-                .background(Color.White)
         ) {
             Column(
                 modifier = Modifier

+ 13 - 5
app/src/main/java/com/example/iplace/main/viewModel/mainView/Auth.kt

@@ -1,5 +1,6 @@
 package com.example.iplace.main.viewModel.mainView
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -30,6 +31,8 @@ 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.painterResource
 import androidx.compose.ui.text.TextStyle
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
@@ -57,12 +60,16 @@ fun  Auth(navController: NavHostController){
 
     val email = remember { mutableStateOf("") }
     val password = remember { mutableStateOf("") }
-
+    Image(
+        painter = painterResource(id = R.drawable.au3),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
 
     Column(
         modifier = Modifier
-            .fillMaxSize()
-            .background(Color.White),
+            .fillMaxSize(),
         verticalArrangement = Arrangement.Top,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -71,7 +78,8 @@ fun  Auth(navController: NavHostController){
             text = "I.PLACE",
             fontSize = 45.sp,
             fontWeight = FontWeight.Bold,
-            fontFamily = headlinesOswald
+            fontFamily = headlinesOswald,
+            color = Color.White
         )
         Spacer(modifier = Modifier.height(55.dp))
         Card(
@@ -79,7 +87,7 @@ fun  Auth(navController: NavHostController){
                 .width(350.dp)
                 .height(485.dp)
                 .clip(RoundedCornerShape(40.dp))
-                .background(beige_white)
+                .background(beige_white.copy(alpha = 0.6f))
 //        .alpha(0.8f) //возможная прозрачность формы
         ) {
             Column(

+ 1 - 1
app/src/main/java/com/example/iplace/main/viewModel/mainView/ChangingPassword.kt

@@ -66,7 +66,7 @@ fun ChangingPassword(navController: NavHostController) {
                 .width(350.dp)
                 .height(485.dp)
                 .clip(RoundedCornerShape(40.dp))
-                .background(beige_white)
+                .background(beige_white.copy(alpha = 0.6f))
 //        .alpha(0.8f) //возможная прозрачность формы
         ) {
             Column(

+ 10 - 2
app/src/main/java/com/example/iplace/main/viewModel/mainView/CreatingUser.kt

@@ -40,7 +40,9 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.graphics.asImageBitmap
+import androidx.compose.ui.layout.ContentScale
 import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -85,10 +87,16 @@ fun CreatingUser(navController: NavHostController) {
             }
         }
     }
+    Image(
+        painter = painterResource(id = R.drawable.cu6),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
+
     Column(
         modifier = Modifier
-            .fillMaxSize()
-            .background(Color.White),
+            .fillMaxSize(),
         verticalArrangement = Arrangement.Top,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {

+ 13 - 5
app/src/main/java/com/example/iplace/main/viewModel/mainView/PasswordRecovery.kt

@@ -1,5 +1,6 @@
 package com.example.iplace.main.viewModel.mainView
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -18,7 +19,6 @@ import androidx.compose.material3.ButtonDefaults
 import androidx.compose.material3.Card
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
-import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextField
 import androidx.compose.runtime.Composable
@@ -26,6 +26,8 @@ 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.painterResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -46,11 +48,16 @@ fun PasswordRecovery(navController: NavHostController) {
     val basicNunitosans = FontFamily(
         Font(resId = R.font.basic_nunitosans)
     )
+    Image(
+        painter = painterResource(id = R.drawable.pr4),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
 
     Column(
         modifier = Modifier
-            .fillMaxSize()
-            .background(Color.White),
+            .fillMaxSize(),
         verticalArrangement = Arrangement.Top,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -59,7 +66,8 @@ fun PasswordRecovery(navController: NavHostController) {
             text = "I.PLACE",
             fontSize = 45.sp,
             fontWeight = FontWeight.Bold,
-            fontFamily = headlinesOswald
+            fontFamily = headlinesOswald,
+            color = Color.White
         )
         Spacer(modifier = Modifier.height(55.dp))
         Card(
@@ -67,7 +75,7 @@ fun PasswordRecovery(navController: NavHostController) {
                 .width(350.dp)
                 .height(485.dp)
                 .clip(RoundedCornerShape(40.dp))
-                .background(beige_white)
+                .background(beige_white.copy(alpha = 0.6f))
 //        .alpha(0.8f) //возможная прозрачность формы
         ) {
             Column(

+ 1 - 1
app/src/main/java/com/example/iplace/main/viewModel/mainView/PasswordVerification.kt

@@ -66,7 +66,7 @@ fun PasswordVerification(navController: NavHostController) {
                 .width(350.dp)
                 .height(485.dp)
                 .clip(RoundedCornerShape(40.dp))
-                .background(beige_white)
+                .background(beige_white.copy(alpha = 0.6f))
 //        .alpha(0.8f) //возможная прозрачность формы
         ) {
             Column(

+ 13 - 5
app/src/main/java/com/example/iplace/main/viewModel/mainView/Registration.kt

@@ -1,6 +1,7 @@
 package com.example.iplace.main.viewModel.mainView
 
 import android.telephony.ims.RegistrationManager
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -26,6 +27,8 @@ 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.painterResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -46,11 +49,15 @@ fun Registration(navController: NavHostController) {
     val basicNunitosans = FontFamily(
         Font(resId = R.font.basic_nunitosans)
     )
-
+    Image(
+        painter = painterResource(id = R.drawable.re5),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
     Column(
         modifier = Modifier
-            .fillMaxSize()
-            .background(Color.White),
+            .fillMaxSize(),
         verticalArrangement = Arrangement.Top,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -59,7 +66,8 @@ fun Registration(navController: NavHostController) {
             text = "I.PLACE",
             fontSize = 45.sp,
             fontWeight = FontWeight.Bold,
-            fontFamily = headlinesOswald
+            fontFamily = headlinesOswald,
+            color = Color.White
         )
         Spacer(modifier = Modifier.height(55.dp))
         Card(
@@ -67,7 +75,7 @@ fun Registration(navController: NavHostController) {
                 .width(350.dp)
                 .height(485.dp)
                 .clip(RoundedCornerShape(40.dp))
-                .background(beige_white)
+                .background(beige_white.copy(alpha = 0.6f))
 //        .alpha(0.8f) //возможная прозрачность формы
         ) {
             Column(

+ 13 - 5
app/src/main/java/com/example/iplace/main/viewModel/mainView/SelectEnter.kt

@@ -1,5 +1,6 @@
 package com.example.iplace.main.viewModel.mainView
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
@@ -19,6 +20,8 @@ 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.painterResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -41,11 +44,15 @@ fun SelectEnter(navController: NavHostController){
     val basicNunitosans = FontFamily(
         Font(resId = R.font.basic_nunitosans)
     )
-
+    Image(
+        painter = painterResource(id = R.drawable.se2),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
     Column(
         modifier = Modifier
-            .fillMaxSize()
-            .background(Color.White),
+            .fillMaxSize(),
         verticalArrangement = Arrangement.Top,
         horizontalAlignment = Alignment.CenterHorizontally
     ) {
@@ -54,7 +61,8 @@ fun SelectEnter(navController: NavHostController){
             text = "I.PLACE",
             fontSize = 45.sp,
             fontWeight = FontWeight.Bold,
-            fontFamily = headlinesOswald
+            fontFamily = headlinesOswald,
+            color = Color.White
         )
         Spacer(modifier = Modifier.height(55.dp))
         Card(
@@ -62,7 +70,7 @@ fun SelectEnter(navController: NavHostController){
                 .width(380.dp)
                 .height(485.dp)
                 .clip(RoundedCornerShape(40.dp))
-                .background(beige_white)
+                .background(beige_white.copy(alpha = 0.6f))
 //                .alpha(0.8f) //возможная прозрачность формы
         ) {
             Column(

+ 10 - 4
app/src/main/java/com/example/iplace/main/viewModel/mainView/UserSettings.kt

@@ -1,5 +1,6 @@
 package com.example.iplace.main.viewModel.mainView
 
+import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Box
@@ -28,6 +29,8 @@ 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.painterResource
 import androidx.compose.ui.text.font.Font
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
@@ -48,18 +51,22 @@ fun UserSettings(navController: NavHostController) {
     val basicNunitosans = FontFamily(
         Font(resId = R.font.basic_nunitosans)
     )
-
+    Image(
+        painter = painterResource(id = R.drawable.fon),
+        contentDescription = "",
+        contentScale = ContentScale.FillHeight,
+        modifier = Modifier.fillMaxSize()
+    )
     Column(
         modifier = Modifier
             .fillMaxSize()
-            .background(Color.White)
     ) {
         Spacer(modifier = Modifier.height(20.dp))
         // Верхний блок (2/5 размера экрана)
         Box(
             modifier = Modifier
                 .weight(2f)
-                .background(Color.LightGray)
+                .background(Color.LightGray.copy(alpha = 0.6f))
                 .padding(16.dp),
             contentAlignment = Alignment.TopCenter
         ) {
@@ -123,7 +130,6 @@ fun UserSettings(navController: NavHostController) {
             modifier = Modifier
                 .weight(3f)
                 .fillMaxSize()
-                .background(Color.White)
         ) {
             Column(
                 modifier = Modifier

BIN
app/src/main/res/drawable/au3.jpg


BIN
app/src/main/res/drawable/cu6.jpg


BIN
app/src/main/res/drawable/fon.png


+ 70 - 181
app/src/main/res/drawable/ic_launcher_background.xml

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

BIN
app/src/main/res/drawable/pc7.jpg


BIN
app/src/main/res/drawable/pr4.jpg


BIN
app/src/main/res/drawable/re5.jpg


BIN
app/src/main/res/drawable/se2.jpg


BIN
app/src/main/res/drawable/sp1.jpg


+ 2 - 3
app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,6 +1,5 @@
 <?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" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

+ 2 - 3
app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

@@ -1,6 +1,5 @@
 <?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" />
+    <background android:drawable="@drawable/ic_launcher_background"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

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


BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.webp


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


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


BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.webp


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


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


BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.webp


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


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


BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.webp


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


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


BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.webp


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


BIN
documentation/logoIPlace.png