Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Network state label #80

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open

Network state label #80

Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8d4e8b8
update - Welcome Screen orientations handles
yugeshjain Jul 12, 2022
e6b2569
added - Network State Bar
yugeshjain Jul 14, 2022
67e1f4a
update - Network State Bar on top of DiscordAppBar
yugeshjain Jul 14, 2022
dcb1531
update - Network State Bar
yugeshjain Jul 14, 2022
ec8e9c6
Merge branch 'master' into yj_network_state_label
yugeshjain Jul 14, 2022
b32a8a8
update - Network State Bar now showing
yugeshjain Jul 20, 2022
630ffcf
update - welcome screen alignment
yugeshjain Jul 20, 2022
4738091
Merge branch 'master' into yj_network_state_label
yugeshjain Jul 28, 2022
17e8bed
update - network bar fixed
yugeshjain Jul 29, 2022
b676cf7
update - color fixed
yugeshjain Jul 29, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
package="dev.baseio.discordjetpackcompose">

<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET"/>

<application
Expand Down
34 changes: 24 additions & 10 deletions app/src/main/java/dev/baseio/discordjetpackcompose/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,22 +1,26 @@
package dev.baseio.discordjetpackcompose

import android.os.Build
import android.os.Bundle
import android.view.WindowInsets
import android.view.WindowInsetsController
import android.view.WindowManager
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.background
import androidx.compose.foundation.layout.Column
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.ui.Alignment
import androidx.compose.ui.Alignment.Companion.CenterHorizontally
import androidx.compose.ui.Modifier
import androidx.core.view.WindowCompat
import androidx.navigation.compose.NavHost
import androidx.navigation.compose.rememberNavController
import com.google.accompanist.insets.ProvideWindowInsets
import com.google.accompanist.insets.statusBarsPadding
import dagger.hilt.android.AndroidEntryPoint
import dev.baseio.discordjetpackcompose.navigator.ComposeNavigator
import dev.baseio.discordjetpackcompose.navigator.DiscordRoute
import dev.baseio.discordjetpackcompose.ui.routes.dashboard.components.NetworkStateBar
import dev.baseio.discordjetpackcompose.ui.routes.dashboard.dashboardRoute
import dev.baseio.discordjetpackcompose.ui.routes.onboarding.onBoardingRoute
import dev.baseio.discordjetpackcompose.ui.theme.DiscordColorProvider
import dev.baseio.discordjetpackcompose.ui.theme.DiscordJetpackComposeTheme
import javax.inject.Inject

Expand All @@ -40,18 +44,28 @@ class MainActivity : ComponentActivity() {
composeNavigator.handleNavigationCommands(navController)
}
DiscordJetpackComposeTheme {

ProvideWindowInsets(windowInsetsAnimationsEnabled = true) {
NavHost(
navController = navController,
startDestination = DiscordRoute.OnBoarding.name,
Column(
modifier = Modifier.background(DiscordColorProvider.colors.background)
) {
onBoardingRoute(composeNavigator)
dashboardRoute(composeNavigator)
NetworkStateBar(
modifier = Modifier
.align(CenterHorizontally)
.statusBarsPadding()
)
NavHost(
navController = navController,
startDestination = DiscordRoute.OnBoarding.name,
) {
onBoardingRoute(composeNavigator)
dashboardRoute(composeNavigator)
}
}
}
}
}
}
}



33 changes: 16 additions & 17 deletions app/src/main/java/dev/baseio/discordjetpackcompose/ui/components/DiscordAppBar.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import androidx.compose.foundation.layout.RowScope
import androidx.compose.material.AppBarDefaults
import androidx.compose.material.TopAppBar
import androidx.compose.material.contentColorFor
import androidx.compose.material.primarySurface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
Expand All @@ -15,21 +14,21 @@ import dev.baseio.discordjetpackcompose.ui.theme.primarySurface

@Composable
fun DiscordAppBar(
modifier: Modifier = Modifier,
title: @Composable () -> Unit = {},
navigationIcon: @Composable (() -> Unit)? = null,
actions: @Composable RowScope.() -> Unit = {},
backgroundColor: Color = DiscordColorProvider.colors.primarySurface,
contentColor: Color = contentColorFor(backgroundColor),
elevation: Dp = AppBarDefaults.TopAppBarElevation,
modifier: Modifier = Modifier,
title: @Composable () -> Unit = {},
navigationIcon: @Composable (() -> Unit)? = null,
actions: @Composable RowScope.() -> Unit = {},
backgroundColor: Color = DiscordColorProvider.colors.primarySurface,
contentColor: Color = contentColorFor(backgroundColor),
elevation: Dp = AppBarDefaults.TopAppBarElevation,
) {
DiscordSurface(
color = backgroundColor,
contentColor = contentColor,
elevation = elevation
) {
TopAppBar(
title, modifier, navigationIcon, actions, backgroundColor, contentColor, elevation
)
}
DiscordSurface(
color = backgroundColor,
contentColor = contentColor,
elevation = elevation
) {
TopAppBar(
title, modifier, navigationIcon, actions, backgroundColor, contentColor, elevation
)
}
}
Loading