diff --git a/android/app/src/main/AndroidManifest.xml b/android/app/src/main/AndroidManifest.xml index 74451ea2..0d41c381 100644 --- a/android/app/src/main/AndroidManifest.xml +++ b/android/app/src/main/AndroidManifest.xml @@ -6,6 +6,7 @@ android:name=".LogseqApplication" android:allowBackup="false" android:icon="@mipmap/ic_launcher" + android:roundIcon="@mipmap/ic_launcher_round" android:label="Logseq" android:networkSecurityConfig="@xml/network_security_config" android:theme="@style/LaunchTheme"> diff --git a/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml new file mode 100644 index 00000000..c7bd21db --- /dev/null +++ b/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/ic_launcher_background.xml b/android/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 00000000..d5fccc53 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/android/app/src/main/res/drawable/ic_launcher_foreground.xml b/android/app/src/main/res/drawable/ic_launcher_foreground.xml deleted file mode 100644 index 74a0a73b..00000000 --- a/android/app/src/main/res/drawable/ic_launcher_foreground.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/android/app/src/main/res/drawable/ic_launcher_monochrome.xml b/android/app/src/main/res/drawable/ic_launcher_monochrome.xml deleted file mode 100644 index e0506c96..00000000 --- a/android/app/src/main/res/drawable/ic_launcher_monochrome.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index c78bee3b..0aa82aa1 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,9 @@ - - - - + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index c78bee3b..0aa82aa1 100644 --- a/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,9 @@ - - - - + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png index 3ffa4250..dbb186e0 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png index 17da051f..4a6cd842 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png index dedaca53..4a6cd842 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png index dedaca53..fe164014 100644 Binary files a/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 00000000..7073bb76 Binary files /dev/null and b/android/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png new file mode 100644 index 00000000..c159beaa Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher_background.png new file mode 100644 index 00000000..7bdde2a7 Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher_foreground.png new file mode 100644 index 00000000..7bdde2a7 Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png new file mode 100644 index 00000000..429442bf Binary files /dev/null and b/android/app/src/main/res/mipmap-ldpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png index 68117cb0..0db78ffa 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png index 7fe601e6..2a74148f 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png index fc23b737..2a74148f 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png index fc23b737..7643cced 100644 Binary files a/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 00000000..5fc932f6 Binary files /dev/null and b/android/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png index 45b6b21e..2dcf24ea 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png index 208c859b..0736e682 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png index e6419c0f..0736e682 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png index e6419c0f..3012190b 100644 Binary files a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 00000000..66e1a364 Binary files /dev/null and b/android/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png index ea17b7ec..c8c31165 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png index e27bba15..8d7c2f22 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png index 9eed7e4c..8d7c2f22 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png index 9eed7e4c..47c73e8a 100644 Binary files a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..c21b4699 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png index a3399877..fc96a60c 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png index 7d3f84bb..5beeac1f 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_background.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png index c9710b45..5beeac1f 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png index c9710b45..d1e80f66 100644 Binary files a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_monochrome.png differ diff --git a/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 00000000..2bc57027 Binary files /dev/null and b/android/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml index f0bf81bc..e3b5505a 100644 --- a/android/app/src/main/res/values/colors.xml +++ b/android/app/src/main/res/values/colors.xml @@ -1,6 +1,5 @@ - #5069C6 #F8F7FB #1B1B1F #5F5E66 diff --git a/android/app/src/main/res/values/ic_launcher_background.xml b/android/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 00000000..c5d5899f --- /dev/null +++ b/android/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/android/settings.gradle.kts b/android/settings.gradle.kts index 17a5175e..46a411bd 100644 --- a/android/settings.gradle.kts +++ b/android/settings.gradle.kts @@ -12,11 +12,12 @@ pluginManagement { // examples/components/android app, mirroring how apple/ path-deps // ../lui/platform/apple. The module resolves plugins from this build's // classpath (AGP 9 + builtInKotlin). -val luiModuleDir = listOf( - File(rootDir, "../../lui/platform/android/lui"), - File(rootDir, "../duniverse/lui/platform/android/lui"), -).firstOrNull { it.isDirectory && File(it, "build.gradle.kts").isFile } -require(luiModuleDir != null) { +val luiModuleDir = requireNotNull( + listOf( + File(rootDir, "../../lui/platform/android/lui"), + File(rootDir, "../duniverse/lui/platform/android/lui"), + ).firstOrNull { it.isDirectory && File(it, "build.gradle.kts").isFile } +) { "Expected a logseq/lui checkout at ../lui or duniverse/lui with platform/android/lui" } diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png index 43e5ea66..bab98a97 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png index 43e5ea66..bab98a97 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@2x~ipad.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png index 0d154a7a..e56dcb5a 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20@3x.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png index ce3a1273..2edae4e0 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-20~ipad.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png index 16cc714f..1f0e847c 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png index bd80df34..645a940c 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png index bd80df34..645a940c 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@2x~ipad.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png index 53b61696..8c4c0bb1 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29@3x.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png index 16cc714f..1f0e847c 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-29~ipad.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png index fc3fde74..266346fd 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png index fc3fde74..266346fd 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@2x~ipad.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png index d5e965cd..9f9dff08 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40@3x.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png index 43e5ea66..bab98a97 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-40~ipad.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png index 7302273d..4b44f345 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon-83.5@2x~ipad.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png index d5e965cd..9f9dff08 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@2x.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png index 5180269f..added6a7 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@2x~ipad.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png index f1cfa19e..f26beff3 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon@3x.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png index e3a253fb..f24fcb4f 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon~ios-marketing.png differ diff --git a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png index 41c7ae85..9b872fd4 100644 Binary files a/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png and b/apple/App/Assets.xcassets/AppIcon.appiconset/AppIcon~ipad.png differ