From b70a0516394b175f48f18f4ffe12c467efffe6cc Mon Sep 17 00:00:00 2001 From: Antoine Robiez Date: Fri, 22 Mar 2024 12:29:21 +0100 Subject: [PATCH 1/2] Added a KMP function to remove HTML tags --- .../components/session/SessionDetailLayout.kt | 4 +-- .../fr/paug/androidmakers/ui/util/TextUtil.kt | 20 -------------- .../domain/utils/TextUtils.android.kt | 14 ++++++++++ .../androidmakers/domain/utils/TextUtils.kt | 3 +++ .../domain/utils/TextUtils.ios.kt | 26 +++++++++++++++++++ .../com/androidmakers/ui/venue/VenueScreen.kt | 3 ++- 6 files changed, 47 insertions(+), 23 deletions(-) delete mode 100644 androidApp/src/main/java/fr/paug/androidmakers/ui/util/TextUtil.kt create mode 100644 shared/domain/src/androidMain/kotlin/fr/androidmakers/domain/utils/TextUtils.android.kt create mode 100644 shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/utils/TextUtils.kt create mode 100644 shared/domain/src/iosMain/kotlin/fr/androidmakers/domain/utils/TextUtils.ios.kt diff --git a/androidApp/src/main/java/fr/paug/androidmakers/ui/components/session/SessionDetailLayout.kt b/androidApp/src/main/java/fr/paug/androidmakers/ui/components/session/SessionDetailLayout.kt index 2343a850..feb93933 100644 --- a/androidApp/src/main/java/fr/paug/androidmakers/ui/components/session/SessionDetailLayout.kt +++ b/androidApp/src/main/java/fr/paug/androidmakers/ui/components/session/SessionDetailLayout.kt @@ -65,11 +65,11 @@ import com.androidmakers.ui.model.Lce import fr.androidmakers.domain.model.Room import fr.androidmakers.domain.model.Session import fr.androidmakers.domain.model.Speaker +import fr.androidmakers.domain.utils.removeHtmlTags import fr.paug.androidmakers.AndroidMakersApplication import fr.paug.androidmakers.R import fr.paug.androidmakers.ui.MR import fr.paug.androidmakers.ui.theme.AMColor -import fr.paug.androidmakers.ui.util.discardHtmlTags import fr.paug.androidmakers.ui.util.stringResource import fr.paug.androidmakers.util.EmojiUtils import io.openfeedback.android.components.SessionFeedbackContainer @@ -205,7 +205,7 @@ private fun SessionDetails(sessionDetails: SessionDetailState, formattedDateAndR Text( modifier = Modifier.padding(top = 16.dp), - text = sessionDetails.session.description?.discardHtmlTags() ?: "", + text = sessionDetails.session.description?.removeHtmlTags() ?: "", textAlign = TextAlign.Start, style = MaterialTheme.typography.bodyLarge, ) diff --git a/androidApp/src/main/java/fr/paug/androidmakers/ui/util/TextUtil.kt b/androidApp/src/main/java/fr/paug/androidmakers/ui/util/TextUtil.kt deleted file mode 100644 index 4d541716..00000000 --- a/androidApp/src/main/java/fr/paug/androidmakers/ui/util/TextUtil.kt +++ /dev/null @@ -1,20 +0,0 @@ -package fr.paug.androidmakers.ui.util - -import android.os.Build -import android.text.Html -import android.text.Html.FROM_HTML_MODE_COMPACT - -/** - * Discards HTML information from a String - * - * In order to keep the style information, we'd need something that does HTML -> AnnotatedString - * or Spanned -> AnnotatedString which doesn't seem to exist - * See https://stackoverflow.com/questions/66494838/android-compose-how-to-use-html-tags-in-a-text-view#comment117551793_66494838 - */ -internal fun String.discardHtmlTags(): String { - return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) { - Html.fromHtml(this, FROM_HTML_MODE_COMPACT).toString() - } else { - Html.fromHtml(this).toString() - } -} \ No newline at end of file diff --git a/shared/domain/src/androidMain/kotlin/fr/androidmakers/domain/utils/TextUtils.android.kt b/shared/domain/src/androidMain/kotlin/fr/androidmakers/domain/utils/TextUtils.android.kt new file mode 100644 index 00000000..769c286f --- /dev/null +++ b/shared/domain/src/androidMain/kotlin/fr/androidmakers/domain/utils/TextUtils.android.kt @@ -0,0 +1,14 @@ +package fr.androidmakers.domain.utils + +import android.text.Html + +actual fun String.removeHtmlTags(): String { + /** + * Discards HTML information from a String + * + * In order to keep the style information, we'd need something that does HTML -> AnnotatedString + * or Spanned -> AnnotatedString which doesn't seem to exist + * See https://stackoverflow.com/questions/66494838/android-compose-how-to-use-html-tags-in-a-text-view#comment117551793_66494838 + */ + return Html.fromHtml(this, Html.FROM_HTML_MODE_COMPACT).toString() +} diff --git a/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/utils/TextUtils.kt b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/utils/TextUtils.kt new file mode 100644 index 00000000..03afc51e --- /dev/null +++ b/shared/domain/src/commonMain/kotlin/fr/androidmakers/domain/utils/TextUtils.kt @@ -0,0 +1,3 @@ +package fr.androidmakers.domain.utils + +expect fun String.removeHtmlTags(): String diff --git a/shared/domain/src/iosMain/kotlin/fr/androidmakers/domain/utils/TextUtils.ios.kt b/shared/domain/src/iosMain/kotlin/fr/androidmakers/domain/utils/TextUtils.ios.kt new file mode 100644 index 00000000..5e16b438 --- /dev/null +++ b/shared/domain/src/iosMain/kotlin/fr/androidmakers/domain/utils/TextUtils.ios.kt @@ -0,0 +1,26 @@ +@file:Suppress("CAST_NEVER_SUCCEEDS") + +package fr.androidmakers.domain.utils + +import kotlinx.cinterop.BetaInteropApi +import kotlinx.cinterop.ExperimentalForeignApi +import platform.Foundation.NSAttributedString +import platform.Foundation.NSString +import platform.Foundation.NSUTF8StringEncoding +import platform.Foundation.dataUsingEncoding +import platform.UIKit.NSDocumentTypeDocumentAttribute +import platform.UIKit.NSHTMLTextDocumentType +import platform.UIKit.create + +@OptIn(ExperimentalForeignApi::class, BetaInteropApi::class) +actual fun String.removeHtmlTags(): String { + return (this as NSString).dataUsingEncoding(NSUTF8StringEncoding)?.let { data -> + val attributed = NSAttributedString.create( + data, + mapOf(NSDocumentTypeDocumentAttribute to NSHTMLTextDocumentType), + null, + null + ) + return attributed?.string ?: "" + } ?: "" +} diff --git a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/venue/VenueScreen.kt b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/venue/VenueScreen.kt index 155c28a8..df421181 100644 --- a/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/venue/VenueScreen.kt +++ b/shared/ui/src/commonMain/kotlin/com/androidmakers/ui/venue/VenueScreen.kt @@ -20,6 +20,7 @@ import androidx.compose.ui.unit.dp import com.androidmakers.ui.model.UIVenue import com.seiko.imageloader.rememberImagePainter import dev.icerock.moko.resources.compose.stringResource +import fr.androidmakers.domain.utils.removeHtmlTags import fr.paug.androidmakers.ui.MR @Composable @@ -60,7 +61,7 @@ fun VenueLayout( uiVenue.descriptionEn } Text( - text = description/*.discardHtmlTags()*/, + text = description.removeHtmlTags(), modifier = Modifier.padding(8.dp), style = MaterialTheme.typography.bodyMedium, ) From 15064d7b858762af83c84f7a2280c3f697402498 Mon Sep 17 00:00:00 2001 From: Antoine Robiez Date: Mon, 25 Mar 2024 17:42:16 +0100 Subject: [PATCH 2/2] Renamed RobotConf to Android Makers --- .../project.pbxproj | 60 ++-- .../contents.xcworkspacedata | 0 .../xcshareddata/IDEWorkspaceChecks.plist | 0 .../xcshareddata/swiftpm/Package.resolved | 0 .../xcschemes/AndroidMakers.xcscheme} | 22 +- .../.swiftlint.yml | 0 .../AndroidMakers.entitlements | 0 .../AppDelegate.swift | 0 .../{RobotConf => AndroidMakers}/Info.plist | 0 .../Model/Data/DataProvider.swift | 0 .../DocumentSnapshot+Decodable.swift | 0 .../Firestore/FirebaseDescriptor.swift | 0 .../FirestoreOpenFeedbackSynchronizer.swift | 0 .../Firestore/Timestamp+Codable.swift | 0 .../Schema/SchemaConfiguration.swift | 0 .../GraphQL/GraphQLDataProvider.swift | 0 .../Data/Providers/GraphQL/schema.graphqls | 0 .../Json/JsonOpenFeedbackSynchronizer.swift | 0 .../Providers/Json/Resources/partners.json | 0 .../Json/Resources/schedule-app.json | 0 .../Providers/Json/Resources/sessions.json | 0 .../Providers/Json/Resources/speakers.json | 0 .../Data/Providers/Json/Resources/venues.json | 0 .../Json/Resources/vote_configuration.json | 0 .../Providers/OpenFeedbackSynchronizer.swift | 0 .../Model/Data/VoteData.swift | 0 .../Model/FeedbackRepository.swift | 0 .../Model/Model.swift | 0 .../Model/TalkFeedback.swift | 0 .../Preview Assets.xcassets/Contents.json | 0 .../SceneDelegate.swift | 0 .../UI/ContentView.swift | 0 .../AppIcon.appiconset/Contents.json | 0 .../AppIcon.appiconset/Icon-1024.png | Bin .../AppIcon.appiconset/Icon-20.png | Bin .../AppIcon.appiconset/Icon-20@2x-1.png | Bin .../AppIcon.appiconset/Icon-20@2x.png | Bin .../AppIcon.appiconset/Icon-20@3x.png | Bin .../AppIcon.appiconset/Icon-29.png | Bin .../AppIcon.appiconset/Icon-29@2x-1.png | Bin .../AppIcon.appiconset/Icon-29@2x.png | Bin .../AppIcon.appiconset/Icon-29@3x.png | Bin .../AppIcon.appiconset/Icon-40.png | Bin .../AppIcon.appiconset/Icon-40@2x-1.png | Bin .../AppIcon.appiconset/Icon-40@2x.png | Bin .../AppIcon.appiconset/Icon-40@3x.png | Bin .../AppIcon.appiconset/Icon-60@2x.png | Bin .../AppIcon.appiconset/Icon-60@3x.png | Bin .../AppIcon.appiconset/Icon-76.png | Bin .../AppIcon.appiconset/Icon-76@2x.png | Bin .../AppIcon.appiconset/Icon-83.5@2x.png | Bin .../Resources/Assets.xcassets/Contents.json | 0 .../Base.lproj/LaunchScreen.storyboard | 0 .../fr.lproj/LaunchScreen.storyboard | 0 .../UI/RichText/RichText.swift | 0 .../xcschemes/xcschememanagement.plist | 287 ------------------ .../xcschemes/xcschememanagement.plist | 32 -- .../UI/Resources/en.lproj/Localizable.strings | 1 - .../UI/Resources/fr.lproj/Localizable.strings | 1 - 59 files changed, 34 insertions(+), 369 deletions(-) rename iosApp/{RobotConf.xcodeproj => Android Makers.xcodeproj}/project.pbxproj (92%) rename iosApp/{RobotConf.xcodeproj => Android Makers.xcodeproj}/project.xcworkspace/contents.xcworkspacedata (100%) rename iosApp/{RobotConf.xcodeproj => Android Makers.xcodeproj}/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist (100%) rename iosApp/{RobotConf.xcodeproj => Android Makers.xcodeproj}/project.xcworkspace/xcshareddata/swiftpm/Package.resolved (100%) rename iosApp/{RobotConf.xcodeproj/xcshareddata/xcschemes/RobotConf.xcscheme => Android Makers.xcodeproj/xcshareddata/xcschemes/AndroidMakers.xcscheme} (82%) rename iosApp/{RobotConf => AndroidMakers}/.swiftlint.yml (100%) rename iosApp/{RobotConf => AndroidMakers}/AndroidMakers.entitlements (100%) rename iosApp/{RobotConf => AndroidMakers}/AppDelegate.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Info.plist (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/DataProvider.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/Firestore/DocumentSnapshot+Decodable.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/Firestore/FirebaseDescriptor.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/Firestore/FirestoreOpenFeedbackSynchronizer.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/Firestore/Timestamp+Codable.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/GraphQL/Generated/Schema/SchemaConfiguration.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/GraphQL/GraphQLDataProvider.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/GraphQL/schema.graphqls (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/Json/JsonOpenFeedbackSynchronizer.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/Json/Resources/partners.json (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/Json/Resources/schedule-app.json (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/Json/Resources/sessions.json (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/Json/Resources/speakers.json (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/Json/Resources/venues.json (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/Json/Resources/vote_configuration.json (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/Providers/OpenFeedbackSynchronizer.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Data/VoteData.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/FeedbackRepository.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/Model.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Model/TalkFeedback.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/Preview Content/Preview Assets.xcassets/Contents.json (100%) rename iosApp/{RobotConf => AndroidMakers}/SceneDelegate.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/ContentView.swift (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-1024.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Assets.xcassets/Contents.json (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/Base.lproj/LaunchScreen.storyboard (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/Resources/fr.lproj/LaunchScreen.storyboard (100%) rename iosApp/{RobotConf => AndroidMakers}/UI/RichText/RichText.swift (100%) delete mode 100644 iosApp/RobotConf.xcodeproj/xcuserdata/antoinerobiez.xcuserdatad/xcschemes/xcschememanagement.plist delete mode 100644 iosApp/RobotConf.xcodeproj/xcuserdata/djavan.xcuserdatad/xcschemes/xcschememanagement.plist delete mode 100644 iosApp/RobotConf/UI/Resources/en.lproj/Localizable.strings delete mode 100644 iosApp/RobotConf/UI/Resources/fr.lproj/Localizable.strings diff --git a/iosApp/RobotConf.xcodeproj/project.pbxproj b/iosApp/Android Makers.xcodeproj/project.pbxproj similarity index 92% rename from iosApp/RobotConf.xcodeproj/project.pbxproj rename to iosApp/Android Makers.xcodeproj/project.pbxproj index e8fd938b..8b59d525 100644 --- a/iosApp/RobotConf.xcodeproj/project.pbxproj +++ b/iosApp/Android Makers.xcodeproj/project.pbxproj @@ -35,7 +35,6 @@ B2CD426923578FBD009FE6B0 /* DocumentSnapshot+Decodable.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2CD426823578FBD009FE6B0 /* DocumentSnapshot+Decodable.swift */; }; B2CD426E2362281A009FE6B0 /* URLImage in Frameworks */ = {isa = PBXBuildFile; productRef = B2CD426D2362281A009FE6B0 /* URLImage */; }; B2EF3CF523E89FC90078019F /* FeedbackRepository.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2EF3CF423E89FC90078019F /* FeedbackRepository.swift */; }; - B2F270CA23DC7E2600FD6823 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = B2F270C823DC7E2600FD6823 /* Localizable.strings */; }; B2F270DB23DC869300FD6823 /* .swiftlint.yml in Resources */ = {isa = PBXBuildFile; fileRef = B2F270DA23DC869300FD6823 /* .swiftlint.yml */; }; B2FE9FE9245493F3005FE370 /* FirebaseDescriptor.swift in Sources */ = {isa = PBXBuildFile; fileRef = B2FE9FE8245493F3005FE370 /* FirebaseDescriptor.swift */; }; /* End PBXBuildFile section */ @@ -55,7 +54,7 @@ B27CC3E22454A9450055D36B /* vote_configuration.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = vote_configuration.json; sourceTree = ""; }; B29CC7032427A01200FB7EF3 /* AndroidMakers.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = AndroidMakers.entitlements; sourceTree = ""; }; B2BC0B8323B91D2100C85F69 /* Model.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Model.swift; sourceTree = ""; }; - B2CD272B234D06530016AA02 /* RobotConf.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = RobotConf.app; sourceTree = BUILT_PRODUCTS_DIR; }; + B2CD272B234D06530016AA02 /* Android Makers.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "Android Makers.app"; sourceTree = BUILT_PRODUCTS_DIR; }; B2CD272E234D06530016AA02 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; B2CD2730234D06530016AA02 /* SceneDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SceneDelegate.swift; sourceTree = ""; }; B2CD2732234D06530016AA02 /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; @@ -66,8 +65,6 @@ B2CD426823578FBD009FE6B0 /* DocumentSnapshot+Decodable.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "DocumentSnapshot+Decodable.swift"; sourceTree = ""; }; B2ECA77324151B6E00489874 /* OpenFeedback-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OpenFeedback-Info.plist"; sourceTree = ""; }; B2EF3CF423E89FC90078019F /* FeedbackRepository.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackRepository.swift; sourceTree = ""; }; - B2F270CC23DC7E9200FD6823 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/Localizable.strings; sourceTree = ""; }; - B2F270CD23DC7EBC00FD6823 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Localizable.strings; sourceTree = ""; }; B2F270DA23DC869300FD6823 /* .swiftlint.yml */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.yaml; path = .swiftlint.yml; sourceTree = ""; }; B2FE9FC02454733E005FE370 /* sessions.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = sessions.json; sourceTree = ""; }; B2FE9FD424548E41005FE370 /* schedule-app.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = "schedule-app.json"; sourceTree = ""; }; @@ -126,7 +123,7 @@ B2CD2722234D06530016AA02 = { isa = PBXGroup; children = ( - B2CD272D234D06530016AA02 /* RobotConf */, + B2CD272D234D06530016AA02 /* AndroidMakers */, B2CD272C234D06530016AA02 /* Products */, ); sourceTree = ""; @@ -134,12 +131,12 @@ B2CD272C234D06530016AA02 /* Products */ = { isa = PBXGroup; children = ( - B2CD272B234D06530016AA02 /* RobotConf.app */, + B2CD272B234D06530016AA02 /* Android Makers.app */, ); name = Products; sourceTree = ""; }; - B2CD272D234D06530016AA02 /* RobotConf */ = { + B2CD272D234D06530016AA02 /* AndroidMakers */ = { isa = PBXGroup; children = ( B29CC7032427A01200FB7EF3 /* AndroidMakers.entitlements */, @@ -153,7 +150,7 @@ 6418BE5C2BA1EC8900F3EA79 /* GoogleService-Info.plist */, B2CD2736234D06560016AA02 /* Preview Content */, ); - path = RobotConf; + path = AndroidMakers; sourceTree = ""; }; B2CD2736234D06560016AA02 /* Preview Content */ = { @@ -189,7 +186,6 @@ children = ( B2CD2739234D06560016AA02 /* LaunchScreen.storyboard */, B2CD2734234D06560016AA02 /* Assets.xcassets */, - B2F270C823DC7E2600FD6823 /* Localizable.strings */, ); path = Resources; sourceTree = ""; @@ -251,9 +247,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - B2CD272A234D06530016AA02 /* RobotConf */ = { + B2CD272A234D06530016AA02 /* Android Makers */ = { isa = PBXNativeTarget; - buildConfigurationList = B2CD2755234D06560016AA02 /* Build configuration list for PBXNativeTarget "RobotConf" */; + buildConfigurationList = B2CD2755234D06560016AA02 /* Build configuration list for PBXNativeTarget "Android Makers" */; buildPhases = ( 64F2D2762B878156005B9EAF /* 🏗️ Compile and embedded shared code */, B2CD2727234D06530016AA02 /* Sources */, @@ -267,7 +263,7 @@ ); dependencies = ( ); - name = RobotConf; + name = "Android Makers"; packageProductDependencies = ( B2CD426D2362281A009FE6B0 /* URLImage */, B26E853A23D49D8B006C2C9E /* SwiftRichString */, @@ -280,7 +276,7 @@ 45DAAD7B29E49D430085977B /* ApolloSQLite */, ); productName = RobotConf; - productReference = B2CD272B234D06530016AA02 /* RobotConf.app */; + productReference = B2CD272B234D06530016AA02 /* Android Makers.app */; productType = "com.apple.product-type.application"; }; /* End PBXNativeTarget section */ @@ -298,7 +294,7 @@ }; }; }; - buildConfigurationList = B2CD2726234D06530016AA02 /* Build configuration list for PBXProject "RobotConf" */; + buildConfigurationList = B2CD2726234D06530016AA02 /* Build configuration list for PBXProject "Android Makers" */; compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 0; @@ -319,7 +315,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - B2CD272A234D06530016AA02 /* RobotConf */, + B2CD272A234D06530016AA02 /* Android Makers */, ); }; /* End PBXProject section */ @@ -329,7 +325,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - B2F270CA23DC7E2600FD6823 /* Localizable.strings in Resources */, B2CD273B234D06560016AA02 /* LaunchScreen.storyboard in Resources */, B2F270DB23DC869300FD6823 /* .swiftlint.yml in Resources */, B2CD2738234D06560016AA02 /* Preview Assets.xcassets in Resources */, @@ -396,7 +391,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "if [ \"${CONFIGURATION}\" == \"Debug\" ]; then\n cp -r \"${SRCROOT}/RobotConf/Model/Data/Providers/Json/Resources/\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\"\nfi\n"; + shellScript = "if [ \"${CONFIGURATION}\" == \"Debug\" ]; then\n cp -r \"${SRCROOT}/AndroidMakers/Model/Data/Providers/Json/Resources/\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\"\nfi\n"; }; B27CC3E82455ADD40055D36B /* Copy Firebase plist files */ = { isa = PBXShellScriptBuildPhase; @@ -414,7 +409,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "MAIN_FIREBASE_FILE=\"${SRCROOT}/RobotConf/GoogleService-Info.plist\"\nOPENFEEDBACK_FIREBASE_FILE=\"${SRCROOT}/RobotConf/OpenFeedback-Info.plist\"\nif [ -f \"${MAIN_FIREBASE_FILE}\" ]; then\n cp -r \"${MAIN_FIREBASE_FILE}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\"\nfi\n\nif [ -f \"${OPENFEEDBACK_FIREBASE_FILE}\" ]; then\n cp -r \"${OPENFEEDBACK_FIREBASE_FILE}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\"\nfi\n"; + shellScript = "MAIN_FIREBASE_FILE=\"${SRCROOT}/AndroidMakers/GoogleService-Info.plist\"\nOPENFEEDBACK_FIREBASE_FILE=\"${SRCROOT}/AndroidMakers/OpenFeedback-Info.plist\"\nif [ -f \"${MAIN_FIREBASE_FILE}\" ]; then\n cp -r \"${MAIN_FIREBASE_FILE}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\"\nfi\n\nif [ -f \"${OPENFEEDBACK_FIREBASE_FILE}\" ]; then\n cp -r \"${OPENFEEDBACK_FIREBASE_FILE}\" \"${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}.app\"\nfi\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -453,15 +448,6 @@ name = LaunchScreen.storyboard; sourceTree = ""; }; - B2F270C823DC7E2600FD6823 /* Localizable.strings */ = { - isa = PBXVariantGroup; - children = ( - B2F270CC23DC7E9200FD6823 /* fr */, - B2F270CD23DC7EBC00FD6823 /* en */, - ); - name = Localizable.strings; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */ @@ -587,15 +573,15 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = RobotConf/AndroidMakers.entitlements; + CODE_SIGN_ENTITLEMENTS = AndroidMakers/AndroidMakers.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 13; - DEVELOPMENT_ASSET_PATHS = "RobotConf/Preview\\ Content"; + DEVELOPMENT_ASSET_PATHS = "\"AndroidMakers/Preview Content\""; DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)"; - INFOPLIST_FILE = RobotConf/Info.plist; + INFOPLIST_FILE = AndroidMakers/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -607,7 +593,7 @@ shared, ); PRODUCT_BUNDLE_IDENTIFIER = com.paug.RobotConf; - PRODUCT_NAME = RobotConf; + PRODUCT_NAME = "Android Makers"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -617,15 +603,15 @@ isa = XCBuildConfiguration; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; - CODE_SIGN_ENTITLEMENTS = RobotConf/AndroidMakers.entitlements; + CODE_SIGN_ENTITLEMENTS = AndroidMakers/AndroidMakers.entitlements; CODE_SIGN_STYLE = Automatic; CURRENT_PROJECT_VERSION = 13; - DEVELOPMENT_ASSET_PATHS = "RobotConf/Preview\\ Content"; + DEVELOPMENT_ASSET_PATHS = "\"AndroidMakers/Preview Content\""; DEVELOPMENT_TEAM = ""; ENABLE_PREVIEWS = YES; ENABLE_USER_SCRIPT_SANDBOXING = NO; FRAMEWORK_SEARCH_PATHS = "$(SRCROOT)/../shared/build/xcode-frameworks/$(CONFIGURATION)/$(SDK_NAME)"; - INFOPLIST_FILE = RobotConf/Info.plist; + INFOPLIST_FILE = AndroidMakers/Info.plist; IPHONEOS_DEPLOYMENT_TARGET = 15.0; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", @@ -637,7 +623,7 @@ shared, ); PRODUCT_BUNDLE_IDENTIFIER = com.paug.RobotConf; - PRODUCT_NAME = RobotConf; + PRODUCT_NAME = "Android Makers"; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; }; @@ -646,7 +632,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - B2CD2726234D06530016AA02 /* Build configuration list for PBXProject "RobotConf" */ = { + B2CD2726234D06530016AA02 /* Build configuration list for PBXProject "Android Makers" */ = { isa = XCConfigurationList; buildConfigurations = ( B2CD2753234D06560016AA02 /* Debug */, @@ -655,7 +641,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - B2CD2755234D06560016AA02 /* Build configuration list for PBXNativeTarget "RobotConf" */ = { + B2CD2755234D06560016AA02 /* Build configuration list for PBXNativeTarget "Android Makers" */ = { isa = XCConfigurationList; buildConfigurations = ( B2CD2756234D06560016AA02 /* Debug */, diff --git a/iosApp/RobotConf.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/iosApp/Android Makers.xcodeproj/project.xcworkspace/contents.xcworkspacedata similarity index 100% rename from iosApp/RobotConf.xcodeproj/project.xcworkspace/contents.xcworkspacedata rename to iosApp/Android Makers.xcodeproj/project.xcworkspace/contents.xcworkspacedata diff --git a/iosApp/RobotConf.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/iosApp/Android Makers.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist similarity index 100% rename from iosApp/RobotConf.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist rename to iosApp/Android Makers.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist diff --git a/iosApp/RobotConf.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved b/iosApp/Android Makers.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved similarity index 100% rename from iosApp/RobotConf.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved rename to iosApp/Android Makers.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved diff --git a/iosApp/RobotConf.xcodeproj/xcshareddata/xcschemes/RobotConf.xcscheme b/iosApp/Android Makers.xcodeproj/xcshareddata/xcschemes/AndroidMakers.xcscheme similarity index 82% rename from iosApp/RobotConf.xcodeproj/xcshareddata/xcschemes/RobotConf.xcscheme rename to iosApp/Android Makers.xcodeproj/xcshareddata/xcschemes/AndroidMakers.xcscheme index 50bed05e..53f3a05c 100644 --- a/iosApp/RobotConf.xcodeproj/xcshareddata/xcschemes/RobotConf.xcscheme +++ b/iosApp/Android Makers.xcodeproj/xcshareddata/xcschemes/AndroidMakers.xcscheme @@ -15,9 +15,9 @@ + BuildableName = "Android Makers.app" + BlueprintName = "Android Makers" + ReferencedContainer = "container:Android Makers.xcodeproj"> @@ -35,7 +35,7 @@ BlueprintIdentifier = "B2CD2740234D06560016AA02" BuildableName = "RobotConfTests.xctest" BlueprintName = "RobotConfTests" - ReferencedContainer = "container:RobotConf.xcodeproj"> + ReferencedContainer = "container:Android Makers.xcodeproj"> + ReferencedContainer = "container:Android Makers.xcodeproj"> @@ -65,9 +65,9 @@ + BuildableName = "Android Makers.app" + BlueprintName = "Android Makers" + ReferencedContainer = "container:Android Makers.xcodeproj"> @@ -82,9 +82,9 @@ + BuildableName = "Android Makers.app" + BlueprintName = "Android Makers" + ReferencedContainer = "container:Android Makers.xcodeproj"> diff --git a/iosApp/RobotConf/.swiftlint.yml b/iosApp/AndroidMakers/.swiftlint.yml similarity index 100% rename from iosApp/RobotConf/.swiftlint.yml rename to iosApp/AndroidMakers/.swiftlint.yml diff --git a/iosApp/RobotConf/AndroidMakers.entitlements b/iosApp/AndroidMakers/AndroidMakers.entitlements similarity index 100% rename from iosApp/RobotConf/AndroidMakers.entitlements rename to iosApp/AndroidMakers/AndroidMakers.entitlements diff --git a/iosApp/RobotConf/AppDelegate.swift b/iosApp/AndroidMakers/AppDelegate.swift similarity index 100% rename from iosApp/RobotConf/AppDelegate.swift rename to iosApp/AndroidMakers/AppDelegate.swift diff --git a/iosApp/RobotConf/Info.plist b/iosApp/AndroidMakers/Info.plist similarity index 100% rename from iosApp/RobotConf/Info.plist rename to iosApp/AndroidMakers/Info.plist diff --git a/iosApp/RobotConf/Model/Data/DataProvider.swift b/iosApp/AndroidMakers/Model/Data/DataProvider.swift similarity index 100% rename from iosApp/RobotConf/Model/Data/DataProvider.swift rename to iosApp/AndroidMakers/Model/Data/DataProvider.swift diff --git a/iosApp/RobotConf/Model/Data/Providers/Firestore/DocumentSnapshot+Decodable.swift b/iosApp/AndroidMakers/Model/Data/Providers/Firestore/DocumentSnapshot+Decodable.swift similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/Firestore/DocumentSnapshot+Decodable.swift rename to iosApp/AndroidMakers/Model/Data/Providers/Firestore/DocumentSnapshot+Decodable.swift diff --git a/iosApp/RobotConf/Model/Data/Providers/Firestore/FirebaseDescriptor.swift b/iosApp/AndroidMakers/Model/Data/Providers/Firestore/FirebaseDescriptor.swift similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/Firestore/FirebaseDescriptor.swift rename to iosApp/AndroidMakers/Model/Data/Providers/Firestore/FirebaseDescriptor.swift diff --git a/iosApp/RobotConf/Model/Data/Providers/Firestore/FirestoreOpenFeedbackSynchronizer.swift b/iosApp/AndroidMakers/Model/Data/Providers/Firestore/FirestoreOpenFeedbackSynchronizer.swift similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/Firestore/FirestoreOpenFeedbackSynchronizer.swift rename to iosApp/AndroidMakers/Model/Data/Providers/Firestore/FirestoreOpenFeedbackSynchronizer.swift diff --git a/iosApp/RobotConf/Model/Data/Providers/Firestore/Timestamp+Codable.swift b/iosApp/AndroidMakers/Model/Data/Providers/Firestore/Timestamp+Codable.swift similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/Firestore/Timestamp+Codable.swift rename to iosApp/AndroidMakers/Model/Data/Providers/Firestore/Timestamp+Codable.swift diff --git a/iosApp/RobotConf/Model/Data/Providers/GraphQL/Generated/Schema/SchemaConfiguration.swift b/iosApp/AndroidMakers/Model/Data/Providers/GraphQL/Generated/Schema/SchemaConfiguration.swift similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/GraphQL/Generated/Schema/SchemaConfiguration.swift rename to iosApp/AndroidMakers/Model/Data/Providers/GraphQL/Generated/Schema/SchemaConfiguration.swift diff --git a/iosApp/RobotConf/Model/Data/Providers/GraphQL/GraphQLDataProvider.swift b/iosApp/AndroidMakers/Model/Data/Providers/GraphQL/GraphQLDataProvider.swift similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/GraphQL/GraphQLDataProvider.swift rename to iosApp/AndroidMakers/Model/Data/Providers/GraphQL/GraphQLDataProvider.swift diff --git a/iosApp/RobotConf/Model/Data/Providers/GraphQL/schema.graphqls b/iosApp/AndroidMakers/Model/Data/Providers/GraphQL/schema.graphqls similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/GraphQL/schema.graphqls rename to iosApp/AndroidMakers/Model/Data/Providers/GraphQL/schema.graphqls diff --git a/iosApp/RobotConf/Model/Data/Providers/Json/JsonOpenFeedbackSynchronizer.swift b/iosApp/AndroidMakers/Model/Data/Providers/Json/JsonOpenFeedbackSynchronizer.swift similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/Json/JsonOpenFeedbackSynchronizer.swift rename to iosApp/AndroidMakers/Model/Data/Providers/Json/JsonOpenFeedbackSynchronizer.swift diff --git a/iosApp/RobotConf/Model/Data/Providers/Json/Resources/partners.json b/iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/partners.json similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/Json/Resources/partners.json rename to iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/partners.json diff --git a/iosApp/RobotConf/Model/Data/Providers/Json/Resources/schedule-app.json b/iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/schedule-app.json similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/Json/Resources/schedule-app.json rename to iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/schedule-app.json diff --git a/iosApp/RobotConf/Model/Data/Providers/Json/Resources/sessions.json b/iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/sessions.json similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/Json/Resources/sessions.json rename to iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/sessions.json diff --git a/iosApp/RobotConf/Model/Data/Providers/Json/Resources/speakers.json b/iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/speakers.json similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/Json/Resources/speakers.json rename to iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/speakers.json diff --git a/iosApp/RobotConf/Model/Data/Providers/Json/Resources/venues.json b/iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/venues.json similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/Json/Resources/venues.json rename to iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/venues.json diff --git a/iosApp/RobotConf/Model/Data/Providers/Json/Resources/vote_configuration.json b/iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/vote_configuration.json similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/Json/Resources/vote_configuration.json rename to iosApp/AndroidMakers/Model/Data/Providers/Json/Resources/vote_configuration.json diff --git a/iosApp/RobotConf/Model/Data/Providers/OpenFeedbackSynchronizer.swift b/iosApp/AndroidMakers/Model/Data/Providers/OpenFeedbackSynchronizer.swift similarity index 100% rename from iosApp/RobotConf/Model/Data/Providers/OpenFeedbackSynchronizer.swift rename to iosApp/AndroidMakers/Model/Data/Providers/OpenFeedbackSynchronizer.swift diff --git a/iosApp/RobotConf/Model/Data/VoteData.swift b/iosApp/AndroidMakers/Model/Data/VoteData.swift similarity index 100% rename from iosApp/RobotConf/Model/Data/VoteData.swift rename to iosApp/AndroidMakers/Model/Data/VoteData.swift diff --git a/iosApp/RobotConf/Model/FeedbackRepository.swift b/iosApp/AndroidMakers/Model/FeedbackRepository.swift similarity index 100% rename from iosApp/RobotConf/Model/FeedbackRepository.swift rename to iosApp/AndroidMakers/Model/FeedbackRepository.swift diff --git a/iosApp/RobotConf/Model/Model.swift b/iosApp/AndroidMakers/Model/Model.swift similarity index 100% rename from iosApp/RobotConf/Model/Model.swift rename to iosApp/AndroidMakers/Model/Model.swift diff --git a/iosApp/RobotConf/Model/TalkFeedback.swift b/iosApp/AndroidMakers/Model/TalkFeedback.swift similarity index 100% rename from iosApp/RobotConf/Model/TalkFeedback.swift rename to iosApp/AndroidMakers/Model/TalkFeedback.swift diff --git a/iosApp/RobotConf/Preview Content/Preview Assets.xcassets/Contents.json b/iosApp/AndroidMakers/Preview Content/Preview Assets.xcassets/Contents.json similarity index 100% rename from iosApp/RobotConf/Preview Content/Preview Assets.xcassets/Contents.json rename to iosApp/AndroidMakers/Preview Content/Preview Assets.xcassets/Contents.json diff --git a/iosApp/RobotConf/SceneDelegate.swift b/iosApp/AndroidMakers/SceneDelegate.swift similarity index 100% rename from iosApp/RobotConf/SceneDelegate.swift rename to iosApp/AndroidMakers/SceneDelegate.swift diff --git a/iosApp/RobotConf/UI/ContentView.swift b/iosApp/AndroidMakers/UI/ContentView.swift similarity index 100% rename from iosApp/RobotConf/UI/ContentView.swift rename to iosApp/AndroidMakers/UI/ContentView.swift diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-1024.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-1024.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-1024.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-1024.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@2x-1.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@2x.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-20@3x.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@2x-1.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@2x.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-29@3x.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@2x-1.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@2x.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-40@3x.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@2x.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-60@3x.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-76@2x.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/AppIcon.appiconset/Icon-83.5@2x.png diff --git a/iosApp/RobotConf/UI/Resources/Assets.xcassets/Contents.json b/iosApp/AndroidMakers/UI/Resources/Assets.xcassets/Contents.json similarity index 100% rename from iosApp/RobotConf/UI/Resources/Assets.xcassets/Contents.json rename to iosApp/AndroidMakers/UI/Resources/Assets.xcassets/Contents.json diff --git a/iosApp/RobotConf/UI/Resources/Base.lproj/LaunchScreen.storyboard b/iosApp/AndroidMakers/UI/Resources/Base.lproj/LaunchScreen.storyboard similarity index 100% rename from iosApp/RobotConf/UI/Resources/Base.lproj/LaunchScreen.storyboard rename to iosApp/AndroidMakers/UI/Resources/Base.lproj/LaunchScreen.storyboard diff --git a/iosApp/RobotConf/UI/Resources/fr.lproj/LaunchScreen.storyboard b/iosApp/AndroidMakers/UI/Resources/fr.lproj/LaunchScreen.storyboard similarity index 100% rename from iosApp/RobotConf/UI/Resources/fr.lproj/LaunchScreen.storyboard rename to iosApp/AndroidMakers/UI/Resources/fr.lproj/LaunchScreen.storyboard diff --git a/iosApp/RobotConf/UI/RichText/RichText.swift b/iosApp/AndroidMakers/UI/RichText/RichText.swift similarity index 100% rename from iosApp/RobotConf/UI/RichText/RichText.swift rename to iosApp/AndroidMakers/UI/RichText/RichText.swift diff --git a/iosApp/RobotConf.xcodeproj/xcuserdata/antoinerobiez.xcuserdatad/xcschemes/xcschememanagement.plist b/iosApp/RobotConf.xcodeproj/xcuserdata/antoinerobiez.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index f0a937bc..00000000 --- a/iosApp/RobotConf.xcodeproj/xcuserdata/antoinerobiez.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,287 +0,0 @@ - - - - - SchemeUserState - - Promises (Playground) 1.xcscheme - - isShown - - orderHint - 8 - - Promises (Playground) 10.xcscheme - - isShown - - orderHint - 35 - - Promises (Playground) 11.xcscheme - - isShown - - orderHint - 36 - - Promises (Playground) 2.xcscheme - - isShown - - orderHint - 9 - - Promises (Playground) 3.xcscheme - - isShown - - orderHint - 13 - - Promises (Playground) 4.xcscheme - - isShown - - orderHint - 14 - - Promises (Playground) 5.xcscheme - - isShown - - orderHint - 15 - - Promises (Playground) 6.xcscheme - - isShown - - orderHint - 25 - - Promises (Playground) 7.xcscheme - - isShown - - orderHint - 26 - - Promises (Playground) 8.xcscheme - - isShown - - orderHint - 27 - - Promises (Playground) 9.xcscheme - - isShown - - orderHint - 34 - - Promises (Playground).xcscheme - - isShown - - orderHint - 7 - - RobotConf.xcscheme_^#shared#^_ - - orderHint - 0 - - Rx (Playground) 1.xcscheme - - isShown - - orderHint - 11 - - Rx (Playground) 2.xcscheme - - isShown - - orderHint - 12 - - Rx (Playground).xcscheme - - isShown - - orderHint - 10 - - SQLite (Playground) 1.xcscheme - - isShown - - orderHint - 2 - - SQLite (Playground) 10.xcscheme - - isShown - - orderHint - 29 - - SQLite (Playground) 11.xcscheme - - isShown - - orderHint - 30 - - SQLite (Playground) 2.xcscheme - - isShown - - orderHint - 3 - - SQLite (Playground) 3.xcscheme - - isShown - - orderHint - 16 - - SQLite (Playground) 4.xcscheme - - isShown - - orderHint - 17 - - SQLite (Playground) 5.xcscheme - - isShown - - orderHint - 18 - - SQLite (Playground) 6.xcscheme - - isShown - - orderHint - 22 - - SQLite (Playground) 7.xcscheme - - isShown - - orderHint - 23 - - SQLite (Playground) 8.xcscheme - - isShown - - orderHint - 24 - - SQLite (Playground) 9.xcscheme - - isShown - - orderHint - 28 - - SQLite (Playground).xcscheme - - isShown - - orderHint - 1 - - SwiftRichString (Playground) 1.xcscheme - - isShown - - orderHint - 5 - - SwiftRichString (Playground) 10.xcscheme - - isShown - - orderHint - 32 - - SwiftRichString (Playground) 11.xcscheme - - isShown - - orderHint - 33 - - SwiftRichString (Playground) 2.xcscheme - - isShown - - orderHint - 6 - - SwiftRichString (Playground) 3.xcscheme - - isShown - - orderHint - 10 - - SwiftRichString (Playground) 4.xcscheme - - isShown - - orderHint - 11 - - SwiftRichString (Playground) 5.xcscheme - - isShown - - orderHint - 12 - - SwiftRichString (Playground) 6.xcscheme - - isShown - - orderHint - 19 - - SwiftRichString (Playground) 7.xcscheme - - isShown - - orderHint - 20 - - SwiftRichString (Playground) 8.xcscheme - - isShown - - orderHint - 21 - - SwiftRichString (Playground) 9.xcscheme - - isShown - - orderHint - 31 - - SwiftRichString (Playground).xcscheme - - isShown - - orderHint - 4 - - - - diff --git a/iosApp/RobotConf.xcodeproj/xcuserdata/djavan.xcuserdatad/xcschemes/xcschememanagement.plist b/iosApp/RobotConf.xcodeproj/xcuserdata/djavan.xcuserdatad/xcschemes/xcschememanagement.plist deleted file mode 100644 index 5ea4d85e..00000000 --- a/iosApp/RobotConf.xcodeproj/xcuserdata/djavan.xcuserdatad/xcschemes/xcschememanagement.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - SchemeUserState - - RobotConf.xcscheme_^#shared#^_ - - orderHint - 22 - - - SuppressBuildableAutocreation - - B2CD272A234D06530016AA02 - - primary - - - B2CD2740234D06560016AA02 - - primary - - - B2CD274B234D06560016AA02 - - primary - - - - - diff --git a/iosApp/RobotConf/UI/Resources/en.lproj/Localizable.strings b/iosApp/RobotConf/UI/Resources/en.lproj/Localizable.strings deleted file mode 100644 index a96ded24..00000000 --- a/iosApp/RobotConf/UI/Resources/en.lproj/Localizable.strings +++ /dev/null @@ -1 +0,0 @@ -"title" = "RobotConf 23"; diff --git a/iosApp/RobotConf/UI/Resources/fr.lproj/Localizable.strings b/iosApp/RobotConf/UI/Resources/fr.lproj/Localizable.strings deleted file mode 100644 index a96ded24..00000000 --- a/iosApp/RobotConf/UI/Resources/fr.lproj/Localizable.strings +++ /dev/null @@ -1 +0,0 @@ -"title" = "RobotConf 23";