diff --git a/apps/android/.gitignore b/apps/android/.gitignore deleted file mode 100644 index 9ddf412fc2..0000000000 --- a/apps/android/.gitignore +++ /dev/null @@ -1,20 +0,0 @@ -*.iml -.gradle -/local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml -/.idea/deploymentTargetDropDown.xml -/.idea/misc.xml -/.idea/uiDesigner.xml -/.idea/kotlinc.xml -.DS_Store -/build -/captures -.externalNativeBuild -.cxx -local.properties -app/src/main/cpp/libs/ diff --git a/apps/android/.idea/.name b/apps/android/.idea/.name deleted file mode 100644 index ccb58e52e1..0000000000 --- a/apps/android/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -SimpleX \ No newline at end of file diff --git a/apps/android/.idea/compiler.xml b/apps/android/.idea/compiler.xml deleted file mode 100644 index fb7f4a8a46..0000000000 --- a/apps/android/.idea/compiler.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/apps/android/.idea/gradle.xml b/apps/android/.idea/gradle.xml deleted file mode 100644 index a2d7c21338..0000000000 --- a/apps/android/.idea/gradle.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/apps/android/.idea/inspectionProfiles/Project_Default.xml b/apps/android/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 28422375b6..0000000000 --- a/apps/android/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - \ No newline at end of file diff --git a/apps/android/.idea/vcs.xml b/apps/android/.idea/vcs.xml deleted file mode 100644 index b2bdec2d71..0000000000 --- a/apps/android/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/apps/ios/SimpleX.xcodeproj/project.pbxproj b/apps/ios/SimpleX.xcodeproj/project.pbxproj index 14224c3efa..fdb2d5412b 100644 --- a/apps/ios/SimpleX.xcodeproj/project.pbxproj +++ b/apps/ios/SimpleX.xcodeproj/project.pbxproj @@ -253,7 +253,7 @@ 18415B08031E8FB0F7FC27F9 /* CallViewRenderers.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CallViewRenderers.swift; sourceTree = ""; }; 18415DAAAD1ADBEDB0EDA852 /* VideoPlayerView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = VideoPlayerView.swift; sourceTree = ""; }; 18415FD2E36F13F596A45BB4 /* CIVideoView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = CIVideoView.swift; sourceTree = ""; }; - 3C714779281C0F6800CB4D4B /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../android/app/src/main/assets/www; sourceTree = ""; }; + 3C714779281C0F6800CB4D4B /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; name = www; path = ../multiplatform/android/src/main/assets/www; sourceTree = ""; }; 3C8C548828133C84000A3EC7 /* PasteToConnectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = PasteToConnectView.swift; sourceTree = ""; }; 3CDBCF4127FAE51000354CDD /* ComposeLinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ComposeLinkView.swift; sourceTree = ""; }; 3CDBCF4727FF621E00354CDD /* CILinkView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CILinkView.swift; sourceTree = ""; }; diff --git a/apps/multiplatform/.gitignore b/apps/multiplatform/.gitignore new file mode 100644 index 0000000000..5012dd1824 --- /dev/null +++ b/apps/multiplatform/.gitignore @@ -0,0 +1,20 @@ +*.iml +.gradle +/local.properties +/.idea +!/.idea/codeStyles/* +.DS_Store +/build +/captures +.externalNativeBuild +.cxx +local.properties +common/src/commonMain/cpp/android/libs/ +common/src/commonMain/cpp/desktop/libs/ +common/src/commonMain/resources/libs/ +android/src/main/cpp/libs/ +android/build +android/release +common/build +desktop/build +release \ No newline at end of file diff --git a/apps/android/.idea/codeStyles/Project.xml b/apps/multiplatform/.idea/codeStyles/Project.xml similarity index 100% rename from apps/android/.idea/codeStyles/Project.xml rename to apps/multiplatform/.idea/codeStyles/Project.xml diff --git a/apps/android/.idea/codeStyles/codeStyleConfig.xml b/apps/multiplatform/.idea/codeStyles/codeStyleConfig.xml similarity index 100% rename from apps/android/.idea/codeStyles/codeStyleConfig.xml rename to apps/multiplatform/.idea/codeStyles/codeStyleConfig.xml diff --git a/apps/android/README.md b/apps/multiplatform/README.md similarity index 100% rename from apps/android/README.md rename to apps/multiplatform/README.md diff --git a/apps/android/app/.gitignore b/apps/multiplatform/android/.gitignore similarity index 100% rename from apps/android/app/.gitignore rename to apps/multiplatform/android/.gitignore diff --git a/apps/android/app/build.gradle b/apps/multiplatform/android/build.gradle similarity index 96% rename from apps/android/app/build.gradle rename to apps/multiplatform/android/build.gradle index ef4bfdbe6e..6d7620da17 100644 --- a/apps/android/app/build.gradle +++ b/apps/multiplatform/android/build.gradle @@ -232,9 +232,9 @@ tasks.register("compressApk") { } if (project.properties['android.injected.signing.key.alias'] != null && buildType == 'release') { - new File(outputDir, "app-release.apk").renameTo(new File(outputDir, "simplex.apk")) - new File(outputDir, "app-armeabi-v7a-release.apk").renameTo(new File(outputDir, "simplex-armv7a.apk")) - new File(outputDir, "app-arm64-v8a-release.apk").renameTo(new File(outputDir, "simplex.apk")) + new File(outputDir, "android-release.apk").renameTo(new File(outputDir, "simplex.apk")) + new File(outputDir, "android-armeabi-v7a-release.apk").renameTo(new File(outputDir, "simplex-armv7a.apk")) + new File(outputDir, "android-arm64-v8a-release.apk").renameTo(new File(outputDir, "simplex.apk")) } // View all gradle properties set diff --git a/apps/android/app/proguard-rules.pro b/apps/multiplatform/android/proguard-rules.pro similarity index 100% rename from apps/android/app/proguard-rules.pro rename to apps/multiplatform/android/proguard-rules.pro diff --git a/apps/android/app/src/androidTest/java/chat/simplex/app/ExampleInstrumentedTest.kt b/apps/multiplatform/android/src/androidTest/java/chat/simplex/app/ExampleInstrumentedTest.kt similarity index 100% rename from apps/android/app/src/androidTest/java/chat/simplex/app/ExampleInstrumentedTest.kt rename to apps/multiplatform/android/src/androidTest/java/chat/simplex/app/ExampleInstrumentedTest.kt diff --git a/apps/android/app/src/main/AndroidManifest.xml b/apps/multiplatform/android/src/main/AndroidManifest.xml similarity index 100% rename from apps/android/app/src/main/AndroidManifest.xml rename to apps/multiplatform/android/src/main/AndroidManifest.xml diff --git a/apps/android/app/src/main/assets/www/README.md b/apps/multiplatform/android/src/main/assets/www/README.md similarity index 100% rename from apps/android/app/src/main/assets/www/README.md rename to apps/multiplatform/android/src/main/assets/www/README.md diff --git a/apps/android/app/src/main/assets/www/call.html b/apps/multiplatform/android/src/main/assets/www/call.html similarity index 100% rename from apps/android/app/src/main/assets/www/call.html rename to apps/multiplatform/android/src/main/assets/www/call.html diff --git a/apps/android/app/src/main/assets/www/call.js b/apps/multiplatform/android/src/main/assets/www/call.js similarity index 100% rename from apps/android/app/src/main/assets/www/call.js rename to apps/multiplatform/android/src/main/assets/www/call.js diff --git a/apps/android/app/src/main/assets/www/lz-string.min.js b/apps/multiplatform/android/src/main/assets/www/lz-string.min.js similarity index 100% rename from apps/android/app/src/main/assets/www/lz-string.min.js rename to apps/multiplatform/android/src/main/assets/www/lz-string.min.js diff --git a/apps/android/app/src/main/assets/www/style.css b/apps/multiplatform/android/src/main/assets/www/style.css similarity index 100% rename from apps/android/app/src/main/assets/www/style.css rename to apps/multiplatform/android/src/main/assets/www/style.css diff --git a/apps/android/app/src/main/cpp/CMakeLists.txt b/apps/multiplatform/android/src/main/cpp/CMakeLists.txt similarity index 100% rename from apps/android/app/src/main/cpp/CMakeLists.txt rename to apps/multiplatform/android/src/main/cpp/CMakeLists.txt diff --git a/apps/android/app/src/main/cpp/simplex-api.c b/apps/multiplatform/android/src/main/cpp/simplex-api.c similarity index 100% rename from apps/android/app/src/main/cpp/simplex-api.c rename to apps/multiplatform/android/src/main/cpp/simplex-api.c diff --git a/apps/android/app/src/main/icon-playstore.png b/apps/multiplatform/android/src/main/icon-playstore.png similarity index 100% rename from apps/android/app/src/main/icon-playstore.png rename to apps/multiplatform/android/src/main/icon-playstore.png diff --git a/apps/android/app/src/main/icon_dark_blue-playstore.png b/apps/multiplatform/android/src/main/icon_dark_blue-playstore.png similarity index 100% rename from apps/android/app/src/main/icon_dark_blue-playstore.png rename to apps/multiplatform/android/src/main/icon_dark_blue-playstore.png diff --git a/apps/android/app/src/main/java/chat/simplex/app/BackupAgent.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/BackupAgent.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/BackupAgent.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/BackupAgent.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/MainActivity.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/MainActivity.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/SimplexApp.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexApp.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/SimplexService.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/SimplexService.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/SimplexService.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/model/ChatModel.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/model/ChatModel.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/model/ChatModel.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/NtfManager.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/model/NtfManager.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/model/NtfManager.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/model/NtfManager.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/model/SimpleXAPI.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/model/SimpleXAPI.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/model/SimpleXAPI.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Color.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/ui/theme/Color.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/ui/theme/Color.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/ui/theme/Color.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Shape.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/ui/theme/Shape.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/ui/theme/Shape.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/ui/theme/Shape.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Theme.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/ui/theme/Theme.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/ui/theme/Theme.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/ui/theme/Theme.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/ui/theme/ThemeManager.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/ui/theme/ThemeManager.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/ui/theme/ThemeManager.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/ui/theme/ThemeManager.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/ui/theme/Type.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/ui/theme/Type.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/ui/theme/Type.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/ui/theme/Type.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/SplashView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/SplashView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/SplashView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/SplashView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/TerminalView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/TerminalView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/TerminalView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/TerminalView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/WelcomeView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/WelcomeView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/WelcomeView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/WelcomeView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/call/CallManager.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallManager.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/call/CallManager.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallManager.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/call/CallView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/call/CallView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/CallView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/IncomingCallActivity.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallAlertView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/IncomingCallAlertView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/call/IncomingCallAlertView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/IncomingCallAlertView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/call/SoundPlayer.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/SoundPlayer.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/call/SoundPlayer.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/SoundPlayer.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/call/WebRTC.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/WebRTC.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/call/WebRTC.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/call/WebRTC.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatInfoView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ChatInfoView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatInfoView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ChatInfoView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatItemInfoView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ChatItemInfoView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatItemInfoView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ChatItemInfoView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ChatView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/ChatView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ChatView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeFileView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ComposeFileView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeFileView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ComposeFileView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeImageView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ComposeImageView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeImageView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ComposeImageView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ComposeView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ComposeView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeVoiceView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ComposeVoiceView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/ComposeVoiceView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ComposeVoiceView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ContactPreferences.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ContextItemView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ContextItemView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/ContextItemView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ContextItemView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/ScanCodeView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ScanCodeView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/ScanCodeView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/ScanCodeView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/SendMsgView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/SendMsgView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/SendMsgView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/SendMsgView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/VerifyCodeView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/VerifyCodeView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/VerifyCodeView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/VerifyCodeView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/AddGroupMembersView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupChatInfoView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupLinkView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupLinkView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupLinkView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupLinkView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupMemberInfoView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupPreferences.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupPreferences.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupPreferences.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupPreferences.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupProfileView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupProfileView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/group/GroupProfileView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/GroupProfileView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/group/WelcomeMessageView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/WelcomeMessageView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/group/WelcomeMessageView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/group/WelcomeMessageView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CICallItemView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CICallItemView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CICallItemView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CICallItemView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIChatFeatureView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIChatFeatureView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIChatFeatureView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIChatFeatureView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIEventView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIEventView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIEventView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIEventView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIFeaturePreferenceView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIFeaturePreferenceView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIFeaturePreferenceView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIFeaturePreferenceView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIFileView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIFileView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIFileView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIFileView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIGroupInvitationView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIGroupInvitationView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIGroupInvitationView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIGroupInvitationView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIImageView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIImageView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIImageView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIImageView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIInvalidJSONView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIInvalidJSONView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIInvalidJSONView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIInvalidJSONView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIMetaView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIMetaView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIMetaView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIMetaView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIRcvDecryptionError.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIRcvDecryptionError.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIRcvDecryptionError.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIRcvDecryptionError.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIVideoView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIVideoView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIVideoView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIVideoView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIVoiceView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIVoiceView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/CIVoiceView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/CIVoiceView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/ChatItemView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/DeletedItemView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/DeletedItemView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/DeletedItemView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/DeletedItemView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/EmojiItemView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/EmojiItemView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/EmojiItemView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/EmojiItemView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/FramedItemView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ImageFullScreenView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/ImageFullScreenView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/ImageFullScreenView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/ImageFullScreenView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/IntegrityErrorItemView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/IntegrityErrorItemView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/IntegrityErrorItemView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/IntegrityErrorItemView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/MarkedDeletedItemView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/MarkedDeletedItemView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/MarkedDeletedItemView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/MarkedDeletedItemView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chat/item/TextItemView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/TextItemView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chat/item/TextItemView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chat/item/TextItemView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ChatHelpView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListNavLinkView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ChatListNavLinkView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListNavLinkView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ChatListNavLinkView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ChatListView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatPreviewView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ChatPreviewView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ChatPreviewView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ChatPreviewView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ContactConnectionView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ContactConnectionView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ContactConnectionView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ContactConnectionView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ContactRequestView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ContactRequestView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ContactRequestView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ContactRequestView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ShareListNavLinkView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ShareListNavLinkView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ShareListNavLinkView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ShareListNavLinkView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ShareListView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ShareListView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chatlist/ShareListView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/ShareListView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/chatlist/UserPicker.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/UserPicker.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/chatlist/UserPicker.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/chatlist/UserPicker.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/database/ChatArchiveView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/database/ChatArchiveView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/database/ChatArchiveView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/database/ChatArchiveView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseEncryptionView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/database/DatabaseEncryptionView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseEncryptionView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/database/DatabaseEncryptionView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseErrorView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/database/DatabaseErrorView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseErrorView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/database/DatabaseErrorView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/database/DatabaseView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/database/DatabaseView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/database/DatabaseView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/AlertManager.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/AlertManager.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/AlertManager.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/AlertManager.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/AnimationUtils.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/AnimationUtils.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/AnimationUtils.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/AnimationUtils.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChatInfoImage.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/ChatInfoImage.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChatInfoImage.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/ChatInfoImage.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChooseAttachmentView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/ChooseAttachmentView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/ChooseAttachmentView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/ChooseAttachmentView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CloseSheetBar.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/CloseSheetBar.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/CloseSheetBar.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/CloseSheetBar.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/CustomIcons.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomTimePicker.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/CustomTimePicker.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/CustomTimePicker.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/CustomTimePicker.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DataClasses.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DataClasses.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/DataClasses.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DataClasses.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DatabaseUtils.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DatabaseUtils.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/DatabaseUtils.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DatabaseUtils.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultBasicTextField.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DefaultBasicTextField.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultBasicTextField.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DefaultBasicTextField.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultDropdownMenu.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DefaultDropdownMenu.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultDropdownMenu.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DefaultDropdownMenu.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultSwitch.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DefaultSwitch.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultSwitch.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DefaultSwitch.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultTopAppBar.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DefaultTopAppBar.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/DefaultTopAppBar.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/DefaultTopAppBar.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Enums.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/Enums.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/Enums.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/Enums.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ExposedDropDownSettingRow.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/ExposedDropDownSettingRow.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/ExposedDropDownSettingRow.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/ExposedDropDownSettingRow.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/GestureDetector.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/GestureDetector.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/GestureDetector.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/GestureDetector.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/GetImageView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/GetImageView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/GetImageView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/GetImageView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/LinkPreviews.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/LinkPreviews.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/LinkPreviews.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/LinkPreviews.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/LocalAuthentication.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/MessagesFetcherWorker.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/MessagesFetcherWorker.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/MessagesFetcherWorker.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/MessagesFetcherWorker.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/ModalView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/ModalView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/ModalView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/ModalView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Modifiers.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/Modifiers.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/Modifiers.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/Modifiers.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/RecAndPlay.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/RecAndPlay.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/RecAndPlay.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/RecAndPlay.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/SearchTextField.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/SearchTextField.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/SearchTextField.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/SearchTextField.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Section.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/Section.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/Section.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/Section.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Share.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/Share.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/Share.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/Share.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/SimpleButton.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/SimpleButton.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/SimpleButton.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/SimpleButton.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/TextEditor.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/TextEditor.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/TextEditor.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/TextEditor.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/Util.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/Util.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/Util.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/helpers/VideoPlayer.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/localauth/LocalAuthView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/localauth/LocalAuthView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/localauth/LocalAuthView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/localauth/LocalAuthView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/localauth/PasscodeView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/localauth/PasscodeView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/localauth/PasscodeView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/localauth/PasscodeView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/localauth/PasswordEntry.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/localauth/PasswordEntry.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/localauth/PasswordEntry.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/localauth/PasswordEntry.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/localauth/SetAppPasscodeView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/localauth/SetAppPasscodeView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/localauth/SetAppPasscodeView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/localauth/SetAppPasscodeView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactLearnMore.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/AddContactLearnMore.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactLearnMore.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/AddContactLearnMore.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/AddContactView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddGroupView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/AddGroupView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/newchat/AddGroupView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/AddGroupView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/ConnectViaLinkView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/ConnectViaLinkView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/newchat/ConnectViaLinkView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/ConnectViaLinkView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/ContactConnectionInfoView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/ContactConnectionInfoView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/newchat/ContactConnectionInfoView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/ContactConnectionInfoView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/CreateLinkView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/CreateLinkView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/newchat/CreateLinkView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/CreateLinkView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/NewChatSheet.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/NewChatSheet.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/newchat/NewChatSheet.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/NewChatSheet.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/PasteToConnect.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/PasteToConnect.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/newchat/PasteToConnect.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/PasteToConnect.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/QRCode.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/QRCode.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/newchat/QRCode.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/QRCode.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/QRCodeScanner.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/QRCodeScanner.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/newchat/QRCodeScanner.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/QRCodeScanner.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/newchat/ScanToConnectView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/ScanToConnectView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/newchat/ScanToConnectView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/newchat/ScanToConnectView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/CreateSimpleXAddress.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/HowItWorks.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/HowItWorks.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/onboarding/HowItWorks.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/HowItWorks.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/OnboardingView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/OnboardingView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/onboarding/OnboardingView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/OnboardingView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/SetNotificationsMode.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/SetNotificationsMode.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/onboarding/SetNotificationsMode.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/SetNotificationsMode.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/SimpleXInfo.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/SimpleXInfo.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/onboarding/SimpleXInfo.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/SimpleXInfo.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/onboarding/WhatsNewView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/WhatsNewView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/onboarding/WhatsNewView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/onboarding/WhatsNewView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/AdvancedNetworkSettings.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/AdvancedNetworkSettings.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/AdvancedNetworkSettings.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/AdvancedNetworkSettings.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Appearance.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/Appearance.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Appearance.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/Appearance.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/CallSettings.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/CallSettings.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/CallSettings.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/CallSettings.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Cryptor.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/Cryptor.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Cryptor.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/Cryptor.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/DeveloperView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/DeveloperView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/DeveloperView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/DeveloperView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/HelpView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/HelpView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/HelpView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/HelpView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/HiddenProfileView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/HiddenProfileView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/HiddenProfileView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/HiddenProfileView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/IncognitoView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/IncognitoView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/IncognitoView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/IncognitoView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/MarkdownHelpView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/MarkdownHelpView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/MarkdownHelpView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/MarkdownHelpView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NetworkAndServers.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/NetworkAndServers.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NetworkAndServers.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/NetworkAndServers.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NotificationsSettingsView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/NotificationsSettingsView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/NotificationsSettingsView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/NotificationsSettingsView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Preferences.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/Preferences.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/Preferences.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/Preferences.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/PrivacySettings.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/PrivacySettings.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/PrivacySettings.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/PrivacySettings.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ProtocolServerView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/ProtocolServerView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ProtocolServerView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/ProtocolServerView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ProtocolServersView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/ProtocolServersView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ProtocolServersView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/ProtocolServersView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/RTCServers.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/RTCServers.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/RTCServers.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/RTCServers.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ScanProtocolServer.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/ScanProtocolServer.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/ScanProtocolServer.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/ScanProtocolServer.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/SettingsView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressLearnMore.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/UserAddressLearnMore.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressLearnMore.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/UserAddressLearnMore.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/UserAddressView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfileView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/UserProfileView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfileView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/UserProfileView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfilesView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/UserProfilesView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/UserProfilesView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/UserProfilesView.kt diff --git a/apps/android/app/src/main/java/chat/simplex/app/views/usersettings/VersionInfoView.kt b/apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/VersionInfoView.kt similarity index 100% rename from apps/android/app/src/main/java/chat/simplex/app/views/usersettings/VersionInfoView.kt rename to apps/multiplatform/android/src/main/java/chat/simplex/app/views/usersettings/VersionInfoView.kt diff --git a/apps/android/app/src/main/res/drawable-hdpi/decentralized.png b/apps/multiplatform/android/src/main/res/drawable-hdpi/decentralized.png similarity index 100% rename from apps/android/app/src/main/res/drawable-hdpi/decentralized.png rename to apps/multiplatform/android/src/main/res/drawable-hdpi/decentralized.png diff --git a/apps/android/app/src/main/res/drawable-hdpi/decentralized_light.png b/apps/multiplatform/android/src/main/res/drawable-hdpi/decentralized_light.png similarity index 100% rename from apps/android/app/src/main/res/drawable-hdpi/decentralized_light.png rename to apps/multiplatform/android/src/main/res/drawable-hdpi/decentralized_light.png diff --git a/apps/android/app/src/main/res/drawable-hdpi/icon.png b/apps/multiplatform/android/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from apps/android/app/src/main/res/drawable-hdpi/icon.png rename to apps/multiplatform/android/src/main/res/drawable-hdpi/icon.png diff --git a/apps/android/app/src/main/res/drawable-hdpi/ntf_icon.png b/apps/multiplatform/android/src/main/res/drawable-hdpi/ntf_icon.png similarity index 100% rename from apps/android/app/src/main/res/drawable-hdpi/ntf_icon.png rename to apps/multiplatform/android/src/main/res/drawable-hdpi/ntf_icon.png diff --git a/apps/android/app/src/main/res/drawable-hdpi/ntf_service_icon.png b/apps/multiplatform/android/src/main/res/drawable-hdpi/ntf_service_icon.png similarity index 100% rename from apps/android/app/src/main/res/drawable-hdpi/ntf_service_icon.png rename to apps/multiplatform/android/src/main/res/drawable-hdpi/ntf_service_icon.png diff --git a/apps/android/app/src/main/res/drawable-hdpi/privacy.png b/apps/multiplatform/android/src/main/res/drawable-hdpi/privacy.png similarity index 100% rename from apps/android/app/src/main/res/drawable-hdpi/privacy.png rename to apps/multiplatform/android/src/main/res/drawable-hdpi/privacy.png diff --git a/apps/android/app/src/main/res/drawable-hdpi/shield.png b/apps/multiplatform/android/src/main/res/drawable-hdpi/shield.png similarity index 100% rename from apps/android/app/src/main/res/drawable-hdpi/shield.png rename to apps/multiplatform/android/src/main/res/drawable-hdpi/shield.png diff --git a/apps/android/app/src/main/res/drawable-mdpi/decentralized.png b/apps/multiplatform/android/src/main/res/drawable-mdpi/decentralized.png similarity index 100% rename from apps/android/app/src/main/res/drawable-mdpi/decentralized.png rename to apps/multiplatform/android/src/main/res/drawable-mdpi/decentralized.png diff --git a/apps/android/app/src/main/res/drawable-mdpi/decentralized_light.png b/apps/multiplatform/android/src/main/res/drawable-mdpi/decentralized_light.png similarity index 100% rename from apps/android/app/src/main/res/drawable-mdpi/decentralized_light.png rename to apps/multiplatform/android/src/main/res/drawable-mdpi/decentralized_light.png diff --git a/apps/android/app/src/main/res/drawable-mdpi/ntf_icon.png b/apps/multiplatform/android/src/main/res/drawable-mdpi/ntf_icon.png similarity index 100% rename from apps/android/app/src/main/res/drawable-mdpi/ntf_icon.png rename to apps/multiplatform/android/src/main/res/drawable-mdpi/ntf_icon.png diff --git a/apps/android/app/src/main/res/drawable-mdpi/ntf_service_icon.png b/apps/multiplatform/android/src/main/res/drawable-mdpi/ntf_service_icon.png similarity index 100% rename from apps/android/app/src/main/res/drawable-mdpi/ntf_service_icon.png rename to apps/multiplatform/android/src/main/res/drawable-mdpi/ntf_service_icon.png diff --git a/apps/android/app/src/main/res/drawable-mdpi/privacy.png b/apps/multiplatform/android/src/main/res/drawable-mdpi/privacy.png similarity index 100% rename from apps/android/app/src/main/res/drawable-mdpi/privacy.png rename to apps/multiplatform/android/src/main/res/drawable-mdpi/privacy.png diff --git a/apps/android/app/src/main/res/drawable-mdpi/shield.png b/apps/multiplatform/android/src/main/res/drawable-mdpi/shield.png similarity index 100% rename from apps/android/app/src/main/res/drawable-mdpi/shield.png rename to apps/multiplatform/android/src/main/res/drawable-mdpi/shield.png diff --git a/apps/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/apps/multiplatform/android/src/main/res/drawable-v24/ic_launcher_foreground.xml similarity index 100% rename from apps/android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml rename to apps/multiplatform/android/src/main/res/drawable-v24/ic_launcher_foreground.xml diff --git a/apps/android/app/src/main/res/drawable-xhdpi/decentralized.png b/apps/multiplatform/android/src/main/res/drawable-xhdpi/decentralized.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xhdpi/decentralized.png rename to apps/multiplatform/android/src/main/res/drawable-xhdpi/decentralized.png diff --git a/apps/android/app/src/main/res/drawable-xhdpi/decentralized_light.png b/apps/multiplatform/android/src/main/res/drawable-xhdpi/decentralized_light.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xhdpi/decentralized_light.png rename to apps/multiplatform/android/src/main/res/drawable-xhdpi/decentralized_light.png diff --git a/apps/android/app/src/main/res/drawable-xhdpi/ntf_icon.png b/apps/multiplatform/android/src/main/res/drawable-xhdpi/ntf_icon.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xhdpi/ntf_icon.png rename to apps/multiplatform/android/src/main/res/drawable-xhdpi/ntf_icon.png diff --git a/apps/android/app/src/main/res/drawable-xhdpi/ntf_service_icon.png b/apps/multiplatform/android/src/main/res/drawable-xhdpi/ntf_service_icon.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xhdpi/ntf_service_icon.png rename to apps/multiplatform/android/src/main/res/drawable-xhdpi/ntf_service_icon.png diff --git a/apps/android/app/src/main/res/drawable-xhdpi/privacy.png b/apps/multiplatform/android/src/main/res/drawable-xhdpi/privacy.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xhdpi/privacy.png rename to apps/multiplatform/android/src/main/res/drawable-xhdpi/privacy.png diff --git a/apps/android/app/src/main/res/drawable-xhdpi/shield.png b/apps/multiplatform/android/src/main/res/drawable-xhdpi/shield.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xhdpi/shield.png rename to apps/multiplatform/android/src/main/res/drawable-xhdpi/shield.png diff --git a/apps/android/app/src/main/res/drawable-xxhdpi/decentralized.png b/apps/multiplatform/android/src/main/res/drawable-xxhdpi/decentralized.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxhdpi/decentralized.png rename to apps/multiplatform/android/src/main/res/drawable-xxhdpi/decentralized.png diff --git a/apps/android/app/src/main/res/drawable-xxhdpi/decentralized_light.png b/apps/multiplatform/android/src/main/res/drawable-xxhdpi/decentralized_light.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxhdpi/decentralized_light.png rename to apps/multiplatform/android/src/main/res/drawable-xxhdpi/decentralized_light.png diff --git a/apps/android/app/src/main/res/drawable-xxhdpi/ntf_icon.png b/apps/multiplatform/android/src/main/res/drawable-xxhdpi/ntf_icon.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxhdpi/ntf_icon.png rename to apps/multiplatform/android/src/main/res/drawable-xxhdpi/ntf_icon.png diff --git a/apps/android/app/src/main/res/drawable-xxhdpi/ntf_service_icon.png b/apps/multiplatform/android/src/main/res/drawable-xxhdpi/ntf_service_icon.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxhdpi/ntf_service_icon.png rename to apps/multiplatform/android/src/main/res/drawable-xxhdpi/ntf_service_icon.png diff --git a/apps/android/app/src/main/res/drawable-xxhdpi/privacy.png b/apps/multiplatform/android/src/main/res/drawable-xxhdpi/privacy.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxhdpi/privacy.png rename to apps/multiplatform/android/src/main/res/drawable-xxhdpi/privacy.png diff --git a/apps/android/app/src/main/res/drawable-xxhdpi/shield.png b/apps/multiplatform/android/src/main/res/drawable-xxhdpi/shield.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxhdpi/shield.png rename to apps/multiplatform/android/src/main/res/drawable-xxhdpi/shield.png diff --git a/apps/android/app/src/main/res/drawable-xxxhdpi/decentralized.png b/apps/multiplatform/android/src/main/res/drawable-xxxhdpi/decentralized.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxxhdpi/decentralized.png rename to apps/multiplatform/android/src/main/res/drawable-xxxhdpi/decentralized.png diff --git a/apps/android/app/src/main/res/drawable-xxxhdpi/decentralized_light.png b/apps/multiplatform/android/src/main/res/drawable-xxxhdpi/decentralized_light.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxxhdpi/decentralized_light.png rename to apps/multiplatform/android/src/main/res/drawable-xxxhdpi/decentralized_light.png diff --git a/apps/android/app/src/main/res/drawable-xxxhdpi/ntf_icon.png b/apps/multiplatform/android/src/main/res/drawable-xxxhdpi/ntf_icon.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxxhdpi/ntf_icon.png rename to apps/multiplatform/android/src/main/res/drawable-xxxhdpi/ntf_icon.png diff --git a/apps/android/app/src/main/res/drawable-xxxhdpi/ntf_service_icon.png b/apps/multiplatform/android/src/main/res/drawable-xxxhdpi/ntf_service_icon.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxxhdpi/ntf_service_icon.png rename to apps/multiplatform/android/src/main/res/drawable-xxxhdpi/ntf_service_icon.png diff --git a/apps/android/app/src/main/res/drawable-xxxhdpi/privacy.png b/apps/multiplatform/android/src/main/res/drawable-xxxhdpi/privacy.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxxhdpi/privacy.png rename to apps/multiplatform/android/src/main/res/drawable-xxxhdpi/privacy.png diff --git a/apps/android/app/src/main/res/drawable-xxxhdpi/shield.png b/apps/multiplatform/android/src/main/res/drawable-xxxhdpi/shield.png similarity index 100% rename from apps/android/app/src/main/res/drawable-xxxhdpi/shield.png rename to apps/multiplatform/android/src/main/res/drawable-xxxhdpi/shield.png diff --git a/apps/android/app/src/main/res/drawable/edit_text_cursor.xml b/apps/multiplatform/android/src/main/res/drawable/edit_text_cursor.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/edit_text_cursor.xml rename to apps/multiplatform/android/src/main/res/drawable/edit_text_cursor.xml diff --git a/apps/android/app/src/main/res/drawable/ic_account_circle_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_account_circle_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_account_circle_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_account_circle_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_add.xml b/apps/multiplatform/android/src/main/res/drawable/ic_add.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_add.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_add.xml diff --git a/apps/android/app/src/main/res/drawable/ic_add_link.xml b/apps/multiplatform/android/src/main/res/drawable/ic_add_link.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_add_link.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_add_link.xml diff --git a/apps/android/app/src/main/res/drawable/ic_add_photo.xml b/apps/multiplatform/android/src/main/res/drawable/ic_add_photo.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_add_photo.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_add_photo.xml diff --git a/apps/android/app/src/main/res/drawable/ic_add_reaction.xml b/apps/multiplatform/android/src/main/res/drawable/ic_add_reaction.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_add_reaction.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_add_reaction.xml diff --git a/apps/android/app/src/main/res/drawable/ic_add_reaction_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_add_reaction_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_add_reaction_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_add_reaction_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_all_inclusive.xml b/apps/multiplatform/android/src/main/res/drawable/ic_all_inclusive.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_all_inclusive.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_all_inclusive.xml diff --git a/apps/android/app/src/main/res/drawable/ic_arrow_back_ios_new.xml b/apps/multiplatform/android/src/main/res/drawable/ic_arrow_back_ios_new.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_arrow_back_ios_new.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_arrow_back_ios_new.xml diff --git a/apps/android/app/src/main/res/drawable/ic_arrow_downward.xml b/apps/multiplatform/android/src/main/res/drawable/ic_arrow_downward.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_arrow_downward.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_arrow_downward.xml diff --git a/apps/android/app/src/main/res/drawable/ic_arrow_forward_ios.xml b/apps/multiplatform/android/src/main/res/drawable/ic_arrow_forward_ios.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_arrow_forward_ios.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_arrow_forward_ios.xml diff --git a/apps/android/app/src/main/res/drawable/ic_arrow_upward.xml b/apps/multiplatform/android/src/main/res/drawable/ic_arrow_upward.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_arrow_upward.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_arrow_upward.xml diff --git a/apps/android/app/src/main/res/drawable/ic_article.xml b/apps/multiplatform/android/src/main/res/drawable/ic_article.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_article.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_article.xml diff --git a/apps/android/app/src/main/res/drawable/ic_attach_file_filled_500.xml b/apps/multiplatform/android/src/main/res/drawable/ic_attach_file_filled_500.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_attach_file_filled_500.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_attach_file_filled_500.xml diff --git a/apps/android/app/src/main/res/drawable/ic_backspace.xml b/apps/multiplatform/android/src/main/res/drawable/ic_backspace.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_backspace.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_backspace.xml diff --git a/apps/android/app/src/main/res/drawable/ic_backup.xml b/apps/multiplatform/android/src/main/res/drawable/ic_backup.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_backup.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_backup.xml diff --git a/apps/android/app/src/main/res/drawable/ic_battery_2_bar.xml b/apps/multiplatform/android/src/main/res/drawable/ic_battery_2_bar.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_battery_2_bar.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_battery_2_bar.xml diff --git a/apps/android/app/src/main/res/drawable/ic_battery_3_bar.xml b/apps/multiplatform/android/src/main/res/drawable/ic_battery_3_bar.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_battery_3_bar.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_battery_3_bar.xml diff --git a/apps/android/app/src/main/res/drawable/ic_bolt.xml b/apps/multiplatform/android/src/main/res/drawable/ic_bolt.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_bolt.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_bolt.xml diff --git a/apps/android/app/src/main/res/drawable/ic_bolt_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_bolt_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_bolt_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_bolt_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_cable.xml b/apps/multiplatform/android/src/main/res/drawable/ic_cable.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_cable.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_cable.xml diff --git a/apps/android/app/src/main/res/drawable/ic_call.xml b/apps/multiplatform/android/src/main/res/drawable/ic_call.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_call.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_call.xml diff --git a/apps/android/app/src/main/res/drawable/ic_call_500.xml b/apps/multiplatform/android/src/main/res/drawable/ic_call_500.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_call_500.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_call_500.xml diff --git a/apps/android/app/src/main/res/drawable/ic_call_end.xml b/apps/multiplatform/android/src/main/res/drawable/ic_call_end.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_call_end.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_call_end.xml diff --git a/apps/android/app/src/main/res/drawable/ic_call_end_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_call_end_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_call_end_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_call_end_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_call_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_call_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_call_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_call_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_camera_enhance.xml b/apps/multiplatform/android/src/main/res/drawable/ic_camera_enhance.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_camera_enhance.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_camera_enhance.xml diff --git a/apps/android/app/src/main/res/drawable/ic_cancel_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_cancel_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_cancel_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_cancel_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_chat.xml b/apps/multiplatform/android/src/main/res/drawable/ic_chat.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_chat.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_chat.xml diff --git a/apps/android/app/src/main/res/drawable/ic_check.xml b/apps/multiplatform/android/src/main/res/drawable/ic_check.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_check.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_check.xml diff --git a/apps/android/app/src/main/res/drawable/ic_check_circle_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_check_circle_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_check_circle_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_check_circle_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_check_fill.xml b/apps/multiplatform/android/src/main/res/drawable/ic_check_fill.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_check_fill.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_check_fill.xml diff --git a/apps/android/app/src/main/res/drawable/ic_check_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_check_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_check_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_check_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_chevron_right.xml b/apps/multiplatform/android/src/main/res/drawable/ic_chevron_right.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_chevron_right.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_chevron_right.xml diff --git a/apps/android/app/src/main/res/drawable/ic_circle.xml b/apps/multiplatform/android/src/main/res/drawable/ic_circle.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_circle.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_circle.xml diff --git a/apps/android/app/src/main/res/drawable/ic_circle_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_circle_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_circle_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_circle_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_close.xml b/apps/multiplatform/android/src/main/res/drawable/ic_close.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_close.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_close.xml diff --git a/apps/android/app/src/main/res/drawable/ic_code.xml b/apps/multiplatform/android/src/main/res/drawable/ic_code.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_code.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_code.xml diff --git a/apps/android/app/src/main/res/drawable/ic_content_copy.xml b/apps/multiplatform/android/src/main/res/drawable/ic_content_copy.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_content_copy.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_content_copy.xml diff --git a/apps/android/app/src/main/res/drawable/ic_content_paste.xml b/apps/multiplatform/android/src/main/res/drawable/ic_content_paste.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_content_paste.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_content_paste.xml diff --git a/apps/android/app/src/main/res/drawable/ic_database.xml b/apps/multiplatform/android/src/main/res/drawable/ic_database.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_database.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_database.xml diff --git a/apps/android/app/src/main/res/drawable/ic_delete.xml b/apps/multiplatform/android/src/main/res/drawable/ic_delete.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_delete.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_delete.xml diff --git a/apps/android/app/src/main/res/drawable/ic_delete_forever.xml b/apps/multiplatform/android/src/main/res/drawable/ic_delete_forever.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_delete_forever.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_delete_forever.xml diff --git a/apps/android/app/src/main/res/drawable/ic_delete_forever_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_delete_forever_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_delete_forever_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_delete_forever_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_dns.xml b/apps/multiplatform/android/src/main/res/drawable/ic_dns.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_dns.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_dns.xml diff --git a/apps/android/app/src/main/res/drawable/ic_do_not_disturb_on.xml b/apps/multiplatform/android/src/main/res/drawable/ic_do_not_disturb_on.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_do_not_disturb_on.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_do_not_disturb_on.xml diff --git a/apps/android/app/src/main/res/drawable/ic_done_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_done_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_done_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_done_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_download.xml b/apps/multiplatform/android/src/main/res/drawable/ic_download.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_download.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_download.xml diff --git a/apps/android/app/src/main/res/drawable/ic_draft.xml b/apps/multiplatform/android/src/main/res/drawable/ic_draft.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_draft.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_draft.xml diff --git a/apps/android/app/src/main/res/drawable/ic_draft_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_draft_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_draft_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_draft_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_drive_folder_upload.xml b/apps/multiplatform/android/src/main/res/drawable/ic_drive_folder_upload.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_drive_folder_upload.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_drive_folder_upload.xml diff --git a/apps/android/app/src/main/res/drawable/ic_edit.xml b/apps/multiplatform/android/src/main/res/drawable/ic_edit.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_edit.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_edit.xml diff --git a/apps/android/app/src/main/res/drawable/ic_edit_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_edit_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_edit_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_edit_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_edit_note.xml b/apps/multiplatform/android/src/main/res/drawable/ic_edit_note.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_edit_note.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_edit_note.xml diff --git a/apps/android/app/src/main/res/drawable/ic_electrical_services.xml b/apps/multiplatform/android/src/main/res/drawable/ic_electrical_services.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_electrical_services.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_electrical_services.xml diff --git a/apps/android/app/src/main/res/drawable/ic_error.xml b/apps/multiplatform/android/src/main/res/drawable/ic_error.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_error.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_error.xml diff --git a/apps/android/app/src/main/res/drawable/ic_error_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_error_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_error_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_error_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_expand_less.xml b/apps/multiplatform/android/src/main/res/drawable/ic_expand_less.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_expand_less.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_expand_less.xml diff --git a/apps/android/app/src/main/res/drawable/ic_expand_more.xml b/apps/multiplatform/android/src/main/res/drawable/ic_expand_more.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_expand_more.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_expand_more.xml diff --git a/apps/android/app/src/main/res/drawable/ic_filter_list.xml b/apps/multiplatform/android/src/main/res/drawable/ic_filter_list.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_filter_list.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_filter_list.xml diff --git a/apps/android/app/src/main/res/drawable/ic_flag.xml b/apps/multiplatform/android/src/main/res/drawable/ic_flag.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_flag.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_flag.xml diff --git a/apps/android/app/src/main/res/drawable/ic_flip_camera_android_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_flip_camera_android_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_flip_camera_android_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_flip_camera_android_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_github.xml b/apps/multiplatform/android/src/main/res/drawable/ic_github.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_github.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_github.xml diff --git a/apps/android/app/src/main/res/drawable/ic_group.xml b/apps/multiplatform/android/src/main/res/drawable/ic_group.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_group.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_group.xml diff --git a/apps/android/app/src/main/res/drawable/ic_help.xml b/apps/multiplatform/android/src/main/res/drawable/ic_help.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_help.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_help.xml diff --git a/apps/android/app/src/main/res/drawable/ic_image.xml b/apps/multiplatform/android/src/main/res/drawable/ic_image.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_image.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_image.xml diff --git a/apps/android/app/src/main/res/drawable/ic_info.xml b/apps/multiplatform/android/src/main/res/drawable/ic_info.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_info.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_info.xml diff --git a/apps/android/app/src/main/res/drawable/ic_inventory_2.xml b/apps/multiplatform/android/src/main/res/drawable/ic_inventory_2.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_inventory_2.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_inventory_2.xml diff --git a/apps/android/app/src/main/res/drawable/ic_ios_share.xml b/apps/multiplatform/android/src/main/res/drawable/ic_ios_share.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_ios_share.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_ios_share.xml diff --git a/apps/android/app/src/main/res/drawable/ic_keyboard.xml b/apps/multiplatform/android/src/main/res/drawable/ic_keyboard.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_keyboard.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_keyboard.xml diff --git a/apps/android/app/src/main/res/drawable/ic_keyboard_arrow_down.xml b/apps/multiplatform/android/src/main/res/drawable/ic_keyboard_arrow_down.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_keyboard_arrow_down.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_keyboard_arrow_down.xml diff --git a/apps/android/app/src/main/res/drawable/ic_keyboard_voice.xml b/apps/multiplatform/android/src/main/res/drawable/ic_keyboard_voice.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_keyboard_voice.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_keyboard_voice.xml diff --git a/apps/android/app/src/main/res/drawable/ic_keyboard_voice_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_keyboard_voice_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_keyboard_voice_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_keyboard_voice_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_launcher_background.xml b/apps/multiplatform/android/src/main/res/drawable/ic_launcher_background.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_launcher_background.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_launcher_background.xml diff --git a/apps/android/app/src/main/res/drawable/ic_light_mode.xml b/apps/multiplatform/android/src/main/res/drawable/ic_light_mode.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_light_mode.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_light_mode.xml diff --git a/apps/android/app/src/main/res/drawable/ic_link.xml b/apps/multiplatform/android/src/main/res/drawable/ic_link.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_link.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_link.xml diff --git a/apps/android/app/src/main/res/drawable/ic_lock.xml b/apps/multiplatform/android/src/main/res/drawable/ic_lock.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_lock.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_lock.xml diff --git a/apps/android/app/src/main/res/drawable/ic_lock_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_lock_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_lock_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_lock_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_lock_open.xml b/apps/multiplatform/android/src/main/res/drawable/ic_lock_open.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_lock_open.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_lock_open.xml diff --git a/apps/android/app/src/main/res/drawable/ic_login.xml b/apps/multiplatform/android/src/main/res/drawable/ic_login.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_login.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_login.xml diff --git a/apps/android/app/src/main/res/drawable/ic_logout.xml b/apps/multiplatform/android/src/main/res/drawable/ic_logout.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_logout.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_logout.xml diff --git a/apps/android/app/src/main/res/drawable/ic_mail.xml b/apps/multiplatform/android/src/main/res/drawable/ic_mail.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_mail.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_mail.xml diff --git a/apps/android/app/src/main/res/drawable/ic_manage_accounts.xml b/apps/multiplatform/android/src/main/res/drawable/ic_manage_accounts.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_manage_accounts.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_manage_accounts.xml diff --git a/apps/android/app/src/main/res/drawable/ic_maps_ugc.xml b/apps/multiplatform/android/src/main/res/drawable/ic_maps_ugc.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_maps_ugc.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_maps_ugc.xml diff --git a/apps/android/app/src/main/res/drawable/ic_mark_chat_unread.xml b/apps/multiplatform/android/src/main/res/drawable/ic_mark_chat_unread.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_mark_chat_unread.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_mark_chat_unread.xml diff --git a/apps/android/app/src/main/res/drawable/ic_menu.xml b/apps/multiplatform/android/src/main/res/drawable/ic_menu.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_menu.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_menu.xml diff --git a/apps/android/app/src/main/res/drawable/ic_mic.xml b/apps/multiplatform/android/src/main/res/drawable/ic_mic.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_mic.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_mic.xml diff --git a/apps/android/app/src/main/res/drawable/ic_mic_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_mic_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_mic_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_mic_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_mic_off.xml b/apps/multiplatform/android/src/main/res/drawable/ic_mic_off.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_mic_off.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_mic_off.xml diff --git a/apps/android/app/src/main/res/drawable/ic_more_horiz.xml b/apps/multiplatform/android/src/main/res/drawable/ic_more_horiz.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_more_horiz.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_more_horiz.xml diff --git a/apps/android/app/src/main/res/drawable/ic_note_add.xml b/apps/multiplatform/android/src/main/res/drawable/ic_note_add.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_note_add.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_note_add.xml diff --git a/apps/android/app/src/main/res/drawable/ic_notifications.xml b/apps/multiplatform/android/src/main/res/drawable/ic_notifications.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_notifications.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_notifications.xml diff --git a/apps/android/app/src/main/res/drawable/ic_notifications_off.xml b/apps/multiplatform/android/src/main/res/drawable/ic_notifications_off.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_notifications_off.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_notifications_off.xml diff --git a/apps/android/app/src/main/res/drawable/ic_notifications_off_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_notifications_off_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_notifications_off_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_notifications_off_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_open_in_new.xml b/apps/multiplatform/android/src/main/res/drawable/ic_open_in_new.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_open_in_new.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_open_in_new.xml diff --git a/apps/android/app/src/main/res/drawable/ic_outline_terminal.xml b/apps/multiplatform/android/src/main/res/drawable/ic_outline_terminal.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_outline_terminal.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_outline_terminal.xml diff --git a/apps/android/app/src/main/res/drawable/ic_pause_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_pause_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_pause_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_pause_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_pending.xml b/apps/multiplatform/android/src/main/res/drawable/ic_pending.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_pending.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_pending.xml diff --git a/apps/android/app/src/main/res/drawable/ic_pending_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_pending_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_pending_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_pending_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_person.xml b/apps/multiplatform/android/src/main/res/drawable/ic_person.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_person.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_person.xml diff --git a/apps/android/app/src/main/res/drawable/ic_person_add.xml b/apps/multiplatform/android/src/main/res/drawable/ic_person_add.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_person_add.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_person_add.xml diff --git a/apps/android/app/src/main/res/drawable/ic_person_add_500.xml b/apps/multiplatform/android/src/main/res/drawable/ic_person_add_500.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_person_add_500.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_person_add_500.xml diff --git a/apps/android/app/src/main/res/drawable/ic_phone_in_talk_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_phone_in_talk_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_phone_in_talk_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_phone_in_talk_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_photo_camera.xml b/apps/multiplatform/android/src/main/res/drawable/ic_photo_camera.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_photo_camera.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_photo_camera.xml diff --git a/apps/android/app/src/main/res/drawable/ic_play_arrow_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_play_arrow_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_play_arrow_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_play_arrow_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_power_settings_new.xml b/apps/multiplatform/android/src/main/res/drawable/ic_power_settings_new.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_power_settings_new.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_power_settings_new.xml diff --git a/apps/android/app/src/main/res/drawable/ic_priority_high.xml b/apps/multiplatform/android/src/main/res/drawable/ic_priority_high.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_priority_high.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_priority_high.xml diff --git a/apps/android/app/src/main/res/drawable/ic_qr_code.xml b/apps/multiplatform/android/src/main/res/drawable/ic_qr_code.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_qr_code.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_qr_code.xml diff --git a/apps/android/app/src/main/res/drawable/ic_repeat_one.xml b/apps/multiplatform/android/src/main/res/drawable/ic_repeat_one.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_repeat_one.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_repeat_one.xml diff --git a/apps/android/app/src/main/res/drawable/ic_replay.xml b/apps/multiplatform/android/src/main/res/drawable/ic_replay.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_replay.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_replay.xml diff --git a/apps/android/app/src/main/res/drawable/ic_reply.xml b/apps/multiplatform/android/src/main/res/drawable/ic_reply.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_reply.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_reply.xml diff --git a/apps/android/app/src/main/res/drawable/ic_report_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_report_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_report_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_report_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_restart_alt.xml b/apps/multiplatform/android/src/main/res/drawable/ic_restart_alt.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_restart_alt.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_restart_alt.xml diff --git a/apps/android/app/src/main/res/drawable/ic_ring_volume.xml b/apps/multiplatform/android/src/main/res/drawable/ic_ring_volume.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_ring_volume.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_ring_volume.xml diff --git a/apps/android/app/src/main/res/drawable/ic_safety_divider.xml b/apps/multiplatform/android/src/main/res/drawable/ic_safety_divider.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_safety_divider.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_safety_divider.xml diff --git a/apps/android/app/src/main/res/drawable/ic_search.xml b/apps/multiplatform/android/src/main/res/drawable/ic_search.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_search.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_search.xml diff --git a/apps/android/app/src/main/res/drawable/ic_search_500.xml b/apps/multiplatform/android/src/main/res/drawable/ic_search_500.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_search_500.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_search_500.xml diff --git a/apps/android/app/src/main/res/drawable/ic_security.xml b/apps/multiplatform/android/src/main/res/drawable/ic_security.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_security.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_security.xml diff --git a/apps/android/app/src/main/res/drawable/ic_settings.xml b/apps/multiplatform/android/src/main/res/drawable/ic_settings.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_settings.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_settings.xml diff --git a/apps/android/app/src/main/res/drawable/ic_settings_backup_restore.xml b/apps/multiplatform/android/src/main/res/drawable/ic_settings_backup_restore.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_settings_backup_restore.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_settings_backup_restore.xml diff --git a/apps/android/app/src/main/res/drawable/ic_settings_ethernet.xml b/apps/multiplatform/android/src/main/res/drawable/ic_settings_ethernet.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_settings_ethernet.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_settings_ethernet.xml diff --git a/apps/android/app/src/main/res/drawable/ic_settings_phone.xml b/apps/multiplatform/android/src/main/res/drawable/ic_settings_phone.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_settings_phone.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_settings_phone.xml diff --git a/apps/android/app/src/main/res/drawable/ic_share.xml b/apps/multiplatform/android/src/main/res/drawable/ic_share.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_share.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_share.xml diff --git a/apps/android/app/src/main/res/drawable/ic_share_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_share_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_share_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_share_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_shield.xml b/apps/multiplatform/android/src/main/res/drawable/ic_shield.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_shield.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_shield.xml diff --git a/apps/android/app/src/main/res/drawable/ic_smart_display.xml b/apps/multiplatform/android/src/main/res/drawable/ic_smart_display.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_smart_display.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_smart_display.xml diff --git a/apps/android/app/src/main/res/drawable/ic_star.xml b/apps/multiplatform/android/src/main/res/drawable/ic_star.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_star.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_star.xml diff --git a/apps/android/app/src/main/res/drawable/ic_star_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_star_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_star_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_star_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_star_off.xml b/apps/multiplatform/android/src/main/res/drawable/ic_star_off.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_star_off.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_star_off.xml diff --git a/apps/android/app/src/main/res/drawable/ic_stop_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_stop_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_stop_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_stop_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_supervised_user_circle_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_supervised_user_circle_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_supervised_user_circle_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_supervised_user_circle_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_swap_horizontal_circle.xml b/apps/multiplatform/android/src/main/res/drawable/ic_swap_horizontal_circle.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_swap_horizontal_circle.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_swap_horizontal_circle.xml diff --git a/apps/android/app/src/main/res/drawable/ic_swap_horizontal_circle_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_swap_horizontal_circle_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_swap_horizontal_circle_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_swap_horizontal_circle_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_tag.xml b/apps/multiplatform/android/src/main/res/drawable/ic_tag.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_tag.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_tag.xml diff --git a/apps/android/app/src/main/res/drawable/ic_task.xml b/apps/multiplatform/android/src/main/res/drawable/ic_task.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_task.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_task.xml diff --git a/apps/android/app/src/main/res/drawable/ic_theater_comedy.xml b/apps/multiplatform/android/src/main/res/drawable/ic_theater_comedy.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_theater_comedy.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_theater_comedy.xml diff --git a/apps/android/app/src/main/res/drawable/ic_theater_comedy_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_theater_comedy_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_theater_comedy_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_theater_comedy_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_timer.xml b/apps/multiplatform/android/src/main/res/drawable/ic_timer.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_timer.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_timer.xml diff --git a/apps/android/app/src/main/res/drawable/ic_timer_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_timer_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_timer_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_timer_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_toggle_on.xml b/apps/multiplatform/android/src/main/res/drawable/ic_toggle_on.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_toggle_on.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_toggle_on.xml diff --git a/apps/android/app/src/main/res/drawable/ic_translate.xml b/apps/multiplatform/android/src/main/res/drawable/ic_translate.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_translate.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_translate.xml diff --git a/apps/android/app/src/main/res/drawable/ic_travel_explore.xml b/apps/multiplatform/android/src/main/res/drawable/ic_travel_explore.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_travel_explore.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_travel_explore.xml diff --git a/apps/android/app/src/main/res/drawable/ic_upload_file.xml b/apps/multiplatform/android/src/main/res/drawable/ic_upload_file.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_upload_file.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_upload_file.xml diff --git a/apps/android/app/src/main/res/drawable/ic_verified_user.xml b/apps/multiplatform/android/src/main/res/drawable/ic_verified_user.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_verified_user.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_verified_user.xml diff --git a/apps/android/app/src/main/res/drawable/ic_videocam.xml b/apps/multiplatform/android/src/main/res/drawable/ic_videocam.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_videocam.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_videocam.xml diff --git a/apps/android/app/src/main/res/drawable/ic_videocam_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_videocam_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_videocam_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_videocam_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_videocam_off.xml b/apps/multiplatform/android/src/main/res/drawable/ic_videocam_off.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_videocam_off.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_videocam_off.xml diff --git a/apps/android/app/src/main/res/drawable/ic_visibility.xml b/apps/multiplatform/android/src/main/res/drawable/ic_visibility.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_visibility.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_visibility.xml diff --git a/apps/android/app/src/main/res/drawable/ic_visibility_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_visibility_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_visibility_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_visibility_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_visibility_off.xml b/apps/multiplatform/android/src/main/res/drawable/ic_visibility_off.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_visibility_off.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_visibility_off.xml diff --git a/apps/android/app/src/main/res/drawable/ic_visibility_off_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_visibility_off_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_visibility_off_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_visibility_off_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_volume_down.xml b/apps/multiplatform/android/src/main/res/drawable/ic_volume_down.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_volume_down.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_volume_down.xml diff --git a/apps/android/app/src/main/res/drawable/ic_volume_up.xml b/apps/multiplatform/android/src/main/res/drawable/ic_volume_up.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_volume_up.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_volume_up.xml diff --git a/apps/android/app/src/main/res/drawable/ic_vpn_key_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_vpn_key_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_vpn_key_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_vpn_key_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_vpn_key_off_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_vpn_key_off_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_vpn_key_off_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_vpn_key_off_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_warning_filled.xml b/apps/multiplatform/android/src/main/res/drawable/ic_warning_filled.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_warning_filled.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_warning_filled.xml diff --git a/apps/android/app/src/main/res/drawable/ic_wifi_tethering.xml b/apps/multiplatform/android/src/main/res/drawable/ic_wifi_tethering.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/ic_wifi_tethering.xml rename to apps/multiplatform/android/src/main/res/drawable/ic_wifi_tethering.xml diff --git a/apps/android/app/src/main/res/drawable/logo.png b/apps/multiplatform/android/src/main/res/drawable/logo.png similarity index 100% rename from apps/android/app/src/main/res/drawable/logo.png rename to apps/multiplatform/android/src/main/res/drawable/logo.png diff --git a/apps/android/app/src/main/res/drawable/logo_light.png b/apps/multiplatform/android/src/main/res/drawable/logo_light.png similarity index 100% rename from apps/android/app/src/main/res/drawable/logo_light.png rename to apps/multiplatform/android/src/main/res/drawable/logo_light.png diff --git a/apps/android/app/src/main/res/drawable/send_msg_view_background.xml b/apps/multiplatform/android/src/main/res/drawable/send_msg_view_background.xml similarity index 100% rename from apps/android/app/src/main/res/drawable/send_msg_view_background.xml rename to apps/multiplatform/android/src/main/res/drawable/send_msg_view_background.xml diff --git a/apps/android/app/src/main/res/font/inter_bold.ttf b/apps/multiplatform/android/src/main/res/font/inter_bold.ttf similarity index 100% rename from apps/android/app/src/main/res/font/inter_bold.ttf rename to apps/multiplatform/android/src/main/res/font/inter_bold.ttf diff --git a/apps/android/app/src/main/res/font/inter_italic.ttf b/apps/multiplatform/android/src/main/res/font/inter_italic.ttf similarity index 100% rename from apps/android/app/src/main/res/font/inter_italic.ttf rename to apps/multiplatform/android/src/main/res/font/inter_italic.ttf diff --git a/apps/android/app/src/main/res/font/inter_light.ttf b/apps/multiplatform/android/src/main/res/font/inter_light.ttf similarity index 100% rename from apps/android/app/src/main/res/font/inter_light.ttf rename to apps/multiplatform/android/src/main/res/font/inter_light.ttf diff --git a/apps/android/app/src/main/res/font/inter_medium.ttf b/apps/multiplatform/android/src/main/res/font/inter_medium.ttf similarity index 100% rename from apps/android/app/src/main/res/font/inter_medium.ttf rename to apps/multiplatform/android/src/main/res/font/inter_medium.ttf diff --git a/apps/android/app/src/main/res/font/inter_regular.ttf b/apps/multiplatform/android/src/main/res/font/inter_regular.ttf similarity index 100% rename from apps/android/app/src/main/res/font/inter_regular.ttf rename to apps/multiplatform/android/src/main/res/font/inter_regular.ttf diff --git a/apps/android/app/src/main/res/font/inter_semi_bold.ttf b/apps/multiplatform/android/src/main/res/font/inter_semi_bold.ttf similarity index 100% rename from apps/android/app/src/main/res/font/inter_semi_bold.ttf rename to apps/multiplatform/android/src/main/res/font/inter_semi_bold.ttf diff --git a/apps/android/app/src/main/res/mipmap-anydpi-v26/icon.xml b/apps/multiplatform/android/src/main/res/mipmap-anydpi-v26/icon.xml similarity index 100% rename from apps/android/app/src/main/res/mipmap-anydpi-v26/icon.xml rename to apps/multiplatform/android/src/main/res/mipmap-anydpi-v26/icon.xml diff --git a/apps/android/app/src/main/res/mipmap-anydpi-v26/icon_dark_blue.xml b/apps/multiplatform/android/src/main/res/mipmap-anydpi-v26/icon_dark_blue.xml similarity index 100% rename from apps/android/app/src/main/res/mipmap-anydpi-v26/icon_dark_blue.xml rename to apps/multiplatform/android/src/main/res/mipmap-anydpi-v26/icon_dark_blue.xml diff --git a/apps/android/app/src/main/res/mipmap-anydpi-v26/icon_dark_blue_round.xml b/apps/multiplatform/android/src/main/res/mipmap-anydpi-v26/icon_dark_blue_round.xml similarity index 100% rename from apps/android/app/src/main/res/mipmap-anydpi-v26/icon_dark_blue_round.xml rename to apps/multiplatform/android/src/main/res/mipmap-anydpi-v26/icon_dark_blue_round.xml diff --git a/apps/android/app/src/main/res/mipmap-anydpi-v26/icon_round.xml b/apps/multiplatform/android/src/main/res/mipmap-anydpi-v26/icon_round.xml similarity index 100% rename from apps/android/app/src/main/res/mipmap-anydpi-v26/icon_round.xml rename to apps/multiplatform/android/src/main/res/mipmap-anydpi-v26/icon_round.xml diff --git a/apps/android/app/src/main/res/mipmap-anydpi-v26/icon_round_dark_blue.xml b/apps/multiplatform/android/src/main/res/mipmap-anydpi-v26/icon_round_dark_blue.xml similarity index 100% rename from apps/android/app/src/main/res/mipmap-anydpi-v26/icon_round_dark_blue.xml rename to apps/multiplatform/android/src/main/res/mipmap-anydpi-v26/icon_round_dark_blue.xml diff --git a/apps/android/app/src/main/res/mipmap-hdpi/icon.png b/apps/multiplatform/android/src/main/res/mipmap-hdpi/icon.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-hdpi/icon.png rename to apps/multiplatform/android/src/main/res/mipmap-hdpi/icon.png diff --git a/apps/android/app/src/main/res/mipmap-hdpi/icon_dark_blue.png b/apps/multiplatform/android/src/main/res/mipmap-hdpi/icon_dark_blue.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-hdpi/icon_dark_blue.png rename to apps/multiplatform/android/src/main/res/mipmap-hdpi/icon_dark_blue.png diff --git a/apps/android/app/src/main/res/mipmap-hdpi/icon_dark_blue_foreground.png b/apps/multiplatform/android/src/main/res/mipmap-hdpi/icon_dark_blue_foreground.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-hdpi/icon_dark_blue_foreground.png rename to apps/multiplatform/android/src/main/res/mipmap-hdpi/icon_dark_blue_foreground.png diff --git a/apps/android/app/src/main/res/mipmap-hdpi/icon_dark_blue_round.png b/apps/multiplatform/android/src/main/res/mipmap-hdpi/icon_dark_blue_round.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-hdpi/icon_dark_blue_round.png rename to apps/multiplatform/android/src/main/res/mipmap-hdpi/icon_dark_blue_round.png diff --git a/apps/android/app/src/main/res/mipmap-hdpi/icon_foreground.png b/apps/multiplatform/android/src/main/res/mipmap-hdpi/icon_foreground.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-hdpi/icon_foreground.png rename to apps/multiplatform/android/src/main/res/mipmap-hdpi/icon_foreground.png diff --git a/apps/android/app/src/main/res/mipmap-hdpi/icon_round.png b/apps/multiplatform/android/src/main/res/mipmap-hdpi/icon_round.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-hdpi/icon_round.png rename to apps/multiplatform/android/src/main/res/mipmap-hdpi/icon_round.png diff --git a/apps/android/app/src/main/res/mipmap-mdpi/icon.png b/apps/multiplatform/android/src/main/res/mipmap-mdpi/icon.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-mdpi/icon.png rename to apps/multiplatform/android/src/main/res/mipmap-mdpi/icon.png diff --git a/apps/android/app/src/main/res/mipmap-mdpi/icon_dark_blue.png b/apps/multiplatform/android/src/main/res/mipmap-mdpi/icon_dark_blue.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-mdpi/icon_dark_blue.png rename to apps/multiplatform/android/src/main/res/mipmap-mdpi/icon_dark_blue.png diff --git a/apps/android/app/src/main/res/mipmap-mdpi/icon_dark_blue_foreground.png b/apps/multiplatform/android/src/main/res/mipmap-mdpi/icon_dark_blue_foreground.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-mdpi/icon_dark_blue_foreground.png rename to apps/multiplatform/android/src/main/res/mipmap-mdpi/icon_dark_blue_foreground.png diff --git a/apps/android/app/src/main/res/mipmap-mdpi/icon_dark_blue_round.png b/apps/multiplatform/android/src/main/res/mipmap-mdpi/icon_dark_blue_round.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-mdpi/icon_dark_blue_round.png rename to apps/multiplatform/android/src/main/res/mipmap-mdpi/icon_dark_blue_round.png diff --git a/apps/android/app/src/main/res/mipmap-mdpi/icon_foreground.png b/apps/multiplatform/android/src/main/res/mipmap-mdpi/icon_foreground.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-mdpi/icon_foreground.png rename to apps/multiplatform/android/src/main/res/mipmap-mdpi/icon_foreground.png diff --git a/apps/android/app/src/main/res/mipmap-mdpi/icon_round.png b/apps/multiplatform/android/src/main/res/mipmap-mdpi/icon_round.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-mdpi/icon_round.png rename to apps/multiplatform/android/src/main/res/mipmap-mdpi/icon_round.png diff --git a/apps/android/app/src/main/res/mipmap-xhdpi/icon.png b/apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xhdpi/icon.png rename to apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon.png diff --git a/apps/android/app/src/main/res/mipmap-xhdpi/icon_dark_blue.png b/apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon_dark_blue.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xhdpi/icon_dark_blue.png rename to apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon_dark_blue.png diff --git a/apps/android/app/src/main/res/mipmap-xhdpi/icon_dark_blue_foreground.png b/apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon_dark_blue_foreground.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xhdpi/icon_dark_blue_foreground.png rename to apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon_dark_blue_foreground.png diff --git a/apps/android/app/src/main/res/mipmap-xhdpi/icon_dark_blue_round.png b/apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon_dark_blue_round.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xhdpi/icon_dark_blue_round.png rename to apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon_dark_blue_round.png diff --git a/apps/android/app/src/main/res/mipmap-xhdpi/icon_foreground.png b/apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon_foreground.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xhdpi/icon_foreground.png rename to apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon_foreground.png diff --git a/apps/android/app/src/main/res/mipmap-xhdpi/icon_round.png b/apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon_round.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xhdpi/icon_round.png rename to apps/multiplatform/android/src/main/res/mipmap-xhdpi/icon_round.png diff --git a/apps/android/app/src/main/res/mipmap-xxhdpi/icon.png b/apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxhdpi/icon.png rename to apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon.png diff --git a/apps/android/app/src/main/res/mipmap-xxhdpi/icon_dark_blue.png b/apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon_dark_blue.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxhdpi/icon_dark_blue.png rename to apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon_dark_blue.png diff --git a/apps/android/app/src/main/res/mipmap-xxhdpi/icon_dark_blue_foreground.png b/apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon_dark_blue_foreground.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxhdpi/icon_dark_blue_foreground.png rename to apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon_dark_blue_foreground.png diff --git a/apps/android/app/src/main/res/mipmap-xxhdpi/icon_dark_blue_round.png b/apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon_dark_blue_round.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxhdpi/icon_dark_blue_round.png rename to apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon_dark_blue_round.png diff --git a/apps/android/app/src/main/res/mipmap-xxhdpi/icon_foreground.png b/apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon_foreground.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxhdpi/icon_foreground.png rename to apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon_foreground.png diff --git a/apps/android/app/src/main/res/mipmap-xxhdpi/icon_round.png b/apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon_round.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxhdpi/icon_round.png rename to apps/multiplatform/android/src/main/res/mipmap-xxhdpi/icon_round.png diff --git a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon.png b/apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxxhdpi/icon.png rename to apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon.png diff --git a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_dark_blue.png b/apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon_dark_blue.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxxhdpi/icon_dark_blue.png rename to apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon_dark_blue.png diff --git a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_dark_blue_foreground.png b/apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon_dark_blue_foreground.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxxhdpi/icon_dark_blue_foreground.png rename to apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon_dark_blue_foreground.png diff --git a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_dark_blue_round.png b/apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon_dark_blue_round.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxxhdpi/icon_dark_blue_round.png rename to apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon_dark_blue_round.png diff --git a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png b/apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon_foreground.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxxhdpi/icon_foreground.png rename to apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon_foreground.png diff --git a/apps/android/app/src/main/res/mipmap-xxxhdpi/icon_round.png b/apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon_round.png similarity index 100% rename from apps/android/app/src/main/res/mipmap-xxxhdpi/icon_round.png rename to apps/multiplatform/android/src/main/res/mipmap-xxxhdpi/icon_round.png diff --git a/apps/android/app/src/main/res/raw/ring_once.mp3 b/apps/multiplatform/android/src/main/res/raw/ring_once.mp3 similarity index 100% rename from apps/android/app/src/main/res/raw/ring_once.mp3 rename to apps/multiplatform/android/src/main/res/raw/ring_once.mp3 diff --git a/apps/android/app/src/main/res/values-ar/strings.xml b/apps/multiplatform/android/src/main/res/values-ar/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-ar/strings.xml rename to apps/multiplatform/android/src/main/res/values-ar/strings.xml diff --git a/apps/android/app/src/main/res/values-cs/strings.xml b/apps/multiplatform/android/src/main/res/values-cs/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-cs/strings.xml rename to apps/multiplatform/android/src/main/res/values-cs/strings.xml diff --git a/apps/android/app/src/main/res/values-de/strings.xml b/apps/multiplatform/android/src/main/res/values-de/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-de/strings.xml rename to apps/multiplatform/android/src/main/res/values-de/strings.xml diff --git a/apps/android/app/src/main/res/values-el/strings.xml b/apps/multiplatform/android/src/main/res/values-el/strings.xml similarity index 98% rename from apps/android/app/src/main/res/values-el/strings.xml rename to apps/multiplatform/android/src/main/res/values-el/strings.xml index 6f31189d09..6926e0c891 100644 --- a/apps/android/app/src/main/res/values-el/strings.xml +++ b/apps/multiplatform/android/src/main/res/values-el/strings.xml @@ -42,7 +42,6 @@ Αποδοχή αιτήματος σύνδεσης; αποδεκτή κλήση Πρόσβαση στους διακομιστές μέσω SOCKS proxy στην πόρτα 9050; Ο διακομιστής μεσολάβησης (proxy server) πρέπει να είναι ενεργός πριν ενεργοποιηθεί αυτή η ρύθμιση. - Αποδοχή αιτημάτων Προσθήκη διακομιστή… Προχωρημένες ρυθμίσεις δικτύου Προσθήκη διακομιστών μέσω σάρωσης QR κωδικών. diff --git a/apps/android/app/src/main/res/values-es/strings.xml b/apps/multiplatform/android/src/main/res/values-es/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-es/strings.xml rename to apps/multiplatform/android/src/main/res/values-es/strings.xml diff --git a/apps/android/app/src/main/res/values-fi/strings.xml b/apps/multiplatform/android/src/main/res/values-fi/strings.xml similarity index 99% rename from apps/android/app/src/main/res/values-fi/strings.xml rename to apps/multiplatform/android/src/main/res/values-fi/strings.xml index c4c7dc1aab..83c37137a0 100644 --- a/apps/android/app/src/main/res/values-fi/strings.xml +++ b/apps/multiplatform/android/src/main/res/values-fi/strings.xml @@ -54,7 +54,6 @@ Tietokannan salauksen tunnuslause päivitetään ja tallennetaan Keystoreen. Poista keskusteluprofiili käyttäjälle poistettu - KEHITÄ LAITE %dh Yhteysvirhe diff --git a/apps/android/app/src/main/res/values-fr/strings.xml b/apps/multiplatform/android/src/main/res/values-fr/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-fr/strings.xml rename to apps/multiplatform/android/src/main/res/values-fr/strings.xml diff --git a/apps/android/app/src/main/res/values-hi/strings.xml b/apps/multiplatform/android/src/main/res/values-hi/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-hi/strings.xml rename to apps/multiplatform/android/src/main/res/values-hi/strings.xml diff --git a/apps/android/app/src/main/res/values-hr/strings.xml b/apps/multiplatform/android/src/main/res/values-hr/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-hr/strings.xml rename to apps/multiplatform/android/src/main/res/values-hr/strings.xml diff --git a/apps/android/app/src/main/res/values-it/strings.xml b/apps/multiplatform/android/src/main/res/values-it/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-it/strings.xml rename to apps/multiplatform/android/src/main/res/values-it/strings.xml diff --git a/apps/android/app/src/main/res/values-iw/strings.xml b/apps/multiplatform/android/src/main/res/values-iw/strings.xml similarity index 99% rename from apps/android/app/src/main/res/values-iw/strings.xml rename to apps/multiplatform/android/src/main/res/values-iw/strings.xml index cdda3579ba..ca8df0dfab 100644 --- a/apps/android/app/src/main/res/values-iw/strings.xml +++ b/apps/multiplatform/android/src/main/res/values-iw/strings.xml @@ -4,7 +4,6 @@ אשר לאשר בקשת חיבור\? אודות SimpleX Chat - אשר בקשות אודות SimpleX ענה שבוע @@ -25,7 +24,6 @@ מראה גרסת האפליקציה: v%s גרסת אפליקציה: %s - הודעת פתיחה כל אנשי הקשר יישארו מחוברים. תמיד להשתמש בממסר ענה לשיחה @@ -83,7 +81,6 @@ אימות אימות נכשל חזרה - אוטומטית מודגש גיבוב הודעה שגוי מזהה הודעה שגוי @@ -228,7 +225,6 @@ תרומה גרסת ליבה: v%s צור כתובת - בקשות ליצירת קשר צור צור פרופיל יצירת הפרופיל שלך diff --git a/apps/android/app/src/main/res/values-ja/strings.xml b/apps/multiplatform/android/src/main/res/values-ja/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-ja/strings.xml rename to apps/multiplatform/android/src/main/res/values-ja/strings.xml diff --git a/apps/android/app/src/main/res/values-ko/strings.xml b/apps/multiplatform/android/src/main/res/values-ko/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-ko/strings.xml rename to apps/multiplatform/android/src/main/res/values-ko/strings.xml diff --git a/apps/android/app/src/main/res/values-lt/strings.xml b/apps/multiplatform/android/src/main/res/values-lt/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-lt/strings.xml rename to apps/multiplatform/android/src/main/res/values-lt/strings.xml diff --git a/apps/android/app/src/main/res/values-ml/strings.xml b/apps/multiplatform/android/src/main/res/values-ml/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-ml/strings.xml rename to apps/multiplatform/android/src/main/res/values-ml/strings.xml diff --git a/apps/android/app/src/main/res/values-night/themes.xml b/apps/multiplatform/android/src/main/res/values-night/themes.xml similarity index 100% rename from apps/android/app/src/main/res/values-night/themes.xml rename to apps/multiplatform/android/src/main/res/values-night/themes.xml diff --git a/apps/android/app/src/main/res/values-nl/strings.xml b/apps/multiplatform/android/src/main/res/values-nl/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-nl/strings.xml rename to apps/multiplatform/android/src/main/res/values-nl/strings.xml diff --git a/apps/android/app/src/main/res/values-pl/strings.xml b/apps/multiplatform/android/src/main/res/values-pl/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-pl/strings.xml rename to apps/multiplatform/android/src/main/res/values-pl/strings.xml diff --git a/apps/android/app/src/main/res/values-pt-rBR/strings.xml b/apps/multiplatform/android/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-pt-rBR/strings.xml rename to apps/multiplatform/android/src/main/res/values-pt-rBR/strings.xml diff --git a/apps/android/app/src/main/res/values-pt/strings.xml b/apps/multiplatform/android/src/main/res/values-pt/strings.xml similarity index 99% rename from apps/android/app/src/main/res/values-pt/strings.xml rename to apps/multiplatform/android/src/main/res/values-pt/strings.xml index 4e19cdcd79..6c8bef2c55 100644 --- a/apps/android/app/src/main/res/values-pt/strings.xml +++ b/apps/multiplatform/android/src/main/res/values-pt/strings.xml @@ -7,7 +7,6 @@ Consola de conversa Teste ao servidor falhou! Usar proxy SOCKS - Usar proxy SOCKS (porto 9050) Usar proxy SOCKS\? Porto porto %d @@ -15,7 +14,6 @@ Versão da aplicação Todos os seus contatos permanecerão conectados. Eliminar endereço - Automaticamente a + b chamada perdida Utilizar sempre o servidor de relay @@ -129,7 +127,6 @@ Aceitar Aceitar pedido de ligação\? Aceitar modo anónimo - Aceitar pedidos Adicionar servidores pré-definidos Aceder aos servidores via proxy SOCKS no porto %d\? O proxy tem de iniciar antes de ativar esta opção. Adicionar a outro dispositivo @@ -357,7 +354,6 @@ Conectado conectando… Tempo limite de conexão - Pedidos de contato Preferências de contato Contato escondido: O contato ainda não está conectado! @@ -736,7 +732,6 @@ Erro de desencriptação O código de acesso é substituído por um código auto-destrutivo. ID da base de dados: %d - DESENVOLVER Nomes, avatares e isolamento de transporte diferentes. Secundário adicional Realce adicional diff --git a/apps/android/app/src/main/res/values-ru/strings.xml b/apps/multiplatform/android/src/main/res/values-ru/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-ru/strings.xml rename to apps/multiplatform/android/src/main/res/values-ru/strings.xml diff --git a/apps/android/app/src/main/res/values-th/strings.xml b/apps/multiplatform/android/src/main/res/values-th/strings.xml similarity index 99% rename from apps/android/app/src/main/res/values-th/strings.xml rename to apps/multiplatform/android/src/main/res/values-th/strings.xml index d604bcd42b..f19d43a145 100644 --- a/apps/android/app/src/main/res/values-th/strings.xml +++ b/apps/multiplatform/android/src/main/res/values-th/strings.xml @@ -401,7 +401,6 @@ เปิดใช้งานรหัสผ่านแบบทําลายตัวเอง เปิดใช้งานการทำลายตัวเอง ความช่วยเหลือ - พัฒนา เครื่องมือสำหรับนักพัฒนา อุปกรณ์ คุณลักษณะสำหรับการทดลอง diff --git a/apps/android/app/src/main/res/values-uk/strings.xml b/apps/multiplatform/android/src/main/res/values-uk/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-uk/strings.xml rename to apps/multiplatform/android/src/main/res/values-uk/strings.xml diff --git a/apps/android/app/src/main/res/values-zh-rCN/strings.xml b/apps/multiplatform/android/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-zh-rCN/strings.xml rename to apps/multiplatform/android/src/main/res/values-zh-rCN/strings.xml diff --git a/apps/android/app/src/main/res/values-zh-rTW/strings.xml b/apps/multiplatform/android/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values-zh-rTW/strings.xml rename to apps/multiplatform/android/src/main/res/values-zh-rTW/strings.xml diff --git a/apps/android/app/src/main/res/values/colors.xml b/apps/multiplatform/android/src/main/res/values/colors.xml similarity index 100% rename from apps/android/app/src/main/res/values/colors.xml rename to apps/multiplatform/android/src/main/res/values/colors.xml diff --git a/apps/android/app/src/main/res/values/icon_background.xml b/apps/multiplatform/android/src/main/res/values/icon_background.xml similarity index 100% rename from apps/android/app/src/main/res/values/icon_background.xml rename to apps/multiplatform/android/src/main/res/values/icon_background.xml diff --git a/apps/android/app/src/main/res/values/icon_dark_blue_background.xml b/apps/multiplatform/android/src/main/res/values/icon_dark_blue_background.xml similarity index 100% rename from apps/android/app/src/main/res/values/icon_dark_blue_background.xml rename to apps/multiplatform/android/src/main/res/values/icon_dark_blue_background.xml diff --git a/apps/android/app/src/main/res/values/strings.xml b/apps/multiplatform/android/src/main/res/values/strings.xml similarity index 100% rename from apps/android/app/src/main/res/values/strings.xml rename to apps/multiplatform/android/src/main/res/values/strings.xml diff --git a/apps/android/app/src/main/res/values/themes.xml b/apps/multiplatform/android/src/main/res/values/themes.xml similarity index 100% rename from apps/android/app/src/main/res/values/themes.xml rename to apps/multiplatform/android/src/main/res/values/themes.xml diff --git a/apps/android/app/src/main/res/xml/file_paths.xml b/apps/multiplatform/android/src/main/res/xml/file_paths.xml similarity index 100% rename from apps/android/app/src/main/res/xml/file_paths.xml rename to apps/multiplatform/android/src/main/res/xml/file_paths.xml diff --git a/apps/android/app/src/main/res/xml/locales_config.xml b/apps/multiplatform/android/src/main/res/xml/locales_config.xml similarity index 100% rename from apps/android/app/src/main/res/xml/locales_config.xml rename to apps/multiplatform/android/src/main/res/xml/locales_config.xml diff --git a/apps/android/app/src/test/java/chat/simplex/app/ExampleUnitTest.kt b/apps/multiplatform/android/src/test/java/chat/simplex/app/ExampleUnitTest.kt similarity index 100% rename from apps/android/app/src/test/java/chat/simplex/app/ExampleUnitTest.kt rename to apps/multiplatform/android/src/test/java/chat/simplex/app/ExampleUnitTest.kt diff --git a/apps/android/build.gradle b/apps/multiplatform/build.gradle similarity index 100% rename from apps/android/build.gradle rename to apps/multiplatform/build.gradle diff --git a/apps/android/gradle.properties b/apps/multiplatform/gradle.properties similarity index 100% rename from apps/android/gradle.properties rename to apps/multiplatform/gradle.properties diff --git a/apps/android/gradle/wrapper/gradle-wrapper.jar b/apps/multiplatform/gradle/wrapper/gradle-wrapper.jar similarity index 100% rename from apps/android/gradle/wrapper/gradle-wrapper.jar rename to apps/multiplatform/gradle/wrapper/gradle-wrapper.jar diff --git a/apps/android/gradle/wrapper/gradle-wrapper.properties b/apps/multiplatform/gradle/wrapper/gradle-wrapper.properties similarity index 100% rename from apps/android/gradle/wrapper/gradle-wrapper.properties rename to apps/multiplatform/gradle/wrapper/gradle-wrapper.properties diff --git a/apps/android/gradlew b/apps/multiplatform/gradlew similarity index 100% rename from apps/android/gradlew rename to apps/multiplatform/gradlew diff --git a/apps/android/gradlew.bat b/apps/multiplatform/gradlew.bat similarity index 100% rename from apps/android/gradlew.bat rename to apps/multiplatform/gradlew.bat diff --git a/apps/android/settings.gradle b/apps/multiplatform/settings.gradle similarity index 94% rename from apps/android/settings.gradle rename to apps/multiplatform/settings.gradle index 3621283ff6..dc20a6dbd0 100644 --- a/apps/android/settings.gradle +++ b/apps/multiplatform/settings.gradle @@ -14,4 +14,4 @@ dependencyResolutionManagement { } } rootProject.name = "SimpleX" -include ':app' +include ':android' diff --git a/packages/simplex-chat-webrtc/copy b/packages/simplex-chat-webrtc/copy index 1b766264fb..4991cdef45 100755 --- a/packages/simplex-chat-webrtc/copy +++ b/packages/simplex-chat-webrtc/copy @@ -8,7 +8,7 @@ cp ./src/webcall.html ./dist/webcall.html cp ./src/ui.js ./dist/ui.js # copy to android app -cp ./src/call.html ../../apps/android/app/src/main/assets/www/call.html -cp ./src/style.css ../../apps/android/app/src/main/assets/www/style.css -cp ./dist/call.js ../../apps/android/app/src/main/assets/www/call.js -cp ./node_modules/lz-string/libs/lz-string.min.js ../../apps/android/app/src/main/assets/www/lz-string.min.js +cp ./src/call.html ../../apps/multiplatform/android/src/main/assets/www/call.html +cp ./src/style.css ../../apps/multiplatform/android/src/main/assets/www/style.css +cp ./dist/call.js ../../apps/multiplatform/android/src/main/assets/www/call.js +cp ./node_modules/lz-string/libs/lz-string.min.js ../../apps/multiplatform/android/src/main/assets/www/lz-string.min.js diff --git a/scripts/android/build-android-bundle.sh b/scripts/android/build-android-bundle.sh index 18aa03145a..3cc37a04cd 100755 --- a/scripts/android/build-android-bundle.sh +++ b/scripts/android/build-android-bundle.sh @@ -15,13 +15,13 @@ git clone https://github.com/simplex-chat/simplex-chat "$tmp/simplex-chat" git -C "$tmp/simplex-chat" checkout "$commit" # Create missing folders -mkdir -p "$tmp/simplex-chat/apps/android/app/src/main/cpp/libs/arm64-v8a" +mkdir -p "$tmp/simplex-chat/apps/multiplatform/android/src/main/cpp/libs/arm64-v8a" curl -sSf "$libsim" -o "$tmp/libsimplex.zip" -unzip -o "$tmp/libsimplex.zip" -d "$tmp/simplex-chat/apps/android/app/src/main/cpp/libs/arm64-v8a" +unzip -o "$tmp/libsimplex.zip" -d "$tmp/simplex-chat/apps/multiplatform/android/src/main/cpp/libs/arm64-v8a" curl -sSf "$libsup" -o "$tmp/libsupport.zip" -unzip -o "$tmp/libsupport.zip" -d "$tmp/simplex-chat/apps/android/app/src/main/cpp/libs/arm64-v8a" +unzip -o "$tmp/libsupport.zip" -d "$tmp/simplex-chat/apps/multiplatform/android/src/main/cpp/libs/arm64-v8a" -gradle -p "$tmp/simplex-chat/apps/android/" clean build -cp "$tmp/simplex-chat/apps/android/app/build/outputs/apk/release/app-release-unsigned.apk" "$PWD/simplex-chat.apk" +gradle -p "$tmp/simplex-chat/apps/multiplatform/" clean build +cp "$tmp/simplex-chat/apps/multiplatform/android/build/outputs/apk/release/android-release-unsigned.apk" "$PWD/simplex-chat.apk" diff --git a/scripts/android/build-android.sh b/scripts/android/build-android.sh index 87f9776b1b..8d5e3612b4 100755 --- a/scripts/android/build-android.sh +++ b/scripts/android/build-android.sh @@ -81,21 +81,21 @@ checks() { build() { # Build preparations - sed -i.bak 's/${extract_native_libs}/true/' "$folder/apps/android/app/src/main/AndroidManifest.xml" - sed -i.bak '/android {/a lint {abortOnError false}' "$folder/apps/android/app/build.gradle" + sed -i.bak 's/${extract_native_libs}/true/' "$folder/apps/multiplatform/android/src/main/AndroidManifest.xml" + sed -i.bak '/android {/a lint {abortOnError false}' "$folder/apps/multiplatform/android/build.gradle" for arch in $arches; do android_simplex_lib="${folder}#hydraJobs.${arch}-android:lib:simplex-chat.x86_64-linux" android_support_lib="${folder}#hydraJobs.${arch}-android:lib:support.x86_64-linux" android_simplex_lib_output="${PWD}/result/pkg-${arch}-android-libsimplex.zip" android_support_lib_output="${PWD}/result/pkg-${arch}-android-libsupport.zip" - + arch_map "$arch" android_tmp_folder="${tmp}/android-${arch}" - android_apk_output="${folder}/apps/android/app/build/outputs/apk/release/app-${android_arch}-release-unsigned.apk" + android_apk_output="${folder}/apps/multiplatform/android/build/outputs/apk/release/android-${android_arch}-release-unsigned.apk" android_apk_output_final="simplex-chat-${android_arch}.apk" - libs_folder="$folder/apps/android/app/src/main/cpp/libs" + libs_folder="$folder/apps/multiplatform/android/src/main/cpp/libs" # Create missing folders mkdir -p "$libs_folder/$android_arch" @@ -107,12 +107,12 @@ build() { unzip -o "$android_support_lib_output" -d "$libs_folder/$android_arch" # Build only one arch - sed -i.bak "s/include '.*/include '${android_arch}'/" "$folder/apps/android/app/build.gradle" - gradle -p "$folder/apps/android/" clean assembleRelease - + sed -i.bak "s/include '.*/include '${android_arch}'/" "$folder/apps/multiplatform/android/build.gradle" + gradle -p "$folder/apps/multiplatform/" clean assembleRelease + mkdir -p "$android_tmp_folder" unzip -oqd "$android_tmp_folder" "$android_apk_output" - + ( cd "$android_tmp_folder" && \ zip -rq5 "$tmp/$android_apk_output_final" . && \ diff --git a/scripts/android/compress-and-sign-apk.sh b/scripts/android/compress-and-sign-apk.sh index 586511cdfa..e46b8a54f1 100755 --- a/scripts/android/compress-and-sign-apk.sh +++ b/scripts/android/compress-and-sign-apk.sh @@ -23,7 +23,7 @@ touch remove_this_file remove_this_FILE #echo Case-insensitive file system: $case_insensitive rm remove_this_file remove_this_FILE 2> /dev/null || true -ORIG_NAMES=( $(echo app*.apk) ) +ORIG_NAMES=( $(echo android*.apk) ) for ORIG_NAME in "${ORIG_NAMES[@]}"; do unzip -o -q -d apk $ORIG_NAME ORIG_NAME_COPY=$ORIG_NAME-copy diff --git a/scripts/android/download-libs.sh b/scripts/android/download-libs.sh index dd1b1fb2d1..c329206cdc 100755 --- a/scripts/android/download-libs.sh +++ b/scripts/android/download-libs.sh @@ -33,7 +33,7 @@ root_dir="$(dirname "$(dirname "$(readlink "$0")")")" for ((i = 0 ; i < ${#arches[@]}; i++)); do arch="${arches[$i]}" output_arch="${output_arches[$i]}" - output_dir="$root_dir/apps/android/app/src/main/cpp/libs/$output_arch/" + output_dir="$root_dir/apps/multiplatform/android/src/main/cpp/libs/$output_arch/" mkdir -p "$output_dir" 2> /dev/null diff --git a/scripts/android/prepare.sh b/scripts/android/prepare.sh index 4947d0c2b3..e649ea77fd 100755 --- a/scripts/android/prepare.sh +++ b/scripts/android/prepare.sh @@ -1,12 +1,12 @@ #!/bin/sh # libsimplex.so and libsupport.so binaries should be in ~/Downloads folder in their directories based on archive name -mkdir -p ./apps/android/app/src/main/cpp/libs/arm64-v8a/ -rm ./apps/android/app/src/main/cpp/libs/arm64-v8a/* -unzip -o ~/Downloads/pkg-aarch64-android-libsupport.zip -d ./apps/android/app/src/main/cpp/libs/arm64-v8a -unzip -o ~/Downloads/pkg-aarch64-android-libsimplex.zip -d ./apps/android/app/src/main/cpp/libs/arm64-v8a/ +mkdir -p ./apps/multiplatform/android/src/main/cpp/libs/arm64-v8a/ +rm ./apps/multiplatform/android/src/main/cpp/libs/arm64-v8a/* +unzip -o ~/Downloads/pkg-aarch64-android-libsupport.zip -d ./apps/multiplatform/android/src/main/cpp/libs/arm64-v8a +unzip -o ~/Downloads/pkg-aarch64-android-libsimplex.zip -d ./apps/multiplatform/android/src/main/cpp/libs/arm64-v8a/ -mkdir -p ./apps/android/app/src/main/cpp/libs/armeabi-v7a/ -rm ./apps/android/app/src/main/cpp/libs/armeabi-v7a/* -unzip -o ~/Downloads/pkg-armv7a-android-libsupport.zip -d ./apps/android/app/src/main/cpp/libs/armeabi-v7a/ -unzip -o ~/Downloads/pkg-armv7a-android-libsimplex.zip -d ./apps/android/app/src/main/cpp/libs/armeabi-v7a/ +mkdir -p ./apps/multiplatform/android/src/main/cpp/libs/armeabi-v7a/ +rm ./apps/multiplatform/android/src/main/cpp/libs/armeabi-v7a/* +unzip -o ~/Downloads/pkg-armv7a-android-libsupport.zip -d ./apps/multiplatform/android/src/main/cpp/libs/armeabi-v7a/ +unzip -o ~/Downloads/pkg-armv7a-android-libsimplex.zip -d ./apps/multiplatform/android/src/main/cpp/libs/armeabi-v7a/