NTO-2026/NTO-2026-Android-TeamTask-Template
106
0
Fork 28
Code Issues Pull Requests 3 Actions Packages Projects Releases Wiki Activity

checkpoint 0 #5

Open
student-e-klyukin wants to merge 15 commits from WindWin-org/NTO-2026-Android-TeamTask-Template:main into main
pull from: WindWin-org/NTO-2026-Android-TeamTask-Template:main
merge into: NTO-2026:main
Conversation 0 Commits 15 Files Changed 44 +11 -1
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d7b5212af6 - Show all commits

3
app/build.gradle.kts
View File

@ -34,6 +34,9 @@ android {
} }
dependencies { dependencies {
implementation("androidx.compose.ui:ui-tooling-preview:1.10.3")
implementation("androidx.wear.tiles:tiles-tooling-preview:1.5.0")
debugImplementation("androidx.compose.ui:ui-tooling:1.10.3")
defaultComposeLibrary() defaultComposeLibrary()
implementation("androidx.datastore:datastore-preferences:1.1.7") implementation("androidx.datastore:datastore-preferences:1.1.7")
implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0") implementation("org.jetbrains.kotlinx:kotlinx-collections-immutable:0.4.0")

2
app/src/main/java/ru/myitschool/work/core/Constants.kt
View File

@ -1,7 +1,7 @@
package ru.myitschool.work.core package ru.myitschool.work.core
object Constants { object Constants {
const val HOST = "http://localhost:8090" const val HOST = "http://10.0.0.14:49182" // "http://10.0.0.14:49182"
const val AUTH_URL = "/auth" const val AUTH_URL = "/auth"
const val INFO_URL = "/info" const val INFO_URL = "/info"
const val BOOKING_URL = "/booking" const val BOOKING_URL = "/booking"

7
app/src/main/java/ru/myitschool/work/ui/screen/main/MainScreen.kt
View File

@ -35,6 +35,7 @@ import androidx.compose.ui.platform.LocalContext
import androidx.compose.ui.platform.testTag import androidx.compose.ui.platform.testTag
import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource import androidx.compose.ui.res.stringResource
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.dp
import androidx.lifecycle.viewmodel.compose.viewModel import androidx.lifecycle.viewmodel.compose.viewModel
import androidx.navigation.NavController import androidx.navigation.NavController
@ -229,4 +230,10 @@ private fun ContentState(
) )
} }
} }
}
@Preview
@Composable
fun Show() {
// MainScreen()
} }