Skip to content

Commit f21a893

Browse files
fix constraints on iOS splash storyboard and force DarkTheme at MainActivity init on Android
1 parent bc2672f commit f21a893

File tree

2 files changed

+11
-16
lines changed

2 files changed

+11
-16
lines changed

android/app/src/main/java/im/status/ethereum/MainActivity.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -125,17 +125,7 @@ public void onNewIntent(final Intent intent) {
125125
@Override
126126
protected void onCreate(Bundle savedInstanceState) {
127127
SplashScreen splashScreen = SplashScreen.installSplashScreen(this);
128-
129-
switch (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK) {
130-
case Configuration.UI_MODE_NIGHT_YES:
131-
setTheme(R.style.DarkTheme);
132-
break;
133-
case Configuration.UI_MODE_NIGHT_NO:
134-
setTheme(R.style.LightTheme);
135-
break;
136-
default:
137-
setTheme(R.style.LightTheme);
138-
}
128+
setTheme(R.style.DarkTheme);
139129
// Make sure we get an Alert for every uncaught exceptions
140130
registerUncaughtExceptionHandler(MainActivity.this);
141131

ios/launch-image-universal.storyboard

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<dependencies>
55
<deployment identifier="iOS"/>
66
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="21505"/>
7-
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
87
<capability name="System colors in document resources" minToolsVersion="11.0"/>
98
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
109
</dependencies>
@@ -17,14 +16,20 @@
1716
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
1817
<autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
1918
<subviews>
20-
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" image="launch-icon.png" translatesAutoresizingMaskIntoConstraints="NO" id="cqW-9w-FC0">
21-
<rect key="frame" x="-1" y="-1" width="376" height="666"/>
22-
<autoresizingMask key="autoresizingMask" flexibleMinX="YES" widthSizable="YES" flexibleMaxX="YES" flexibleMinY="YES" heightSizable="YES" flexibleMaxY="YES"/>
19+
<imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="launch-icon.png" translatesAutoresizingMaskIntoConstraints="NO" id="cqW-9w-FC0">
20+
<rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
2321
<color key="backgroundColor" red="0.035294117647058823" green="0.062745098039215685" blue="0.10980392156862745" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
2422
</imageView>
2523
</subviews>
26-
<viewLayoutGuide key="safeArea" id="2aN-f8-qiu"/>
2724
<color key="backgroundColor" systemColor="systemBackgroundColor"/>
25+
<constraints>
26+
<constraint firstAttribute="bottom" secondItem="cqW-9w-FC0" secondAttribute="bottom" id="2Ue-hX-Tna"/>
27+
<constraint firstAttribute="trailing" secondItem="cqW-9w-FC0" secondAttribute="trailing" id="Sfz-tk-PSg"/>
28+
<constraint firstItem="cqW-9w-FC0" firstAttribute="leading" secondItem="0g6-xG-Wkj" secondAttribute="leading" id="UQo-dC-xeN"/>
29+
<constraint firstItem="cqW-9w-FC0" firstAttribute="top" secondItem="0g6-xG-Wkj" secondAttribute="top" id="YrE-J2-QHf"/>
30+
<constraint firstItem="cqW-9w-FC0" firstAttribute="centerX" secondItem="0g6-xG-Wkj" secondAttribute="centerX" id="ZQS-4G-GAL"/>
31+
<constraint firstItem="cqW-9w-FC0" firstAttribute="centerY" secondItem="0g6-xG-Wkj" secondAttribute="centerY" id="noT-Rj-8Uy"/>
32+
</constraints>
2833
</view>
2934
</viewController>
3035
<placeholder placeholderIdentifier="IBFirstResponder" id="hOp-FG-FML" userLabel="First Responder" sceneMemberID="firstResponder"/>

0 commit comments

Comments
 (0)