Skip to content

Commit 797d8a6

Browse files
SmartToolFactorySmartToolFactory
committed
rearrange tutorial 4-1
1 parent da180e4 commit 797d8a6

File tree

6 files changed

+14
-14
lines changed

6 files changed

+14
-14
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ previous searches using a database, domain with ViewModel.
8383

8484
| Tutorial | Preview |
8585
|:---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|---------------------------------------------------------|
86-
| <h3>4-1 Remember&MutableState</h3><br/>Remember and mutableState effect recomposition and states.<br><br>• remember<br>• State<br>• Recomposition<br> | <img src ="/./screenshots/tutorial4_1.png" width=200> |
86+
| <h3>4-1-1 Remember&MutableState</h3><br/>Remember and mutableState effect recomposition and states.<br><br>• remember<br>• State<br>• Recomposition<br> | <img src ="/./screenshots/tutorial4_1_1.png" width=200> |
8787
| | |
8888
| <h3>4-2-3 Scoped Recomposition</h3><br/>How hierarchy of Composables effects Smart Composition.<br><br>• remember<br>• Recomposition<br>• State<br> | <img src ="/./screenshots/tutorial4_2_3.png" width=200> |
8989
| | |

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter4_state/Tutorial4_1RememberMutableState.kt renamed to ‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter4_state/Tutorial4_1_1RememberMutableState.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import com.smarttoolfactory.tutorial1_1basics.ui.components.StyleableTutorialTex
2525

2626
@Preview
2727
@Composable
28-
fun Tutorial4_1Screen() {
28+
fun Tutorial4_1Screen1() {
2929
TutorialContent()
3030
}
3131

@@ -41,7 +41,7 @@ private fun TutorialContent() {
4141

4242
StyleableTutorialText(
4343
text = "At outer level there is no **recomposition** since " +
44-
"mutableState(counter) is not observed by outer level. " +
44+
"mutableState(counter) is not read by outer level. " +
4545
"Because of that **only in this counter myVal gets updated**.",
4646
bullets = false
4747
)
@@ -181,7 +181,7 @@ private fun Counter4() {
181181
onClick = {
182182
counter++
183183
myVal++
184-
// 🔥 Since MyData is remembered at each composition the one initially instantiated
184+
// 🔥 Since MyData is remembered on each composition the one initially instantiated
185185
// inside remember is retained
186186
myData = MyData(myData.value + 1)
187187
}) {

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/chapter4_state/Tutorial4_3RememberKeys.kt

+4-4
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ private fun TutorialContent() {
4444
RememberKeyExample()
4545
StyleableTutorialText(text = "2-) Remember the value returned by calculation " +
4646
"if key1 and key2 are equal to the previous\n" +
47-
" * composition, otherwise produce and remember a new value by calling calculation.")
47+
" composition, otherwise produce and remember a new value by calling calculation.")
4848
RememberMultipleKeysExample()
4949
}
5050
}
@@ -87,7 +87,7 @@ private fun RememberKeyExample() {
8787
}
8888
}
8989

90-
enum class MathOperation() {
90+
enum class MathOperation {
9191
INCREASE, DECREASE
9292
}
9393

@@ -99,9 +99,9 @@ private fun RememberMultipleKeysExample() {
9999

100100
var counter by remember(key1 = key1Text, key2 = key2Text) { mutableStateOf(0) }
101101

102-
Column() {
102+
Column {
103103

104-
Row() {
104+
Row {
105105
OutlinedTextField(
106106
modifier = Modifier.weight(1f),
107107
value = key1Text,

‎Tutorial1-1Basics/src/main/java/com/smarttoolfactory/tutorial1_1basics/tutorial_list/TutorialList.kt

+5-5
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ import com.smarttoolfactory.tutorial1_1basics.chapter3_layout.Tutorial3_6Screen2
6161
import com.smarttoolfactory.tutorial1_1basics.chapter3_layout.Tutorial3_7Screen1
6262
import com.smarttoolfactory.tutorial1_1basics.chapter3_layout.Tutorial3_7Screen2
6363
import com.smarttoolfactory.tutorial1_1basics.chapter3_layout.Tutorial3_7Screen3
64-
import com.smarttoolfactory.tutorial1_1basics.chapter4_state.Tutorial4_1Screen
64+
import com.smarttoolfactory.tutorial1_1basics.chapter4_state.Tutorial4_1Screen1
6565
import com.smarttoolfactory.tutorial1_1basics.chapter4_state.Tutorial4_2_1Screen
6666
import com.smarttoolfactory.tutorial1_1basics.chapter4_state.Tutorial4_2_2Screen
6767
import com.smarttoolfactory.tutorial1_1basics.chapter4_state.Tutorial4_2_3Screen
@@ -1097,12 +1097,12 @@ fun createLayoutTutorialList(): List<TutorialSectionModel> {
10971097
@Composable
10981098
fun createStateTutorialList(): List<TutorialSectionModel> {
10991099

1100-
val tutorial4_1 = TutorialSectionModel(
1101-
title = stringResource(R.string.title_4_1),
1100+
val tutorial4_1_1 = TutorialSectionModel(
1101+
title = stringResource(R.string.title_4_1_1),
11021102
description = "This tutorial shows how remember and mutableState " +
11031103
"effect recomposition and states.",
11041104
action = {
1105-
Tutorial4_1Screen()
1105+
Tutorial4_1Screen1()
11061106
},
11071107
tags = listOf(
11081108
TAG_COMPOSE,
@@ -1335,7 +1335,7 @@ fun createStateTutorialList(): List<TutorialSectionModel> {
13351335
)
13361336

13371337
return listOf(
1338-
tutorial4_1,
1338+
tutorial4_1_1,
13391339
tutorial4_2_1,
13401340
tutorial4_2_2,
13411341
tutorial4_2_3,

‎Tutorial1-1Basics/src/main/res/values/strings.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
<string name="title_3_7_2">3-7-2 movableContentOf2</string>
4949
<string name="title_3_7_3">3-7-3 movableContentOf3</string>
5050

51-
<string name="title_4_1"><![CDATA[4-1 Remember&MutableState]]></string>
51+
<string name="title_4_1_1"><![CDATA[4-1-1 Remember&MutableState]]></string>
5252
<string name="title_4_2_1">4-2-1 Recomposition</string>
5353
<string name="title_4_2_2">4-2-2 Recomposition2</string>
5454
<string name="title_4_2_3">4-2-3 ScopedRecomposition</string>

‎screenshots/tutorial4_1.png renamed to ‎screenshots/tutorial4_1_1.png

File renamed without changes.

0 commit comments

Comments
 (0)