Преглед на файлове

fix action grouping image in editor group

alqindiirsyam преди 2 години
родител
ревизия
7e91d03281

BIN
appbuilder-ios/DigiXLite/DigiXLite.xcworkspace/xcuserdata/akhmadalqindiirsyam.xcuserdatad/UserInterfaceState.xcuserstate


+ 2 - 2
appbuilder-ios/DigiXLite/DigiXLite/Resource/id.lproj/Localizable.strings

@@ -84,8 +84,8 @@
 "Auto Download" = "Unduh Otomatis";
 "Version" = "Versi";
 "Powered by Qmera" = "Dipersembahkan oleh Qmera";
-"Powered by Nexilis" = "Dipersembahkan oleh Nexilis";
-"Powered by Telkomsel" = "Dipersembahkan oleh Nexilis";
+"Powered by Telkomsel" = "Dipersembahkan oleh Telkomsel";
+"Powered by Telkomsel" = "Dipersembahkan oleh Telkomsel";
 "Sign-Up (Change profile)" = "Daftar (Ubah Profil)";
 "Change Profile" = "Ubah Profil";
 "Sign-In (Change Device)" = "Masuk (Ubah Perangkat)";

+ 6 - 2
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/EditorGroup.swift

@@ -487,7 +487,7 @@ public class EditorGroup: UIViewController {
                     }
                     row["chat_date"] = chatDate(stringDate: row["server_date"] as! String)
                     
