Home Explore Help
Register Sign In
oleg_kostyunin
/
BenchTest
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

commit

костюниноа 5 days ago
parent
0d80541992
commit
1835aca0f9
26 changed files with 211 additions and 231 deletions
Split View Show Diff Stats
  1. 2 2
      .idea/deploymentTargetSelector.xml
  2. 18 0
      app/src/main/assets/yandex.html
  3. BIN
      app/src/main/ic_launcher-playstore.png
  4. 6 1
      app/src/main/java/com/example/lectionsupabase/navigation/Navigation.kt
  5. 11 10
      app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Benchs.kt
  6. 1 1
      app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Exhibition.kt
  7. 65 0
      app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Maps.kt
  8. 5 3
      app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Restaurants.kt
  9. 4 4
      app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/auth.kt
  10. 4 4
      app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/slide1.kt
  11. 4 4
      app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/slide2.kt
  12. 4 4
      app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/slide3.kt
  13. 70 166
      app/src/main/res/drawable/ic_launcher_background.xml
  14. 13 26
      app/src/main/res/drawable/ic_launcher_foreground.xml
  15. 2 3
      app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
  16. 2 3
      app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
  17. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher.webp
  18. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
  19. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher.webp
  20. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
  21. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher.webp
  22. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
  23. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
  24. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
  25. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
  26. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp

+ 2 - 2
.idea/deploymentTargetSelector.xml
View File 

@@ -4,10 +4,10 @@
 
     <selectionStates>
 
       <SelectionState runConfigName="app">
 
         <option name="selectionMode" value="DROPDOWN" />
 
-        <DropdownSelection timestamp="2024-11-19T12:22:40.863364100Z">
 
+        <DropdownSelection timestamp="2024-11-20T05:08:34.946870500Z">
 
           <Target type="DEFAULT_BOOT">
 
             <handle>
 
-              <DeviceId pluginId="LocalEmulator" identifier="path=C:\AndroidSettings\.android\avd\Pixel_7a_API_34.avd" />
 
+              <DeviceId pluginId="PhysicalDevice" identifier="serial=128c7b10" />
 
             </handle>
 
           </Target>
 
         </DropdownSelection>

+ 18 - 0
app/src/main/assets/yandex.html
View File 

@@ -0,0 +1,18 @@
 
+<!DOCTYPE html>
 
+<html lang="ru">
 
+<head>
 
+    <meta charset="utf-8">
 
+    <style>
 
+        html, body {
 
+            margin: 0;
 
+            padding: 0;
 
+            width: 100%;
 
+            height: 100%
 
+        }
 
+
 
+    </style>
 
+</head>
 
+<body>
 
+<script type="text/javascript" charset="utf-8" async src="https://api-maps.yandex.ru/services/constructor/1.0/js/?um=constructor%3Ad7c3bebd6d360800ad39f122059db7431c5606f83a03b1c0243d81794879a240&amp;width=1200&amp;height=1300&amp;lang=ru_RU&amp;scroll=true"></script>
 
+</body>
 
+</html>

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


+ 6 - 1
app/src/main/java/com/example/lectionsupabase/navigation/Navigation.kt
View File 

@@ -12,6 +12,7 @@ import com.example.lectionsupabase.view.mainActivity.components.Concerts
 
 import com.example.lectionsupabase.view.mainActivity.components.DealersList
 
 import com.example.lectionsupabase.view.mainActivity.components.Exhibition
 
 import com.example.lectionsupabase.view.mainActivity.components.InsertCar
 
+import com.example.lectionsupabase.view.mainActivity.components.Maps
 
 import com.example.lectionsupabase.view.mainActivity.components.Restaurants
 
 import com.example.lectionsupabase.view.mainActivity.components.reg
 
 import com.example.lectionsupabase.view.mainActivity.components.slide1
 
