From c20f14dbbb5f7a05a4b16aeb921ad0c5986ed0f1 Mon Sep 17 00:00:00 2001
From: Markus Tamm <markus.tamm@nortal.com>
Date: Wed, 28 Jan 2026 13:41:42 +0200
Subject: [PATCH] Change launch screen design

---
 RIADigiDoc/RIADigiDocApp.swift                |  1 +
 .../Supporting files/LaunchScreen.storyboard  | 41 ++++++++----
 .../Supporting files/Localizable.xcstrings    | 63 +++++++------------
 RIADigiDoc/UI/Component/InitView.swift        | 44 ++++++++++---
 .../Component/Shared/LaunchScreenView.swift   | 33 ++++++++--
 RIADigiDoc/UI/Theme/Dimensions.swift          |  1 +
 6 files changed, 118 insertions(+), 65 deletions(-)

diff --git a/RIADigiDoc/RIADigiDocApp.swift b/RIADigiDoc/RIADigiDocApp.swift
index d75f9254..37ed00cb 100644
--- a/RIADigiDoc/RIADigiDocApp.swift
+++ b/RIADigiDoc/RIADigiDocApp.swift
@@ -109,6 +109,7 @@ struct RIADigiDocApp: App {
                     .onAppear { onLaunchScreenViewAppear() }
                     .environment(themeSettings)
                     .preferredColorScheme(.light)
+                    .environment(languageSettings)
             }
         }
     }
diff --git a/RIADigiDoc/Supporting files/LaunchScreen.storyboard b/RIADigiDoc/Supporting files/LaunchScreen.storyboard
index 2d409edc..db54db73 100644
--- a/RIADigiDoc/Supporting files/LaunchScreen.storyboard	
+++ b/RIADigiDoc/Supporting files/LaunchScreen.storyboard	
@@ -1,12 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="23094" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="24412" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="01J-lp-oVM">
     <device id="retina6_12" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="23084"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="24405"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
+    <customFonts key="customFonts">
+        <array key="Roboto_Condensed-Medium.ttf">
+            <string>RobotoCondensed-Medium</string>
+        </array>
+    </customFonts>
     <scenes>
         <!--View Controller-->
         <scene sceneID="EHf-IW-A2E">
@@ -16,18 +21,30 @@
                         <rect key="frame" x="0.0" y="0.0" width="393" height="852"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="AppLogo" translatesAutoresizingMaskIntoConstraints="NO" id="hPn-7G-dZF">
-                                <rect key="frame" x="116.66666666666669" y="255.33333333333334" width="160" height="341.33333333333326"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="160" id="FwR-bb-zvK"/>
-                                </constraints>
-                            </imageView>
+                            <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="cDc-rZ-eCa">
+                                <rect key="frame" x="124.66666666666669" y="337.66666666666669" width="144" height="177.00000000000006"/>
+                                <subviews>
+                                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="image_eesti_shield" translatesAutoresizingMaskIntoConstraints="NO" id="hPn-7G-dZF">
+                                        <rect key="frame" x="0.0" y="0.0" width="144" height="144"/>
+                                        <constraints>
+                                            <constraint firstAttribute="width" constant="144" id="Q19-JD-VbR"/>
+                                            <constraint firstAttribute="height" constant="144" id="a0A-yg-cMi"/>
+                                        </constraints>
+                                    </imageView>
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="RIA DIGIDOC" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="wIm-vW-aRj">
+                                        <rect key="frame" x="1.3333333333333286" y="144" width="141.33333333333337" height="33"/>
+                                        <fontDescription key="fontDescription" name="RobotoCondensed-Medium" family="Roboto Condensed" pointSize="28"/>
+                                        <color key="textColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                        <nil key="highlightedColor"/>
+                                    </label>
+                                </subviews>
+                            </stackView>
                         </subviews>
                         <viewLayoutGuide key="safeArea" id="Bcu-3y-fUS"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <color key="backgroundColor" red="0.065298415720000003" green="0.18868720529999999" blue="0.39347493649999998" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
                         <constraints>
