Skip to content

Commit

Permalink
updated pngs with correct path
Browse files Browse the repository at this point in the history
  • Loading branch information
Gurupreet Singh committed Jul 4, 2022
1 parent 5324ff1 commit 4d641b5
Show file tree
Hide file tree
Showing 17 changed files with 7 additions and 7 deletions.
7 changes: 3 additions & 4 deletions Reply/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ This sample showcases:
## Screenshots

<img src="screenshots/reply.gif"/>
<img src="screenshots/reply_medium_and_large_tablet.png">

## Features

Expand All @@ -36,20 +35,20 @@ The sample provides usage of material navigation components depending on screen
* [`NavigationRail`](app/src/main/java/com/example/reply/ui/navigation/ReplyNavigationComponents.kt#70) is used for medium size devices. It is also used along with [`ModalNavigationDrawer`](app/src/main/java/com/example/reply/ui/ReplyApp.kt#73) when user want to see more content.
* [`PermanentNavigationDrawer`](app/src/main/java/com/example/reply/ui/ReplyApp.kt#153) is used for large devices or desktops when we have enough space to show navigation drawer content always.
* Depending upon the different size and state of device correct [navigation type](app/src/main/java/com/example/reply/ui/ReplyApp.kt#71) is chosen dynamically.
<img src="screenshots/reply_3_screens.pmg">
<img src="screenshots/compact_medium_large_displays.png">

#### [Material 3 Theming](app/src/main/java/com/example/reply/ui/theme)
Reply is using brand new Material 3 [colors](app/src/main/java/com/example/reply/ui/theme/Color.kt), [typography](app/src/main/java/com/example/reoly/ui/theme/Type.kt) and [theming](app/src/main/java/com/example/reply/ui/theme/Theme.kt). It also supports both [light and dark mode]((app/src/main/java/com/example/reply/ui/theme/Theme.kt#95)) depending on system settings.
[Material Theme builder](https://material-foundation.github.io/material-theme-builder/#/custom) is used to create material 3 theme and directly export it for Compose.

#### [Dynamic theming/Material You](app/src/main/java/com/example/reply/ui/theme/Theme.kt#100)
On Android 12+ Reply supports Material You dynamic color, which extracts a custom color scheme from the device wallpaper. For older version of android it falls back to defined light and dark [color schemes](aapp/src/main/java/com/example/reply/ui/theme/Theme.kt#34)
<img src="screenshots/dynamic_theming.pmg">
<img src="screenshots/dynamic_theming.png">

#### [Inbox Screen](app/src/main/java/com/example/reply/ui/ReplyListContent.kt)
Similar to navigation type, depending on device's size and state correct [content type](app/src/main/java/com/example/reply/ui/ReplyApp.kt#72) is chosen, we can have [Inbox only](app/src/main/java/com/example/reply/ui/ReplyListContent.kt#91) or [Inbox and thread detail](app/src/main/java/com/example/reply/ui/ReplyListContent.kt#83) together. The content in inbox screen
is adaptive and is switched between list only or list and details page depending on the screen size available.
<img src="screenshots/reply_small_and_large_tablet.pmg">
<img src="screenshots/medium_and_large_display.png">

#### [FAB & Material 3 components](app/src/main/java/com/example/reply/ui/ReplyListContent.kt)
Reply is using all material 3 components including different type of FAB for different screen size and states.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@ fun ReplyListAndDetailContent(
modifier: Modifier = Modifier,
navigateToDetail: (Long) -> Unit
) {
Row(modifier = modifier, horizontalArrangement = Arrangement.spacedBy(8.dp)) {
Row(modifier = modifier) {
LazyColumn(modifier = modifier.weight(1f), state = emailLazyListState) {
item {
ReplySearchBar(modifier = Modifier.fillMaxWidth())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ fun ReplyNavigationRail(
) {
NavigationRail(
modifier = Modifier.fillMaxHeight(),
containerColor = MaterialTheme.colorScheme.inverseOnSurface
) {
//TODO remove custom nav rail positioning when NavRail component supports it. ticket : b/232495216
Layout(
Expand Down Expand Up @@ -184,7 +185,7 @@ fun NavigationDrawerContent(
) {
//TODO remove custom nav drawer content positioning when NavDrawer component supports it. ticket : b/232495216
Layout(
modifier = Modifier.padding(16.dp),
modifier = Modifier.background(MaterialTheme.colorScheme.inverseOnSurface).padding(16.dp),
content = {
Column(
modifier = Modifier.layoutId("header"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ private val replyLightColorScheme = lightColorScheme(
@Composable
fun ReplyTheme(
darkTheme: Boolean = isSystemInDarkTheme(),
dynamicColor: Boolean = true,
dynamicColor: Boolean = false,
content: @Composable () -> Unit
) {
val replyColorScheme = when {
Expand Down
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Reply/screenshots/dynamic_theming.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Reply/screenshots/medium_and_large_display.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Reply/screenshots/reply_3_screens.png
Binary file not shown.
Binary file removed Reply/screenshots/reply_large_display.png
Binary file not shown.
Binary file added Reply/screenshots/reply_large_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Reply/screenshots/reply_medium_and_large_tablet.png
Binary file not shown.
Binary file added Reply/screenshots/reply_medium_screen.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Reply/screenshots/reply_mobile_and_tablet.png
Binary file not shown.
Binary file modified Reply/screenshots/reply_phone.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Reply/screenshots/reply_tablet.png
Binary file not shown.
Binary file added Reply/screenshots/reply_theme.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Reply/screenshots/theme.png
Binary file not shown.

0 comments on commit 4d641b5

Please sign in to comment.