Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[FEATURE][INSPECT-#281]- Fix to Keycloak for awaiting access; set to .dev for TestFlight #286

Merged
merged 1 commit into from
Jan 26, 2024
Merged

[FEATURE][INSPECT-#281]- Fix to Keycloak for awaiting access; set to .dev for TestFlight #286

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ipad/Constants/AppRemoteAPIConst.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class RemoteURLManager {
static var `default` = {
// Here We Can use Target Flag to customize
// Switch Env
return RemoteURLManager(.prod)
return RemoteURLManager(.dev)
}()

init(_ env: RemoteEnv) {
Expand Down
2 changes: 1 addition & 1 deletion ipad/ViewControllers/Entry Point/ViewController.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ class ViewController: UIViewController, Theme {
awaitingAccessResponseView.show(in: self.view, onRefresh: { [weak self] in
guard let _self = self else {return}
awaitingAccessResponseView.removeFromSuperview()
_self.presentNext()
_self.segueToLoginPage()
})
}

Expand Down
25 changes: 13 additions & 12 deletions ipad/Views/AwaitingAccessResponse/AwaitingAccessResponse.xib
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,52 @@
<?xml version="1.0" encoding="UTF-8"?>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15705" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="22155" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="ipad10_9rounded" orientation="portrait" layout="fullscreen" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15706"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="22131"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="AwaitingAccessResponse" customModule="InvasivesBC" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
<view contentMode="scaleToFill" id="iN0-l3-epB" customClass="AwaitingAccessResponse" customModule="Inspect" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="820" height="1180"/>
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
<subviews>
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" spacing="32" translatesAutoresizingMaskIntoConstraints="NO" id="5W3-FM-rxP">
<rect key="frame" x="32" y="401.5" width="350" height="93.5"/>
<rect key="frame" x="32" y="553.5" width="756" height="73"/>
<subviews>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Awaiting Access Response" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="OGd-6q-jb8">
<rect key="frame" x="73.5" y="0.0" width="203.5" height="20.5"/>
<rect key="frame" x="277" y="0.0" width="202.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="We've sent a request for elevated access for you to use this application" textAlignment="center" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="NcG-SN-QPK">
<rect key="frame" x="4" y="52.5" width="342.5" height="41"/>
<rect key="frame" x="108.5" y="52.5" width="539.5" height="20.5"/>
<fontDescription key="fontDescription" type="system" pointSize="17"/>
<nil key="textColor"/>
<nil key="highlightedColor"/>
</label>
</subviews>
</stackView>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kBh-mv-GvA">
<rect key="frame" x="147" y="645" width="120" height="43"/>
<rect key="frame" x="350" y="776.5" width="120" height="43"/>
<constraints>
<constraint firstAttribute="width" constant="120" id="S0T-pD-JA8"/>
<constraint firstAttribute="height" constant="43" id="cx9-g1-2a7"/>
</constraints>
<color key="tintColor" red="0.050980392159999999" green="0.24313725489999999" blue="0.45098039220000002" alpha="1" colorSpace="calibratedRGB"/>
<state key="normal" title="Refresh" image="arrow.clockwise.circle.fill" catalog="system">
<state key="normal" title=" Login" image="arrow.clockwise.circle.fill" catalog="system">
<color key="titleColor" red="0.050980392159999999" green="0.24313725489999999" blue="0.45098039220000002" alpha="1" colorSpace="calibratedRGB"/>
</state>
<connections>
<action selector="refreshAction:" destination="iN0-l3-epB" eventType="touchUpInside" id="019-Mm-w64"/>
</connections>
</button>
</subviews>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<constraints>
<constraint firstItem="5W3-FM-rxP" firstAttribute="centerX" secondItem="iN0-l3-epB" secondAttribute="centerX" id="0Vl-VX-EEq"/>
Expand All @@ -54,7 +56,6 @@
<constraint firstItem="kBh-mv-GvA" firstAttribute="top" secondItem="5W3-FM-rxP" secondAttribute="bottom" constant="150" id="Bph-bc-1Fl"/>
<constraint firstItem="5W3-FM-rxP" firstAttribute="leading" secondItem="iN0-l3-epB" secondAttribute="leading" constant="32" id="gdd-xe-nEM"/>
</constraints>
<viewLayoutGuide key="safeArea" id="vUN-kp-3ea"/>
<connections>
<outlet property="headerLabel" destination="OGd-6q-jb8" id="3zJ-rz-DOr"/>
<outlet property="messageLabel" destination="NcG-SN-QPK" id="7vu-t7-Nei"/>
Expand All @@ -64,6 +65,6 @@
</view>
</objects>
<resources>
<image name="arrow.clockwise.circle.fill" catalog="system" width="64" height="60"/>
<image name="arrow.clockwise.circle.fill" catalog="system" width="128" height="123"/>
</resources>
</document>
Loading