From 4ec45e55d556971079d0f55ee353d8e7b20e804e Mon Sep 17 00:00:00 2001 From: TymanWasTaken Date: Fri, 19 Nov 2021 07:56:41 -0700 Subject: [PATCH] Make navbar transparent (#5) * github workflow * Make navbar transparent * remove unused imports --- .github/workflows/build.yml | 33 +++++++++++++++++++ .../com/aliucord/manager/ui/MainActivity.kt | 8 ++--- .../aliucord/manager/ui/screens/HomeScreen.kt | 1 - .../manager/ui/screens/PluginsScreen.kt | 4 +-- .../manager/ui/screens/SettingsScreen.kt | 2 -- 5 files changed, 37 insertions(+), 11 deletions(-) create mode 100644 .github/workflows/build.yml diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..5a47267 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,33 @@ +name: Build APK + +on: + push: + branches: + - '*' + pull_request: + branches: + - '*' + workflow_dispatch: + +jobs: + build: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: set up JDK 11 + uses: actions/setup-java@v2 + with: + java-version: 11 + distribution: 'zulu' + cache: 'gradle' + + - name: Build project with Gradle + run: chmod +x ./gradlew && ./gradlew build + + - name: Upload apk as artifact + uses: actions/upload-artifact@v2 + with: + name: app + path: | + app/build/outputs/apk/debug/app-debug.apk \ No newline at end of file diff --git a/app/src/main/java/com/aliucord/manager/ui/MainActivity.kt b/app/src/main/java/com/aliucord/manager/ui/MainActivity.kt index f66a188..e030e91 100644 --- a/app/src/main/java/com/aliucord/manager/ui/MainActivity.kt +++ b/app/src/main/java/com/aliucord/manager/ui/MainActivity.kt @@ -17,13 +17,11 @@ import androidx.compose.foundation.layout.* import androidx.compose.material.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.ArrowBack -import androidx.compose.material.icons.filled.Build import androidx.compose.material.icons.filled.MoreVert import androidx.compose.runtime.* import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color -import androidx.compose.ui.layout.HorizontalAlignmentLine import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.painterResource import androidx.compose.ui.res.stringResource @@ -38,14 +36,12 @@ import com.aliucord.manager.R import com.aliucord.manager.preferences.sharedPreferences import com.aliucord.manager.ui.theme.AliucordManagerTheme import com.aliucord.manager.ui.theme.primaryColor -import com.aliucord.manager.ui.theme.primaryColorDark import com.aliucord.manager.utils.Github import com.google.accompanist.permissions.ExperimentalPermissionsApi import com.google.accompanist.permissions.PermissionRequired import com.google.accompanist.permissions.PermissionState import com.google.accompanist.permissions.rememberPermissionState import com.google.accompanist.systemuicontroller.rememberSystemUiController -import org.intellij.lang.annotations.JdkConstants class MainActivity : ComponentActivity() { override fun onCreate(savedInstanceState: Bundle?) { @@ -67,8 +63,10 @@ fun MainActivityLayout() { val systemUiController = rememberSystemUiController() val storagePermissionState = rememberPermissionState(Manifest.permission.WRITE_EXTERNAL_STORAGE) + val colors = MaterialTheme.colors SideEffect { - systemUiController.setSystemBarsColor(primaryColorDark) + systemUiController.setNavigationBarColor(colors.background) + systemUiController.setStatusBarColor(colors.primary) if (!storagePermissionState.hasPermission) storagePermissionState.launchPermissionRequest() } diff --git a/app/src/main/java/com/aliucord/manager/ui/screens/HomeScreen.kt b/app/src/main/java/com/aliucord/manager/ui/screens/HomeScreen.kt index 00f4f24..d3d5cc9 100644 --- a/app/src/main/java/com/aliucord/manager/ui/screens/HomeScreen.kt +++ b/app/src/main/java/com/aliucord/manager/ui/screens/HomeScreen.kt @@ -9,7 +9,6 @@ import android.util.Log import androidx.compose.foundation.background import androidx.compose.foundation.layout.* import androidx.compose.foundation.shape.CircleShape -import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.* import androidx.compose.runtime.* import androidx.compose.ui.Alignment diff --git a/app/src/main/java/com/aliucord/manager/ui/screens/PluginsScreen.kt b/app/src/main/java/com/aliucord/manager/ui/screens/PluginsScreen.kt index 338e569..4984283 100644 --- a/app/src/main/java/com/aliucord/manager/ui/screens/PluginsScreen.kt +++ b/app/src/main/java/com/aliucord/manager/ui/screens/PluginsScreen.kt @@ -3,8 +3,6 @@ package com.aliucord.manager.ui.screens import androidx.compose.foundation.layout.* import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items -import androidx.compose.foundation.rememberScrollState -import androidx.compose.foundation.verticalScroll import androidx.compose.material.* import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Delete @@ -52,7 +50,7 @@ fun PluginsScreen() { // TODO - make this get pluginEnabled from Aliucord preferences somehow val isChecked = remember { mutableStateOf(true) } var showDeleteDialog by remember { mutableStateOf(false) } - var showChangelogDialog = remember { mutableStateOf(false) } + val showChangelogDialog = remember { mutableStateOf(false) } if (showDeleteDialog) { AlertDialog( diff --git a/app/src/main/java/com/aliucord/manager/ui/screens/SettingsScreen.kt b/app/src/main/java/com/aliucord/manager/ui/screens/SettingsScreen.kt index 0943e36..be026e0 100644 --- a/app/src/main/java/com/aliucord/manager/ui/screens/SettingsScreen.kt +++ b/app/src/main/java/com/aliucord/manager/ui/screens/SettingsScreen.kt @@ -11,8 +11,6 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.padding import androidx.compose.material.* import androidx.compose.runtime.Composable -import androidx.compose.runtime.mutableStateOf -import androidx.compose.runtime.remember import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource