diff --git a/LOGO.md b/LOGO.md index 13b6127..2d2d4ca 100644 --- a/LOGO.md +++ b/LOGO.md @@ -1,4 +1,4 @@ -# MemosApp Logo Specification +# Nikki Logo Specification ## Concept diff --git a/androidApp/src/main/AndroidManifest.xml b/androidApp/src/main/AndroidManifest.xml index 71225df..1ec8ba1 100644 --- a/androidApp/src/main/AndroidManifest.xml +++ b/androidApp/src/main/AndroidManifest.xml @@ -18,12 +18,12 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.MemosApp"> + android:theme="@style/Theme.Nikki"> + android:theme="@style/Theme.Nikki"> diff --git a/androidApp/src/main/res/values-night/themes.xml b/androidApp/src/main/res/values-night/themes.xml index bcaec65..2f33f85 100644 --- a/androidApp/src/main/res/values-night/themes.xml +++ b/androidApp/src/main/res/values-night/themes.xml @@ -1,5 +1,5 @@ - diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index b7c68c5..0ec2f8b 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - Memos App + Nikki \ No newline at end of file diff --git a/androidApp/src/main/res/values/themes.xml b/androidApp/src/main/res/values/themes.xml index bcaec65..2f33f85 100644 --- a/androidApp/src/main/res/values/themes.xml +++ b/androidApp/src/main/res/values/themes.xml @@ -1,5 +1,5 @@ - diff --git a/composeApp/src/androidMain/kotlin/com/avinal/memos/notifications/TaskNotificationManager.kt b/composeApp/src/androidMain/kotlin/com/avinal/memos/notifications/TaskNotificationManager.kt index 76ca4c9..0c52deb 100644 --- a/composeApp/src/androidMain/kotlin/com/avinal/memos/notifications/TaskNotificationManager.kt +++ b/composeApp/src/androidMain/kotlin/com/avinal/memos/notifications/TaskNotificationManager.kt @@ -84,7 +84,7 @@ object TaskNotificationManager { .setContentTitle(title) .setContentText(dueLabel) .setStyle(NotificationCompat.BigTextStyle().bigText(bigText)) - .setSubText(when (priority) { 1 -> "p1 urgent"; 2 -> "p2 medium"; 3 -> "p3 low"; else -> "memos" }) + .setSubText(when (priority) { 1 -> "p1 urgent"; 2 -> "p2 medium"; 3 -> "p3 low"; else -> "nikki" }) .setWhen(System.currentTimeMillis()) .setShowWhen(true) .setPriority(notifPriority) diff --git a/composeApp/src/commonMain/kotlin/com/avinal/memos/App.kt b/composeApp/src/commonMain/kotlin/com/avinal/memos/App.kt index 9b88416..bfca69d 100644 --- a/composeApp/src/commonMain/kotlin/com/avinal/memos/App.kt +++ b/composeApp/src/commonMain/kotlin/com/avinal/memos/App.kt @@ -5,7 +5,7 @@ import coil3.ImageLoader import coil3.compose.setSingletonImageLoaderFactory import coil3.network.ktor3.KtorNetworkFetcherFactory import com.avinal.memos.ui.navigation.AppNavHost -import com.avinal.memos.ui.theme.MemosAppTheme +import com.avinal.memos.ui.theme.NikkiTheme import com.avinal.memos.util.LocalAppDependencies @Composable @@ -20,7 +20,7 @@ fun App() { .build() } - MemosAppTheme { + NikkiTheme { AppNavHost(deps) } } diff --git a/composeApp/src/commonMain/kotlin/com/avinal/memos/ui/settings/SettingsScreen.kt b/composeApp/src/commonMain/kotlin/com/avinal/memos/ui/settings/SettingsScreen.kt index 9a5af0e..51d7290 100644 --- a/composeApp/src/commonMain/kotlin/com/avinal/memos/ui/settings/SettingsScreen.kt +++ b/composeApp/src/commonMain/kotlin/com/avinal/memos/ui/settings/SettingsScreen.kt @@ -215,7 +215,7 @@ fun SettingsScreen( fontSize = 15.sp, color = accent, modifier = Modifier.clickable { viewModel.getExportJson { json -> - saveFile("memos-backup.json", json) + saveFile("nikki-backup.json", json) } }.padding(vertical = 6.dp), ) @@ -231,16 +231,29 @@ fun SettingsScreen( Spacer(Modifier.height(36.dp)) SectionHeader("about") - Column( + Row( modifier = Modifier.fillMaxWidth().padding(vertical = 12.dp), - horizontalAlignment = Alignment.CenterHorizontally, + verticalAlignment = Alignment.CenterVertically, + horizontalArrangement = Arrangement.spacedBy(16.dp), ) { - AppLogo(size = 64f) - Spacer(Modifier.height(10.dp)) - Text("memosapp", fontSize = 18.sp, fontWeight = FontWeight.Light, color = MaterialTheme.colorScheme.onBackground) - Text("version 1.0.0", fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + AppLogo(size = 96f) + Column { + Text("nikki", fontSize = 24.sp, fontWeight = FontWeight.Light, color = MaterialTheme.colorScheme.onBackground) + Text("v1.0.0", fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + Spacer(Modifier.height(4.dp)) + Text("a memos client with todoist-style tasks", fontSize = 13.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + Spacer(Modifier.height(2.dp)) + Text("by avinal kumar", fontSize = 12.sp, color = MaterialTheme.colorScheme.onSurfaceVariant) + } } + Spacer(Modifier.height(8.dp)) + Text( + "report issues at github.com/avinal/nikki", + fontSize = 12.sp, + color = accent, + ) + Spacer(Modifier.height(36.dp)) Text( diff --git a/composeApp/src/commonMain/kotlin/com/avinal/memos/ui/theme/Theme.kt b/composeApp/src/commonMain/kotlin/com/avinal/memos/ui/theme/Theme.kt index d6b0f8f..9aac70c 100644 --- a/composeApp/src/commonMain/kotlin/com/avinal/memos/ui/theme/Theme.kt +++ b/composeApp/src/commonMain/kotlin/com/avinal/memos/ui/theme/Theme.kt @@ -9,7 +9,7 @@ import androidx.compose.ui.graphics.Color import com.avinal.memos.util.LocalAppDependencies @Composable -fun MemosAppTheme(content: @Composable () -> Unit) { +fun NikkiTheme(content: @Composable () -> Unit) { val deps = LocalAppDependencies.current val themeName by deps.tokenStore.theme.collectAsState(initial = "DARK") val accentName by deps.tokenStore.accentColor.collectAsState(initial = "Cobalt")