ElEgEv/TanksApp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add dao models.

Browse Source
This commit is contained in:
ElEgEv 2023-11-11 18:14:10 +04:00
parent 63207fadd8
commit c059f4fe77
18 changed files with 168 additions and 79 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
compose/app/src/main/java/ru/ulstu/is/pmu/composeui/navigation/MainNavbar.kt
View File

@ -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

4
compose/app/src/main/java/ru/ulstu/is/pmu/student/composeui/StudentView.kt → compose/app/src/main/java/ru/ulstu/is/pmu/tank/composeui/StudentView.kt
View File

@ -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)

9
compose/app/src/main/java/ru/ulstu/is/pmu/student/composeui/TankList.kt → compose/app/src/main/java/ru/ulstu/is/pmu/tank/composeui/TankList.kt
View File

@ -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

42
compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/LevelDao.kt Normal file
View File

@ -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<List<Nation>>
//получить уровни с танками
@Transaction
@Query("SELECT * FROM levels")
fun getLevelsWithTanks(): List<LevelWithTanks>
//получить конкретный уровень
@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)
}

40
compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/NationDao.kt Normal file
View File

@ -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<List<Nation>>
//получить нации с танками
@Transaction
@Query("SELECT * FROM nations")
fun getNationsWithTanks(): List<NationWithTanks>
//получить конкретную нацию
@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)
}

30
compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/TankDao.kt Normal file
View File

@ -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<List<Tank>>
//получить конкретный уровень
@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)
}

35
compose/app/src/main/java/ru/ulstu/is/pmu/tank/dao/UserDao.kt Normal file
View File

@ -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<List<User>>
//получить нации с танками
@Transaction
@Query("SELECT * FROM users")
fun getNationsWithTanks(): List<UserTankCrossRef>
//получить конкретную нацию
@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)
}

2
compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Level.kt → compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Level.kt
View File

@ -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

2
compose/app/src/main/java/ru/ulstu/is/pmu/student/model/LevelWithTanks.kt → compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/LevelWithTanks.kt
View File

@ -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

3
compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Nation.kt → compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Nation.kt
View File

@ -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"

4
compose/app/src/main/java/ru/ulstu/is/pmu/student/model/NaationWithTanks.kt → compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/NationWithTanks.kt
View File

@ -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,

2
compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Student.kt → compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Student.kt
View File

@ -1,4 +1,4 @@
package ru.ulstu.`is`.pmu.student.model
package ru.ulstu.`is`.pmu.tank.model
import java.io.Serializable

3
compose/app/src/main/java/ru/ulstu/is/pmu/student/model/Tank.kt → compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/Tank.kt
View File

@ -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"

6
compose/app/src/main/java/ru/ulstu/is/pmu/student/model/User.kt → compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/User.kt
View File

@ -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?,

2
compose/app/src/main/java/ru/ulstu/is/pmu/student/model/UserTankCrossRef.kt → compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/UserTankCrossRef.kt
View File

@ -1,4 +1,4 @@
package ru.ulstu.`is`.pmu.student.model
package ru.ulstu.`is`.pmu.tank.model
import androidx.room.Entity

2
compose/app/src/main/java/ru/ulstu/is/pmu/student/model/UserWithTanks.kt → compose/app/src/main/java/ru/ulstu/is/pmu/tank/model/UserWithTanks.kt
View File

@ -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

34
compose/app/src/main/java/ru/ulstu/is/pmu/tanks/composeui/Constructor.kt
View File

@ -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

9
compose/app/src/main/java/ru/ulstu/is/pmu/tanks/composeui/Hangar.kt
View File

@ -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