From b0fbd2704f4196722adf8459eed7f36ea3bfcf95 Mon Sep 17 00:00:00 2001 From: ElEgEv <112943269+ElEgEv@users.noreply.github.com> Date: Mon, 11 Dec 2023 16:09:28 +0400 Subject: [PATCH] It's working!!! --- .../8.0/executionHistory/executionHistory.bin | Bin 3352986 -> 3495581 bytes .../executionHistory/executionHistory.lock | Bin 17 -> 17 bytes compose/.gradle/8.0/fileHashes/fileHashes.bin | Bin 439541 -> 441141 bytes .../.gradle/8.0/fileHashes/fileHashes.lock | Bin 17 -> 17 bytes .../8.0/fileHashes/resourceHashesCache.bin | Bin 390711 -> 395879 bytes .../buildOutputCleanup.lock | Bin 17 -> 17 bytes .../buildOutputCleanup/outputFiles.bin | Bin 1327958 -> 1328066 bytes compose/.gradle/file-system.probe | Bin 8 -> 8 bytes .../tank/composeui/edit/TankEditViewModel.kt | 12 +++++ .../ulstu/is/pmu/tank/database/AppDatabase.kt | 2 +- .../is/pmu/tanks/composeui/Constructor.kt | 42 +++++++++++++++--- compose/app/src/main/res/values/strings.xml | 1 + 12 files changed, 50 insertions(+), 7 deletions(-) diff --git a/compose/.gradle/8.0/executionHistory/executionHistory.bin b/compose/.gradle/8.0/executionHistory/executionHistory.bin index 1ef4a53e58b67ce6f6555ad1ba3e974951049d4b..de8faa72d0347f74395487d0cafdf8521836ee8f 100644 GIT binary patch delta 19353 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 IB)9MX0WK@?S^xk5 delta 9232 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 diff --git a/compose/.gradle/8.0/executionHistory/executionHistory.lock b/compose/.gradle/8.0/executionHistory/executionHistory.lock index da9e0582ae96fe31759ca9017cfea651ed3bd5db..9c2f6e59a52cb0f23f6008981b330ec43e1990d7 100644 GIT binary patch literal 17 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 delta 9359 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 Hr7`{=$|uPG delta 1503 zcmXw3YfMyE5N77iU6&MLkthpBV66)Exr(S@L{yMPu^@;AZS2~njm4_f`dFZ`5RHl! zUA@}Dq&|NrLM&`=)A51rT3V$>t&LXEhyqnnw5ilK!D!l^wf6itnLFp)nfbo?=5+3~ z%cIDKv38hYCfSS7JQUqb=7w0CZhkSyu9>&u)6g6@bb|7Y%q7E;SYw_0n;U2_>pt@EQ6IUu_m|{1uTH342XoAd#$YlJ`pdyc`Oa_jX>yyJn?51a z(VR@?it|=5cU*|Fm`#^&lX;>g7tDb-l2yoVUY||{+?`HNPR>vveHr96&$UL*gbe9O zfY~53he9rhISi^n-WdUH#Pi31pA!?o&2@?3k%?pBLzJd*kbtZugO}?9TYd^WmiZIG zrt`Wqb@f>qwD7|z%K2m}bnBLw${;O2idTiwY`zsrb`A}rNG=GYDBc^UJ}-u;l1AE; zwc4ieTEfXA`B~5z2k|_y7_#{DVsP>EVknWS#jsJA;mg6V39SNW7-z2sul%_l4gmH) z&SO&b!MrS0ckxfDdJA8htlK4fBkZY!$=qebBT^TRJs>9|a1qGFzG&BYu^nqJx_D<|14!X4oB&euIwk`@ z&B075%*9P8J$cv++%gBfTwb7pr_IG&lA3ww);MkfI(g9o^os2*tgu*O!h@h_3@4S6 zgO`?)o9~qd$S70W)-tlo)iR0$@w|u6Z15(pT!UHi%NpEom8x=dS>(43c$Vb+7M$Hn zk_=Q=m+Ztgkas^*_3?;m^kJNj?=)*mxZ+36D+6}p&#@3KzaPUQ6!*yh4Q-9s79lN{ z@CHJKM1HJ~0I9x$+zIp8*{B`i?nccc6{j?hMZ&+=_9M5S(YDF{vsydJ?(>@0BCY$- z3X*k29m>&z0Xw)w+pc3=h0oy)<55TSP?_;aD~*CY`9Y_JnxqDkBGB>*DXD!OLN*L2 zqb8sSPe2NOQ7VW>&WNBHayWwOd&^P>xiz^rh!ol5htPtMe_pPjpxDzsN3Jc9CQs_W z)mHc|xg@iwekT{&7DSxO=XObfU{C?QhTnz?e#( zV^jElc>5GnsTH!MY6V@l$l8(sQq@t@OU`D+Vp*EnIN`s3m@vI4tSDOs)EuDF`88XXw(z~@MKnep&Jx*%3l$RDLC=ecL(!(4`>zr0$ahofYd=`ET#uVOq(S%n@9;<_G~=SS;wn^o?&2kh)B S{iy|`cl#WkzM^7SXZ;IY;x2gr diff --git a/compose/.gradle/buildOutputCleanup/buildOutputCleanup.lock b/compose/.gradle/buildOutputCleanup/buildOutputCleanup.lock index dc722108cbb888a0f92fc5e244e1ea0a707f8bd6..fa7128be875698c5734e26c23a96fa8c34b7466f 100644 GIT binary patch literal 17 VcmZQhF*rNr{gMY+3}CQfBLF=+{gvKwI%tA*Oo`aac`o$NGHO`v+$q-s2VTzha{RPmW_wakEie(;6H{mQv+ zsf(DutKE$&hm(sLS!%Fb;8D=Q&YH3y&}t|*705<=U2tZVEq)>akAm-_^OrU>B^1=J759A9+nR)`GmQ`<1{tKmZR zC@twr>Q=d$bD{n^l}eAQyZ#r}kMUDb?G0Rj{JPr2&YKZUAWbJNu=tjsXZlnVl?UPG zztIIO=BOT$<`G(-Bd=)dls`yO(^1qCvoDGwUimYznbytzN}u!j<6ZR&_*#FmEb!q* z;=?$sRU(pt?gajGL4ramW*}h`JY@MySF;xK7@h*O=5<!;>-3r(h!4>-w*V32NJ6!wOLULGh40)C7-l z3yRkj+9{H;Der)9*B7^L<1pIWb4e!kl;Ru#WAX0H&VBuHMH+Dpm{Zs;>HA{$~Bv~@_{-@_!3Q6 zJYrmwCuBiD`eW{q>k!XdK#;eA61zy?5I#h{$3bLok``$>X>;W}bQ+`*sq0BfS2BnT zDmSVuXUEBPjzS7p5c0oloW)}C8-org6`?3=P^An+B||fAOa$a-dr~;wRQ^9P>WUq5 z*lUjg+^aLmz`0b5jAMh*+8-K|xvAN_k*EtaFA>Ll>Bv#-`hC;9rv1M8z;mrp1zW4e pm7cwuB%;XEeq%ARDt$8*+M?@4-cq?*vXrYCn5(5?pYn{R{{i>W8I=G4 delta 1214 zcmYjRO=w(I80FrXm&}`=mzg)EMkqL=)s@gmpx`2lsqMnf#%UG-2Wq3ZNHOU618sz+ z13sLXDn1x9pH+;Lx6lDyOvuxZY-&v46)KeRhcJkXv0^1DDcPu$2HJD)YlEB1ow@h> z&iT$c@2=NRZN7J^<_JeR5hv;x&VV!M#2nL!`-$^0agAqUiHgCuQi-J}g;>s~4RViX zA8UGMK>a1@QSG0MORayg)UF$|G`SM>sJs(hpu){atiCmt;H|Ob)@AV}|FW4pmf)vv zBrAvb=GD|}tof}qz0!a21Ho%|g%DIWQL$sDc*nFZ42aA8YT9~1^6$14KP=8J=i8>j zK2GUxq5+kk09tXucGYf=cX#a*f(kcc;9(g(>R!wCG|Ao7Y(VJ$l_ta|Pg=Lni7)t> zAFTYN4R2$Z-~Y{8P06S3Ea!)H|B(k>??qkiUzdx5Ype2#q(WlQBX>@2s~u49Mc-xj zjx~B#e8d|s5507l$Ld425Hrj9PvVN`2=5NtIYFI6NjGHH-7p~7L9<7bf7>3lj$+AO zG`AbAl1H7_&^kA6?u9pMKc~)6YcMiH_|kA@K4hEHY(qQKZvZTJPEH7FHKk9r z^CDkAzVf+3-Gw16uZW6rJW!Aw5uUh>q^FLbQ{v4@LR%dbG*okS{)k)( zYtXhR8^u2nn#YrV=;~x<&

