Skip to content

Commit

Permalink
change statusbar, app icon
Browse files Browse the repository at this point in the history
  • Loading branch information
mirlee0304 committed Nov 8, 2023
1 parent 38ad384 commit a8c5926
Show file tree
Hide file tree
Showing 25 changed files with 44 additions and 210 deletions.
9 changes: 9 additions & 0 deletions frontend/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,12 @@ android {
vectorDrawables {
useSupportLibrary = true
}
configurations.all {
resolutionStrategy {
force("androidx.emoji2:emoji2-views-helper:1.3.0")
force("androidx.emoji2:emoji2:1.3.0")
}
}
}

buildTypes {
Expand Down Expand Up @@ -116,4 +122,7 @@ dependencies {
androidTestImplementation ("androidx.compose.ui:ui-test-junit4:1.7.0")
// coil: image upload
implementation ("io.coil-kt:coil-compose:1.4.0")

//design system bar
implementation("com.google.accompanist:accompanist-systemuicontroller:0.32.0")
}
Binary file added frontend/app/src/main/ic_launcher-playstore.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 10 additions & 3 deletions frontend/app/src/main/java/com/team13/fooriend/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,26 @@ package com.team13.fooriend
import android.os.Bundle
import androidx.activity.ComponentActivity
import androidx.activity.compose.setContent
import androidx.compose.foundation.isSystemInDarkTheme
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.Surface
import androidx.compose.runtime.Composable
import androidx.compose.runtime.DisposableEffect
import androidx.compose.runtime.SideEffect
import androidx.compose.runtime.getValue
import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Modifier
import com.google.accompanist.systemuicontroller.rememberSystemUiController
import com.team13.fooriend.ui.FooriendApp
import com.team13.fooriend.ui.LocationPermissionScreen
import com.team13.fooriend.ui.theme.FooriendTheme
import com.team13.fooriend.ui.util.checkForPermission


import com.team13.fooriend.ui.util.SetStatusBarColor
import androidx.compose.ui.graphics.Color
import com.team13.fooriend.ui.theme.CIvory

class MainActivity : ComponentActivity() {

Expand All @@ -25,9 +31,10 @@ class MainActivity : ComponentActivity() {

setContent {
FooriendTheme {
SetStatusBarColor(color = Color.Transparent)
Surface(
modifier = Modifier.fillMaxSize(),
color = MaterialTheme.colorScheme.background
color = Color.White
) {
var hasLocationPermission by remember {
mutableStateOf(checkForPermission(this))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ fun SignUpScreen(
),
placeholder = { Text("PASSWORD CONFIRM")},
)
TODO("keyboard hide")
// TODO("keyboard hide")
Spacer(modifier = Modifier.height(20.dp))
// TextField(value = nickname, onValueChange = nicknameValue)
// TextField(value = phoneNumber, onValueChange = phoneNumberValue)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.team13.fooriend.ui.util

import androidx.compose.ui.graphics.Color
import androidx.compose.runtime.Composable
import androidx.compose.runtime.SideEffect
import com.google.accompanist.systemuicontroller.rememberSystemUiController

@Composable
fun SetStatusBarColor(color: Color) {
val systemUiController = rememberSystemUiController()
SideEffect() {
systemUiController.setSystemBarsColor(
color,
darkIcons = true)
}
}
170 changes: 0 additions & 170 deletions frontend/app/src/main/res/drawable/ic_launcher_background.xml

This file was deleted.

30 changes: 0 additions & 30 deletions frontend/app/src/main/res/drawable/ic_launcher_foreground.xml

This file was deleted.

5 changes: 2 additions & 3 deletions frontend/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background" />
<foreground android:drawable="@drawable/ic_launcher_foreground" />
<monochrome android:drawable="@drawable/ic_launcher_foreground" />
<background android:drawable="@color/ic_launcher_background"/>
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
</adaptive-icon>
Binary file modified frontend/app/src/main/res/mipmap-hdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file modified frontend/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified frontend/app/src/main/res/mipmap-mdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file modified frontend/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified frontend/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file modified frontend/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file modified frontend/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
Binary file not shown.
Binary file modified frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
Binary file not shown.
Binary file not shown.
Binary file modified frontend/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
Binary file not shown.
4 changes: 4 additions & 0 deletions frontend/app/src/main/res/values/ic_launcher_background.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="ic_launcher_background">#32B768</color>
</resources>

0 comments on commit a8c5926

Please sign in to comment.