From 9bfd259cb93458ae5074775a5b6b942a381382e0 Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Thu, 3 Feb 2022 15:11:53 +0900
Subject: [PATCH 1/4] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=86=E3=82=AD?=
 =?UTF-8?q?=E3=82=B9=E3=83=88=E3=83=91=E3=82=B9UI=E8=BF=BD=E5=8A=A0=20#16?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Login/View/LoginViewController.storyboard | 25 +++++++---
 .../Login/View/LoginViewController.swift      | 49 ++++++++++++++-----
 2 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard b/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
index 655fd52..a150f0f 100644
--- a/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
+++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19455" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Muw-p4-tJJ">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="19529" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Muw-p4-tJJ">
     <device id="retina5_9" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19454"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="19519"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -34,26 +34,34 @@
                                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qGm-EW-OID">
                                                         <rect key="frame" x="0.0" y="0.0" width="281" height="34"/>
                                                         <subviews>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="https://" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dUY-1H-zKT">
-                                                                <rect key="frame" x="0.0" y="0.0" width="46" height="34"/>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="https://" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dUY-1H-zKT">
+                                                                <rect key="frame" x="0.0" y="0.0" width="34.666666666666664" height="34"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <nil key="textColor"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorksサーバ" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="yKN-J5-cmU" userLabel="Server Text Field">
-                                                                <rect key="frame" x="46" y="0.0" width="159.66666666666666" height="34"/>
+                                                            <textField opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorksサーバ" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="yKN-J5-cmU" userLabel="Server Text Field">
+                                                                <rect key="frame" x="34.666666666666671" y="0.0" width="142.33333333333331" height="34"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <textInputTraits key="textInputTraits" keyboardType="alphabet"/>
                                                                 <connections>
                                                                     <outlet property="delegate" destination="Muw-p4-tJJ" id="kus-M9-RjK"/>
                                                                 </connections>
                                                             </textField>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="/AgileWorks" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="EQs-BM-sRI">
-                                                                <rect key="frame" x="205.66666666666666" y="0.0" width="75.333333333333343" height="34"/>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="/" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mmq-EM-bmp">
+                                                                <rect key="frame" x="177" y="0.0" width="4.3333333333333428" height="34"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <nil key="textColor"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
+                                                            <textField opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorks" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="k5g-9b-hWd" userLabel="Context Text Field">
+                                                                <rect key="frame" x="181.33333333333334" y="0.0" width="99.666666666666657" height="34"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <textInputTraits key="textInputTraits" keyboardType="alphabet"/>
+                                                                <connections>
+                                                                    <outlet property="delegate" destination="Muw-p4-tJJ" id="cQB-t5-6Pi"/>
+                                                                </connections>
+                                                            </textField>
                                                         </subviews>
                                                     </stackView>
                                                     <button opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="W0b-va-UXh">
@@ -194,6 +202,7 @@
                         <outlet property="appVersionLabel" destination="4LY-tr-xFi" id="WQt-0p-Y2o"/>
                         <outlet property="clientCertificateRemovalButton" destination="4W4-CG-MTM" id="bRk-Rk-gFd"/>
                         <outlet property="clientCertificateSettingView" destination="5IT-4z-wWP" id="Lws-FM-Kbg"/>
+                        <outlet property="contextTextField" destination="k5g-9b-hWd" id="H4e-aT-ytQ"/>
                         <outlet property="disablingView" destination="Eac-pO-PpC" id="pp8-Ex-Y2i"/>
                         <outlet property="loginButton" destination="W0b-va-UXh" id="rzC-OC-nhO"/>
                         <outlet property="qrCodeReadLabel" destination="oDi-1K-fPP" id="rm0-Ni-e6r"/>
diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
index fb9c263..92b92de 100644
--- a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
+++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
@@ -16,10 +16,12 @@ protocol LoginView: AnyObject {
 class LoginViewController: UIViewController {
     private let serverProtocol = "https://"
     private let serverDirectory = "/AgileWorks"
-    private static let kValidHostPattern = try? NSRegularExpression(pattern: #"^[-a-z0-9]+(?:\.[-a-z0-9]+)*\.?(?::\d+)?$"#, options: .caseInsensitive)
+    private static let kValidServerPattern = try? NSRegularExpression(pattern: #"^[-a-z0-9]+(?:\.[-a-z0-9]+)*\.?(?::\d+)?$"#, options: .caseInsensitive)
+    private static let kValidContextPattern = try? NSRegularExpression(pattern: #"^[a-zA-Z0-9]+"#, options: .caseInsensitive)
 
     @IBOutlet private var appVersionLabel: UILabel!
     @IBOutlet private var serverTextField: UITextField!
+    @IBOutlet private var contextTextField: UITextField!
     // TODO X-Point 接続用に残す
     private var domainText: String = "trial"
     @IBOutlet private var loginButton: UIButton!
@@ -66,6 +68,7 @@ class LoginViewController: UIViewController {
 
         let server = tryAbbreviateCloudDomain(hostName: Configuration.shared.awDomain)
         serverTextField.text = server
+        contextTextField.text = "AgileWorks"
         updateCloudUsage()
 
         view.addSubview(activityIndicator)
@@ -151,24 +154,41 @@ class LoginViewController: UIViewController {
 
     private func updateCloudUsage() {
         serverTextField.placeholder = NSLocalizedString("ServerURLPlaceholder", comment: "")
-
-        loginButton.isEnabled = isValidInput(server: serverTextField.text)
+        contextTextField.placeholder = "AgileWorks" //TODO
+        loginButton.isEnabled = isTextFieldValue()
+    }
+    
+    private func isTextFieldValue() -> Bool {
+        let isServer = isValidInput(textField: serverTextField, string: serverTextField.text)
+        let isContext = isValidInput(textField: contextTextField, string: contextTextField.text)
+        return isServer && isContext
     }
 
-    private func isValidInput(server: String?) -> Bool {
-        guard let server = server else { return false }
-        if server.isEmpty {
+    private func isValidInput(textField: UITextField, string: String?) -> Bool {
+        guard let text = string else { return false }
+        if text.isEmpty {
             return false
         } else {
+            /*
             var serverHost: String
             //serverHost = server.appending(Self.serverDirectory)
             serverHost = server
-            return isValidHost(string: serverHost)
+             */
+            let isFieldValid: Bool
+            switch textField {
+            case serverTextField:
+                isFieldValid = isValidHost(string: text)
+            case contextTextField:
+                isFieldValid = isValidHost(string: text)
+            default:
+                isFieldValid = false
+            }
+            return isFieldValid
         }
     }
 
     private func isValidHost(string: String) -> Bool {
-        guard let pattern = Self.kValidHostPattern else { return false }
+        guard let pattern = Self.kValidServerPattern else { return false }
         return pattern.firstMatch(in: string, range: NSRange(location: 0, length: string.count)) != nil
     }
 
@@ -178,7 +198,7 @@ class LoginViewController: UIViewController {
 
     private func enableLogin() {
         setLoginControlesEnabled(true)
-        loginButton.isEnabled = isValidInput(server: serverTextField.text)
+        loginButton.isEnabled = isTextFieldValue()
     }
 
     private func setLoginControlesEnabled(_ enabled: Bool) {
@@ -205,10 +225,17 @@ class LoginViewController: UIViewController {
 extension LoginViewController: UITextFieldDelegate {
     internal func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
         let str = (textField.text as NSString?)?.replacingCharacters(in: range, with: string) ?? string
-
+        var isServer = false
+        var isContext = false
         if textField == serverTextField {
-            loginButton.isEnabled = isValidInput(server: str)
+            isServer = isValidInput(textField: textField, string: str)
+            isContext = isValidInput(textField: contextTextField, string: contextTextField.text)
+        }
+        if textField == contextTextField {
+            isServer = isValidInput(textField: serverTextField, string: serverTextField.text)
+            isContext = isValidInput(textField: textField, string: str)
         }
+        loginButton.isEnabled = isServer && isContext
 
         return true
     }
-- 
GitLab


From abe1d94586e2e132d7cd2161b89a9e5be65b1dce Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Fri, 4 Feb 2022 11:56:04 +0900
Subject: [PATCH 2/4] =?UTF-8?q?=E3=83=AC=E3=83=93=E3=83=A5=E3=83=BC?=
 =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E3=83=BB=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E9=96=93=E3=81=AE?=
 =?UTF-8?q?=E9=81=B7=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Login/View/LoginViewController.swift      | 41 +++++++++++--------
 .../AgileWorks/ja.lproj/Localizable.strings   |  3 +-
 2 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
index 92b92de..e3073f6 100644
--- a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
+++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
@@ -154,18 +154,17 @@ class LoginViewController: UIViewController {
 
     private func updateCloudUsage() {
         serverTextField.placeholder = NSLocalizedString("ServerURLPlaceholder", comment: "")
-        contextTextField.placeholder = "AgileWorks" //TODO
+        contextTextField.placeholder = NSLocalizedString("ContextPlaceholder", comment: "")
         loginButton.isEnabled = isTextFieldValue()
     }
-    
     private func isTextFieldValue() -> Bool {
-        let isServer = isValidInput(textField: serverTextField, string: serverTextField.text)
-        let isContext = isValidInput(textField: contextTextField, string: contextTextField.text)
+        let isServer = isValidInput(textField: serverTextField, text: serverTextField.text)
+        let isContext = isValidInput(textField: contextTextField, text: contextTextField.text)
         return isServer && isContext
     }
 
-    private func isValidInput(textField: UITextField, string: String?) -> Bool {
-        guard let text = string else { return false }
+    private func isValidInput(textField: UITextField, text: String?) -> Bool {
+        guard let text = text else { return false }
         if text.isEmpty {
             return false
         } else {
@@ -177,20 +176,25 @@ class LoginViewController: UIViewController {
             let isFieldValid: Bool
             switch textField {
             case serverTextField:
-                isFieldValid = isValidHost(string: text)
+                isFieldValid = isValidServer(string: text)
             case contextTextField:
-                isFieldValid = isValidHost(string: text)
+                isFieldValid = isValidContext(string: text)
             default:
                 isFieldValid = false
             }
             return isFieldValid
         }
     }
-
-    private func isValidHost(string: String) -> Bool {
+    
+    private func isValidServer(string: String) -> Bool {
         guard let pattern = Self.kValidServerPattern else { return false }
         return pattern.firstMatch(in: string, range: NSRange(location: 0, length: string.count)) != nil
     }
+    
+    private func isValidContext(string: String) -> Bool {
+        guard let pattern = Self.kValidContextPattern else { return false }
+        return pattern.firstMatch(in: string, range: NSRange(location: 0, length: string.count)) != nil
+    }
 
     private func disableLogin() {
         setLoginControlesEnabled(false)
@@ -225,23 +229,24 @@ class LoginViewController: UIViewController {
 extension LoginViewController: UITextFieldDelegate {
     internal func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
         let str = (textField.text as NSString?)?.replacingCharacters(in: range, with: string) ?? string
-        var isServer = false
-        var isContext = false
         if textField == serverTextField {
-            isServer = isValidInput(textField: textField, string: str)
-            isContext = isValidInput(textField: contextTextField, string: contextTextField.text)
+            let isServer = isValidInput(textField: textField, text: str)
+            let isContext = isValidInput(textField: contextTextField, text: contextTextField.text)
+            loginButton.isEnabled = isServer && isContext
         }
         if textField == contextTextField {
-            isServer = isValidInput(textField: serverTextField, string: serverTextField.text)
-            isContext = isValidInput(textField: textField, string: str)
+            let isServer = isValidInput(textField: serverTextField, text: serverTextField.text)
+            let isContext = isValidInput(textField: textField, text: str)
+            loginButton.isEnabled = isServer && isContext
         }
-        loginButton.isEnabled = isServer && isContext
-
         return true
     }
 
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         if textField == serverTextField {
+            contextTextField.becomeFirstResponder()
+        }
+        if textField == contextTextField {
             if loginButton.isEnabled {
                 textField.resignFirstResponder()
                 loginTapped()
diff --git a/AgileWorks/AgileWorks/ja.lproj/Localizable.strings b/AgileWorks/AgileWorks/ja.lproj/Localizable.strings
index 132f7db..2415999 100644
--- a/AgileWorks/AgileWorks/ja.lproj/Localizable.strings
+++ b/AgileWorks/AgileWorks/ja.lproj/Localizable.strings
@@ -13,7 +13,8 @@
 "AppVersion"         = "App ver. %@";
 
 // Login
-"ServerURLPlaceholder"      = "AgileWorksサーバ";
+"ServerURLPlaceholder" = "AgileWorksサーバ";
+"ContextPlaceholder" = "AgileWorks";
 "QRCodeReadLabel" = "QRコードリード";
 "QRCodeReadGuidance" = "ログインQRコードを読み込んでください";
 "ClientCertificateRemovalConfirmation"  = "クライアント証明書の設定を削除します。よろしいですか？";
-- 
GitLab


From be0c9e63a4ebbdee159bc8b0b2df4a8c75ba8cd1 Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Fri, 4 Feb 2022 17:25:30 +0900
Subject: [PATCH 3/4] =?UTF-8?q?=E3=82=B5=E3=83=BC=E3=83=90=E5=90=8D?=
 =?UTF-8?q?=E3=83=BB=E3=82=B3=E3=83=B3=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=83=91=E3=82=B9=E3=81=AE=E4=BF=9D=E5=AD=98=E3=83=BB=E8=AA=AD?=
 =?UTF-8?q?=E3=81=BF=E8=BE=BC=E3=81=BF=20=E3=83=86=E3=82=AD=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E3=81=AE?=
 =?UTF-8?q?=E5=B9=85=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Login/View/LoginViewController.storyboard |  3 ++
 .../Login/View/LoginViewController.swift      | 29 ++++++++++++++-----
 .../AgileWorks/en.lproj/Localizable.strings   |  1 +
 3 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard b/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
index a150f0f..cf45f18 100644
--- a/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
+++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
@@ -42,6 +42,9 @@
                                                             </label>
                                                             <textField opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorksサーバ" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="yKN-J5-cmU" userLabel="Server Text Field">
                                                                 <rect key="frame" x="34.666666666666671" y="0.0" width="142.33333333333331" height="34"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="width" constant="142.33000000000001" id="tbs-Ua-pPV"/>
+                                                                </constraints>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <textInputTraits key="textInputTraits" keyboardType="alphabet"/>
                                                                 <connections>
diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
index 4f5d64a..c9b7535 100644
--- a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
+++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
@@ -15,7 +15,6 @@ protocol LoginView: AnyObject {
 
 class LoginViewController: UIViewController {
     private let serverProtocol = "https://"
-
     private var contextPath = "AgileWorks"
     private var serverDirectory: String {
         return "/" + self.contextPath
@@ -33,7 +32,6 @@ class LoginViewController: UIViewController {
     @IBOutlet private var qrCodeReadLabel: UILabel!
     @IBOutlet private var qrCodeReadView: UIView!
     @IBOutlet private var qrCodeStartupButton: UIButton!
-    
     @IBOutlet private var scrollViewBottomConstraint: NSLayoutConstraint!
 
     private let activityIndicator = UIActivityIndicatorView(style: .whiteLarge)
@@ -45,6 +43,11 @@ class LoginViewController: UIViewController {
         return server
     }
 
+    private var context: String? {
+        guard let context = contextTextField.text else { return nil }
+        return context
+    }
+
     let qrCodeReader = QRCodeReader()
 
     struct LoginQr: Decodable {
@@ -66,10 +69,12 @@ class LoginViewController: UIViewController {
 
         appVersionLabel.text = appVersionLabelText()
 
+        //保存されたサーバー名・コンテキストパスの取得
         let server = Configuration.shared.awServer
+        let context = Configuration.shared.awContextPath
         serverTextField.text = server
-        contextTextField.text = "AgileWorks"
-        //self.contextPath = Configuration.shared.awContextPath
+        contextTextField.text = context
+
         updateCloudUsage()
 
         view.addSubview(activityIndicator)
@@ -97,12 +102,13 @@ class LoginViewController: UIViewController {
 
     @IBAction private func loginTapped() {
         guard let serverHost = serverHost else { return }
+        guard let context = context else { return }
 
         disableLogin()
 
-        print(contextPath)
+        //サーバー名コンテキストパスの保存
         KeychainDataStore().writeServerURL(serverURL: serverHost)
-        KeychainDataStore().writeContextPath(contextPath: contextPath)
+        KeychainDataStore().writeContextPath(contextPath: context)
 
         presenter.fetch() { result in
             switch result {
@@ -146,12 +152,15 @@ class LoginViewController: UIViewController {
         contextTextField.placeholder = NSLocalizedString("ContextPlaceholder", comment: "")
         loginButton.isEnabled = isTextFieldValue()
     }
+
+    //テキストフィールド入力値チェック
     private func isTextFieldValue() -> Bool {
         let isServer = isValidInput(textField: serverTextField, text: serverTextField.text)
         let isContext = isValidInput(textField: contextTextField, text: contextTextField.text)
         return isServer && isContext
     }
 
+    //テキストフィールド空文字チェック
     private func isValidInput(textField: UITextField, text: String?) -> Bool {
         guard let text = text else { return false }
         if text.isEmpty {
@@ -169,12 +178,14 @@ class LoginViewController: UIViewController {
             return isFieldValid
         }
     }
-
+    
+    //サーバー名入力値チェック
     private func isValidServer(string: String) -> Bool {
         guard let pattern = Self.kValidServerPattern else { return false }
         return pattern.firstMatch(in: string, range: NSRange(location: 0, length: string.count)) != nil
     }
 
+    //コンテキストパス入力値チェック
     private func isValidContext(string: String) -> Bool {
         guard let pattern = Self.kValidContextPattern else { return false }
         return pattern.firstMatch(in: string, range: NSRange(location: 0, length: string.count)) != nil
@@ -214,6 +225,7 @@ extension LoginViewController: UITextFieldDelegate {
     internal func textField(_ textField: UITextField, shouldChangeCharactersIn range: NSRange, replacementString string: String) -> Bool {
         let str = (textField.text as NSString?)?.replacingCharacters(in: range, with: string) ?? string
 
+        //新規入力値チェック
         if textField == serverTextField {
             let isServer = isValidInput(textField: textField, text: str)
             let isContext = isValidInput(textField: contextTextField, text: contextTextField.text)
@@ -228,12 +240,15 @@ extension LoginViewController: UITextFieldDelegate {
         return true
     }
 
+    //キーボード確定時（エンター）のアクション
     func textFieldShouldReturn(_ textField: UITextField) -> Bool {
         if textField == serverTextField {
+            //サーバー名→コンテキスト入力
             contextTextField.becomeFirstResponder()
         }
         if textField == contextTextField {
             if loginButton.isEnabled {
+                //コンテキスト→ログイン
                 textField.resignFirstResponder()
                 loginTapped()
             }
diff --git a/AgileWorks/AgileWorks/en.lproj/Localizable.strings b/AgileWorks/AgileWorks/en.lproj/Localizable.strings
index cdf459d..b31b14c 100644
--- a/AgileWorks/AgileWorks/en.lproj/Localizable.strings
+++ b/AgileWorks/AgileWorks/en.lproj/Localizable.strings
@@ -14,6 +14,7 @@
 
 // Login
 "ServerURLPlaceholder"      = "AgileWorksサーバ";
+"ContextPlaceholder" = "AgileWorks";
 "QRCodeReadLabel" = "QRコードリード";
 "QRCodeReadGuidance" = "ログインQRコードを読み込んでください";
 "ClientCertificateRemovalConfirmation"  = "クライアント証明書の設定を削除します。よろしいですか？";
-- 
GitLab


From c5b195c46ddf15989d52d8bbdf24691fe8c27779 Mon Sep 17 00:00:00 2001
From: Azuma Kasumi <azuma.kasumi@nttdata-sbc.co.jp>
Date: Thu, 10 Feb 2022 16:55:30 +0900
Subject: [PATCH 4/4] =?UTF-8?q?=E3=83=86=E3=82=AD=E3=82=B9=E3=83=88?=
 =?UTF-8?q?=E3=83=95=E3=82=A3=E3=83=BC=E3=83=AB=E3=83=89=E3=81=AE=E5=89=B2?=
 =?UTF-8?q?=E5=90=88=20->=20=E5=90=84=E7=AB=AF=E6=9C=AB=E5=85=B1=E9=80=9A?=
 =?UTF-8?q?=E8=A1=A8=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Login/View/LoginViewController.storyboard | 38 +++++++++++--------
 .../Login/View/LoginViewController.swift      | 31 ++++++++++++++-
 2 files changed, 51 insertions(+), 18 deletions(-)

diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard b/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
index cf45f18..77d6638 100644
--- a/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
+++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.storyboard
@@ -34,35 +34,38 @@
                                                     <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qGm-EW-OID">
                                                         <rect key="frame" x="0.0" y="0.0" width="281" height="34"/>
                                                         <subviews>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="https://" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dUY-1H-zKT">
-                                                                <rect key="frame" x="0.0" y="0.0" width="34.666666666666664" height="34"/>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="https://" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dUY-1H-zKT">
+                                                                <rect key="frame" x="0.0" y="0.0" width="47.666666666666664" height="34"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="width" relation="greaterThanOrEqual" constant="47.670000000000002" id="7IY-O2-Li0"/>
+                                                                </constraints>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <nil key="textColor"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorksサーバ" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="yKN-J5-cmU" userLabel="Server Text Field">
-                                                                <rect key="frame" x="34.666666666666671" y="0.0" width="142.33333333333331" height="34"/>
-                                                                <constraints>
-                                                                    <constraint firstAttribute="width" constant="142.33000000000001" id="tbs-Ua-pPV"/>
-                                                                </constraints>
+                                                            <textField opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorksサーバ" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Rra-md-EVd">
+                                                                <rect key="frame" x="47.666666666666664" y="0.0" width="123.66666666666669" height="34"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                                <textInputTraits key="textInputTraits" keyboardType="alphabet"/>
+                                                                <textInputTraits key="textInputTraits"/>
                                                                 <connections>
-                                                                    <outlet property="delegate" destination="Muw-p4-tJJ" id="kus-M9-RjK"/>
+                                                                    <outlet property="delegate" destination="Muw-p4-tJJ" id="EbW-g8-ER9"/>
                                                                 </connections>
                                                             </textField>
-                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="/" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mmq-EM-bmp">
-                                                                <rect key="frame" x="177" y="0.0" width="4.3333333333333428" height="34"/>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" ambiguous="YES" text="/" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="mmq-EM-bmp">
+                                                                <rect key="frame" x="171.33333333333334" y="0.0" width="10" height="34"/>
+                                                                <constraints>
+                                                                    <constraint firstAttribute="width" constant="10" id="rHT-69-2bh"/>
+                                                                </constraints>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <nil key="textColor"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorks" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="k5g-9b-hWd" userLabel="Context Text Field">
+                                                            <textField opaque="NO" contentMode="scaleToFill" ambiguous="YES" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="AgileWorks" textAlignment="natural" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="lHB-Zh-MQx">
                                                                 <rect key="frame" x="181.33333333333334" y="0.0" width="99.666666666666657" height="34"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                                <textInputTraits key="textInputTraits" keyboardType="alphabet"/>
+                                                                <textInputTraits key="textInputTraits"/>
                                                                 <connections>
-                                                                    <outlet property="delegate" destination="Muw-p4-tJJ" id="cQB-t5-6Pi"/>
+                                                                    <outlet property="delegate" destination="Muw-p4-tJJ" id="f0o-hq-Xn2"/>
                                                                 </connections>
                                                             </textField>
                                                         </subviews>
@@ -205,14 +208,17 @@
                         <outlet property="appVersionLabel" destination="4LY-tr-xFi" id="WQt-0p-Y2o"/>
                         <outlet property="clientCertificateRemovalButton" destination="4W4-CG-MTM" id="bRk-Rk-gFd"/>
                         <outlet property="clientCertificateSettingView" destination="5IT-4z-wWP" id="Lws-FM-Kbg"/>
-                        <outlet property="contextTextField" destination="k5g-9b-hWd" id="H4e-aT-ytQ"/>
+                        <outlet property="contextTextField" destination="lHB-Zh-MQx" id="0DV-B4-C9n"/>
                         <outlet property="disablingView" destination="Eac-pO-PpC" id="pp8-Ex-Y2i"/>
+                        <outlet property="httpsLavel" destination="dUY-1H-zKT" id="QVv-jX-GF2"/>
                         <outlet property="loginButton" destination="W0b-va-UXh" id="rzC-OC-nhO"/>
                         <outlet property="qrCodeReadLabel" destination="oDi-1K-fPP" id="rm0-Ni-e6r"/>
                         <outlet property="qrCodeReadView" destination="0QN-lE-A8b" id="nhQ-ss-wFb"/>
                         <outlet property="qrCodeStartupButton" destination="B5D-Cm-PQs" id="s77-n1-Qm5"/>
                         <outlet property="scrollViewBottomConstraint" destination="tE3-Av-QIH" id="U1V-RH-MI5"/>
-                        <outlet property="serverTextField" destination="yKN-J5-cmU" id="nHt-VS-c46"/>
+                        <outlet property="serverTextField" destination="Rra-md-EVd" id="0d1-dc-HaH"/>
+                        <outlet property="slashLabel" destination="mmq-EM-bmp" id="ysa-E4-gCb"/>
+                        <outlet property="urlStackView" destination="qGm-EW-OID" id="DKz-wS-b6w"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="eyw-es-qLh" userLabel="First Responder" sceneMemberID="firstResponder"/>
diff --git a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
index c9b7535..b673720 100644
--- a/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
+++ b/AgileWorks/AgileWorks/Login/View/LoginViewController.swift
@@ -20,10 +20,13 @@ class LoginViewController: UIViewController {
         return "/" + self.contextPath
     }
     private static let kValidServerPattern = try? NSRegularExpression(pattern: #"^[-a-z0-9]+(?:\.[-a-z0-9]+)*\.?(?::\d+)?$"#, options: .caseInsensitive)
-    private static let kValidContextPattern = try? NSRegularExpression(pattern: #"^[a-zA-Z0-9]+"#, options: .caseInsensitive)
+    private static let kValidContextPattern = try? NSRegularExpression(pattern: #"^[a-z0-9]+"#, options: .caseInsensitive)
 
     @IBOutlet private var appVersionLabel: UILabel!
+    @IBOutlet private var urlStackView: UIStackView!
+    @IBOutlet private var httpsLavel: UILabel!
     @IBOutlet private var serverTextField: UITextField!
+    @IBOutlet private var slashLabel: UILabel!
     @IBOutlet private var contextTextField: UITextField!
     @IBOutlet private var loginButton: UIButton!
     @IBOutlet private var disablingView: UIView!
@@ -92,6 +95,30 @@ class LoginViewController: UIViewController {
         NotificationCenter.default.addObserver(self, selector: #selector(keyboardWillHide(_:)), name: UIResponder.keyboardWillHideNotification, object: nil)
     }
 
+    override func viewDidLayoutSubviews() {
+        super.viewDidLayoutSubviews()
+        //テキストフィールドの幅を決定
+        //URL群のAutoLayoutを解除
+        serverTextField.translatesAutoresizingMaskIntoConstraints = true
+        contextTextField.translatesAutoresizingMaskIntoConstraints = true
+        httpsLavel.translatesAutoresizingMaskIntoConstraints = true
+        slashLabel.translatesAutoresizingMaskIntoConstraints = true
+        //urlStackViewの幅を取得
+        self.urlStackView.setNeedsLayout()
+        self.urlStackView.layoutIfNeeded()
+        let allUrlWidth = urlStackView.frame.width
+        //ラベルの表示幅を取得
+        let httpsWidth = httpsLavel.frame.width
+        let slashWidth = slashLabel.frame.width
+        //テキストフィールドの表示幅を設定
+        let textFieldWidth = allUrlWidth - httpsWidth - slashWidth
+        serverTextField.frame.size.width = textFieldWidth * 0.6
+        contextTextField.frame.size.width = textFieldWidth * 0.4
+        //表示位置の修正
+        slashLabel.frame.origin.x = serverTextField.frame.origin.x + serverTextField.frame.size.width
+        contextTextField.frame.origin.x = slashLabel.frame.origin.x + slashWidth
+    }
+
     override func touchesBegan(_ touches: Set<UITouch>, with event: UIEvent?) {
         self.view.endEditing(true)
     }
@@ -178,7 +205,7 @@ class LoginViewController: UIViewController {
             return isFieldValid
         }
     }
-    
+
     //サーバー名入力値チェック
     private func isValidServer(string: String) -> Bool {
         guard let pattern = Self.kValidServerPattern else { return false }
-- 
GitLab