Skip to content

Commit d88d05a

Browse files
commandironcommandiron
committed
minor changes.
1 parent 1eefba1 commit d88d05a

File tree

14 files changed

+422
-457
lines changed

14 files changed

+422
-457
lines changed

‎app/src/main/java/com/commandiron/composeloading/MainActivity.kt‎

Lines changed: 105 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,11 @@ import androidx.activity.compose.BackHandler
66
import androidx.activity.compose.setContent
77
import androidx.compose.foundation.background
88
import androidx.compose.foundation.layout.*
9+
import androidx.compose.material3.CircularProgressIndicator
910
import androidx.compose.runtime.Composable
1011
import androidx.compose.runtime.LaunchedEffect
1112
import androidx.compose.runtime.rememberCoroutineScope
13+
import androidx.compose.ui.Alignment
1214
import androidx.compose.ui.Modifier
1315
import androidx.compose.ui.unit.DpSize
1416
import androidx.compose.ui.unit.dp
@@ -52,130 +54,163 @@ fun ShowScreen() {
5254
0 -> { ShowGrid() }
5355

5456
1 -> {
55-
RotatingPlane(
56-
modifier = Modifier
57-
.background(BurntOrange)
58-
.fillMaxSize(),
59-
size = DpSize(60.dp, 60.dp
60-
)
61-
)
57+
Box(
58+
modifier = Modifier
59+
.fillMaxSize()
60+
.background(BurntOrange),
61+
contentAlignment = Alignment.Center
62+
) {
63+
RotatingPlane()
64+
}
6265
}
6366

6467
2 -> {
65-
ChasingDots(
68+
Box(
6669
modifier = Modifier
67-
.background(Charcoal)
68-
.fillMaxSize(),
69-
size = 60.dp
70-
)
70+
.fillMaxSize()
71+
.background(Charcoal),
72+
contentAlignment = Alignment.Center
73+
) {
74+
ChasingDots()
75+
}
7176
}
7277

7378
3 -> {
74-
DoubleBounce(
79+
Box(
7580
modifier = Modifier
76-
.background(MountainMeadow)
77-
.fillMaxSize(),
78-
size = DpSize(60.dp, 60.dp)
79-
)
81+
.fillMaxSize()
82+
.background(MountainMeadow),
83+
contentAlignment = Alignment.Center
84+
) {
85+
DoubleBounce()
86+
}
8087
}
8188

8289
4 -> {
83-
Wave(
90+
Box(
8491
modifier = Modifier
85-
.background(StarCommandBlue)
86-
.fillMaxSize(),
87-
size = 60.dp
88-
)
92+
.fillMaxSize()
93+
.background(StarCommandBlue),
94+
contentAlignment = Alignment.Center
95+
) {
96+
Wave()
97+
}
8998
}
9099

91100
5 -> {
92-
WanderingCubes(
101+
Box(
93102
modifier = Modifier
94-
.background(BattleshipGrey)
95-
.fillMaxSize(),
96-
size = DpSize(60.dp, 60.dp)
97-
)
103+
.fillMaxSize()
104+
.background(BattleshipGrey),
105+
contentAlignment = Alignment.Center
106+
) {
107+
WanderingCubes()
108+
}
98109
}
99110

100111
6 -> {
101-
Pulse(
112+
Box(
102113
modifier = Modifier
103-
.background(MaximumYellowRed)
104-
.fillMaxSize(),
105-
size = DpSize(60.dp, 60.dp)
106-
)
114+
.fillMaxSize()
115+
.background(MaximumYellowRed),
116+
contentAlignment = Alignment.Center
117+
) {
118+
Pulse()
119+
}
107120
}
108121

109122
7 -> {
110-
ChasingTwoDots(
123+
Box(
111124
modifier = Modifier
112-
.background(BurntOrange)
113-
.fillMaxSize(),
114-
size = DpSize(60.dp, 60.dp)
115-
)
125+
.fillMaxSize()
126+
.background(BurntOrange),
127+
contentAlignment = Alignment.Center
128+
) {
129+
ChasingTwoDots()
130+
}
116131
}
117132

118133
8 -> {
119-
ThreeBounce(
134+
Box(
120135
modifier = Modifier
121-
.background(GOGreen)
122-
.fillMaxSize(),
123-
size = DpSize(60.dp, 60.dp)
124-
)
136+
.fillMaxSize()
137+
.background(GOGreen),
138+
contentAlignment = Alignment.Center
139+
) {
140+
ThreeBounce()
141+
}
125142
}
126143

127144
9 -> {
128-
Circle(
145+
Box(
129146
modifier = Modifier
130-
.background(BurntOrange)
131-
.fillMaxSize(),
132-
size = 60.dp
133-
)
147+
.fillMaxSize()
148+
.background(BurntOrange),
149+
contentAlignment = Alignment.Center
150+
) {
151+
Circle()
152+
}
134153
}
135154

136155
10 -> {
137-
CubeGrid(
156+
Box(
138157
modifier = Modifier
139-
.background(Charcoal)
140-
.fillMaxSize(),
141-
size = DpSize(60.dp, 60.dp)
142-
)
158+
.fillMaxSize()
159+
.background(Charcoal),
160+
contentAlignment = Alignment.Center
161+
) {
162+
CubeGrid()
163+
}
143164
}
144165

145166
11 -> {
146-
FadingCircle(
167+
Box(
147168
modifier = Modifier
148-
.background(MountainMeadow)
149-
.fillMaxSize(),
150-
size = 60.dp
151-
)
169+
.fillMaxSize()
170+
.background(MountainMeadow),
171+
contentAlignment = Alignment.Center
172+
) {
173+
FadingCircle()
174+
}
152175
}
153176

154177
12 -> {
155-
FoldingCube(
178+
Box(
156179
modifier = Modifier
157-
.background(StarCommandBlue)
158-
.fillMaxSize(),
159-
size = DpSize(60.dp, 60.dp)
160-
)
180+
.fillMaxSize()
181+
.background(StarCommandBlue),
182+
contentAlignment = Alignment.Center
183+
) {
184+
FoldingCube()
185+
}
161186
}
162187

163188
13 -> {
164-
InstaSpinner(Modifier.background(BattleshipGrey).fillMaxSize())
189+
InstaSpinner(Modifier
190+
.background(BattleshipGrey)
191+
.fillMaxSize())
165192
}
166193

167194
14 -> {
168-
LoadingBar(
195+
Box(
169196
modifier = Modifier
170-
.background(MaximumYellowRed)
171-
.fillMaxSize(),
172-
fakeMillis = 10000,
173-
fillColor = Bluetiful
174-
)
197+
.fillMaxSize()
198+
.background(MaximumYellowRed),
199+
contentAlignment = Alignment.Center
200+
) {
201+
LoadingBar(fakeMillis = 10000, fillColor = Bluetiful)
202+
}
175203
}
176204

177205
15 -> {
178-
LoadingDots(Modifier.background(GOGreen).fillMaxSize(),"Loading")
206+
Box(
207+
modifier = Modifier
208+
.fillMaxSize()
209+
.background(GOGreen),
210+
contentAlignment = Alignment.Center
211+
) {
212+
LoadingDots(text = "Loading")
213+
}
179214
}
180215
}
181216
}

0 commit comments

Comments
 (0)