-                            <constraint firstItem="hPn-7G-dZF" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="9cK-uk-ATq"/>
-                            <constraint firstItem="hPn-7G-dZF" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="FW5-15-q8O"/>
+                            <constraint firstItem="cDc-rZ-eCa" firstAttribute="centerY" secondItem="Ze5-6b-2t3" secondAttribute="centerY" id="HlS-ts-us0"/>
+                            <constraint firstItem="cDc-rZ-eCa" firstAttribute="centerX" secondItem="Ze5-6b-2t3" secondAttribute="centerX" id="vO4-jF-0bZ"/>
                         </constraints>
                     </view>
                 </viewController>
@@ -37,6 +54,6 @@
         </scene>
     </scenes>
     <resources>
-        <image name="AppLogo" width="341.33334350585938" height="341.33334350585938"/>
+        <image name="image_eesti_shield" width="512" height="512"/>
     </resources>
 </document>
diff --git a/RIADigiDoc/Supporting files/Localizable.xcstrings b/RIADigiDoc/Supporting files/Localizable.xcstrings
index 1131e27b..bb767558 100644
--- a/RIADigiDoc/Supporting files/Localizable.xcstrings	
+++ b/RIADigiDoc/Supporting files/Localizable.xcstrings	
@@ -1974,7 +1974,7 @@
       }
     },
     "Information system authority" : {
-      "comment" : "RIA name. Used in initial language screen",
+      "comment" : "RIA name",
       "extractionState" : "manual",
       "localizations" : {
         "en" : {
@@ -1991,6 +1991,24 @@
         }
       }
     },
+    "Init footer RIA" : {
+      "comment" : "Init footer smallcaps RIA text",
+      "extractionState" : "manual",
+      "localizations" : {
+        "en" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Riigi Infosüsteemi Amet"
+          }
+        },
+        "et" : {
+          "stringUnit" : {
+            "state" : "translated",
+            "value" : "Riigi Infosüsteemi Amet"
+          }
+        }
+      }
+    },
     "Init lang locale en" : {
       "comment" : "Init lang locale en",
       "extractionState" : "manual",
@@ -1998,13 +2016,13 @@
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "In English"
+            "value" : "English"
           }
         },
         "et" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "In English"
+            "value" : "English"
           }
         }
       }
@@ -2016,13 +2034,13 @@
         "en" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Eesti keel"
+            "value" : "Eesti"
           }
         },
         "et" : {
           "stringUnit" : {
             "state" : "translated",
-            "value" : "Eesti keel"
+            "value" : "Eesti"
           }
         }
       }
@@ -2266,23 +2284,6 @@
         }
       }
     },
-    "Logo" : {
-      "comment" : "Accessibility label for launch screen logo",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Logo"
-          }
-        },
-        "et" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Logo"
-          }
-        }
-      }
-    },
     "Main about 1 logo text" : {
       "comment" : "Main about Estonia logo text",
       "extractionState" : "manual",
@@ -5987,24 +5988,6 @@
         }
       }
     },
