Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ui/navigation/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ dependencies {
implementation(projects.features.notes.presentation)
implementation(projects.features.auth.presentation)
implementation(projects.features.help)
implementation(projects.features.profile.presentation)
//implementation(projects.features.profile.presentation)
implementation(projects.features.quickActions)
implementation(projects.features.deviceAdmin.presentation)
implementation(projects.features.security.secureContent)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import io.gromif.astracrypt.presentation.navigation.settings.about.aboutGraph
import io.gromif.astracrypt.presentation.navigation.settings.aead.settingsSecurityAead
import io.gromif.astracrypt.presentation.navigation.settings.aead.settingsSecurityColumnsAead
import io.gromif.astracrypt.presentation.navigation.settings.donate
import io.gromif.astracrypt.presentation.navigation.settings.profileSettings
import io.gromif.astracrypt.presentation.navigation.settings.quickActionsSettings
import io.gromif.astracrypt.presentation.navigation.settings.security.settingsSecurity
import io.gromif.astracrypt.presentation.navigation.settings.settingsSecurityAdmin
Expand All @@ -32,7 +31,6 @@ internal fun root(
labGraph()

// settings
profileSettings()
settingsUi(
isDynamicColorsSupported = navParams.isDynamicColorsSupported,
onDynamicColorsStateChange = onDynamicColorsStateChange,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ object Route {
val outUri: String? = null
)

@Serializable object EditProfile

@Serializable object Donate

@Serializable object SettingsUi
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import io.gromif.astracrypt.presentation.navigation.models.UiState
import io.gromif.astracrypt.presentation.navigation.shared.LocalHostEvents
import io.gromif.astracrypt.presentation.navigation.shared.LocalNavController
import io.gromif.astracrypt.presentation.navigation.shared.UiStateHandler
import io.gromif.astracrypt.profile.presentation.settings.aead.ProfileAeadSettingsScreen
import io.gromif.astracrypt.resources.R
import io.gromif.notes.presentation.settings.AeadSettings
import io.gromif.ui.compose.core.PreferencesScreen
Expand All @@ -34,6 +33,5 @@ internal fun NavGraphBuilder.settingsSecurityAead() = composable<Route.SettingsS
)
AeadSettings()
AuthAeadSettingsScreen()
ProfileAeadSettingsScreen()
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ import androidx.compose.ui.Modifier
import androidx.compose.ui.res.stringResource
import io.gromif.astracrypt.files.recent.RecentFilesComponent
import io.gromif.astracrypt.files.recent.list.Actions
import io.gromif.astracrypt.profile.presentation.shared.Profile
import io.gromif.astracrypt.profile.presentation.widget.WidgetComponent
import io.gromif.astracrypt.resources.R
import io.gromif.ui.compose.core.CardWithTitle
import io.gromif.ui.compose.core.theme.spaces
Expand All @@ -28,7 +26,6 @@ fun HomeScreen(
.padding(MaterialTheme.spaces.spaceMedium),
verticalArrangement = Arrangement.spacedBy(MaterialTheme.spaces.spaceMedium)
) {
Profile.WidgetComponent()
CardWithTitle(titleText = stringResource(id = R.string.recentlyAdded)) {
RecentFilesComponent(actions = recentFilesActions)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.outlined.Info
import androidx.compose.material.icons.outlined.MonetizationOn
import androidx.compose.material.icons.outlined.Palette
import androidx.compose.material.icons.outlined.Person
import androidx.compose.material.icons.outlined.Security
import androidx.compose.ui.graphics.vector.ImageVector
import io.gromif.astracrypt.resources.R
Expand All @@ -14,11 +13,6 @@ enum class SettingsMainItems(
val imageVector: ImageVector,
@StringRes val titleId: Int
) {

EditProfile(
imageVector = Icons.Outlined.Person,
titleId = R.string.settings_editProfile
),
Security(
imageVector = Icons.Outlined.Security,
titleId = R.string.settings_security
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ fun SettingsScreen() {
imageVector = key.imageVector
) {
when (key) {
SettingsMainItems.EditProfile -> navController.navigate(Route.EditProfile)
SettingsMainItems.Security -> navController.navigate(Route.SettingsSecurity)
SettingsMainItems.Interface -> navController.navigate(Route.SettingsUi)
SettingsMainItems.Donate -> navController.navigate(Route.Donate)
Expand Down