Skip to content

Commit eed0490

Browse files
SmartToolFactorySmartToolFactory
committed
update previews of layout section
1 parent 979d7e9 commit eed0490

22 files changed

+28
-33
lines changed

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_1_1CustomModifier.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialHeader
2525
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialText2
2626
import kotlin.random.Random
2727

28+
@Preview
2829
@Composable
2930
fun Tutorial3_1Screen1() {
3031
TutorialContent()
3132
}
3233

33-
@Preview
3434
@Composable
3535
private fun TutorialContent() {
3636

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_1_2OnGloballyPositionedModifier.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import androidx.compose.ui.tooling.preview.Preview
2424
import androidx.compose.ui.unit.dp
2525
import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialText
2626

27+
@Preview
2728
@Composable
2829
fun Tutorial3_1Screen2() {
2930
TutorialContent()
3031
}
3132

32-
@Preview
3333
@Composable
3434
private fun TutorialContent() {
3535
Column(modifier =Modifier.fillMaxSize()) {

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_1_3OffsetGraphicsLayer.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialTex
5151
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialText2
5252
import kotlin.math.roundToInt
5353

54+
@Preview
5455
@Composable
5556
fun Tutorial3_1Screen3() {
5657
TutorialContent()
5758
}
5859

59-
@Preview
6060
@Composable
6161
private fun TutorialContent() {
6262
Column(

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_2_1CustomLayout1.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,12 @@ import androidx.compose.ui.unit.Dp
3333
import androidx.compose.ui.unit.dp
3434
import kotlin.random.Random
3535

36+
@Preview
3637
@Composable
3738
fun Tutorial3_2Screen1() {
3839
TutorialContent()
3940
}
4041

41-
@Preview
4242
@Composable
4343
private fun TutorialContent() {
4444
Column(

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_2_2CustomLayout2.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialTex
3636
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialHeader
3737
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialText2
3838

39+
@Preview
3940
@Composable
4041
fun Tutorial3_2Screen2() {
4142
TutorialContent()
4243
}
4344

44-
@Preview
4545
@Composable
4646
private fun TutorialContent() {
4747

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_2_3Constraints.kt

+6-11
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,12 @@
11
package com.smarttoolfactory.tutorial1_1basics.chapter3_layout
22

3-
import android.content.res.Configuration
43
import androidx.compose.foundation.background
54
import androidx.compose.foundation.border
6-
import androidx.compose.foundation.layout.*
5+
import androidx.compose.foundation.layout.Column
6+
import androidx.compose.foundation.layout.fillMaxWidth
7+
import androidx.compose.foundation.layout.width
8+
import androidx.compose.foundation.layout.widthIn
9+
import androidx.compose.foundation.layout.wrapContentSize
710
import androidx.compose.foundation.rememberScrollState
811
import androidx.compose.foundation.verticalScroll
912
import androidx.compose.material.Text
@@ -15,7 +18,6 @@ import androidx.compose.ui.layout.Measurable
1518
import androidx.compose.ui.layout.MeasureResult
1619
import androidx.compose.ui.layout.MeasureScope
1720
import androidx.compose.ui.platform.LocalDensity
18-
import androidx.compose.ui.tooling.preview.Devices
1921
import androidx.compose.ui.tooling.preview.Preview
2022
import androidx.compose.ui.unit.Constraints
2123
import androidx.compose.ui.unit.dp
@@ -25,16 +27,9 @@ import com.smarttoolfactory.tutorial1_1basics.ui.Pink400
2527
import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialText
2628
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialText2
2729

28-
@Composable
29-
fun Tutorial3_2Screen3() {
30-
TutorialContent()
31-
}
32-
3330
@Preview
34-
@Preview("dark", uiMode = Configuration.UI_MODE_NIGHT_YES)
35-
@Preview(device = Devices.PIXEL_C)
3631
@Composable
37-
private fun Tutorial3_2_3Preview() {
32+
fun Tutorial3_2Screen3() {
3833
TutorialContent()
3934
}
4035

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_2_4ConstraintsBounds.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.Pink400
3939
import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialText
4040
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialText2
4141

42+
@Preview
4243
@Composable
4344
fun Tutorial3_2Screen4() {
4445
TutorialContent()
4546
}
4647

47-
@Preview
4848
@Composable
4949
private fun TutorialContent() {
5050

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_2_5SiblingConstraints.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.Pink400
3535
import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialText
3636
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialText2
3737

38+
@Preview
3839
@Composable
3940
fun Tutorial3_2Screen5() {
4041
TutorialContent()
4142
}
4243

43-
@Preview
4444
@Composable
4545
private fun TutorialContent() {
4646
Column(modifier = Modifier

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_2_6ConstrainAndOffset1.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@ val textBackgroundColor = Color(0xff2196F3)
3939
* especially when our Composable dimensions are at same size of or bigger than its Parent.
4040
*
4141
*/
42+
@Preview
4243
@Composable
4344
fun Tutorial3_2Screen6() {
4445
TutorialContent()
4546
}
4647

47-
@Preview
4848
@Composable
4949
private fun TutorialContent() {
5050
var message by remember { mutableStateOf("Type to monitor overflow") }

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_2_7ConstrainAndOffset2.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialTex
4646
* This is the inner area after we remove nip's dimensions and padding dimensions like in padding
4747
* example in first section.
4848
*/
49+
@Preview
4950
@Composable
5051
fun Tutorial3_2Screen7() {
5152
TutorialContent()
5253
}
5354

54-
@Preview
5555
@Composable
5656
private fun TutorialContent() {
5757
var message by remember { mutableStateOf("Type to monitor overflow") }

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_2_8ConstraintsAndLayout.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.ReceivedQuoteColor
4242
import com.smarttoolfactory.tutorial1_1basics.ui.SentMessageColor
4343
import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialText
4444

45+
@Preview
4546
@Composable
4647
fun Tutorial3_2Screen8() {
4748
TutorialContent()
4849
}
4950

50-
@Preview
5151
@Composable
5252
private fun TutorialContent() {
5353
Column(

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_2_9WrapContentModifier.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.Pink400
2323
import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialText
2424
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialText2
2525

26+
@Preview
2627
@Composable
2728
fun Tutorial3_2Screen9() {
2829
TutorialContent()
2930
}
3031

31-
@Preview
3232
@Composable
3333
private fun TutorialContent() {
3434
Column(

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_3_1ScopeAndParentDataModifier.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialTex
2424
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialHeader
2525
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialText2
2626

27+
@Preview
2728
@Composable
2829
fun Tutorial3_3Screen1() {
2930
TutorialContent()
3031
}
3132

32-
@Preview
3333
@Composable
3434
private fun TutorialContent() {
3535
Column(

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_3_2LayoutIdModifier.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ import com.smarttoolfactory.tutorial1_1basics.R
3434
import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialText
3535
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialHeader
3636

37+
@Preview
3738
@Composable
3839
fun Tutorial3_3Screen2() {
3940
TutorialContent()
4041
}
4142

42-
@Preview
4343
@Composable
4444
private fun TutorialContent() {
4545
Column(

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_3_3OnPlacedModifier1.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,12 +31,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.Orange400
3131
import com.smarttoolfactory.tutorial1_1basics.ui.Pink400
3232
import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialText
3333

34+
@Preview
3435
@Composable
3536
fun Tutorial3_3Screen3() {
3637
TutorialContent()
3738
}
3839

39-
@Preview
4040
@Composable
4141
private fun TutorialContent() {
4242
val density = LocalDensity.current

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_3_4OnPlacedModifier2.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.Pink400
3434
import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialText
3535
import kotlin.math.roundToInt
3636

37+
@Preview
3738
@Composable
3839
fun Tutorial3_3Screen4() {
3940
TutorialContent()
4041
}
4142

42-
@Preview
4343
@Composable
4444
private fun TutorialContent() {
4545
Column(

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_3_5OnPlacedModifier3.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.Red400
3838
import kotlinx.coroutines.launch
3939
import kotlin.math.roundToInt
4040

41+
@Preview
4142
@Composable
4243
fun Tutorial3_3Screen5() {
4344
TutorialContent()
4445
}
4546

46-
@Preview
4747
@Composable
4848
private fun TutorialContent() {
4949
var alignment by remember {

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_4BoxWithConstraints.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -48,12 +48,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialTex
4848
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialHeader
4949
import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialText2
5050

51+
@Preview
5152
@Composable
5253
fun Tutorial3_4Screen() {
5354
TutorialContent()
5455
}
5556

56-
@Preview
5757
@Composable
5858
private fun TutorialContent() {
5959

@@ -214,7 +214,7 @@ private fun ConstrainsSample2() {
214214
.background(Color.Red))
215215
Box(modifier = Modifier
216216
.size(50.dp)
217-
.requiredSizeIn(100.dp)
217+
.requiredSizeIn(minWidth = 100.dp)
218218
.background(Color.Green))
219219

220220

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_5SubcomposeLayout.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,12 +57,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.components.TutorialText2
5757
* When remeasuring take into consideration that new measurement must be done with new
5858
* [Constraints] that use that property as one of parameters.
5959
*/
60+
@Preview
6061
@Composable
6162
fun Tutorial3_5Screen() {
6263
TutorialContent()
6364
}
6465

65-
@Preview
6666
@Composable
6767
private fun TutorialContent() {
6868

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_7_1MovableContentOf1.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.backgroundColor
3636
import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialText
3737
import com.smarttoolfactory.tutorial1_1basics.ui.components.getRandomColor
3838

39+
@Preview
3940
@Composable
4041
fun Tutorial3_7Screen1() {
4142
TutorialContent()
4243
}
4344

44-
@Preview
4545
@Composable
4646
private fun TutorialContent() {
4747

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_7_2MovableContentOf2.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialTex
2828
* https://cs.android.com/androidx/platform/frameworks/support/+/androidx-main:compose/runtime/design/movable-content.md
2929
*
3030
*/
31+
@Preview
3132
@Composable
3233
fun Tutorial3_7Screen2() {
3334
TutorialContent()
3435
}
3536

36-
@Preview
3737
@Composable
3838
private fun TutorialContent() {
3939
Column(

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter3_layout/Tutorial3_7_3MoveableContentOf3.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ import androidx.compose.ui.unit.dp
2424
import com.smarttoolfactory.tutorial1_1basics.ui.backgroundColor
2525
import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialText
2626

27+
@Preview
2728
@Composable
2829
fun Tutorial3_7Screen3() {
2930
TutorialContent()
3031
}
3132

32-
@Preview
3333
@Composable
3434
private fun TutorialContent() {
3535
Column(

0 commit comments

Comments
 (0)