reskin: remove bar style ivars from RiotDesignValues

This commit is contained in:
manuroe
2019-01-10 17:08:32 +01:00
parent 3bacf204d5
commit 7b40258d05
40 changed files with 44 additions and 76 deletions
@@ -126,7 +126,7 @@
- (UIStatusBarStyle)preferredStatusBarStyle
{
return kRiotDesignStatusBarStyle;
return RiotDesignValues.theme.statusBarStyle;
}
- (void)destroy
@@ -223,7 +223,7 @@
self.activityIndicator.backgroundColor = kRiotOverlayColor;
self.memberHeaderView.backgroundColor = kRiotDesignNavigationBarBarTintColor;
self.memberHeaderView.backgroundColor = RiotDesignValues.theme.baseColor;
self.roomMemberNameLabel.textColor = kRiotPrimaryTextColor;
self.roomMemberStatusLabel.textColor = RiotDesignValues.theme.tintColor;
@@ -239,7 +239,7 @@
- (UIStatusBarStyle)preferredStatusBarStyle
{
return kRiotDesignStatusBarStyle;
return RiotDesignValues.theme.statusBarStyle;
}
- (BOOL)prefersStatusBarHidden
@@ -184,7 +184,7 @@
- (UIStatusBarStyle)preferredStatusBarStyle
{
return kRiotDesignStatusBarStyle;
return RiotDesignValues.theme.statusBarStyle;
}
// This method is called when the viewcontroller is added or removed from a container view controller.
@@ -118,7 +118,7 @@
- (UIStatusBarStyle)preferredStatusBarStyle
{
return kRiotDesignStatusBarStyle;
return RiotDesignValues.theme.statusBarStyle;
}
- (void)destroy
+1 -1
View File
@@ -447,7 +447,7 @@
- (UIStatusBarStyle)preferredStatusBarStyle
{
return kRiotDesignStatusBarStyle;
return RiotDesignValues.theme.statusBarStyle;
}
- (void)didReceiveMemoryWarning
@@ -90,7 +90,7 @@
- (UIStatusBarStyle)preferredStatusBarStyle
{
return kRiotDesignStatusBarStyle;
return RiotDesignValues.theme.statusBarStyle;
}
- (void)destroy
@@ -91,7 +91,7 @@
- (UIStatusBarStyle)preferredStatusBarStyle
{
return kRiotDesignStatusBarStyle;
return RiotDesignValues.theme.statusBarStyle;
}
- (void)destroy
@@ -282,7 +282,7 @@ NSString *const kRoomSettingsAdvancedE2eEnabledCellViewIdentifier = @"kRoomSetti
- (UIStatusBarStyle)preferredStatusBarStyle
{
return kRiotDesignStatusBarStyle;
return RiotDesignValues.theme.statusBarStyle;
}
- (void)viewWillAppear:(BOOL)animated
@@ -64,7 +64,7 @@
[super customizeViewRendering];
// Use same color as navigation bar
self.mainHeaderBackground.backgroundColor = kRiotDesignNavigationBarBarTintColor;
self.mainHeaderBackground.backgroundColor = RiotDesignValues.theme.baseColor;
self.roomTopic.textColor = kRiotTopicTextColor;
@@ -138,8 +138,8 @@
[super customizeViewRendering];
// Use same color as navigation bar
self.backgroundColor = kRiotDesignNavigationBarBarTintColor;
self.displayNameTextField.textColor = (self.mxRoom.summary.displayname.length ? kRiotDesignNavigationBarTintColor : kRiotSecondaryTextColor);
self.backgroundColor = RiotDesignValues.theme.baseColor;
self.displayNameTextField.textColor = (self.mxRoom.summary.displayname.length ? RiotDesignValues.theme.baseTextPrimaryColor : kRiotSecondaryTextColor);
}
- (void)setRoomPreviewData:(RoomPreviewData *)roomPreviewData
@@ -168,7 +168,7 @@
}
else
{
self.displayNameTextField.textColor = kRiotDesignNavigationBarTintColor;
self.displayNameTextField.textColor = RiotDesignValues.theme.baseTextPrimaryColor;
}
}
}