@@ -9,9 +9,8 @@ import androidx.compose.animation.fadeIn
9
9
import androidx.compose.animation.fadeOut
10
10
import androidx.compose.animation.slideInVertically
11
11
import androidx.compose.animation.slideOutVertically
12
- import androidx.compose.foundation.background
13
12
import androidx.compose.foundation.layout.Box
14
- import androidx.compose.foundation.layout.Column
13
+ import androidx.compose.foundation.layout.Row
15
14
import androidx.compose.foundation.layout.Spacer
16
15
import androidx.compose.foundation.layout.fillMaxSize
17
16
import androidx.compose.foundation.layout.padding
@@ -20,19 +19,19 @@ import androidx.compose.material.icons.Icons
20
19
import androidx.compose.material.icons.automirrored.rounded.ArrowBack
21
20
import androidx.compose.material.icons.automirrored.rounded.ArrowForward
22
21
import androidx.compose.material.icons.rounded.ContentCopy
23
- import androidx.compose.material.icons.rounded.Edit
24
22
import androidx.compose.material.icons.rounded.GridOff
25
23
import androidx.compose.material.icons.rounded.GridOn
26
24
import androidx.compose.material.icons.rounded.MoreVert
27
25
import androidx.compose.material.icons.rounded.Palette
28
26
import androidx.compose.material.icons.rounded.Refresh
29
27
import androidx.compose.material.icons.rounded.Save
30
28
import androidx.compose.material3.BottomAppBar
29
+ import androidx.compose.material3.Card
30
+ import androidx.compose.material3.CardDefaults.cardColors
31
31
import androidx.compose.material3.CenterAlignedTopAppBar
32
32
import androidx.compose.material3.ExperimentalMaterial3Api
33
33
import androidx.compose.material3.Icon
34
34
import androidx.compose.material3.IconButton
35
- import androidx.compose.material3.MaterialTheme
36
35
import androidx.compose.material3.MaterialTheme.colorScheme
37
36
import androidx.compose.material3.Scaffold
38
37
import androidx.compose.material3.Text
@@ -59,6 +58,7 @@ import com.dede.android_eggs.cat_editor.CaptureControllerDelegate.Companion.reme
59
58
import com.dede.android_eggs.cat_editor.CatEditorRecords.Companion.rememberCatEditorRecords
60
59
import com.dede.android_eggs.navigation.EasterEggsDestination
61
60
import com.dede.android_eggs.navigation.LocalNavController
61
+ import com.dede.android_eggs.ui.composes.icons.rounded.Cat
62
62
import com.dede.basic.copy
63
63
import com.dede.basic.toast
64
64
import com.dede.basic.utils.ShareCatUtils
@@ -109,7 +109,7 @@ fun CatEditorScreen() {
109
109
Icon (
110
110
imageVector = Icons .AutoMirrored .Rounded .ArrowBack ,
111
111
contentDescription = null ,
112
- tint = MaterialTheme . colorScheme.onSurface
112
+ tint = colorScheme.onSurface
113
113
)
114
114
}
115
115
},
@@ -291,35 +291,39 @@ fun CatEditorScreen() {
291
291
visible = moreOptionsVisible,
292
292
modifier = Modifier
293
293
.align(Alignment .BottomEnd )
294
- .padding(vertical = 14 .dp, horizontal = 10 .dp),
294
+ .padding(vertical = 12 .dp, horizontal = 14 .dp),
295
295
label = " More Options Visibility" ,
296
296
enter = fadeIn(animationSpec = tween(220 )) +
297
297
slideInVertically(animationSpec = tween(220 )) { it / 2 },
298
298
exit = fadeOut(animationSpec = tween(220 )) +
299
299
slideOutVertically(animationSpec = tween(220 )) { it / 2 }
300
300
) {
301
- Column (
302
- modifier = Modifier
303
- .background(colorScheme.surfaceColorAtElevation(4 .dp), CircleShape )
304
- .padding(4 .dp)
301
+ Card (
302
+ shape = CircleShape ,
303
+ colors = cardColors(containerColor = colorScheme.surfaceColorAtElevation(4 .dp))
305
304
) {
305
+ Row (modifier = Modifier .padding(4 .dp)) {
306
+ IconButton (onClick = {
307
+ context.copy(catSeed.toString())
308
+ }) {
309
+ Icon (
310
+ imageVector = Icons .Rounded .ContentCopy ,
311
+ contentDescription = stringResource(android.R .string.copy)
312
+ )
313
+ }
306
314
307
- IconButton (onClick = {
308
- context.copy(catSeed.toString())
309
- }) {
310
- Icon (imageVector = Icons .Rounded .ContentCopy , contentDescription = null )
311
- }
312
-
313
- IconButton (onClick = {
314
- inputSeedDialogState.value = true
315
- }) {
316
- Icon (imageVector = Icons .Rounded .Edit , contentDescription = null )
317
- }
315
+ IconButton (onClick = {
316
+ moreOptionsVisible = false
317
+ inputSeedDialogState.value = true
318
+ }) {
319
+ Icon (imageVector = Icons .Rounded .Cat , contentDescription = null )
320
+ }
318
321
319
- IconButton (onClick = {
320
- updateCatSeed(Utilities .randomSeed())
321
- }) {
322
- Icon (imageVector = Icons .Rounded .Refresh , contentDescription = null )
322
+ IconButton (onClick = {
323
+ updateCatSeed(Utilities .randomSeed())
324
+ }) {
325
+ Icon (imageVector = Icons .Rounded .Refresh , contentDescription = null )
326
+ }
323
327
}
324
328
}
325
329
}
0 commit comments