Ported About and its subviews to SwiftUI. Also some color cleanup in …

…other parts of the app.
Yubico · Nov 19, 2024 · 8db771d · 8db771d
1 parent e6d753a
commit 8db771d
Show file tree

Hide file tree

Showing 29 changed files with 706 additions and 1,942 deletions.
diff --git a/Authenticator.xcodeproj/project.pbxproj b/Authenticator.xcodeproj/project.pbxproj
diff --git a/Authenticator/Assets.xcassets/AccentColor.colorset/Contents.json b/Authenticator/Assets.xcassets/AccentColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0",
+          "green" : "0",
+          "red" : "0"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "255",
+          "green" : "255",
+          "red" : "255"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Authenticator/Assets.xcassets/AppIcon.appiconset/Contents.json b/Authenticator/Assets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,116 +1,116 @@
 {
   "images" : [
-	{
-      "size" : "20x20",
-      "idiom": "iphone",
-	  "filename" : "[email protected]",
-      "scale": "2x"
-    },
-	{
-      "size" : "20x20",
-      "idiom": "iphone",
-	  "filename" : "[email protected]",
-      "scale": "3x"
-    },
-	{
-      "size" : "20x20",
-      "idiom": "ipad",
-	  "filename" : "AppIcon-20.png",
-      "scale": "1x"
-    },
     {
-      "size" : "20x20",
-      "idiom": "ipad",
-	  "filename" : "[email protected]",
-      "scale": "2x"
+      "filename" : "[email protected]",
+      "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "scale" : "3x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "3x"
+      "scale" : "2x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "scale" : "3x",
+      "size" : "40x40"
     },
     {
-      "size" : "60x60",
+      "filename" : "[email protected]",
       "idiom" : "iphone",
+      "scale" : "2x",
+      "size" : "60x60"
+    },
+    {
       "filename" : "[email protected]",
-      "scale" : "3x"
+      "idiom" : "iphone",
+      "scale" : "3x",
+      "size" : "60x60"
     },
     {
-      "size" : "29x29",
+      "filename" : "AppIcon-20.png",
       "idiom" : "ipad",
-      "filename" : "AppIcon-29.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "20x20"
     },
     {
-      "size" : "29x29",
+      "filename" : "[email protected]",
       "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "20x20"
     },
     {
-      "size" : "40x40",
+      "filename" : "AppIcon-29.png",
       "idiom" : "ipad",
-      "filename" : "AppIcon-40.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
+      "filename" : "[email protected]",
       "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "76x76",
+      "filename" : "AppIcon-40.png",
       "idiom" : "ipad",
-      "filename" : "AppIcon-76.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "size" : "40x40"
     },
     {
-      "size" : "76x76",
+      "filename" : "[email protected]",
       "idiom" : "ipad",
-      "filename" : "[email protected]",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "40x40"
+    },
+    {
+      "filename" : "AppIcon-76.png",
+      "idiom" : "ipad",
+      "scale" : "1x",
+      "size" : "76x76"
     },
     {
-      "size" : "83.5x83.5",
+      "filename" : "[email protected]",
       "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "76x76"
+    },
+    {
       "filename" : "[email protected]",
-      "scale" : "2x"
+      "idiom" : "ipad",
+      "scale" : "2x",
+      "size" : "83.5x83.5"
     },
     {
-      "size" : "1024x1024",
-      "idiom" : "ios-marketing",
       "filename" : "AppIcon-1024.png",
-      "scale" : "1x"
+      "idiom" : "ios-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }
diff --git a/Authenticator/Assets.xcassets/SymbolColor.colorset/Contents.json b/Authenticator/Assets.xcassets/SymbolColor.colorset/Contents.json
@@ -0,0 +1,38 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0x66",
+          "green" : "0x66",
+          "red" : "0x66"
+        }
+      },
+      "idiom" : "universal"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0xCC",
+          "green" : "0xCC",
+          "red" : "0xCC"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Authenticator/Localizable.xcstrings b/Authenticator/Localizable.xcstrings
@@ -65,6 +65,19 @@
           }
         }
       }
+    },
+    "%@ (build %@)" : {
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "new",
+            "value" : "%1$@ (build %2$@)"
+          }
+        }
+      }
+    },
+    "•" : {
+
     },
     "888 888" : {
       "localizations" : {
@@ -83,7 +96,7 @@
       }
     },
     "About" : {
-      "comment" : "About view navigation title",
+      "comment" : "About navigation title",
       "localizations" : {
         "fr" : {
           "stringUnit" : {
@@ -268,6 +281,9 @@
           }
         }
       }
+    },
+    "Application" : {
+
     },
     "Authentication required" : {
       "comment" : "Password Configuration auth required",
@@ -584,6 +600,9 @@
           }
         }
       }
+    },
+    "Contact support" : {
+
     },
     "Continue with limited usability" : {
       "localizations" : {
@@ -1230,6 +1249,12 @@
           }
         }
       }
+    },
+    "Help with YubiKey" : {
+
+    },
+    "How does it work" : {
+
     },
     "Incorrect password. Re-enter password." : {
       "comment" : "OATH password entry retry",
@@ -1462,6 +1487,9 @@
           }
         }
       }
+    },
+    "Next" : {
+
     },
     "NFC settings" : {
       "localizations" : {
@@ -2259,6 +2287,9 @@
           }
         }
       }
+    },
+    "Privacy policy" : {
+
     },
     "Public key certificates on" : {
       "comment" : "PIV extension no certs on device message",
@@ -2957,6 +2988,12 @@
           }
         }
       }
+    },
+    "Support" : {
+
+    },
+    "Terms of use" : {
+
     },
     "The FIDO application of your YubiKey has been reset to factory defaults." : {
       "comment" : "FIDO reset view",
@@ -3459,7 +3496,7 @@
       }
     },
     "Version history" : {
-      "comment" : "Version history navigation title",
+      "comment" : "About navigation title",
       "localizations" : {
         "fr" : {
           "stringUnit" : {
@@ -3508,8 +3545,12 @@
         }
       }
     },
+    "What's new" : {
+      "comment" : "About navigation title"
+    },
     "What's new in\nYubico Authenticator" : {
-      "comment" : "Version history title",
+      "comment" : "About navigation title",
+      "extractionState" : "stale",
       "localizations" : {
         "fr" : {
           "stringUnit" : {
@@ -3641,6 +3682,9 @@
           }
         }
       }
+    },
+    "Yubico Authenticator" : {
+
     },
     "Yubico OTP" : {
       "localizations" : {