-    "RIA small caps" : {
-      "comment" : "RIA small caps",
-      "extractionState" : "manual",
-      "localizations" : {
-        "en" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Rɪɪɢɪ Iɴꜰᴏꜱüꜱᴛᴇᴇᴍɪ Aᴍᴇᴛ"
-          }
-        },
-        "et" : {
-          "stringUnit" : {
-            "state" : "translated",
-            "value" : "Rɪɪɢɪ Iɴꜰᴏꜱüꜱᴛᴇᴇᴍɪ Aᴍᴇᴛ"
-          }
-        }
-      }
-    },
     "Role and address title" : {
       "comment" : "Role and address view title",
       "extractionState" : "manual",
diff --git a/RIADigiDoc/UI/Component/InitView.swift b/RIADigiDoc/UI/Component/InitView.swift
index 6492f00f..b544f3c2 100644
--- a/RIADigiDoc/UI/Component/InitView.swift
+++ b/RIADigiDoc/UI/Component/InitView.swift
@@ -34,6 +34,9 @@ struct InitView: View {
     private var appName: String {
         languageSettings.localized("App name")
     }
+    private var footerRIA: String {
+        languageSettings.localized("Init footer RIA")
+    }
 
     init() {
         _viewModel = State(wrappedValue: Container.shared.initViewModel())
@@ -80,14 +83,10 @@ struct InitView: View {
                         .padding(.vertical, Dimensions.Padding.MPadding)
 
                         Spacer()
-
-                        Text(languageSettings.localized("RIA small caps"))
-                            .font(typography.titleMedium)
-                            .foregroundStyle(Color.white)
-                            .padding(.bottom, Dimensions.Padding.MPadding)
-                            .accessibilityLabel(
-                                Text(verbatim: languageSettings.localized("Information system authority"))
-                            )
+                        smallCapsTextView(
+                            footerRIA,
+                            accessibilityLabel: footerRIA
+                        )
                     }
                     .frame(minHeight: geometry.size.height)
                     .frame(minWidth: geometry.size.width)
@@ -95,6 +94,35 @@ struct InitView: View {
             }
         }
     }
+
+    func smallCapsTextView(_ text: String, accessibilityLabel: String) -> some View {
+        var attr = AttributedString(text)
+        var isStartOfWord = true
+
+        for index in attr.characters.indices {
+            let char = attr.characters[index]
+
+            let nextIndex = attr.characters.index(after: index)
+            let range = index..<nextIndex
+
+            if char.isWhitespace {
+                isStartOfWord = true
+                continue
+            }
+
+            if isStartOfWord {
+                attr[range].font = typography.titleMedium
+                isStartOfWord = false
+            } else {
+                attr[range].font = typography.titleMedium.smallCaps()
+            }
+        }
+
+        return Text(attr)
+            .foregroundColor(.white)
+            .accessibilityElement(children: .combine)
+            .accessibilityLabel(accessibilityLabel)
+    }
 }
 
 // MARK: - Preview
diff --git a/RIADigiDoc/UI/Component/Shared/LaunchScreenView.swift b/RIADigiDoc/UI/Component/Shared/LaunchScreenView.swift
index 7bc4dcab..6f2061a5 100644
--- a/RIADigiDoc/UI/Component/Shared/LaunchScreenView.swift
+++ b/RIADigiDoc/UI/Component/Shared/LaunchScreenView.swift
@@ -18,15 +18,36 @@
  */
 
 import SwiftUI
+import FactoryKit
 
 struct LaunchScreenView: View {
+    @AppTheme private var theme
+    @AppTypography private var typography
+    @Environment(LanguageSettings.self) private var languageSettings
+
+    private var appName: String {
+        languageSettings.localized("App name")
+    }
+
     var body: some View {
         ZStack {
-            Image("AppLogo")
-                .resizable()
-                .scaledToFit()
-                .frame(width: 160)
-                .accessibilityLabel("Logo")
+            AppColors.BlueBackground.ignoresSafeArea()
+            VStack(spacing: Dimensions.Padding.ZeroPadding) {
+                Image("image_eesti_shield")
+                    .resizable()
+                    .scaledToFit()
+                    .frame(height: Dimensions.Icon.IconSizeXXL)
+                    .accessibilityLabel(appName.lowercased())
+
+                Text(appName.uppercased())
+                    .font(typography.headlineMedium)
+                    .foregroundStyle(Color.white)
+                    .accessibilityLabel(appName.lowercased())
+                    .scaleEffect(
+                        x: Dimensions.Scaling.SmallScaling,
+                        y: Dimensions.Scaling.DefaultScaling
+                    )
+            }
         }
         .frame(maxWidth: .infinity, maxHeight: .infinity)
         .edgesIgnoringSafeArea(.all)
@@ -35,4 +56,6 @@ struct LaunchScreenView: View {
 
 #Preview {
     LaunchScreenView()
+        .environment(Container.shared.themeSettings())
+        .environment(Container.shared.languageSettings())
 }
diff --git a/RIADigiDoc/UI/Theme/Dimensions.swift b/RIADigiDoc/UI/Theme/Dimensions.swift
index 7b8b5d30..837ecdf4 100644
--- a/RIADigiDoc/UI/Theme/Dimensions.swift
+++ b/RIADigiDoc/UI/Theme/Dimensions.swift
@@ -66,6 +66,7 @@ enum Dimensions {
 
     enum Scaling {
         static let DefaultScaling: CGFloat = 1.0
+        static let SmallScaling: CGFloat = 1.1
         static let WideScaling: CGFloat = 1.2
     }