From c059f4fe776d09e474c07ed626455fc08f826dcd Mon Sep 17 00:00:00 2001 From: ElEgEv <112943269+ElEgEv@users.noreply.github.com> Date: Sat, 11 Nov 2023 18:14:10 +0400 Subject: [PATCH] Add dao models. --- .../is/pmu/composeui/navigation/MainNavbar.kt | 18 +------- .../composeui/StudentView.kt | 4 +- .../{student => tank}/composeui/TankList.kt | 9 +--- .../java/ru/ulstu/is/pmu/tank/dao/LevelDao.kt | 42 +++++++++++++++++++ .../ru/ulstu/is/pmu/tank/dao/NationDao.kt | 40 ++++++++++++++++++ .../java/ru/ulstu/is/pmu/tank/dao/TankDao.kt | 30 +++++++++++++ .../java/ru/ulstu/is/pmu/tank/dao/UserDao.kt | 35 ++++++++++++++++ .../is/pmu/{student => tank}/model/Level.kt | 2 +- .../{student => tank}/model/LevelWithTanks.kt | 2 +- .../is/pmu/{student => tank}/model/Nation.kt | 3 +- .../model/NationWithTanks.kt} | 4 +- .../is/pmu/{student => tank}/model/Student.kt | 2 +- .../is/pmu/{student => tank}/model/Tank.kt | 3 +- .../is/pmu/{student => tank}/model/User.kt | 6 ++- .../model/UserTankCrossRef.kt | 2 +- .../{student => tank}/model/UserWithTanks.kt | 2 +- .../is/pmu/tanks/composeui/Constructor.kt | 34 +-------------- .../ru/ulstu/is/pmu/tanks/composeui/Hangar.kt | 9 ---- 18 files changed, 168 insertions(+), 79 deletions(-) rename compose/app/src/main/java/ru/ulstu/is/pmu/{student => tank}/composeui/StudentView.kt (96%) rename compose/app/src/main/java/ru/ulstu/is/pmu/{student => tank}/composeui/TankList.kt (95%) create mode 100644 compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/LevelDao.kt create mode 100644 compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/NationDao.kt create mode 100644 compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/TankDao.kt create mode 100644 compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/UserDao.kt rename compose/app/src/main/java/ru/ulstu/is/pmu/{student => tank}/model/Level.kt (95%) rename compose/app/src/main/java/ru/ulstu/is/pmu/{student => tank}/model/LevelWithTanks.kt (86%) rename compose/app/src/main/java/ru/ulstu/is/pmu/{student => tank}/model/Nation.kt (94%) rename compose/app/src/main/java/ru/ulstu/is/pmu/{student/model/NaationWithTanks.kt => tank/model/NationWithTanks.kt} (77%) rename compose/app/src/main/java/ru/ulstu/is/pmu/{student => tank}/model/Student.kt (92%) rename compose/app/src/main/java/ru/ulstu/is/pmu/{student => tank}/model/Tank.kt (94%) rename compose/app/src/main/java/ru/ulstu/is/pmu/{student => tank}/model/User.kt (92%) rename compose/app/src/main/java/ru/ulstu/is/pmu/{student => tank}/model/UserTankCrossRef.kt (81%) rename compose/app/src/main/java/ru/ulstu/is/pmu/{student => tank}/model/UserWithTanks.kt (91%) diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/composeui/navigation/MainNavbar.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/composeui/navigation/MainNavbar.kt index 029be29..362f175 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/composeui/navigation/MainNavbar.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/composeui/navigation/MainNavbar.kt @@ -3,28 +3,19 @@ package ru.ulstu.`is`.pmu.composeui.navigation import android.annotation.SuppressLint import android.content.res.Configuration import androidx.compose.foundation.background -import androidx.compose.foundation.border -import androidx.compose.foundation.clickable import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column -import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row -import androidx.compose.foundation.layout.fillMaxHeight import androidx.compose.foundation.layout.fillMaxSize import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width -import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowBack -import androidx.compose.material.icons.filled.KeyboardArrowDown -import androidx.compose.material.icons.filled.KeyboardArrowUp -import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExposedDropdownMenuBox @@ -34,7 +25,6 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme import androidx.compose.material3.NavigationBar import androidx.compose.material3.NavigationBarItem -import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold import androidx.compose.material3.Surface import androidx.compose.material3.Text @@ -46,8 +36,6 @@ import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.ui.Modifier -import androidx.compose.ui.geometry.Size -import androidx.compose.ui.platform.LocalDensity import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.text.style.TextAlign @@ -65,20 +53,18 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import androidx.navigation.navArgument import ru.ulstu.`is`.pmu.R -import ru.ulstu.`is`.pmu.student.composeui.StudentView +import ru.ulstu.`is`.pmu.tank.composeui.StudentView import ru.ulstu.`is`.pmu.ui.theme.CustomDark import ru.ulstu.`is`.pmu.ui.theme.CustomOrange import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.graphics.Color -import androidx.compose.ui.platform.LocalConfiguration import androidx.navigation.NavController -import ru.ulstu.`is`.pmu.student.composeui.TankList +import ru.ulstu.`is`.pmu.tank.composeui.TankList import ru.ulstu.`is`.pmu.tanks.composeui.Account import ru.ulstu.`is`.pmu.tanks.composeui.Constructor import ru.ulstu.`is`.pmu.tanks.composeui.Hangar -import ru.ulstu.`is`.pmu.ui.theme.CustomRed @OptIn(ExperimentalMaterial3Api::class) @Composable diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/student/composeui/StudentView.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/composeui/StudentView.kt similarity index 96% rename from compose/app/src/main/java/ru/ulstu/is/pmu/student/composeui/StudentView.kt rename to compose/app/src/main/java/ru/ulstu/is/pmu/tank/composeui/StudentView.kt index e6a5513..c60a51c 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/student/composeui/StudentView.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/composeui/StudentView.kt @@ -1,4 +1,4 @@ -package ru.ulstu.`is`.pmu.student.composeui +package ru.ulstu.`is`.pmu.tank.composeui import android.content.res.Configuration import androidx.compose.foundation.layout.Column @@ -15,7 +15,7 @@ import androidx.compose.ui.res.stringResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import ru.ulstu.`is`.pmu.R -import ru.ulstu.`is`.pmu.student.model.getStudents +import ru.ulstu.`is`.pmu.tank.model.getStudents import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme @OptIn(ExperimentalMaterial3Api::class) diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/student/composeui/TankList.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/composeui/TankList.kt similarity index 95% rename from compose/app/src/main/java/ru/ulstu/is/pmu/student/composeui/TankList.kt rename to compose/app/src/main/java/ru/ulstu/is/pmu/tank/composeui/TankList.kt index acc4047..128d1f1 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/student/composeui/TankList.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/composeui/TankList.kt @@ -1,7 +1,6 @@ -package ru.ulstu.`is`.pmu.student.composeui +package ru.ulstu.`is`.pmu.tank.composeui import android.content.res.Configuration -import androidx.annotation.StringRes import androidx.compose.foundation.Image import androidx.compose.foundation.ScrollState import androidx.compose.foundation.background @@ -9,9 +8,7 @@ import androidx.compose.foundation.horizontalScroll 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.fillMaxHeight import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding @@ -19,7 +16,6 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items import androidx.compose.foundation.lazy.itemsIndexed -import androidx.compose.foundation.rememberScrollState import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Card @@ -27,7 +23,6 @@ import androidx.compose.material3.CardDefaults import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -39,7 +34,7 @@ import androidx.compose.ui.unit.sp import androidx.navigation.NavController import ru.ulstu.`is`.pmu.R import ru.ulstu.`is`.pmu.composeui.navigation.Screen -import ru.ulstu.`is`.pmu.student.model.getStudents +import ru.ulstu.`is`.pmu.tank.model.getStudents import ru.ulstu.`is`.pmu.ui.theme.CustomDark import ru.ulstu.`is`.pmu.ui.theme.CustomOrange import ru.ulstu.`is`.pmu.ui.theme.CustomRed diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/LevelDao.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/LevelDao.kt new file mode 100644 index 0000000..19eeeb2 --- /dev/null +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/LevelDao.kt @@ -0,0 +1,42 @@ +package ru.ulstu.`is`.pmu.tank.dao + +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Transaction +import androidx.room.Update +import kotlinx.coroutines.flow.Flow +import ru.ulstu.`is`.pmu.tank.model.Level +import ru.ulstu.`is`.pmu.tank.model.LevelWithTanks +import ru.ulstu.`is`.pmu.tank.model.Nation +import ru.ulstu.`is`.pmu.tank.model.User + + +interface LevelDao { + @Query("select * from levels order by level collate nocase asc") + fun getAll(): Flow> + + //получить уровни с танками + @Transaction + @Query("SELECT * FROM levels") + fun getLevelsWithTanks(): List + + //получить конкретный уровень + @Query("select * from levels where levels.uid = :uid") + suspend fun getLevelUid(uid: Long): LevelWithTanks + + //получить уровень без списка танков + @Query( + "SELECT level FROM levels where levels.uid = :uid" + ) + open fun getSimpleLevelUid(uid: Long): Level + + @Insert + suspend fun insert(level: Level) + + @Update + suspend fun update(level: Level) + + @Delete + suspend fun delete(level: Level) +} \ No newline at end of file diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/NationDao.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/NationDao.kt new file mode 100644 index 0000000..4f44613 --- /dev/null +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/NationDao.kt @@ -0,0 +1,40 @@ +package ru.ulstu.`is`.pmu.tank.dao + +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Transaction +import androidx.room.Update +import ru.ulstu.`is`.pmu.tank.model.Nation +import kotlinx.coroutines.flow.Flow +import ru.ulstu.`is`.pmu.tank.model.Level +import ru.ulstu.`is`.pmu.tank.model.NationWithTanks + +interface NationDao { + @Query("select * from nations order by name collate nocase asc") + fun getAll(): Flow> + + //получить нации с танками + @Transaction + @Query("SELECT * FROM nations") + fun getNationsWithTanks(): List + + //получить конкретную нацию + @Query("select * from nations where nations.uid = :uid") + suspend fun getNationUid(uid: Long): NationWithTanks + + //получить нацию без списка танков + @Query( + "SELECT name FROM nations where nations.uid = :uid" + ) + open fun getSimpleNationUid(uid: Long): Level + + @Insert + suspend fun insert(nation: Nation) + + @Update + suspend fun update(nation: Nation) + + @Delete + suspend fun delete(nation: Nation) +} diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/TankDao.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/TankDao.kt new file mode 100644 index 0000000..4f35b95 --- /dev/null +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/TankDao.kt @@ -0,0 +1,30 @@ +package ru.ulstu.`is`.pmu.tank.dao + +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Transaction +import androidx.room.Update +import kotlinx.coroutines.flow.Flow +import ru.ulstu.`is`.pmu.tank.model.LevelWithTanks +import ru.ulstu.`is`.pmu.tank.model.Nation +import ru.ulstu.`is`.pmu.tank.model.Tank + + +interface TankDao { + @Query("select * from tanks order by name collate nocase asc") + fun getAll(): Flow> + + //получить конкретный уровень + @Query("select * from tanks where tanks.uid = :uid") + suspend fun getTankUid(uid: Long): Tank + + @Insert + suspend fun insert(tank: Tank) + + @Update + suspend fun update(tank: Tank) + + @Delete + suspend fun delete(tank: Tank) +} \ No newline at end of file diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/UserDao.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/UserDao.kt new file mode 100644 index 0000000..3e811cc --- /dev/null +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/UserDao.kt @@ -0,0 +1,35 @@ +package ru.ulstu.`is`.pmu.tank.dao + +import androidx.room.Delete +import androidx.room.Insert +import androidx.room.Query +import androidx.room.Transaction +import androidx.room.Update +import kotlinx.coroutines.flow.Flow +import ru.ulstu.`is`.pmu.tank.model.Nation +import ru.ulstu.`is`.pmu.tank.model.NationWithTanks +import ru.ulstu.`is`.pmu.tank.model.User +import ru.ulstu.`is`.pmu.tank.model.UserTankCrossRef + +interface UserDao { + @Query("select * from users order by nickname collate nocase asc") + fun getAll(): Flow> + + //получить нации с танками + @Transaction + @Query("SELECT * FROM users") + fun getNationsWithTanks(): List + + //получить конкретную нацию + @Query("select * from users where users.uid = :uid") + suspend fun getUserUid(uid: Long): UserTankCrossRef + + @Insert + suspend fun insert(user: User) + + @Update + suspend fun update(user: User) + + @Delete + suspend fun delete(user: User) +} \ No newline at end of file diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Level.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Level.kt similarity index 95% rename from compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Level.kt rename to compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Level.kt index 9c59d3e..6f3278d 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Level.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Level.kt @@ -1,4 +1,4 @@ -package ru.ulstu.`is`.pmu.student.model +package ru.ulstu.`is`.pmu.tank.model import androidx.room.ColumnInfo import androidx.room.Entity diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/LevelWithTanks.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/LevelWithTanks.kt similarity index 86% rename from compose/app/src/main/java/ru/ulstu/is/pmu/student/model/LevelWithTanks.kt rename to compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/LevelWithTanks.kt index 9273b04..543cf72 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/LevelWithTanks.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/LevelWithTanks.kt @@ -1,4 +1,4 @@ -package ru.ulstu.`is`.pmu.student.model +package ru.ulstu.`is`.pmu.tank.model import androidx.room.Embedded import androidx.room.Relation diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Nation.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Nation.kt similarity index 94% rename from compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Nation.kt rename to compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Nation.kt index c13dc3b..ffb945d 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Nation.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Nation.kt @@ -1,10 +1,9 @@ -package ru.ulstu.`is`.pmu.student.model +package ru.ulstu.`is`.pmu.tank.model import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Ignore import androidx.room.PrimaryKey -import java.io.Serializable @Entity( tableName = "nations" diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/NaationWithTanks.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/NationWithTanks.kt similarity index 77% rename from compose/app/src/main/java/ru/ulstu/is/pmu/student/model/NaationWithTanks.kt rename to compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/NationWithTanks.kt index 623aec0..be6ad71 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/NaationWithTanks.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/NationWithTanks.kt @@ -1,10 +1,10 @@ -package ru.ulstu.`is`.pmu.student.model +package ru.ulstu.`is`.pmu.tank.model import androidx.room.Embedded import androidx.room.Relation //one to many for nation and tanks -data class NaationWithTanks ( +data class NationWithTanks ( @Embedded val nation: Nation, diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Student.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Student.kt similarity index 92% rename from compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Student.kt rename to compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Student.kt index 566e5a2..78bf7c2 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Student.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Student.kt @@ -1,4 +1,4 @@ -package ru.ulstu.`is`.pmu.student.model +package ru.ulstu.`is`.pmu.tank.model import java.io.Serializable diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Tank.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Tank.kt similarity index 94% rename from compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Tank.kt rename to compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Tank.kt index b9fa92a..393d426 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Tank.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Tank.kt @@ -1,10 +1,9 @@ -package ru.ulstu.`is`.pmu.student.model +package ru.ulstu.`is`.pmu.tank.model import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Ignore import androidx.room.PrimaryKey -import java.io.Serializable @Entity( tableName = "tanks" diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/User.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/User.kt similarity index 92% rename from compose/app/src/main/java/ru/ulstu/is/pmu/student/model/User.kt rename to compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/User.kt index 62ecbca..d0c812d 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/User.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/User.kt @@ -1,11 +1,13 @@ -package ru.ulstu.`is`.pmu.student.model +package ru.ulstu.`is`.pmu.tank.model import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.Ignore import androidx.room.PrimaryKey -@Entity +@Entity( + tableName = "users" +) data class User ( @PrimaryKey(autoGenerate = true) val uid: Long?, diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/UserTankCrossRef.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/UserTankCrossRef.kt similarity index 81% rename from compose/app/src/main/java/ru/ulstu/is/pmu/student/model/UserTankCrossRef.kt rename to compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/UserTankCrossRef.kt index a81f86a..860c6c8 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/UserTankCrossRef.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/UserTankCrossRef.kt @@ -1,4 +1,4 @@ -package ru.ulstu.`is`.pmu.student.model +package ru.ulstu.`is`.pmu.tank.model import androidx.room.Entity diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/UserWithTanks.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/UserWithTanks.kt similarity index 91% rename from compose/app/src/main/java/ru/ulstu/is/pmu/student/model/UserWithTanks.kt rename to compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/UserWithTanks.kt index a496bd3..8329cc8 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/student/model/UserWithTanks.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/UserWithTanks.kt @@ -1,4 +1,4 @@ -package ru.ulstu.`is`.pmu.student.model +package ru.ulstu.`is`.pmu.tank.model import androidx.room.Embedded import androidx.room.Junction diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tanks/composeui/Constructor.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tanks/composeui/Constructor.kt index 24dae7b..8683362 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/tanks/composeui/Constructor.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tanks/composeui/Constructor.kt @@ -1,45 +1,25 @@ package ru.ulstu.`is`.pmu.tanks.composeui import android.content.res.Configuration -import android.graphics.drawable.Icon -import android.widget.Toast -import androidx.compose.foundation.Image import androidx.compose.foundation.background -import androidx.compose.foundation.border 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.width -import androidx.compose.foundation.layout.wrapContentSize -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.shape.RoundedCornerShape -import androidx.compose.foundation.verticalScroll -import androidx.compose.material.icons.Icons -import androidx.compose.material.icons.filled.MoreVert import androidx.compose.material3.Button import androidx.compose.material3.ButtonDefaults -import androidx.compose.material3.DropdownMenu import androidx.compose.material3.DropdownMenuItem import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.ExposedDropdownMenuBox import androidx.compose.material3.ExposedDropdownMenuDefaults -import androidx.compose.material3.Icon -import androidx.compose.material3.IconButton -import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Surface 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.LaunchedEffect import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember @@ -47,17 +27,9 @@ 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.graphics.StrokeJoin -import androidx.compose.ui.graphics.drawscope.Stroke -import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.modifier.modifierLocalConsumer -import androidx.compose.ui.platform.LocalContext -import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource import androidx.compose.ui.text.ExperimentalTextApi -import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight -import androidx.compose.ui.text.style.TextAlign import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp @@ -66,12 +38,10 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import ru.ulstu.`is`.pmu.R import ru.ulstu.`is`.pmu.composeui.navigation.Screen -import ru.ulstu.`is`.pmu.student.model.getLevels -import ru.ulstu.`is`.pmu.student.model.getNations -import ru.ulstu.`is`.pmu.ui.theme.CustomBackground +import ru.ulstu.`is`.pmu.tank.model.getLevels +import ru.ulstu.`is`.pmu.tank.model.getNations import ru.ulstu.`is`.pmu.ui.theme.CustomDark import ru.ulstu.`is`.pmu.ui.theme.CustomOrange -import ru.ulstu.`is`.pmu.ui.theme.CustomRed import ru.ulstu.`is`.pmu.ui.theme.CustomYellow import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tanks/composeui/Hangar.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tanks/composeui/Hangar.kt index 5bc51a4..be3d588 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/tanks/composeui/Hangar.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tanks/composeui/Hangar.kt @@ -2,9 +2,7 @@ package ru.ulstu.`is`.pmu.tanks.composeui import android.content.res.Configuration import androidx.compose.foundation.Image -import androidx.compose.foundation.ScrollState import androidx.compose.foundation.background -import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -14,15 +12,11 @@ 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.material3.Button -import androidx.compose.material3.ButtonDefaults import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Surface import androidx.compose.material3.Text -import androidx.compose.material3.TextField import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.ui.Alignment @@ -40,10 +34,7 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import ru.ulstu.`is`.pmu.R import ru.ulstu.`is`.pmu.composeui.navigation.Screen -import ru.ulstu.`is`.pmu.student.model.getStudents import ru.ulstu.`is`.pmu.ui.theme.CustomDark -import ru.ulstu.`is`.pmu.ui.theme.CustomOrange -import ru.ulstu.`is`.pmu.ui.theme.CustomRed import ru.ulstu.`is`.pmu.ui.theme.CustomYellow import ru.ulstu.`is`.pmu.ui.theme.PmudemoTheme