Ios blockly updates (#393)

* naming fixes
ob-f · Jun 25, 2024 · caeba05 · caeba05
1 parent 0873c85
commit caeba05
Show file tree

Hide file tree

Showing 10 changed files with 84 additions and 1,347 deletions.
diff --git a/android/robot/google-services.json b/android/robot/google-services.json
@@ -1,40 +1,25 @@
 {
   "project_info": {
     "project_number": "955078484078",
+    "firebase_url": "https://opencode-openbot-default-rtdb.asia-southeast1.firebasedatabase.app",
     "project_id": "opencode-openbot",
     "storage_bucket": "opencode-openbot.appspot.com"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:955078484078:android:0ed69dbcaad0793a65867f",
+        "mobilesdk_app_id": "1:955078484078:android:42efc0c06fa6583165867f",
         "android_client_info": {
           "package_name": "org.openbot"
         }
       },
       "oauth_client": [
         {
-          "client_id": "955078484078-385d4dqq0l8rr1ksge8gbe4q8794b96b.apps.googleusercontent.com",
+          "client_id": "955078484078-91d6gg3p2qt9eilolpqp8o9j6nqjaqdf.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
             "package_name": "org.openbot",
-            "certificate_hash": "b7e97790753c13482e22d0c1ea899ae17b1b4f88"
-          }
-        },
-        {
-          "client_id": "955078484078-610055je567ae4i8p7q75et34e7ssvkm.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "org.openbot",
-            "certificate_hash": "3ee1786f8f6f7fb3a93e593d0c1ccdb6a334cb0d"
-          }
-        },
-        {
-          "client_id": "955078484078-jaoouon63eq00dqkc8l1rdl1qphpfmv2.apps.googleusercontent.com",
-          "client_type": 1,
-          "android_info": {
-            "package_name": "org.openbot",
-            "certificate_hash": "f397f5f4db44bef0e43eb61f529a7532dbf62483"
+            "certificate_hash": "224d8f13596161c1d53e2008aee1650856446ce7"
           }
         },
         {
@@ -55,10 +40,10 @@
               "client_type": 3
             },
             {
-              "client_id": "955078484078-40uecrlb9cdan3fkckisjlv8uthaj9dd.apps.googleusercontent.com",
+              "client_id": "955078484078-4m63lascf45ranfmedahhcgo10ainnfa.apps.googleusercontent.com",
               "client_type": 2,
               "ios_info": {
-                "bundle_id": "com.emboidedai.openbot"
+                "bundle_id": "org.openbot"
               }
             }
           ]

diff --git a/android/robot/src/main/assets/google-services.json b/android/robot/src/main/assets/google-services.json
@@ -0,0 +1,55 @@
+{
+  "project_info": {
+    "project_number": "955078484078",
+    "firebase_url": "https://opencode-openbot-default-rtdb.asia-southeast1.firebasedatabase.app",
+    "project_id": "opencode-openbot",
+    "storage_bucket": "opencode-openbot.appspot.com"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:955078484078:android:42efc0c06fa6583165867f",
+        "android_client_info": {
+          "package_name": "org.openbot"
+        }
+      },
+      "oauth_client": [
+        {
+          "client_id": "955078484078-91d6gg3p2qt9eilolpqp8o9j6nqjaqdf.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.openbot",
+            "certificate_hash": "224d8f13596161c1d53e2008aee1650856446ce7"
+          }
+        },
+        {
+          "client_id": "955078484078-kbadvp54dljcpk0g0j5bnf5c17q63ir2.apps.googleusercontent.com",
+          "client_type": 3
+        }
+      ],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA7AhVQcAsZJtYIrJqcvmlxNlcPgmt5bGw"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": [
+            {
+              "client_id": "955078484078-kbadvp54dljcpk0g0j5bnf5c17q63ir2.apps.googleusercontent.com",
+              "client_type": 3
+            },
+            {
+              "client_id": "955078484078-4m63lascf45ranfmedahhcgo10ainnfa.apps.googleusercontent.com",
+              "client_type": 2,
+              "ios_info": {
+                "bundle_id": "org.openbot"
+              }
+            }
+          ]
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}
diff --git a/ios/OpenBot/OpenBot.xcodeproj/project.pbxproj b/ios/OpenBot/OpenBot.xcodeproj/project.pbxproj
@@ -146,7 +146,7 @@
 /* End PBXContainerItemProxy section */
 
 /* Begin PBXFileReference section */
