Minor string and UI updates

- Implemented anonaddy/addy-android#15 - Fixed add domain view - Copy aa-verify record upon adding domain
anonaddy · Jan 27, 2025 · 0047f52 · 0047f52
1 parent f03dda2
commit 0047f52
Show file tree

Hide file tree

Showing 24 changed files with 351 additions and 101 deletions.
diff --git a/AddyStatisticWidget/AddyStatisticWidget.swift b/AddyStatisticWidget/AddyStatisticWidget.swift
@@ -265,15 +265,15 @@ struct AliasWidgetRowView: View {
                                 aliasDescription =  String(format: String(localized: "s_s_s"),
                                                            description,
                                                            String(format: NSLocalizedString("created_at_s", comment: ""),
-                                                                  DateTimeUtils.turnStringIntoLocalString(alias.created_at)),
+                                                                  DateTimeUtils.convertStringToLocalTimeZoneString(alias.created_at)),
                                                            String(format: String(localized: "updated_at_s"),
-                                                                  DateTimeUtils.turnStringIntoLocalString(alias.updated_at)))
+                                                                  DateTimeUtils.convertStringToLocalTimeZoneString(alias.updated_at)))
                             } else {
                                 aliasDescription =  String(format: String(localized: "s_s"),
                                                            String(format: NSLocalizedString("created_at_s", comment: ""),
-                                                                  DateTimeUtils.turnStringIntoLocalString(alias.created_at)),
+                                                                  DateTimeUtils.convertStringToLocalTimeZoneString(alias.created_at)),
                                                            String(format: String(localized: "updated_at_s"),
-                                                                  DateTimeUtils.turnStringIntoLocalString(alias.updated_at)))
+                                                                  DateTimeUtils.convertStringToLocalTimeZoneString(alias.updated_at)))
                             }
                         }
                 }

diff --git a/...xcodeproj/project.xcworkspace/xcuserdata/stjin.xcuserdatad/UserInterfaceState.xcuserstate b/...xcodeproj/project.xcworkspace/xcuserdata/stjin.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/addy.xcodeproj/xcuserdata/stjin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/addy.xcodeproj/xcuserdata/stjin.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -468,22 +468,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "515D06DC-487A-4167-AF60-625F3127FD20"
-            shouldBeEnabled = "No"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "addy/extensions/PrettyTime.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "44"
-            endingLineNumber = "44"
-            landmarkName = "futureDateDisplay()"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent
@@ -4818,22 +4802,6 @@
             landmarkType = "7">
          </BreakpointContent>
       </BreakpointProxy>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
-         <BreakpointContent
-            uuid = "68BC7002-6A8A-4F00-ACA8-614D1AFF9A7E"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            filePath = "addy/View/aliases/AliasesView.swift"
-            startingColumnNumber = "9223372036854775807"
-            endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "610"
-            endingLineNumber = "610"
-            landmarkName = "onPressSend(client:sendToRecipients:)"
-            landmarkType = "7">
-         </BreakpointContent>
-      </BreakpointProxy>
       <BreakpointProxy
          BreakpointExtensionID = "Xcode.Breakpoint.FileBreakpoint">
          <BreakpointContent

diff --git a/addy.xcodeproj/xcuserdata/stjin.xcuserdatad/xcschemes/xcschememanagement.plist b/addy.xcodeproj/xcuserdata/stjin.xcuserdatad/xcschemes/xcschememanagement.plist
@@ -19,7 +19,7 @@
 		<key>Periphery.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>7</integer>
+			<integer>8</integer>
 		</dict>
 		<key>Playground (Playground) 1.xcscheme</key>
 		<dict>
@@ -45,7 +45,7 @@
 		<key>Privacy Manifest.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>8</integer>
+			<integer>7</integer>
 		</dict>
 		<key>ShareExtension.xcscheme_^#shared#^_</key>
 		<dict>

diff --git a/addy/Localizable.xcstrings b/addy/Localizable.xcstrings
@@ -17,6 +17,38 @@
     },
     "0" : {
 
+    },
+    "1_day_ago" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "1 day ago"
+          }
+        }
+      }
+    },
+    "1_hour_ago" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "1 hour ago"
+          }
+        }
+      }
+    },
+    "1_month_ago" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "1 month ago"
+          }
+        }
+      }
     },
     "about_this_app" : {
       "extractionState" : "manual",
@@ -1705,6 +1737,16 @@
         }
       }
     },
+    "d_days_ago" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%d days ago"
+          }
+        }
+      }
+    },
     "d_days_from_now_on" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -1727,6 +1769,17 @@
         }
       }
     },
+    "d_hours_ago" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%d hours ago"
+          }
+        }
+      }
+    },
     "d_hrs_from_now_on" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -1738,6 +1791,17 @@
         }
       }
     },
+    "d_min_ago" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%d minutes ago"
+          }
+        }
+      }
+    },
     "d_min_from_now_on" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -1749,6 +1813,16 @@
         }
       }
     },
+    "d_months_ago" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%d months ago"
+          }
+        }
+      }
+    },
     "d_months_from_now_on" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -1771,6 +1845,17 @@
         }
       }
     },
+    "d_sec_ago" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%d seconds ago"
+          }
+        }
+      }
+    },
     "d_sec_from_now_on" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -1804,6 +1889,17 @@
         }
       }
     },
