Skip to content

Commit ffe99fa

Browse files
xtools-atxtools-at
committed
fixed layout issues with offline container, works now
1 parent 1c2278e commit ffe99fa

File tree

11 files changed

+128
-18
lines changed

11 files changed

+128
-18
lines changed

‎.gitignore‎

Lines changed: 103 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,103 @@
1+
#####
2+
# OS X temporary files that should never be committed
3+
.DS_Store
4+
*.swp
5+
*.lock
6+
profile
7+
8+
#####
9+
# DotEnv files
10+
.env
11+
12+
####
13+
# Xcode temporary files that should never be committed
14+
*~.nib
15+
16+
####
17+
# Objective-C/Swift specific
18+
*.hmap
19+
*.ipa
20+
21+
####
22+
# Xcode build files
23+
DerivedData/
24+
build/
25+
Builds/
26+
27+
#####
28+
# Xcode private settings (window sizes, bookmarks, breakpoints, custom executables, smart groups)
29+
*.pbxuser
30+
*.mode1v3
31+
*.mode2v3
32+
*.perspectivev3
33+
!default.pbxuser
34+
!default.mode1v3
35+
!default.mode2v3
36+
!default.perspectivev3
37+
38+
####
39+
# Xcode 4
40+
xcuserdata
41+
!xcschemes
42+
# Xcode 4
43+
*.moved-aside
44+
45+
####
46+
# XCode 4 workspaces - more detailed
47+
!xcshareddata
48+
!default.xcworkspace
49+
*.xcworkspacedata
50+
51+
52+
####
53+
# Xcode 5
54+
*.xccheckout
55+
*.xcuserstate
56+
57+
####
58+
# Xcode 7
59+
*.xcscmblueprint
60+
61+
####
62+
# AppCode
63+
.idea/
64+
65+
####
66+
# Other Xcode files
67+
profile
68+
*.hmap
69+
*.ipa
70+
71+
####
72+
# CocoaPods
73+
Pods/
74+
!Podfile
75+
!Podfile.lock
76+
77+
####
78+
# Carthage
79+
Carthage/Build.rbenv-vars
80+
!Cartfile
81+
!Cartfile.private
82+
!Cartfile.resolved
83+
84+
####
85+
# Fastlane
86+
# Temporary profiling data
87+
/fastlane/report.xml
88+
# Deliver temporary error output
89+
/fastlane/Error*.png
90+
# Deliver temporary preview output
91+
/fastlane/Preview.html
92+
# Snapshot generated screenshots
93+
/fastlane/screenshots/*/*-portrait.png
94+
/fastlane/screenshots/*/*-landscape.png
95+
/fastlane/screenshots/screenshots.html
96+
# Frameit generated screenshots
97+
/fastlane/screenshots/*/*-portrait_framed.png
98+
/fastlane/screenshots/*/*-landscape_framed.png
99+
100+
####
101+
# rbenv
102+
.rbenv-vars
103+

‎ios-pwa-wrapper/Assets.xcassets/ic_cloud_off_black_48dp.imageset/ic_cloud_off_black_48dp-1.png‎

-1.57 KB
Binary file not shown.

‎ios-pwa-wrapper/Assets.xcassets/ic_cloud_off_black_48dp.imageset/ic_cloud_off_black_48dp-2.png‎

-1.07 KB
Binary file not shown.

‎ios-pwa-wrapper/Assets.xcassets/ic_cloud_off_black_48dp.imageset/ic_cloud_off_black_48dp.png‎

-2.09 KB
Binary file not shown.

ios-pwa-wrapper/Assets.xcassets/ic_cloud_off_black_48dp.imageset/Contents.json renamed to ios-pwa-wrapper/Assets.xcassets/ic_cloud_off_white_48pt.imageset/Contents.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,17 @@
22
"images" : [
33
{
44
"idiom" : "universal",
5-
"filename" : "ic_cloud_off_black_48dp-2.png",
5+
"filename" : "ic_cloud_off_white_48pt.png",
66
"scale" : "1x"
77
},
88
{
99
"idiom" : "universal",
10-
"filename" : "ic_cloud_off_black_48dp-1.png",
10+
"filename" : "ic_cloud_off_white_48pt_2x.png",
1111
"scale" : "2x"
1212
},
1313
{
1414
"idiom" : "universal",
15-
"filename" : "ic_cloud_off_black_48dp.png",
15+
"filename" : "ic_cloud_off_white_48pt_3x.png",
1616
"scale" : "3x"
1717
}
1818
],

‎ios-pwa-wrapper/Assets.xcassets/ic_cloud_off_white_48pt.imageset/ic_cloud_off_white_48pt.png‎

593 Bytes
Loading

‎ios-pwa-wrapper/Assets.xcassets/ic_cloud_off_white_48pt.imageset/ic_cloud_off_white_48pt_2x.png‎

1.1 KB
Loading

‎ios-pwa-wrapper/Assets.xcassets/ic_cloud_off_white_48pt.imageset/ic_cloud_off_white_48pt_3x.png‎

1.65 KB
Loading