9$C%Jn+El3Xlk^#KSwcCqP1Ua@PO8vwt#0>1h18{K z6~`X6Zbf}9P5)E762d~xze0DB3Xh6MOuv!-)n^0>;ZZtM!7-5_#j*Id0qv0jJ-Uj* zs8DktTN6O<*x4VcJ9^-Af;9o74w4~y3Nzrf56vmW5kcYV5&IpT@I^tnkJXF{2l?D4 zgtkX$>@hNeq#((@DuTQjELw7K^Ynl0u7V|F>M69V+lT<*#^p-kG*nkrjDkg>f9t^& zS+0I>;{yW-s%j%9Iv{{5AE)ifh`zQ@Mb#JO{~g0rN+DNi?W?Tq<4mb+dBB2jN?@)% zVod1X7`AMuJA#WB5n1&TUorT%)qTZ*r1-HH-N UcpmhFQfg=FrMAtbb~gFheRv80BLDyZ diff --git a/compose/.gradle/file-system.probe b/compose/.gradle/file-system.probe index 9e25017c58f4fab5e4cb1a0ac5d6cd3fbbb8e64c..14f521173df8ea190c77ac25bd4cd3dd750ed595 100644 GIT binary patch literal 8 PcmZQzVC;!FEOZ+H2XX?I literal 8 PcmZQzVC)I+?Y0L12O 0) { + tankRepository.deleteTank(tankUiState.tankDetails.toTank(tankUid)) + } + } + } + private fun validateInput(uiState: TankDetails = tankUiState.tankDetails): Boolean { return with(uiState) { name.isNotBlank() diff --git a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/database/AppDatabase.kt b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/database/AppDatabase.kt index 9a7cb94..953fe39 100644 --- a/compose/app/src/main/java/ru/ulstu/is/pmu/tank/database/AppDatabase.kt +++ b/compose/app/src/main/java/ru/ulstu/is/pmu/tank/database/AppDatabase.kt @@ -34,7 +34,7 @@ abstract class AppDatabase : RoomDatabase() { abstract fun tankImageDao() : TankImageDao companion object { - private const val DB_NAME: String = "18-db" + private const val DB_NAME: String = "19-db" @Volatile private var INSTANCE: AppDatabase? = null 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 5ae015f..61e1346 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 @@ -42,6 +42,7 @@ import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel import androidx.navigation.NavController +import com.application.ui.getEmptyBitmap import com.application.ui.miniatureBound import com.application.ui.resize import com.application.ui.tankImageBound @@ -75,11 +76,14 @@ fun Constructor( nationDropDownViewModel: NationDropDownViewModel = viewModel(factory = AppViewModelProvider.Factory) ){ val coroutineScope = rememberCoroutineScope() + + val tankId = tankEditViewModel.getTankId() levelDropDownViewModel.setCurrentLevel(tankEditViewModel.tankUiState.tankDetails.levelId ?: 1) nationDropDownViewModel.setCurrentNation(tankEditViewModel.tankUiState.tankDetails.nationId ?: 1) Constructor( + tankId = tankId, tankViewModel = tankEditViewModel, tankUiState = tankEditViewModel.tankUiState, levelUiState = levelDropDownViewModel.levelUiState, @@ -88,12 +92,18 @@ fun Constructor( nationUiState = nationDropDownViewModel.nationUiState, nationsListUiState = nationDropDownViewModel.nationsListUiState, onNationUpdate = nationDropDownViewModel::updateUiState, - onClick = { + onClickSave = { coroutineScope.launch { tankEditViewModel.saveTank() navController.popBackStack() } }, + onClickDelete = { + coroutineScope.launch { + tankEditViewModel.deleteTank() + navController.popBackStack() + } + }, onUpdate = tankEditViewModel::updateUiState ) } @@ -200,6 +210,7 @@ private fun NationDropDown( @OptIn(ExperimentalMaterial3Api::class) @Composable private fun Constructor( + tankId: Long, tankViewModel: TankEditViewModel, tankUiState: TankUiState, levelUiState: LevelUiState, @@ -208,7 +219,8 @@ private fun Constructor( nationUiState: NationUiState, nationsListUiState: NationsListUiState, onNationUpdate: (Nation) -> Unit, - onClick: () -> Unit, + onClickSave: () -> Unit, + onClickDelete: () -> Unit, onUpdate: (TankDetails) -> Unit ) { fun handleImageUpload(bitmap: Bitmap) { @@ -344,7 +356,7 @@ private fun Constructor( } Spacer(Modifier.height(10.dp)) Row( - horizontalArrangement = Arrangement.Center, + horizontalArrangement = Arrangement.SpaceAround, modifier = Modifier .fillMaxWidth() .padding(10.dp, 10.dp) @@ -358,11 +370,27 @@ private fun Constructor( contentColor = Color.Black ), enabled = tankUiState.isEntryValid, - onClick = onClick + onClick = onClickSave ) { //"${student.firstName} ${student.lastName}" Text(text = stringResource(id = R.string.save_account_button), fontSize = 20.sp, fontWeight = FontWeight.Bold) } + if(tankId != 0L){ + Button( + modifier = Modifier + .width(200.dp) + .height(50.dp), + colors = ButtonDefaults.buttonColors( + containerColor = CustomOrange, + contentColor = Color.Black + ), + enabled = tankUiState.isEntryValid, + onClick = onClickDelete + ) { + //"${student.firstName} ${student.lastName}" + Text(text = stringResource(id = R.string.delete_account_button), fontSize = 20.sp, fontWeight = FontWeight.Bold) + } + } } } } @@ -467,7 +495,7 @@ private fun Constructor( containerColor = CustomOrange, contentColor = Color.Black ), - onClick = onClick + onClick = onClickSave ) { //"${student.firstName} ${student.lastName}" Text(text = stringResource(id = R.string.create_account_button), fontSize = 20.sp, fontWeight = FontWeight.Bold) @@ -488,6 +516,7 @@ fun ConstructorEditPreview() { color = CustomDark ) { Constructor( + tankId = 0L, tankViewModel = viewModel(factory = AppViewModelProvider.Factory), tankUiState = Tank.getTank().toUiState(true), levelUiState = Level.DEMO_LEVEL.toUiState(), @@ -496,7 +525,8 @@ fun ConstructorEditPreview() { nationUiState = Nation.DEMO_NATION.toUiState(), nationsListUiState = NationsListUiState(listOf()), onNationUpdate = { }, - onClick = { }, + onClickSave = { }, + onClickDelete = { }, onUpdate = { }, ) } diff --git a/compose/app/src/main/res/values/strings.xml b/compose/app/src/main/res/values/strings.xml index de52e68..b5cc118 100644 --- a/compose/app/src/main/res/values/strings.xml +++ b/compose/app/src/main/res/values/strings.xml @@ -13,6 +13,7 @@ Войти Создать Сохранить + Удалить Регистрация Имя Фамилия