+    "d_years_from_now_on" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "%d year(s) from now on"
+          }
+        }
+      }
+    },
     "deactivate" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -3762,6 +3858,16 @@
         }
       }
     },
+    "just_now" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Just now"
+          }
+        }
+      }
+    },
     "last_blocked" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -3773,6 +3879,16 @@
         }
       }
     },
+    "last_d_at" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "last %@ at %@"
+          }
+        }
+      }
+    },
     "last_forwarded" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -7087,6 +7203,17 @@
         }
       }
     },
+    "verification_record_copied_to_clipboard" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Verification record has been copied to the clipboard"
+          }
+        }
+      }
+    },
     "version_channel_info" : {
       "extractionState" : "manual",
       "localizations" : {
@@ -7225,7 +7352,7 @@
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Keep track of emails being forwarded through a specific alias. Open the management page of an alias and enable  \"Watch alias\" to be notified of a new forwarded message.\n\nYou can watch a maximum of 25 aliases."
+            "value" : "Keep track of emails being forwarded through a specific alias. Open the management page of an alias and enable \"Watch alias\" to be notified of a new forwarded message.\n\nYou can watch a maximum of 25 aliases."
           }
         }
       }
@@ -7556,6 +7683,17 @@
         }
       }
     },
+    "yesterday_at" : {
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "yesterday at %@"
+          }
+        }
+      }
+    },
     "you_do_not_own_this_domain" : {
       "extractionState" : "manual",
       "localizations" : {

diff --git a/addy/View/aliases/AddAliasBottomSheet.swift b/addy/View/aliases/AddAliasBottomSheet.swift
@@ -101,11 +101,15 @@ struct AddAliasBottomSheet: View {
 
             } header: {
                 VStack(alignment: .leading){
-                    Text(String(format: String(localized: "add_alias_desc"), self.mainViewState.userResource!.username)).multilineTextAlignment(.center)
-                    Spacer(minLength: 25)
-                    Text(String(localized: "alias"))
+                    VStack(alignment: .leading){
+                        Text(String(format: String(localized: "add_alias_desc"), self.mainViewState.userResource!.username)).multilineTextAlignment(.center)
+                        Spacer(minLength: 25)
+                    }.textCase(nil)
 
-                }.textCase(nil).frame(maxWidth: .infinity, alignment: .center)
+                    VStack(alignment: .leading){
+                        Text(String(localized: "alias"))
+                    }
+                }.frame(maxWidth: .infinity, alignment: .center)
             } footer: {
                 if let error = aliasError {
                     if (!error.isEmpty){

diff --git a/addy/View/aliases/AliasRowView.swift b/addy/View/aliases/AliasRowView.swift
@@ -33,18 +33,40 @@ struct AliasRowView: View {
 
 
         if let description = alias.description {
-            self.aliasDescription =  String(format: String(localized: "s_s_s"),
-                                            description,
-                                            String(format: NSLocalizedString("created_at_s", comment: ""),
-                                                   DateTimeUtils.turnStringIntoLocalString(alias.created_at)),
-                                            String(format: String(localized: "updated_at_s"),
-                                                   DateTimeUtils.turnStringIntoLocalString(alias.updated_at)))
+
+            do {
+                self.aliasDescription =  String(format: String(localized: "s_s_s"),
+                                                description,
+                                                String(format: NSLocalizedString("created_at_s", comment: ""),
+                                                       try DateTimeUtils.convertStringToLocalTimeZoneDate(alias.created_at).aliasRowDateDisplay()),
+                                                String(format: String(localized: "updated_at_s"),
+                                                       try DateTimeUtils.convertStringToLocalTimeZoneDate(alias.updated_at).aliasRowDateDisplay()))
+            }
+            catch {
+                self.aliasDescription =  String(format: String(localized: "s_s_s"),
+                                                description,
+                                                String(format: NSLocalizedString("created_at_s", comment: ""),
+                                                       DateTimeUtils.convertStringToLocalTimeZoneString(alias.created_at)),
+                                                String(format: String(localized: "updated_at_s"),
+                                                       DateTimeUtils.convertStringToLocalTimeZoneString(alias.updated_at)))
+            }
+
         } else {
-            self.aliasDescription =  String(format: String(localized: "s_s"),
-                                            String(format: NSLocalizedString("created_at_s", comment: ""),
-                                                   DateTimeUtils.turnStringIntoLocalString(alias.created_at)),
-                                            String(format: String(localized: "updated_at_s"),
-                                                   DateTimeUtils.turnStringIntoLocalString(alias.updated_at)))
+
+            do {
+                self.aliasDescription =  String(format: String(localized: "s_s"),
+                                                String(format: NSLocalizedString("created_at_s", comment: ""),
+                                                       try DateTimeUtils.convertStringToLocalTimeZoneDate(alias.created_at).aliasRowDateDisplay()),
+                                                String(format: String(localized: "updated_at_s"),
+                                                       try DateTimeUtils.convertStringToLocalTimeZoneDate(alias.updated_at).aliasRowDateDisplay()))
+            }
+            catch {
+                self.aliasDescription =  String(format: String(localized: "s_s"),
+                                                String(format: NSLocalizedString("created_at_s", comment: ""),
+                                                       DateTimeUtils.convertStringToLocalTimeZoneString(alias.created_at)),
+                                                String(format: String(localized: "updated_at_s"),
+                                                       DateTimeUtils.convertStringToLocalTimeZoneString(alias.updated_at)))
+            }
         }
     }