‎ios-pwa-wrapper/Base.lproj/Main.storyboard‎

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
</device>
66
<dependencies>
77
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="13174"/>
8+
<capability name="Alignment constraints to the first baseline" minToolsVersion="6.0"/>
89
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
910
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
1011
</dependencies>
@@ -21,40 +22,38 @@
2122
<rect key="frame" x="0.0" y="64" width="375" height="603"/>
2223
<subviews>
2324
<stackView opaque="NO" contentMode="scaleToFill" axis="vertical" alignment="center" translatesAutoresizingMaskIntoConstraints="NO" id="PAe-DD-sEP">
24-
<rect key="frame" x="0.0" y="200" width="375" height="132.5"/>
25+
<rect key="frame" x="0.0" y="180" width="375" height="165"/>
2526
<subviews>
26-
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_cloud_off_black_48dp" translatesAutoresizingMaskIntoConstraints="NO" id="oc6-1O-6cw">
27-
<rect key="frame" x="118" y="0.0" width="139" height="72"/>
27+
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="ic_cloud_off_white_48pt" translatesAutoresizingMaskIntoConstraints="NO" id="oc6-1O-6cw">
28+
<rect key="frame" x="163.5" y="0.0" width="48" height="48"/>
2829
</imageView>
2930
<label opaque="NO" userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="You are offline." textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="2o9-AL-VUQ">
30-
<rect key="frame" x="116.5" y="72" width="142" height="26.5"/>
31-
<fontDescription key="fontDescription" type="system" pointSize="22"/>
31+
<rect key="frame" x="123.5" y="48" width="128.5" height="24"/>
32+
<fontDescription key="fontDescription" type="system" pointSize="20"/>
3233
<color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
3334
<nil key="highlightedColor"/>
3435
</label>
35-
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="M9z-jX-53J">
36-
<rect key="frame" x="118" y="98.5" width="139" height="34"/>
37-
<fontDescription key="fontDescription" type="system" pointSize="18"/>
36+
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="wordWrap" translatesAutoresizingMaskIntoConstraints="NO" id="M9z-jX-53J">
37+
<rect key="frame" x="101" y="72" width="173" height="93"/>
38+
<fontDescription key="fontDescription" type="system" pointSize="24"/>
3839
<state key="normal" title="Tap here to retry!"/>
3940
<connections>
4041
<action selector="onOfflineButtonClick:" destination="BYZ-38-t0r" eventType="touchUpInside" id="rqj-bK-hyk"/>
4142
</connections>
4243
</button>
4344
</subviews>
4445
<constraints>
45-
<constraint firstItem="oc6-1O-6cw" firstAttribute="top" secondItem="PAe-DD-sEP" secondAttribute="top" id="44T-fD-cKO"/>
46-
<constraint firstItem="oc6-1O-6cw" firstAttribute="leading" secondItem="2o9-AL-VUQ" secondAttribute="trailing" constant="-140.5" id="Hr3-h7-6gE"/>
47-
<constraint firstItem="2o9-AL-VUQ" firstAttribute="leading" secondItem="M9z-jX-53J" secondAttribute="trailing" constant="-140.5" id="wdO-oV-eNf"/>
46+
<constraint firstItem="M9z-jX-53J" firstAttribute="firstBaseline" secondItem="2o9-AL-VUQ" secondAttribute="baseline" constant="60" id="djg-iE-GSj"/>
4847
</constraints>
4948
</stackView>
5049
</subviews>
5150
<constraints>
5251
<constraint firstAttribute="trailing" secondItem="PAe-DD-sEP" secondAttribute="trailing" id="2Hh-cQ-iwx"/>
52+
<constraint firstItem="PAe-DD-sEP" firstAttribute="top" secondItem="P71-RQ-w3Y" secondAttribute="top" constant="180" id="Eia-9Q-zWJ"/>
5353
<constraint firstItem="PAe-DD-sEP" firstAttribute="leading" secondItem="P71-RQ-w3Y" secondAttribute="leading" id="Vx8-ru-pdt"/>
54-
<constraint firstItem="PAe-DD-sEP" firstAttribute="top" secondItem="P71-RQ-w3Y" secondAttribute="top" constant="200" id="ge0-AZ-Dbn"/>
5554
</constraints>
5655
</view>
57-
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HnO-cS-a4I">
56+
<view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="HnO-cS-a4I">
5857
<rect key="frame" x="0.0" y="64" width="375" height="603"/>
5958
<color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
6059
</view>
@@ -121,6 +120,6 @@
121120
</scene>
122121
</scenes>
123122
<resources>
124-
<image name="ic_cloud_off_black_48dp" width="72" height="72"/>
123+
<image name="ic_cloud_off_white_48pt" width="48" height="48"/>
125124
</resources>
126125
</document>

‎ios-pwa-wrapper/Constants.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ let navigationBarColor = getColorFromHex(hex: 0xF44336, alpha: 1.0)
3030
let navigationTitleColor = getColorFromHex(hex: 0xFFFFFF, alpha: 1.0)
3131
let navigationButtonColor = navigationTitleColor
3232
let progressBarColor = getColorFromHex(hex: 0x4CAF50, alpha: 1.0)
33-
let offlineIconColor = navigationBarColor
33+
let offlineIconColor = UIColor.darkGray
34+
let buttonColor = navigationBarColor
3435

3536
// Color Helper function
3637
func getColorFromHex(hex: UInt, alpha: CGFloat) -> UIColor {

0 commit comments

Comments
 (0)