diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt index 8bf7f3176..ce4d6fa93 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/navigation/DrawerContent.kt @@ -44,9 +44,17 @@ import androidx.compose.foundation.text.KeyboardOptions import androidx.compose.foundation.verticalScroll import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.Send +import androidx.compose.material.icons.filled.AccountCircle import androidx.compose.material.icons.filled.Delete +import androidx.compose.material.icons.outlined.AccountCircle +import androidx.compose.material.icons.outlined.BookmarkBorder +import androidx.compose.material.icons.outlined.Bookmarks import androidx.compose.material.icons.outlined.CloudUpload +import androidx.compose.material.icons.outlined.Drafts import androidx.compose.material.icons.outlined.GroupAdd +import androidx.compose.material.icons.outlined.Key +import androidx.compose.material.icons.outlined.Security +import androidx.compose.material.icons.outlined.Settings import androidx.compose.material3.HorizontalDivider import androidx.compose.material3.Icon import androidx.compose.material3.IconButton @@ -109,6 +117,7 @@ import com.vitorpamplona.amethyst.ui.theme.Size16dp import com.vitorpamplona.amethyst.ui.theme.Size20Modifier import com.vitorpamplona.amethyst.ui.theme.Size22Modifier import com.vitorpamplona.amethyst.ui.theme.Size26Modifier +import com.vitorpamplona.amethyst.ui.theme.StdHorzSpacer import com.vitorpamplona.amethyst.ui.theme.bannerModifier import com.vitorpamplona.amethyst.ui.theme.drawerSpacing import com.vitorpamplona.amethyst.ui.theme.placeholderText @@ -158,6 +167,8 @@ fun DrawerContent( modifier = Modifier.padding(top = 20.dp), ) + Spacer(modifier = StdHorzSpacer) + ListContent( modifier = Modifier.fillMaxWidth(), openSheet, @@ -425,7 +436,7 @@ fun ListContent( Column(modifier) { NavigationRow( title = R.string.profile, - icon = R.drawable.ic_profile, + icon = Icons.Default.AccountCircle, tint = MaterialTheme.colorScheme.primary, nav = nav, route = remember { Route.Profile(accountViewModel.userProfile().pubkeyHex) }, @@ -433,7 +444,7 @@ fun ListContent( NavigationRow( title = R.string.bookmarks, - icon = R.drawable.ic_bookmarks, + icon = Icons.Outlined.BookmarkBorder, tint = MaterialTheme.colorScheme.onBackground, nav = nav, route = Route.Bookmarks, @@ -441,7 +452,7 @@ fun ListContent( NavigationRow( title = R.string.drafts, - icon = R.drawable.ic_topics, + icon = Icons.Outlined.Drafts, tint = MaterialTheme.colorScheme.onBackground, nav = nav, route = Route.Drafts, @@ -467,7 +478,7 @@ fun ListContent( NavigationRow( title = R.string.security_filters, - icon = R.drawable.ic_security, + icon = Icons.Outlined.Security, tint = MaterialTheme.colorScheme.onBackground, nav = nav, route = Route.SecurityFilters, @@ -486,7 +497,7 @@ fun ListContent( accountViewModel.account.settings.keyPair.privKey?.let { IconRow( title = R.string.backup_keys, - icon = R.drawable.ic_key, + icon = Icons.Outlined.Key, tint = MaterialTheme.colorScheme.onBackground, onClick = { nav.closeDrawer() @@ -497,7 +508,7 @@ fun ListContent( NavigationRow( title = R.string.preferences, - icon = R.drawable.ic_settings, + icon = Icons.Outlined.Settings, tint = MaterialTheme.colorScheme.onBackground, nav = nav, route = Route.Settings, @@ -590,6 +601,25 @@ fun NavigationRow( ) } +@Composable +fun NavigationRow( + title: Int, + icon: ImageVector, + tint: Color, + nav: INav, + route: Route, +) { + IconRow( + title, + icon, + tint, + onClick = { + nav.closeDrawer() + nav.nav(route) + }, + ) +} + @Composable fun IconRow( title: Int, diff --git a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt index ce60f2f62..e503de742 100644 --- a/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt +++ b/amethyst/src/main/java/com/vitorpamplona/amethyst/ui/note/Icons.kt @@ -40,6 +40,7 @@ import androidx.compose.material.icons.filled.PushPin import androidx.compose.material.icons.filled.Report import androidx.compose.material.icons.filled.Share import androidx.compose.material.icons.outlined.AddReaction +import androidx.compose.material.icons.outlined.Close import androidx.compose.material.icons.outlined.PlayCircle import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme @@ -51,6 +52,7 @@ import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.Dp +import coil3.compose.AsyncImagePainter.State.Empty.painter import com.vitorpamplona.amethyst.R import com.vitorpamplona.amethyst.commons.hashtags.Amethyst import com.vitorpamplona.amethyst.commons.hashtags.Cashu @@ -392,7 +394,7 @@ fun CancelIcon() { @Composable fun CloseIcon() { Icon( - painter = painterResource(id = R.drawable.ic_close), + imageVector = Icons.Outlined.Close, contentDescription = stringRes(id = R.string.cancel), modifier = Size20Modifier, ) diff --git a/amethyst/src/main/res/drawable-anydpi/ic_add_photo.xml b/amethyst/src/main/res/drawable-anydpi/ic_add_photo.xml deleted file mode 100644 index 4ebcf7e03..000000000 --- a/amethyst/src/main/res/drawable-anydpi/ic_add_photo.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/amethyst/src/main/res/drawable-anydpi/ic_close.xml b/amethyst/src/main/res/drawable-anydpi/ic_close.xml deleted file mode 100644 index 844b6b62e..000000000 --- a/amethyst/src/main/res/drawable-anydpi/ic_close.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/amethyst/src/main/res/drawable-anydpi/ic_key.xml b/amethyst/src/main/res/drawable-anydpi/ic_key.xml deleted file mode 100644 index 0db74fa0d..000000000 --- a/amethyst/src/main/res/drawable-anydpi/ic_key.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/amethyst/src/main/res/drawable-anydpi/ic_logout.xml b/amethyst/src/main/res/drawable-anydpi/ic_logout.xml deleted file mode 100644 index 6555606de..000000000 --- a/amethyst/src/main/res/drawable-anydpi/ic_logout.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - diff --git a/amethyst/src/main/res/drawable-anydpi/ic_security.xml b/amethyst/src/main/res/drawable-anydpi/ic_security.xml deleted file mode 100644 index 717b89c05..000000000 --- a/amethyst/src/main/res/drawable-anydpi/ic_security.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - diff --git a/amethyst/src/main/res/drawable-hdpi/ic_bookmarks.png b/amethyst/src/main/res/drawable-hdpi/ic_bookmarks.png deleted file mode 100644 index 8a7cf8bea..000000000 Binary files a/amethyst/src/main/res/drawable-hdpi/ic_bookmarks.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-hdpi/ic_globe.png b/amethyst/src/main/res/drawable-hdpi/ic_globe.png deleted file mode 100644 index 71e7d944d..000000000 Binary files a/amethyst/src/main/res/drawable-hdpi/ic_globe.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-hdpi/ic_key.png b/amethyst/src/main/res/drawable-hdpi/ic_key.png deleted file mode 100644 index 81ef03db8..000000000 Binary files a/amethyst/src/main/res/drawable-hdpi/ic_key.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-hdpi/ic_logout.png b/amethyst/src/main/res/drawable-hdpi/ic_logout.png deleted file mode 100644 index a74a0f2a1..000000000 Binary files a/amethyst/src/main/res/drawable-hdpi/ic_logout.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-hdpi/ic_profile.png b/amethyst/src/main/res/drawable-hdpi/ic_profile.png deleted file mode 100644 index da70047c2..000000000 Binary files a/amethyst/src/main/res/drawable-hdpi/ic_profile.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-hdpi/ic_security.png b/amethyst/src/main/res/drawable-hdpi/ic_security.png deleted file mode 100644 index 5d563a786..000000000 Binary files a/amethyst/src/main/res/drawable-hdpi/ic_security.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-hdpi/ic_theme.png b/amethyst/src/main/res/drawable-hdpi/ic_theme.png deleted file mode 100644 index b2b5876a4..000000000 Binary files a/amethyst/src/main/res/drawable-hdpi/ic_theme.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-hdpi/ic_topics.png b/amethyst/src/main/res/drawable-hdpi/ic_topics.png deleted file mode 100644 index 1b0973811..000000000 Binary files a/amethyst/src/main/res/drawable-hdpi/ic_topics.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-hdpi/ic_trends.png b/amethyst/src/main/res/drawable-hdpi/ic_trends.png deleted file mode 100644 index 7fa5184a3..000000000 Binary files a/amethyst/src/main/res/drawable-hdpi/ic_trends.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-mdpi/ic_bookmarks.png b/amethyst/src/main/res/drawable-mdpi/ic_bookmarks.png deleted file mode 100644 index ecb040b7a..000000000 Binary files a/amethyst/src/main/res/drawable-mdpi/ic_bookmarks.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-mdpi/ic_globe.png b/amethyst/src/main/res/drawable-mdpi/ic_globe.png deleted file mode 100644 index d442d9b3d..000000000 Binary files a/amethyst/src/main/res/drawable-mdpi/ic_globe.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-mdpi/ic_key.png b/amethyst/src/main/res/drawable-mdpi/ic_key.png deleted file mode 100644 index 67341e7e1..000000000 Binary files a/amethyst/src/main/res/drawable-mdpi/ic_key.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-mdpi/ic_logout.png b/amethyst/src/main/res/drawable-mdpi/ic_logout.png deleted file mode 100644 index dc2dabde5..000000000 Binary files a/amethyst/src/main/res/drawable-mdpi/ic_logout.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-mdpi/ic_profile.png b/amethyst/src/main/res/drawable-mdpi/ic_profile.png deleted file mode 100644 index 8eec4f1e3..000000000 Binary files a/amethyst/src/main/res/drawable-mdpi/ic_profile.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-mdpi/ic_security.png b/amethyst/src/main/res/drawable-mdpi/ic_security.png deleted file mode 100644 index 3dc8abcce..000000000 Binary files a/amethyst/src/main/res/drawable-mdpi/ic_security.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-mdpi/ic_theme.png b/amethyst/src/main/res/drawable-mdpi/ic_theme.png deleted file mode 100644 index 616707d87..000000000 Binary files a/amethyst/src/main/res/drawable-mdpi/ic_theme.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-mdpi/ic_topics.png b/amethyst/src/main/res/drawable-mdpi/ic_topics.png deleted file mode 100644 index aebed8f6b..000000000 Binary files a/amethyst/src/main/res/drawable-mdpi/ic_topics.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-mdpi/ic_trends.png b/amethyst/src/main/res/drawable-mdpi/ic_trends.png deleted file mode 100644 index 3275536af..000000000 Binary files a/amethyst/src/main/res/drawable-mdpi/ic_trends.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xhdpi/ic_bookmarks.png b/amethyst/src/main/res/drawable-xhdpi/ic_bookmarks.png deleted file mode 100644 index 5b04fca6c..000000000 Binary files a/amethyst/src/main/res/drawable-xhdpi/ic_bookmarks.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xhdpi/ic_globe.png b/amethyst/src/main/res/drawable-xhdpi/ic_globe.png deleted file mode 100644 index 1e0e02c22..000000000 Binary files a/amethyst/src/main/res/drawable-xhdpi/ic_globe.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xhdpi/ic_key.png b/amethyst/src/main/res/drawable-xhdpi/ic_key.png deleted file mode 100644 index 79ffc2e67..000000000 Binary files a/amethyst/src/main/res/drawable-xhdpi/ic_key.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xhdpi/ic_logout.png b/amethyst/src/main/res/drawable-xhdpi/ic_logout.png deleted file mode 100644 index 10fd5751c..000000000 Binary files a/amethyst/src/main/res/drawable-xhdpi/ic_logout.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xhdpi/ic_profile.png b/amethyst/src/main/res/drawable-xhdpi/ic_profile.png deleted file mode 100644 index 67c2513f6..000000000 Binary files a/amethyst/src/main/res/drawable-xhdpi/ic_profile.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xhdpi/ic_security.png b/amethyst/src/main/res/drawable-xhdpi/ic_security.png deleted file mode 100644 index d8f6c01f2..000000000 Binary files a/amethyst/src/main/res/drawable-xhdpi/ic_security.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xhdpi/ic_theme.png b/amethyst/src/main/res/drawable-xhdpi/ic_theme.png deleted file mode 100644 index 59b9eeee3..000000000 Binary files a/amethyst/src/main/res/drawable-xhdpi/ic_theme.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xhdpi/ic_topics.png b/amethyst/src/main/res/drawable-xhdpi/ic_topics.png deleted file mode 100644 index f235e5d22..000000000 Binary files a/amethyst/src/main/res/drawable-xhdpi/ic_topics.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xhdpi/ic_trends.png b/amethyst/src/main/res/drawable-xhdpi/ic_trends.png deleted file mode 100644 index fb979bb71..000000000 Binary files a/amethyst/src/main/res/drawable-xhdpi/ic_trends.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xhdpi/ic_verified.png b/amethyst/src/main/res/drawable-xhdpi/ic_verified.png deleted file mode 100644 index 7234f029f..000000000 Binary files a/amethyst/src/main/res/drawable-xhdpi/ic_verified.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xhdpi/ic_verified_transparent.png b/amethyst/src/main/res/drawable-xhdpi/ic_verified_transparent.png deleted file mode 100644 index 27ee31f90..000000000 Binary files a/amethyst/src/main/res/drawable-xhdpi/ic_verified_transparent.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxhdpi/ic_bookmarks.png b/amethyst/src/main/res/drawable-xxhdpi/ic_bookmarks.png deleted file mode 100644 index b810d48cf..000000000 Binary files a/amethyst/src/main/res/drawable-xxhdpi/ic_bookmarks.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxhdpi/ic_globe.png b/amethyst/src/main/res/drawable-xxhdpi/ic_globe.png deleted file mode 100644 index 3e4d76b9b..000000000 Binary files a/amethyst/src/main/res/drawable-xxhdpi/ic_globe.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxhdpi/ic_key.png b/amethyst/src/main/res/drawable-xxhdpi/ic_key.png deleted file mode 100644 index e0cdfef0a..000000000 Binary files a/amethyst/src/main/res/drawable-xxhdpi/ic_key.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxhdpi/ic_logout.png b/amethyst/src/main/res/drawable-xxhdpi/ic_logout.png deleted file mode 100644 index c19029b20..000000000 Binary files a/amethyst/src/main/res/drawable-xxhdpi/ic_logout.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxhdpi/ic_profile.png b/amethyst/src/main/res/drawable-xxhdpi/ic_profile.png deleted file mode 100644 index 118d4eb78..000000000 Binary files a/amethyst/src/main/res/drawable-xxhdpi/ic_profile.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxhdpi/ic_security.png b/amethyst/src/main/res/drawable-xxhdpi/ic_security.png deleted file mode 100644 index dba255c73..000000000 Binary files a/amethyst/src/main/res/drawable-xxhdpi/ic_security.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxhdpi/ic_theme.png b/amethyst/src/main/res/drawable-xxhdpi/ic_theme.png deleted file mode 100644 index d58f977f6..000000000 Binary files a/amethyst/src/main/res/drawable-xxhdpi/ic_theme.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxhdpi/ic_topics.png b/amethyst/src/main/res/drawable-xxhdpi/ic_topics.png deleted file mode 100644 index d65cc49b3..000000000 Binary files a/amethyst/src/main/res/drawable-xxhdpi/ic_topics.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxhdpi/ic_trends.png b/amethyst/src/main/res/drawable-xxhdpi/ic_trends.png deleted file mode 100644 index 858746bba..000000000 Binary files a/amethyst/src/main/res/drawable-xxhdpi/ic_trends.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxhdpi/ic_verified.png b/amethyst/src/main/res/drawable-xxhdpi/ic_verified.png deleted file mode 100644 index e52a538bc..000000000 Binary files a/amethyst/src/main/res/drawable-xxhdpi/ic_verified.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxhdpi/ic_verified_transparent.png b/amethyst/src/main/res/drawable-xxhdpi/ic_verified_transparent.png deleted file mode 100644 index 76f539089..000000000 Binary files a/amethyst/src/main/res/drawable-xxhdpi/ic_verified_transparent.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxxhdpi/ic_bookmarks.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_bookmarks.png deleted file mode 100644 index 165366df4..000000000 Binary files a/amethyst/src/main/res/drawable-xxxhdpi/ic_bookmarks.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxxhdpi/ic_globe.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_globe.png deleted file mode 100644 index 4062798a8..000000000 Binary files a/amethyst/src/main/res/drawable-xxxhdpi/ic_globe.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxxhdpi/ic_profile.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_profile.png deleted file mode 100644 index ee8bcf94f..000000000 Binary files a/amethyst/src/main/res/drawable-xxxhdpi/ic_profile.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxxhdpi/ic_theme.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_theme.png deleted file mode 100644 index 432b8953f..000000000 Binary files a/amethyst/src/main/res/drawable-xxxhdpi/ic_theme.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxxhdpi/ic_topics.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_topics.png deleted file mode 100644 index c40d9f9a4..000000000 Binary files a/amethyst/src/main/res/drawable-xxxhdpi/ic_topics.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxxhdpi/ic_trends.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_trends.png deleted file mode 100644 index b7a948c49..000000000 Binary files a/amethyst/src/main/res/drawable-xxxhdpi/ic_trends.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxxhdpi/ic_verified.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_verified.png deleted file mode 100644 index 947c365d7..000000000 Binary files a/amethyst/src/main/res/drawable-xxxhdpi/ic_verified.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable-xxxhdpi/ic_verified_transparent.png b/amethyst/src/main/res/drawable-xxxhdpi/ic_verified_transparent.png deleted file mode 100644 index 8213c188e..000000000 Binary files a/amethyst/src/main/res/drawable-xxxhdpi/ic_verified_transparent.png and /dev/null differ diff --git a/amethyst/src/main/res/drawable/following.xml b/amethyst/src/main/res/drawable/following.xml deleted file mode 100644 index 60c2c4395..000000000 --- a/amethyst/src/main/res/drawable/following.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - diff --git a/amethyst/src/main/res/drawable/ic_settings.xml b/amethyst/src/main/res/drawable/ic_settings.xml deleted file mode 100644 index f783dd69b..000000000 --- a/amethyst/src/main/res/drawable/ic_settings.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/amethyst/src/main/res/drawable/lyrics_off.xml b/amethyst/src/main/res/drawable/lyrics_off.xml deleted file mode 100644 index 763ec6fc1..000000000 --- a/amethyst/src/main/res/drawable/lyrics_off.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - diff --git a/amethyst/src/main/res/drawable/lyrics_on.xml b/amethyst/src/main/res/drawable/lyrics_on.xml deleted file mode 100644 index c4a17de8b..000000000 --- a/amethyst/src/main/res/drawable/lyrics_on.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/amethyst/src/main/res/drawable/manage_accounts.xml b/amethyst/src/main/res/drawable/manage_accounts.xml deleted file mode 100644 index 734c70559..000000000 --- a/amethyst/src/main/res/drawable/manage_accounts.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - diff --git a/amethyst/src/main/res/drawable/x.xml b/amethyst/src/main/res/drawable/x.xml deleted file mode 100644 index 5548bf909..000000000 --- a/amethyst/src/main/res/drawable/x.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file