diff --git a/.idea/.name b/.idea/.name index 8a14fc66..5b7ffa9e 100644 --- a/.idea/.name +++ b/.idea/.name @@ -1 +1 @@ -Revolt \ No newline at end of file +PepChat \ No newline at end of file diff --git a/app/src/main/java/chat/peptide/screens/chat/ChatRouterScreen.kt b/app/src/main/java/chat/peptide/screens/chat/ChatRouterScreen.kt index 99f892f4..241386bc 100644 --- a/app/src/main/java/chat/peptide/screens/chat/ChatRouterScreen.kt +++ b/app/src/main/java/chat/peptide/screens/chat/ChatRouterScreen.kt @@ -10,6 +10,7 @@ import android.view.inputmethod.InputMethodManager import androidx.activity.compose.rememberLauncherForActivityResult import androidx.activity.result.contract.ActivityResultContracts import androidx.compose.animation.AnimatedVisibility +import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.WindowInsets import androidx.compose.foundation.layout.WindowInsetsSides @@ -985,7 +986,7 @@ fun ChannelNavigator( } } ) { innerPadding -> - Column(modifier = Modifier.padding(innerPadding)) { + Box(modifier = Modifier.padding(innerPadding)) { when (dest) { is ChatRouterDestination.Settings -> { SettingsScreen( diff --git a/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreen.kt b/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreen.kt index a188a634..33e727de 100644 --- a/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreen.kt +++ b/app/src/main/java/chat/peptide/screens/chat/views/channel/ChannelScreen.kt @@ -661,7 +661,7 @@ fun ChannelScreen( ChannelIcon( channelType = it.channelType ?: ChannelType.TextChannel, modifier = Modifier - .size(24.dp) + .alpha(0.8f) ) } diff --git a/app/src/main/java/chat/peptide/screens/settings/SettingsScreen.kt b/app/src/main/java/chat/peptide/screens/settings/SettingsScreen.kt index 41a4428c..48b66573 100644 --- a/app/src/main/java/chat/peptide/screens/settings/SettingsScreen.kt +++ b/app/src/main/java/chat/peptide/screens/settings/SettingsScreen.kt @@ -10,9 +10,12 @@ import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.verticalScroll import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon +import androidx.compose.material3.IconButton +import androidx.compose.material3.LargeTopAppBar import androidx.compose.material3.ListItem import androidx.compose.material3.LocalContentColor import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Scaffold import androidx.compose.material3.Text import androidx.compose.material3.TopAppBar import androidx.compose.material3.TopAppBarDefaults @@ -67,7 +70,7 @@ fun SettingsScreen( Column( modifier = Modifier.nestedScroll(scrollBehavior.nestedScrollConnection), ) { - TopAppBar( + LargeTopAppBar( scrollBehavior = scrollBehavior, title = { Text( diff --git a/settings.gradle.kts b/settings.gradle.kts index 88c92ff9..be0ef9cc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -27,5 +27,5 @@ dependencyResolutionManagement { } } } -rootProject.name = "Revolt" +rootProject.name = "PepChat" include(":app")