-		0619EEC92C24208B0050EB6A /* Modes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Modes.swift; path = OpenBot/Modes.swift; sourceTree = SOURCE_ROOT; };
+		0619EEC92C24208B0050EB6A /* Modes.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; name = Modes.swift; path = OpenBot/Models/Modes.swift; sourceTree = SOURCE_ROOT; };
 		06B219AC2ABD4D6100E65CEF /* SharedPreferences.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SharedPreferences.swift; sourceTree = "<group>"; };
 		06C87ABA2B3568E700454299 /* FragmentType.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FragmentType.swift; sourceTree = "<group>"; };
 		113A10896533873FE2926AF5 /* BlockyTasksStorage.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BlockyTasksStorage.swift; sourceTree = "<group>"; };
@@ -306,6 +306,14 @@
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		0666F18B2C295BCB006D88C7 /* Models */ = {
+			isa = PBXGroup;
+			children = (
+				0619EEC92C24208B0050EB6A /* Modes.swift */,
+			);
+			path = Models;
+			sourceTree = "<group>";
+		};
 		06C87AB92B3568AF00454299 /* Fragment */ = {
 			isa = PBXGroup;
 			children = (
@@ -370,14 +378,6 @@
 			path = Utils;
 			sourceTree = "<group>";
 		};
-		4FEF44F0837469F66D5A7156 /* Models */ = {
-			isa = PBXGroup;
-			children = (
-				0619EEC92C24208B0050EB6A /* Modes.swift */,
-			);
-			path = Models;
-			sourceTree = "<group>";
-		};
 		4FEF4549B0D1FC8F591E63FE /* OpenBotUITests */ = {
 			isa = PBXGroup;
 			children = (
@@ -390,10 +390,10 @@
 		4FEF489C07FD5C967FFDCDE8 /* OpenBot */ = {
 			isa = PBXGroup;
 			children = (
+				0666F18B2C295BCB006D88C7 /* Models */,
 				3A70CA1129C98E5800E4192B /* GoogleService-Info.plist */,
 				66AC71E129B885410022108A /* Controllers */,
 				BF9BAED628AF94A800EF3E48 /* Frameworks */,
-				4FEF44F0837469F66D5A7156 /* Models */,
 				4FEF42AB3B7AC14D55B7DBA3 /* Utils */,
 				4FEF4A209F128B8F5AC06E17 /* Products */,
 				4FEF4BBD0A2E51DD7BAD32C5 /* Assets.xcassets */,
@@ -1331,7 +1331,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 0.7.0;
-				PRODUCT_BUNDLE_IDENTIFIER = org.robot.openbo;
+				PRODUCT_BUNDLE_IDENTIFIER = org.openbot;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;
@@ -1374,7 +1374,7 @@
 					"@executable_path/Frameworks",
 				);
 				MARKETING_VERSION = 0.7.0;
-				PRODUCT_BUNDLE_IDENTIFIER = org.robot.openbo;
+				PRODUCT_BUNDLE_IDENTIFIER = org.openbot;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_EMIT_LOC_STRINGS = YES;

diff --git a/ios/OpenBot/OpenBot/Controllers/RobotInfo/CheckBox.swift b/ios/OpenBot/OpenBot/Controllers/RobotInfo/CheckBox.swift
@@ -79,7 +79,6 @@ public class Checkbox: UIControl {
     public var checkmarkColor: UIColor!
 
     /// **Default:** White.
-    @available(swift, obsoleted: 4.1, renamed: "checkboxFillColor", message: "Defaults to a clear color")
     public var checkboxBackgroundColor: UIColor! = .white
 
     /// The checkboxes fill color.

diff --git a/ios/OpenBot/OpenBot/Controllers/WebView/WebViewFragment.swift b/ios/OpenBot/OpenBot/Controllers/WebView/WebViewFragment.swift
@@ -41,7 +41,7 @@ class openCodeWebView: UIViewController, WKUIDelegate, WKNavigationDelegate {
     override func viewDidLoad() {
         super.viewDidLoad()
         webView.navigationDelegate = self
-        let myURL = URL(string: "https://www.openbot.itinker.io/")
+        let myURL = URL(string: "https://www.playground.openbot.org/")
         let myRequest = URLRequest(url: myURL!)
         let scrollView = webView.scrollView
         scrollView.showsVerticalScrollIndicator = false

diff --git a/ios/OpenBot/OpenBot/GoogleService-Info.plist b/ios/OpenBot/OpenBot/GoogleService-Info.plist
@@ -3,17 +3,19 @@
 <plist version="1.0">
 <dict>
 	<key>CLIENT_ID</key>
-	<string>955078484078-kq5d4bbjh05qdksr433k1ugakgspk8ee.apps.googleusercontent.com</string>
+	<string>955078484078-4m63lascf45ranfmedahhcgo10ainnfa.apps.googleusercontent.com</string>
 	<key>REVERSED_CLIENT_ID</key>
-	<string>com.googleusercontent.apps.955078484078-kq5d4bbjh05qdksr433k1ugakgspk8ee</string>
+	<string>com.googleusercontent.apps.955078484078-4m63lascf45ranfmedahhcgo10ainnfa</string>
+	<key>ANDROID_CLIENT_ID</key>
+	<string>955078484078-234hcdks9b2fv94n77d6guek1sfsk30r.apps.googleusercontent.com</string>
 	<key>API_KEY</key>
 	<string>AIzaSyCMmaGPZ7rWxQXPIFU0zf9EKM82jH9kn2M</string>
 	<key>GCM_SENDER_ID</key>
 	<string>955078484078</string>
 	<key>PLIST_VERSION</key>
 	<string>1</string>
 	<key>BUNDLE_ID</key>
-	<string>com.emboidedai.openbot</string>
+	<string>org.openbot</string>
 	<key>PROJECT_ID</key>
 	<string>opencode-openbot</string>
 	<key>STORAGE_BUCKET</key>
@@ -29,6 +31,8 @@
 	<key>IS_SIGNIN_ENABLED</key>
 	<true></true>
 	<key>GOOGLE_APP_ID</key>
-	<string>1:955078484078:ios:13f2678949d5395a65867f</string>
+	<string>1:955078484078:ios:dd1d0a2f4d0a7f9a65867f</string>
+	<key>DATABASE_URL</key>
+	<string>https://opencode-openbot-default-rtdb.asia-southeast1.firebasedatabase.app</string>
 </dict>
 </plist>
diff --git a/ios/OpenBot/OpenBot/Info.plist b/ios/OpenBot/OpenBot/Info.plist
@@ -27,7 +27,7 @@
 			<string>Editor</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>com.googleusercontent.apps.955078484078-kq5d4bbjh05qdksr433k1ugakgspk8ee</string>
+				<string>com.googleusercontent.apps.955078484078-4m63lascf45ranfmedahhcgo10ainnfa</string>
 			</array>
 		</dict>
 		<dict/>

diff --git a/ios/OpenBot/OpenBot/Modes.swift → ios/OpenBot/OpenBot/Models/Modes.swift b/ios/OpenBot/OpenBot/Modes.swift → ios/OpenBot/OpenBot/Models/Modes.swift