Skip to content

Commit f4fe88c

Browse files
committed
Address additional feedback
1 parent 7e0a085 commit f4fe88c

8 files changed

Lines changed: 27 additions & 27 deletions

File tree

README.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ Solution code for the Android Basics with Compose: Reply app.
44

55
Introduction
66
------------
7-
The Reply app is a simple email client that display various categories of your
8-
inbox. This app is used to illustrate the concept of adaptive layout.
7+
The Reply app is a basic email client that displays various categories of your
8+
inbox. This app is used to illustrate the concept of adaptive layouts.
99

1010
Pre-requisites
1111
--------------
1212

13-
* Experience with Kotlin syntax.
14-
* How to create and run a project in Android Studio.
13+
* Experience with Kotlin syntax
14+
* How to create and run a project in Android Studio
1515
* How to create composable functions
1616
* How to create compose navigation
1717

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@
3939
</activity>
4040
</application>
4141

42-
</manifest>
42+
</manifest>

app/src/main/java/com/example/reply/ui/ReplyDetailsScreen.kt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,9 @@ private fun ReplyEmailDetailsCard(
154154
email,
155155
Modifier.fillMaxWidth()
156156
)
157-
if (!isFullScreen) {
157+
if (isFullScreen) {
158+
Spacer(modifier = Modifier.height(dimensionResource(R.dimen.detail_content_padding_top)))
159+
} else {
158160
Text(
159161
text = stringResource(email.subject),
160162
style = MaterialTheme.typography.bodyMedium,
@@ -164,8 +166,6 @@ private fun ReplyEmailDetailsCard(
164166
bottom = dimensionResource(R.dimen.detail_expanded_subject_body_spacing)
165167
),
166168
)
167-
} else {
168-
Spacer(modifier = Modifier.height(dimensionResource(R.dimen.detail_content_padding_top)))
169169
}
170170
Text(
171171
text = stringResource(email.body),
@@ -298,10 +298,10 @@ private fun ActionButton(
298298
) {
299299
Text(
300300
text = text,
301-
color = if (!containIrreversibleAction) {
302-
MaterialTheme.colorScheme.onSurfaceVariant
303-
} else {
301+
color = if (containIrreversibleAction) {
304302
MaterialTheme.colorScheme.onError
303+
} else {
304+
MaterialTheme.colorScheme.onSurfaceVariant
305305
}
306306
)
307307
}

app/src/main/java/com/example/reply/ui/ReplyHomeScreen.kt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,7 @@ private fun ReplyAppContent(
188188
AnimatedVisibility(
189189
visible = navigationType == ReplyNavigationType.BOTTOM_NAVIGATION
190190
) {
191-
val bottomNavigationContentDescription =
192-
stringResource(R.string.navigation_bottom)
191+
val bottomNavigationContentDescription = stringResource(R.string.navigation_bottom)
193192
ReplyBottomNavigationBar(
194193
currentTab = replyUiState.currentMailbox,
195194
onTabPressed = onTabPressed,

app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
<background android:drawable="@drawable/ic_launcher_background" />
1919
<foreground android:drawable="@drawable/ic_launcher_foreground" />
2020
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
21-
</adaptive-icon>
21+
</adaptive-icon>

app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,4 @@
1818
<background android:drawable="@drawable/ic_launcher_background" />
1919
<foreground android:drawable="@drawable/ic_launcher_foreground" />
2020
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
21-
</adaptive-icon>
21+
</adaptive-icon>

app/src/main/res/values/strings.xml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,47 +36,47 @@
3636

3737
<string name="account_1_first_name">Jeff</string>
3838
<string name="account_1_last_name">Hansen</string>
39-
<string name="account_1_email">hikingfan@gmail.com</string>
39+
<string name="account_1_email">hikingfan@altostrat.com</string>
4040

4141
<string name="account_4_first_name">Tracy</string>
4242
<string name="account_4_last_name">Alvarez</string>
43-
<string name="account_4_email">tracealvie@gmail.com</string>
43+
<string name="account_4_email">tracealvie@altostrat.com</string>
4444

4545
<string name="account_5_first_name">Allison</string>
4646
<string name="account_5_last_name">Trabucco</string>
47-
<string name="account_5_email">atrabucco222@gmail.com</string>
47+
<string name="account_5_email">atrabucco222@altostrat.com</string>
4848

4949
<string name="account_6_first_name">Ali</string>
5050
<string name="account_6_last_name">Connors</string>
51-
<string name="account_6_email">aliconnors@gmail.com</string>
51+
<string name="account_6_email">aliconnors@altostrat.com</string>
5252

5353
<string name="account_7_first_name">Alberto</string>
5454
<string name="account_7_last_name">Williams</string>
55-
<string name="account_7_email">albertowilliams124@gmail.com</string>
55+
<string name="account_7_email">albertowilliams124@altostrat.com</string>
5656

5757
<string name="account_8_first_name">Kim</string>
5858
<string name="account_8_last_name">Alen</string>
59-
<string name="account_8_email">alen13@gmail.com</string>
59+
<string name="account_8_email">alen13@altostrat.com</string>
6060

6161
<string name="account_9_first_name">Google</string>
6262
<string name="account_9_last_name">Express</string>
63-
<string name="account_9_email">express@google.com</string>
63+
<string name="account_9_email">express@altostrat.com</string>
6464

6565
<string name="account_10_first_name">Sandra</string>
6666
<string name="account_10_last_name">Adams</string>
67-
<string name="account_10_email">sandraadams@gmail.com</string>
67+
<string name="account_10_email">sandraadams@altostrat.com</string>
6868

6969
<string name="account_11_first_name">Trevor</string>
7070
<string name="account_11_last_name">Hansen</string>
71-
<string name="account_11_email">trevorhandsen@gmail.com</string>
71+
<string name="account_11_email">trevorhandsen@altostrat.com</string>
7272

7373
<string name="account_12_first_name">Sean</string>
7474
<string name="account_12_last_name">Holt</string>
75-
<string name="account_12_email">sholt@gmail.com</string>
75+
<string name="account_12_email">sholt@altostrat.com</string>
7676

7777
<string name="account_13_first_name">Frank</string>
7878
<string name="account_13_last_name">Hawkins</string>
79-
<string name="account_13_email">fhawkank@gmail.com</string>
79+
<string name="account_13_email">fhawkank@altostrat.com</string>
8080

8181
<string name="email_0_subject">Package shipped!</string>
8282
<string name="email_0_body">

build.gradle.kts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,14 @@
1313
* See the License for the specific language governing permissions and
1414
* limitations under the License.
1515
*/
16+
17+
// Top-level build file where you can add configuration options common to all sub-projects/modules.
1618
buildscript {
1719
extra.apply {
1820
set("lifecycle_version", "2.6.1")
1921
}
2022
}
2123

22-
// Top-level build file where you can add configuration options common to all sub-projects/modules.
2324
plugins {
2425
id("com.android.application") version "8.0.2" apply false
2526
id("com.android.library") version "8.0.2" apply false

0 commit comments

Comments
 (0)