tama hai 6 meses
pai
achega
157f13452f
Modificáronse 1 ficheiros con 36 adicións e 2 borrados
  1. 36 2
      main-embed.py

+ 36 - 2
main-embed.py

@@ -139,6 +139,8 @@ def write_android_menu(xml_menu_path: str, features: dict, security: dict):
                 n = n + 1
                 write_android_menu_item(f, "action_secure_browser", n, "Secure Browser", features["secure_browser"]["status"])
                 n = n + 1
+                write_android_menu_item(f, "action_new_post", n, "New Post", features["new_post"]["status"])
+                n = n + 1
                 write_android_menu_item(f, "action_ppob", n, "PPOB Agent", features["ppob"]["status"])
                 n = n + 1
                 write_android_menu_item(f, "action_wallet", n, "Wallet", features["wallet"]["status"])
@@ -188,6 +190,12 @@ def write_flutter_menu_item_invoke(f, label: str, function_call: str, is_active:
     f.write(indented_str(4, f'{line_start}nativeChannel.invokeMethod("{function_call}");', spaces=2))
     f.write(indented_str(4, f'{line_start}break;', spaces=2))
 
+def write_flutter_menu_item_invoke_arg(f, label: str, function_call: str, function_arg: str, is_active: bool):
+    line_start = "" if is_active else "// "
+    f.write(indented_str(3, f'{line_start}case "{label}":', spaces=2))
+    f.write(indented_str(4, f'{line_start}nativeChannel.invokeMethod("{function_call}", arguments: "{function_arg}");', spaces=2))
+    f.write(indented_str(4, f'{line_start}break;', spaces=2))
+
 def write_flutter_main(main_act_path, features: dict, security: dict):
     with open(main_act_path, "r") as f:
         lines = f.readlines()
@@ -213,6 +221,7 @@ def write_flutter_main(main_act_path, features: dict, security: dict):
                 features_str.append("%s'Call Log'" % ("" if features["call_log"]["status"] else "// "))
                 features_str.append("%s'Create Channel'" % ("" if features["create_channel"]["status"] else "// "))
                 features_str.append("%s'Secure Browser'" % ("" if features["secure_browser"]["status"] else "// "))
+                features_str.append("%s'New Post'" % ("" if features["new_post"]["status"] else "// "))
                 features_str.append("%s'PPOB Agent'" % ("" if features["ppob"]["status"] else "// "))
                 features_str.append("%s'Wallet'" % ("" if features["wallet"]["status"] else "// "))
                 features_str.append("%s'Social Commerce'" % ("" if features["social_commerce"]["status"] else "// "))
@@ -245,7 +254,8 @@ def write_flutter_main(main_act_path, features: dict, security: dict):
                 write_flutter_menu_item_invoke(f, "Status Updates", "openStatusUpdates", features["status_update"]["status"])
                 write_flutter_menu_item_invoke(f, "Call Log", "openCallLog", features["call_log"]["status"])
                 write_flutter_menu_item_invoke(f, "Create Channel", "createChannel", features["create_channel"]["status"])
-                write_flutter_menu_item_invoke(f, "Secure Browser", "secureBrowser", features["secure_browser"]["status"])
+                write_flutter_menu_item_invoke_arg(f, "Secure Browser", "openURLSecure", '\"https://google.com\"' features["secure_browser"]["status"])
+                write_flutter_menu_item_invoke(f, "New Post", "openSocialCommerce", features["new_post"]["status"])
             else:
                 f.write(line)
 
@@ -287,7 +297,8 @@ def write_ionic_main(main_act_path, features: dict, security: dict):
                 write_ionic_menu_handler(f, "Status Updates", "openStatusUpdates", features["status_update"]["status"])
                 write_ionic_menu_handler(f, "Call Log", "openCallLog", features["call_log"]["status"])
                 write_ionic_menu_handler(f, "Create Channel", "createChannel", features["create_channel"]["status"])
-                write_ionic_menu_handler(f, "Secure Browser", "secureBrowser", features["secure_browser"]["status"])
+                write_ionic_menu_handler(f, "Secure Browser", "openURLSecure", features["secure_browser"]["status"])
+                write_ionic_menu_handler(f, "New Post", "openSocialCommerce", features["new_post"]["status"])
             else:
                 f.write(line)
 
@@ -355,6 +366,7 @@ def write_react_main(main_act_path, features: dict, security: dict):
                 f.write(indented_str(4, "%s'Call Log'," % ("" if features["call_log"]["status"] else "// "), spaces=2))
                 f.write(indented_str(4, "%s'Create Channel'," % ("" if features["create_channel"]["status"] else "// "), spaces=2))
                 f.write(indented_str(4, "%s'Secure Browser'," % ("" if features["secure_browser"]["status"] else "// "), spaces=2))
+                f.write(indented_str(4, "%s'New Post'," % ("" if features["new_post"]["status"] else "// "), spaces=2))
 
                 f.write(indented_str(4, "%s'PPOB Agent'," % ("" if features["ppob"]["status"] else "// "), spaces=2))
                 f.write(indented_str(4, "%s'Wallet'," % ("" if features["wallet"]["status"] else "// "), spaces=2))
@@ -399,6 +411,8 @@ def write_react_main(main_act_path, features: dict, security: dict):
                 n = (n + 1) if features["call_log"]["status"] else n
                 write_react_call_native_1(f, n, "createChannel", features["create_channel"]["status"])
                 n = (n + 1) if features["create_channel"]["status"] else n
+                write_react_call_native_1(f, n, "openSocialCommerce", features["new_post"]["status"])
+                n = (n + 1) if features["new_post"]["status"] else n
                 write_react_call_native_1_arg(f, n, "openURLSecure", "\"https://google.com\"", features["secure_browser"]["status"])
                 n = (n + 1) if features["secure_browser"]["status"] else n
                 write_react_call_native_1(f, n, "openPPOB", features["ppob"]["status"])
@@ -450,6 +464,8 @@ def write_react_main(main_act_path, features: dict, security: dict):
                 n = (n + 1) if features["call_log"]["status"] else n
                 write_react_call_native(f, n, "createChannel", features["create_channel"]["status"])
                 n = (n + 1) if features["create_channel"]["status"] else n
+                write_react_call_native(f, n, "openSocialCommerce", features["new_post"]["status"])
+                n = (n + 1) if features["new_post"]["status"] else n
                 write_react_call_native_arg(f, n, "openURLSecure", "\"https://google.com\"", features["secure_browser"]["status"])
                 n = (n + 1) if features["secure_browser"]["status"] else n
                 write_react_call_native(f, n, "openPPOB", features["ppob"]["status"])
@@ -502,6 +518,8 @@ def write_react_main(main_act_path, features: dict, security: dict):
                 n = (n + 1) if features["create_channel"]["status"] else n
                 write_react_button_press(f, n, "Secure Browser", features["secure_browser"]["status"])
                 n = (n + 1) if features["secure_browser"]["status"] else n
+                write_react_button_press(f, n, "New Post", features["new_post"]["status"])
+                n = (n + 1) if features["new_post"]["status"] else n
                 write_react_button_press(f, n, "PPOB Agent", features["ppob"]["status"])
                 n = (n + 1) if features["ppob"]["status"] else n
                 write_react_button_press(f, n, "Wallet", features["wallet"]["status"])
@@ -549,6 +567,7 @@ def change(app_id: str, platform: str, mode: str, path_dest: str, features: dict
                     write_android_menu_item_onselect(f, "action_call_log", "API.openCallLog()", features["call_log"]["status"])
                     write_android_menu_item_onselect(f, "action_create_channel", "API.createChannel()", features["create_channel"]["status"])
                     write_android_menu_item_onselect(f, "action_secure_browser", "API.openURLSecure(\"https://google.com\")", features["secure_browser"]["status"])
+                    write_android_menu_item_onselect(f, "action_new_post", "API.openSocialCommerce()", features["new_post"]["status"])
                     
                     write_android_menu_item_onselect(f, "action_ppob", "API.openPPOB()", features["ppob"]["status"])
                     write_android_menu_item_onselect(f, "action_wallet", "API.openWallet()", features["wallet"]["status"])
@@ -682,6 +701,7 @@ def change(app_id: str, platform: str, mode: str, path_dest: str, features: dict
                     write_android_grid_item_onclick(f, "imageViewCallLog", "btn_call_log", "API.openCallLog()", features["call_log"]["status"])
                     write_android_grid_item_onclick(f, "imageViewCreateChannel", "btn_create_channel", "API.createChannel()", features["create_channel"]["status"])
                     write_android_grid_item_onclick(f, "imageViewSecureBrowser", "btn_secure_browser", "API.openURLSecure(\"https://google.com\")", features["secure_browser"]["status"])
+                    write_android_grid_item_onclick(f, "imageViewNewPost", "btn_new_post", "API.openSocialCommerce()", features["new_post"]["status"])
 
                     write_android_grid_item_onclick(f, "imageViewPPOB", "btn_ppob", "API.openPPOB()", features["ppob"]["status"])
                     write_android_grid_item_onclick(f, "imageViewWallet", "btn_wallet", "API.openWallet()", features["wallet"]["status"])
@@ -751,6 +771,7 @@ def change(app_id: str, platform: str, mode: str, path_dest: str, features: dict
                     write_android_grid_item_layout(f, "btn_call_log", "pb_button_call_log", (mode == "grid" and "call_log" in l_features))
                     write_android_grid_item_layout(f, "btn_create_channel", "pb_button_create_channel", (mode == "grid" and "create_channel" in l_features))
                     write_android_grid_item_layout(f, "btn_secure_browser", "pb_button_secure_browser", (mode == "grid" and "secure_browser" in l_features))
+                    write_android_grid_item_layout(f, "btn_new_post", "pb_button_new_post", (mode == "grid" and "new_post" in l_features))
 
                     write_android_grid_item_layout(f, "btn_ppob", "pb_button_ppob", (mode == "grid" and "ppob" in l_features))
                     write_android_grid_item_layout(f, "btn_wallet", "pb_button_wallet", (mode == "grid" and "wallet" in l_features))
@@ -1304,6 +1325,9 @@ def save_icons(app_id: str, platform: str, mode: str, path_dest: str, features:
         if features["secure_browser"]["icon"]:
             file = features["secure_browser"]["icon"]
             file.save(os.path.join(drawable_path, "pb_button_secure_browser.png"))
+        if features["new_post"]["icon"]:
+            file = features["new_post"]["icon"]
+            file.save(os.path.join(drawable_path, "pb_button_new_post.png"))
         pass
 
 def deliver_zip(path_dest, uid):
@@ -1453,6 +1477,10 @@ def build_project():
                 "status": False,
                 "icon": None
             },
+            "new_post": {
+                "status": False,
+                "icon": None
+            },
 
             "cc_chat": {
                 "status": False,
@@ -1553,6 +1581,8 @@ def build_project():
                 feature_dict["create_channel"]["status"] = request.form["feature_create_channel"] == "1"
             if "feature_secure_browser" in request.form:
                 feature_dict["secure_browser"]["status"] = request.form["feature_secure_browser"] == "1"
+            if "feature_new_post" in request.form:
+                feature_dict["new_post"]["status"] = request.form["feature_new_post"] == "1"
             if "feature_secure_folder" in request.form and not security_dict["secure_folder"]:
                 security_dict["secure_folder"] = request.form["feature_secure_folder"] == "1"
                 feature_dict["secure_folder"]["status"] = request.form["feature_secure_folder"] == "1"
@@ -1694,6 +1724,10 @@ def build_project():
                 file = request.files['gridicon_secure_browser']
                 if file and file.filename and allowed_file(file.filename):
                     feature_dict["secure_browser"]["icon"] = file
+            if "gridicon_new_post" in request.files:
+                file = request.files['gridicon_new_post']
+                if file and file.filename and allowed_file(file.filename):
+                    feature_dict["new_post"]["icon"] = file
             if "gridicon_secure_folder" in request.files:
                 file = request.files['gridicon_secure_folder']
                 if file and file.filename and allowed_file(file.filename):