-                    if (dataMessages.count == 0 || dataMessages.last!["f_pin"] as! String == row["f_pin"] as! String) && tempImages.count <= 30 && row["image_id"] != nil && !(row["image_id"] as! String).isEmpty && (row["message_text"] as! String).isEmpty && (row["reff_id"] as! String).isEmpty && (row["credential"] as! String) != "1" && (row["read_receipts"] as! String) != "8" {
+                    if (dataMessages.count == 0 || dataMessages.last!["f_pin"] as! String == row["f_pin"] as! String) && tempImages.count <= 30 && row["image_id"] != nil && !(row["image_id"] as! String).isEmpty && (row["message_text"] as! String).isEmpty && (row["reff_id"] as! String).isEmpty && (row["read_receipts"] as! String) != "8" {
                         if tempImages.count != 0 && getSecondsDifferenceFromTwoDates(start: Date.init(milliseconds: Int64(tempImages.last!.time)!), end: Date.init(milliseconds: Int64(row["server_date"] as! String)!))/60 >= 11 {
                             if tempImages.count >= 4 {
                                 groupImages[tempImages[0].messageId] = tempImages
@@ -2345,6 +2345,10 @@ extension EditorGroup: UIContextMenuInteractionDelegate {
         
         if (dataMessages[indexPath!.row]["lock"] != nil && dataMessages[indexPath!.row]["lock"] as! String == "1") {
             children = [delete]
+        } else if (groupImages[dataMessages[indexPath!.row]["message_id"] as! String] != nil) {
+            forward.title = "Forward All".localized()
+            delete.title = "Delete All".localized()
+            children = [forward, delete]
         }
         else if dataMessages[indexPath!.row]["f_pin"] as! String == "-999" {
             children = [star, reply ,delete]
@@ -3554,7 +3558,7 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
                 timeMessage.isHidden = true
                 statusMessage.isHidden = true
                 imageStared.isHidden = true
-                topMarginText.constant = topMarginText.constant + 225
+                topMarginText.constant = topMarginText.constant + 205
                 let listImageThumb: [UIImageView] = [UIImageView(), UIImageView(), UIImageView(), UIImageView()]
                 for i in 0..<4 {
                     containerMessage.addSubview(listImageThumb[i])

+ 2 - 2
appbuilder-ios/DigiXLite/DigiXLite/Source/View/Chat/EditorPersonal.swift

@@ -3558,12 +3558,12 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
             if (groupImages[dataMessages[indexPath!.row]["message_id"] as! String] != nil) {
                 children = [reply, copy]
             }
+        } else if (dataMessages[indexPath!.row]["lock"] != nil && dataMessages[indexPath!.row]["lock"] as! String == "1") || dataMessages[indexPath!.row]["message_scope_id"] as! String == "18" || dataPerson["f_pin"] == "-999" || dataMessages[indexPath!.row]["credential"] as! String == "1" {
+            children = [delete]
         } else if (groupImages[dataMessages[indexPath!.row]["message_id"] as! String] != nil) {
             forward.title = "Forward All".localized()
             delete.title = "Delete All".localized()
             children = [forward, delete]
-        } else if (dataMessages[indexPath!.row]["lock"] != nil && dataMessages[indexPath!.row]["lock"] as! String == "1") || dataMessages[indexPath!.row]["message_scope_id"] as! String == "18" || dataPerson["f_pin"] == "-999" || dataMessages[indexPath!.row]["credential"] as! String == "1" {
-            children = [delete]
         } else if blocking == "1" || blocking == "-1" {
             children = [star, forward, copy ,delete]
             if !(dataMessages[indexPath!.row]["image_id"] as! String).isEmpty || !(dataMessages[indexPath!.row]["video_id"] as! String).isEmpty {

+ 7 - 3
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorGroup.swift

@@ -487,7 +487,7 @@ public class EditorGroup: UIViewController {
                     }
                     row["chat_date"] = chatDate(stringDate: row["server_date"] as! String)
                     
-                    if (dataMessages.count == 0 || dataMessages.last!["f_pin"] as! String == row["f_pin"] as! String) && tempImages.count <= 30 && row["image_id"] != nil && !(row["image_id"] as! String).isEmpty && (row["message_text"] as! String).isEmpty && (row["reff_id"] as! String).isEmpty && (row["credential"] as! String) != "1" && (row["read_receipts"] as! String) != "8" {
+                    if (dataMessages.count == 0 || dataMessages.last!["f_pin"] as! String == row["f_pin"] as! String) && tempImages.count <= 30 && row["image_id"] != nil && !(row["image_id"] as! String).isEmpty && (row["message_text"] as! String).isEmpty && (row["reff_id"] as! String).isEmpty && (row["read_receipts"] as! String) != "8" {
                         if tempImages.count != 0 && getSecondsDifferenceFromTwoDates(start: Date.init(milliseconds: Int64(tempImages.last!.time)!), end: Date.init(milliseconds: Int64(row["server_date"] as! String)!))/60 >= 11 {
                             if tempImages.count >= 4 {
                                 groupImages[tempImages[0].messageId] = tempImages
@@ -2345,7 +2345,11 @@ extension EditorGroup: UIContextMenuInteractionDelegate {
         
         if (dataMessages[indexPath!.row]["lock"] != nil && dataMessages[indexPath!.row]["lock"] as! String == "1") {
             children = [delete]
-        }
+        } else if (groupImages[dataMessages[indexPath!.row]["message_id"] as! String] != nil) {
+            forward.title = "Forward All".localized()
+            delete.title = "Delete All".localized()
+            children = [forward, delete]
+        } 
         else if dataMessages[indexPath!.row]["f_pin"] as! String == "-999" {
             children = [star, reply ,delete]
             if (dataMessages[indexPath!.row]["f_pin"] as! String) == idMe {
@@ -3554,7 +3558,7 @@ extension EditorGroup: UITableViewDelegate, UITableViewDataSource {
                 timeMessage.isHidden = true
                 statusMessage.isHidden = true
                 imageStared.isHidden = true
-                topMarginText.constant = topMarginText.constant + 225
+                topMarginText.constant = topMarginText.constant + 205
                 let listImageThumb: [UIImageView] = [UIImageView(), UIImageView(), UIImageView(), UIImageView()]
                 for i in 0..<4 {
                     containerMessage.addSubview(listImageThumb[i])

+ 2 - 2
appbuilder-ios/NexilisLite/NexilisLite/Source/View/Chat/EditorPersonal.swift

@@ -3558,12 +3558,12 @@ extension EditorPersonal: UIContextMenuInteractionDelegate {
             if (groupImages[dataMessages[indexPath!.row]["message_id"] as! String] != nil) {
                 children = [reply, copy]
             }
+        } else if (dataMessages[indexPath!.row]["lock"] != nil && dataMessages[indexPath!.row]["lock"] as! String == "1") || dataMessages[indexPath!.row]["message_scope_id"] as! String == "18" || dataPerson["f_pin"] == "-999" || dataMessages[indexPath!.row]["credential"] as! String == "1" {
+            children = [delete]
         } else if (groupImages[dataMessages[indexPath!.row]["message_id"] as! String] != nil) {
             forward.title = "Forward All".localized()
             delete.title = "Delete All".localized()
             children = [forward, delete]
-        } else if (dataMessages[indexPath!.row]["lock"] != nil && dataMessages[indexPath!.row]["lock"] as! String == "1") || dataMessages[indexPath!.row]["message_scope_id"] as! String == "18" || dataPerson["f_pin"] == "-999" || dataMessages[indexPath!.row]["credential"] as! String == "1" {
-            children = [delete]
         } else if blocking == "1" || blocking == "-1" {
             children = [star, forward, copy ,delete]
             if !(dataMessages[indexPath!.row]["image_id"] as! String).isEmpty || !(dataMessages[indexPath!.row]["video_id"] as! String).isEmpty {