@@ -23,7 +24,7 @@ import slide3
 
 fun Navigation() {
 
     val navController = rememberNavController()
 
     NavHost(navController = navController,
 
-        startDestination = "Restaurants")
 
+        startDestination = "auth")
 
     {
 
         composable("auth") {
 
             auth(navController, MainViewModel())
 
@@ -57,6 +58,10 @@ fun Navigation() {
 
         composable("Benchs"){
 
             Benchs(navController)
 
         }
 
+
 
+        composable("Maps"){
 
+            Maps(navController)
 
+        }
 
         composable("DealersList"){
 
             DealersList(navController)
 
         }

+ 11 - 10
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Benchs.kt
View File 

@@ -128,8 +128,8 @@ fun Benchs(navHost: NavHostController) {
 
 
             // Стрелка вправо
 
             IconButton(
 
-                onClick = { navHost.navigate("Concerts") },
 
-
 
+                onClick = { navHost.navigate("Maps") },
 
+                modifier = Modifier.padding(start = 8.dp)
 
             ) {
 
                 Icon(
 
                     imageVector = Icons.Default.ArrowForward,
 
@@ -150,14 +150,14 @@ fun Benchs(navHost: NavHostController) {
 
             LazyColumn(
 
                 modifier = Modifier
 
                     .fillMaxHeight()
 
-                    .padding(bottom = 10.dp),
 
+                    .padding(bottom = 8.dp),
 
                 verticalArrangement = Arrangement.spacedBy(10.dp)
 
             ) {
 
                 items(benchs, key = { bench -> bench.id }) { bench ->
 
                     Card(
 
                         modifier = Modifier
 
-                            .width(430.dp)
 
-                            .padding(8.dp), // Отступы для карточки
 
+                            .width(440.dp)
 
+                            .padding(4.dp), // Отступы для карточки
 
                         elevation = CardDefaults.cardElevation(0.dp),
 
                         shape = RoundedCornerShape(55.dp),
 
                         colors = CardDefaults.cardColors(containerColor = Color.White),
 
@@ -166,7 +166,8 @@ fun Benchs(navHost: NavHostController) {
 
                         Row(
 
                             modifier = Modifier
 
                                 .fillMaxWidth()
 
-                                .padding(10.dp), // Отступы внутри карточки
 
+                                .padding(10.dp)
 
+                                .padding(start = 2.dp),// Отступы внутри карточки
 
                             verticalAlignment = Alignment.CenterVertically
 
                         ) {
 
                             val painter = rememberImagePainter(
 
@@ -193,26 +194,26 @@ fun Benchs(navHost: NavHostController) {
 
                                 Text(
 
                                     text = "Район: ${bench.district}",
 
                                     style = MaterialTheme.typography.titleMedium,
 
-                                    fontSize = 14.sp,
 
+                                    fontSize = 13.sp,
 
                                     fontFamily = montserratRegular
 
                                 )
 
                                 Text(
 
                                     text = "Координаты: ${bench.coordinates}",
 
                                     style = MaterialTheme.typography.titleMedium,
 
-                                    fontSize = 14.sp,
 
+                                    fontSize = 13.sp,
 
                                     fontFamily = montserratRegular
 
                                 )
 
                                 Text(
 
                                     text = "Состояние: ${bench.state}",
 
                                     style = MaterialTheme.typography.titleMedium,
 
-                                    fontSize = 14.sp,
 
+                                    fontSize = 13.sp,
 
                                     fontFamily = montserratRegular
 
                                 )
 
                                 Text(
 
                                     text = "Посмотреть на карте",
 
                                     style = MaterialTheme.typography.titleMedium,
 
                                     fontWeight = FontWeight.SemiBold,
 
-                                    fontSize = 14.sp,
 
+                                    fontSize = 13.sp,
 
                                     color = Color(0xFF72C3F1),
 
                                     modifier = Modifier.clickable { /* Действие при нажатии */ }
 
                                 )

+ 1 - 1
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Exhibition.kt
View File 

@@ -124,7 +124,7 @@ fun Exhibition(navHost: NavHostController) {
 
             // Стрелка с отступом
 
             IconButton(
 
                 onClick = { navHost.navigate("Benchs") },
 
-                // Отступ слева для стрелки
 
+                modifier = Modifier.padding(start = 8.dp)
 
             ) {
 
                 Icon(
 
                     imageVector = Icons.Default.ArrowForward,

+ 65 - 0
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Maps.kt
View File 

@@ -0,0 +1,65 @@
 
+package com.example.lectionsupabase.view.mainActivity.components
 
+
 
+import android.os.Bundle
 
+import android.webkit.WebView
 
+import android.webkit.WebViewClient
 
+import androidx.activity.ComponentActivity
 
+import androidx.activity.compose.setContent
 
+import androidx.compose.foundation.background
 
+import androidx.compose.foundation.layout.Box
 
+import androidx.compose.foundation.layout.Column
 
+import androidx.compose.foundation.layout.Spacer
 
+import androidx.compose.foundation.layout.fillMaxSize
 
+import androidx.compose.foundation.layout.fillMaxWidth
 
+import androidx.compose.foundation.layout.height
 
+import androidx.compose.foundation.layout.padding
 
+import androidx.compose.material3.MaterialTheme
 
+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.unit.dp
 
+import androidx.compose.ui.viewinterop.AndroidView
 
+import androidx.navigation.NavHostController
 
+
 
+
 
+@Composable
 
+fun Maps(navHost: NavHostController) {
 
+    Column(modifier = Modifier.fillMaxSize()) {
 
+        // Верхняя часть с WebView (карта)
 
+        AndroidView(
 
+            modifier = Modifier
 
+                .weight(1f) // Занимает 1 часть доступного пространства
 
+                .fillMaxWidth(),
 
+            factory = { context ->
 
+                WebView(context).apply {
 
+                    webViewClient = WebViewClient()
 
+                    settings.javaScriptEnabled = true
 
+                    settings.loadWithOverviewMode = true
 
+                    settings.useWideViewPort = true
 
+                    settings.setSupportZoom(true)
 
+                    loadUrl("file:///android_asset/yandex.html") // Замените на ваш URL
 
+                }
 
+            }
 
+        )
 
+
 
+        // Нижняя часть с информацией
 
+        Box(
 
+            modifier = Modifier
 
+                .weight(0.3f) // Занимает 0.3 части доступного пространства
 
+                .fillMaxWidth()
 
+                .background(Color.White) // Белая панель
 
+        ) {
 
+            // Здесь можно добавить текст или другую информацию о месте
 
+            Column(
 
+                modifier = Modifier.padding(16.dp)
 
+            ) {
 
+                Text(text = "Название места", style = MaterialTheme.typography.titleLarge)
 
+                Spacer(modifier = Modifier.height(8.dp))
 
+                Text(text = "Описание места", style = MaterialTheme.typography.bodyMedium)
 
+                Spacer(modifier = Modifier.height(8.dp))
 
+                Text(text = "Дополнительная информация", style = MaterialTheme.typography.bodySmall)
 
+            }
 
+        }
 
+    }
 
+}

+ 5 - 3
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/Restaurants.kt
View File 

@@ -105,12 +105,13 @@ fun Restaurants(navHost: NavHostController) {
 
         ) {
 
             // Стрелка влево
 
             IconButton(
 
-                onClick = { navHost.navigate("Restaurants")},
 
+                onClick = { navHost.navigate("")},
 
+                modifier = Modifier.padding(end = 8.dp)
 
             ) {
 
                 Icon(
 
                     imageVector = Icons.Default.ArrowBack,
 
                     contentDescription = "Назад",
 
-                    tint = Color.Black
 
+                    tint = Color.White
 
                 )
 
             }
 
 
@@ -121,7 +122,8 @@ fun Restaurants(navHost: NavHostController) {
 
                 color = MaterialTheme.colorScheme.onBackground,
 
                 textAlign = TextAlign.Center,
 
                 fontSize = 20.sp,
 
-                fontFamily = montserratSemiBold
 
+                fontFamily = montserratSemiBold,
 
+                modifier = Modifier.weight(1f)
 
             )
 
 
             // Стрелка с отступом

+ 4 - 4
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/auth.kt
View File 

@@ -66,7 +66,7 @@ fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
 
     Column(
 
         modifier = Modifier
 
             .fillMaxSize()
 
-            .background(Color(0xFFAAD4EE)) // Фон страницы
 
+            .background(Color(0xFFBCE1FB)) // Фон страницы
 
             .padding(8.dp),
 
         verticalArrangement = Arrangement.Center,
 
         horizontalAlignment = Alignment.CenterHorizontally
 
@@ -116,7 +116,7 @@ fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
 
                     colors = TextFieldDefaults.textFieldColors(
 
                         focusedIndicatorColor = Color.Transparent,
 
                         unfocusedIndicatorColor = Color.Transparent,
 
-                        containerColor = Color(0xFF96C7E5)
 
+                        containerColor = Color(0xFF97CAEF)
 
                     )
 
                 )
 
                 Spacer(modifier = Modifier.height(16.dp))
 
@@ -147,7 +147,7 @@ fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
 
                     colors = TextFieldDefaults.textFieldColors(
 
                         focusedIndicatorColor = Color.Transparent,
 
                         unfocusedIndicatorColor = Color.Transparent,
 
-                        containerColor = Color(0xFF96C7E5)
 
+                        containerColor = Color(0xFF97CAEF)
 
                     )
 
                 )
 
                 Spacer(modifier = Modifier.height(36.dp)) // Увеличенный отступ между полем и кнопкой
 
@@ -166,7 +166,7 @@ fun auth(navHostController: NavHostController, viewModel: MainViewModel) {
 
                         .height(46.dp),
 
                     shape = RoundedCornerShape(5.dp), // Закругление кнопки
 
                     colors = ButtonDefaults.buttonColors(
 
-                        containerColor = Color(0xFF7DBCDF),
 
+                        containerColor = Color(0xFF97CAEF),
 
                         contentColor = Color.White,
 
                     )
 
                 ) {

+ 4 - 4
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/slide1.kt
View File 

@@ -61,18 +61,18 @@ fun slide1(navController: NavHostController) {
 
         Text(
 
             text = "Пропустить",
 
             fontFamily = montserratSemiBold,
 
-            fontSize = 20.sp,
 
+            fontSize = 16.sp,
 
             color = Color(0xFF6FC5F2),
 
             modifier = Modifier
 
                 .align(Alignment.Start)
 
                 .padding(top = 25.dp) // Уменьшен отступ сверху
 
         )
 
-        Spacer(modifier = Modifier.height(60.dp))
 
+        Spacer(modifier = Modifier.height(50.dp))
 
         // Заголовок "Интересные места"
 
         Text(
 
             text = "Интересные места",
 
             fontFamily = montserratExtraBold,
 
-            fontSize = 25.sp,
 
+            fontSize = 24.sp,
 
             color = Color(0xFF4FB7F0),
 
             modifier = Modifier.align(Alignment.CenterHorizontally)
 
                 .padding(vertical = 15.dp) // Уменьшен вертикальный отступ
 
@@ -82,7 +82,7 @@ fun slide1(navController: NavHostController) {
 
         Text(
 
             text = "Узнавайте о интересных местах \n в вашем городе",
 
             fontFamily = montserratRegular,
 
-            fontSize = 14.sp,
 
+            fontSize = 13.sp,
 
             color = Color(0xFFA2A2A2),
 
             modifier = Modifier.align(Alignment.CenterHorizontally)
 
                 .padding(vertical = 10.dp),

+ 4 - 4
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/slide2.kt
View File 

@@ -59,18 +59,18 @@ fun slide2(navController: NavHostController) {
 
         Text(
 
             text = "Пропустить",
 
             fontFamily = montserratSemiBold,
 
-            fontSize = 20.sp,
 
+            fontSize = 16.sp,
 
             color = Color(0xFF6FC5F2),
 
             modifier = Modifier
 
                 .align(Alignment.Start)
 
                 .padding(top = 25.dp) // Уменьшен отступ сверху
 
         )
 
-        Spacer(modifier = Modifier.height(60.dp))
 
+        Spacer(modifier = Modifier.height(50.dp))
 
         // Заголовок "Интересные места"
 
         Text(
 
             text = "Обновление ленты",
 
             fontFamily = montserratExtraBold,
 
-            fontSize = 25.sp,
 
+            fontSize = 24.sp,
 
             color = Color(0xFF4FB7F0),
 
             modifier = Modifier.align(Alignment.CenterHorizontally)
 
                 .padding(vertical = 15.dp) // Уменьшен вертикальный отступ
 
@@ -80,7 +80,7 @@ fun slide2(navController: NavHostController) {
 
         Text(
 
             text = "Проверяйте ленту и следите за \n обновлением подборки",
 
             fontFamily = montserratRegular,
 
-            fontSize = 14.sp,
 
+            fontSize = 13.sp,
 
             color = Color(0xFFA2A2A2),
 
             modifier = Modifier.align(Alignment.CenterHorizontally)
 
                 .padding(vertical = 10.dp),

+ 4 - 4
app/src/main/java/com/example/lectionsupabase/view/mainActivity/components/slide3.kt
View File 

@@ -59,18 +59,18 @@ fun slide3(navController: NavHostController) {
 
         Text(
 
             text = "Завершить",
 
             fontFamily = montserratSemiBold,
 
-            fontSize = 20.sp,
 
+            fontSize = 16.sp,
 
             color = Color(0xFF6FC5F2),
 
             modifier = Modifier
 
                 .align(Alignment.Start)
 
                 .padding(top = 25.dp) // Уменьшен отступ сверху
 
         )
 
-        Spacer(modifier = Modifier.height(60.dp))
 
+        Spacer(modifier = Modifier.height(50.dp))
 
         // Заголовок "Интересные места"
 
         Text(
 
             text = "Исследуйте новые места",
 
             fontFamily = montserratExtraBold,
 
-            fontSize = 25.sp,
 
+            fontSize = 24.sp,
 
             color = Color(0xFF4FB7F0),
 
             modifier = Modifier.align(Alignment.CenterHorizontally)
 
                 .padding(vertical = 15.dp) // Уменьшен вертикальный отступ
 
@@ -80,7 +80,7 @@ fun slide3(navController: NavHostController) {
 
         Text(
 
             text = "Посещайте новые места в вашем городе \n первым и добавляйте свой отзыв",
 
             fontFamily = montserratRegular,
 
-            fontSize = 14.sp,
 
+            fontSize = 13.sp,
 
             color = Color(0xFFA2A2A2),
 
             modifier = Modifier.align(Alignment.CenterHorizontally)
 
                 .padding(vertical = 10.dp),

+ 70 - 166
app/src/main/res/drawable/ic_launcher_background.xml
View File 

@@ -1,170 +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="#3DDC84"
 
-        android:pathData="M0,0h108v108h-108z" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M9,0L9,108"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M19,0L19,108"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M29,0L29,108"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M39,0L39,108"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M49,0L49,108"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M59,0L59,108"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M69,0L69,108"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M79,0L79,108"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M89,0L89,108"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M99,0L99,108"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M0,9L108,9"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M0,19L108,19"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M0,29L108,29"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M0,39L108,39"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M0,49L108,49"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M0,59L108,59"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M0,69L108,69"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M0,79L108,79"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M0,89L108,89"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M0,99L108,99"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M19,29L89,29"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M19,39L89,39"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M19,49L89,49"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M19,59L89,59"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M19,69L89,69"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M19,79L89,79"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M29,19L29,89"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M39,19L39,89"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M49,19L49,89"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M59,19L59,89"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M69,19L69,89"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
-    <path
 
-        android:fillColor="#00000000"
 
-        android:pathData="M79,19L79,89"
 
-        android:strokeWidth="0.8"
 
-        android:strokeColor="#33FFFFFF" />
 
+    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>

+ 13 - 26
app/src/main/res/drawable/ic_launcher_foreground.xml
View File 

@@ -1,30 +1,17 @@
 
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 
-    xmlns:aapt="http://schemas.android.com/aapt"
 
     android:width="108dp"
 
     android:height="108dp"
 
-    android:viewportWidth="108"
 
-    android:viewportHeight="108">
 
-    <path android:pathData="M31,63.928c0,0 6.4,-11 12.1,-13.1c7.2,-2.6 26,-1.4 26,-1.4l38.1,38.1L107,108.928l-32,-1L31,63.928z">
 
-        <aapt:attr name="android:fillColor">
 
-            <gradient
 
-                android:endX="85.84757"
 
-                android:endY="92.4963"
 
-                android:startX="42.9492"
 
-                android:startY="49.59793"
 
-                android:type="linear">
 
-                <item
 
-                    android:color="#44000000"
 
-                    android:offset="0.0" />
 
-                <item
 
-                    android:color="#00000000"
 
-                    android:offset="1.0" />
 
-            </gradient>
 
-        </aapt:attr>
 
-    </path>
 
+    android:viewportWidth="150"
 
+    android:viewportHeight="150">
 
+  <group android:scaleX="0.88"
 
+      android:scaleY="0.88"
 
+      android:translateX="9"
 
+      android:translateY="9">
 
     <path
 
-        android:fillColor="#FFFFFF"
 
-        android:fillType="nonZero"
 
-        android:pathData="M65.3,45.828l3.8,-6.6c0.2,-0.4 0.1,-0.9 -0.3,-1.1c-0.4,-0.2 -0.9,-0.1 -1.1,0.3l-3.9,6.7c-6.3,-2.8 -13.4,-2.8 -19.7,0l-3.9,-6.7c-0.2,-0.4 -0.7,-0.5 -1.1,-0.3C38.8,38.328 38.7,38.828 38.9,39.228l3.8,6.6C36.2,49.428 31.7,56.028 31,63.928h46C76.3,56.028 71.8,49.428 65.3,45.828zM43.4,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2c-0.3,-0.7 -0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C45.3,56.528 44.5,57.328 43.4,57.328L43.4,57.328zM64.6,57.328c-0.8,0 -1.5,-0.5 -1.8,-1.2s-0.1,-1.5 0.4,-2.1c0.5,-0.5 1.4,-0.7 2.1,-0.4c0.7,0.3 1.2,1 1.2,1.8C66.5,56.528 65.6,57.328 64.6,57.328L64.6,57.328z"
 
-        android:strokeWidth="1"
 
-        android:strokeColor="#00000000" />
 
-</vector>
 
+        android:pathData="M75,75m-75,0a75,75 0,1 1,150 0a75,75 0,1 1,-150 0"
 
+        android:fillColor="#ffffff"/>
 
+    <path
 
+        android:pathData="M37.36,92V58.4H54.54C58.96,58.4 62.26,59.22 64.43,60.85C66.61,62.45 67.7,64.56 67.7,67.18C67.7,68.91 67.23,70.43 66.3,71.74C65.41,73.02 64.13,74.05 62.46,74.82C60.83,75.55 58.88,75.92 56.61,75.92L57.57,73.62C59.94,73.62 62,73.98 63.76,74.72C65.52,75.42 66.88,76.46 67.84,77.84C68.83,79.18 69.33,80.83 69.33,82.78C69.33,85.7 68.14,87.97 65.78,89.6C63.44,91.2 60.02,92 55.5,92H37.36ZM46.77,85.14H54.74C56.37,85.14 57.6,84.86 58.43,84.32C59.3,83.74 59.73,82.88 59.73,81.73C59.73,80.58 59.3,79.73 58.43,79.18C57.6,78.61 56.37,78.32 54.74,78.32H46.1V71.74H53.3C54.9,71.74 56.1,71.47 56.9,70.93C57.7,70.38 58.1,69.57 58.1,68.48C58.1,67.39 57.7,66.59 56.9,66.08C56.1,65.54 54.9,65.26 53.3,65.26H46.77V85.14ZM74.25,92V58.4H82.07L95.99,81.25H91.87L105.4,58.4H113.23L113.32,92H104.59L104.49,71.7H105.98L95.85,88.69H91.63L81.21,71.7H83.03V92H74.25Z"
 
+        android:fillColor="#5EC6FF"/>
 
+  </group>
 
+</vector>

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

@@ -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="@drawable/ic_launcher_foreground"/>
 
 </adaptive-icon>

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

@@ -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="@drawable/ic_launcher_foreground"/>
 
 </adaptive-icon>

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


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


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


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


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


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


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


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


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


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