diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e112da23a..15cddc9e1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,9 +9,8 @@ android:allowBackup="true" android:dataExtractionRules="@xml/data_extraction_rules" android:fullBackupContent="@xml/backup_rules" - android:icon="@drawable/amethyst_logo" + android:icon="@drawable/amethyst" android:label="@string/app_name" - android:roundIcon="@drawable/amethyst_logo" android:enableOnBackInvokedCallback="true" android:supportsRtl="true" android:theme="@style/Theme.Amethyst" @@ -19,7 +18,6 @@ diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt index bd302b093..c8ddbcf83 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/navigation/AppTopBar.kt @@ -38,13 +38,10 @@ import kotlinx.coroutines.launch @Composable fun AppTopBar(navController: NavHostController, scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) { - - when (currentRoute(navController)) { //Route.Profile.route -> TopBarWithBackButton(navController) else -> MainTopBar(scaffoldState, accountViewModel) } - } @Composable @@ -77,14 +74,13 @@ fun MainTopBar(scaffoldState: ScaffoldState, accountViewModel: AccountViewModel) } ) { Icon( - painter = painterResource(R.drawable.ic_amethyst), + painter = painterResource(R.drawable.amethyst), null, - modifier = Modifier.size(32.dp), - tint = MaterialTheme.colors.primary + modifier = Modifier.size(40.dp), + tint = Color.Unspecified ) } } - }, navigationIcon = { IconButton( diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt index b6446afeb..2118f6d49 100644 --- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt +++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/loggedOff/LoginScreen.kt @@ -70,7 +70,7 @@ fun LoginPage(accountViewModel: AccountStateViewModel) { var errorMessage by remember { mutableStateOf("") } Image( - painterResource(id = R.drawable.amethyst_logo), + painterResource(id = R.drawable.amethyst), contentDescription = "App Logo", modifier = Modifier.size(300.dp), contentScale = ContentScale.Inside diff --git a/app/src/main/res/drawable-hdpi/ic_amethyst.png b/app/src/main/res/drawable-hdpi/ic_amethyst.png deleted file mode 100644 index 813f42f7f..000000000 Binary files a/app/src/main/res/drawable-hdpi/ic_amethyst.png and /dev/null differ diff --git a/app/src/main/res/drawable-mdpi/ic_amethyst.png b/app/src/main/res/drawable-mdpi/ic_amethyst.png deleted file mode 100644 index 32891ab13..000000000 Binary files a/app/src/main/res/drawable-mdpi/ic_amethyst.png and /dev/null differ diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index 2b068d114..000000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-xhdpi/ic_amethyst.png b/app/src/main/res/drawable-xhdpi/ic_amethyst.png deleted file mode 100644 index 21f7a7d2e..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_amethyst.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_amethyst.png b/app/src/main/res/drawable-xxhdpi/ic_amethyst.png deleted file mode 100644 index 0fa65e03a..000000000 Binary files a/app/src/main/res/drawable-xxhdpi/ic_amethyst.png and /dev/null differ diff --git a/app/src/main/res/drawable/amethyst.xml b/app/src/main/res/drawable/amethyst.xml new file mode 100644 index 000000000..f983ac83e --- /dev/null +++ b/app/src/main/res/drawable/amethyst.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 07d5da9cb..000000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml deleted file mode 100644 index eca70cfe5..000000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index eca70cfe5..000000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp deleted file mode 100644 index c209e78ec..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp deleted file mode 100644 index b2dfe3d1b..000000000 Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp deleted file mode 100644 index 4f0f1d64e..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp deleted file mode 100644 index 62b611da0..000000000 Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp deleted file mode 100644 index 948a3070f..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp deleted file mode 100644 index 1b9a6956b..000000000 Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp deleted file mode 100644 index 28d4b77f9..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9287f5083..000000000 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp deleted file mode 100644 index aa7d6427e..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp deleted file mode 100644 index 9126ae37c..000000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and /dev/null differ diff --git a/docs/design/Amethyst Assets.eps b/docs/design/Amethyst Assets.eps new file mode 100644 index 000000000..d626401e4 Binary files /dev/null and b/docs/design/Amethyst Assets.eps differ diff --git a/docs/design/Amethyst Assets.svg b/docs/design/Amethyst Assets.svg new file mode 100644 index 000000000..cdc2cdeed --- /dev/null +++ b/docs/design/Amethyst Assets.svg @@ -0,0 +1,140 @@ + + + + diff --git a/docs/design/Amethyst Visual Identity.pdf b/docs/design/Amethyst Visual Identity.pdf new file mode 100644 index 000000000..b092244ea Binary files /dev/null and b/docs/design/Amethyst Visual Identity.pdf differ diff --git a/app/src/main/res/drawable-xxxhdpi/amethyst_logo.png b/docs/design/Old Logo/amethyst_logo.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/amethyst_logo.png rename to docs/design/Old Logo/amethyst_logo.png diff --git a/app/src/main/res/drawable-xxxhdpi/ic_amethyst.png b/docs/design/Old Logo/ic_amethyst.png similarity index 100% rename from app/src/main/res/drawable-xxxhdpi/ic_amethyst.png rename to docs/design/Old Logo/ic_amethyst.png diff --git a/docs/design/amethyst.svg b/docs/design/amethyst.svg new file mode 100644 index 000000000..a356c3b01 --- /dev/null +++ b/docs/design/amethyst.svg @@ -0,0 +1,106 @@ + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + +