Skip to content

Commit 533c782

Browse files
acb-mvrablador
authored andcommitted
Remove all resized instances of info icon
1 parent 518f79d commit 533c782

File tree

3 files changed

+15
-14
lines changed

3 files changed

+15
-14
lines changed

ios/MullvadVPN/Containers/Root/HeaderBarView.swift

+5-5
Original file line numberDiff line numberDiff line change
@@ -84,11 +84,11 @@ class HeaderBarView: UIView {
8484
return button
8585
}()
8686

87-
class func prepareHeaderBarButtonImage(from image: UIImage) -> UIImage {
88-
let resizeRatio = 24.0 / 20.0
89-
let targetSize = CGSize(width: image.size.width * resizeRatio, height: image.size.height * resizeRatio)
90-
return image // .resizeImage(targetSize: targetSize)
91-
}
87+
// class func prepareHeaderBarButtonImage(from image: UIImage) -> UIImage {
88+
// let resizeRatio = 24.0 / 20.0
89+
// let targetSize = CGSize(width: image.size.width * resizeRatio, height: image.size.height * resizeRatio)
90+
// return image // .resizeImage(targetSize: targetSize)
91+
// }
9292

9393
class func makeHeaderBarButton(with image: UIImage?) -> IncreasedHitButton {
9494
// let image = image.map { prepareHeaderBarButtonImage(from: $0) }

ios/MullvadVPN/Extensions/UIImage+Assets.swift

+9-8
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ extension UIImage {
1313
// Button images we expect as tightly cropped 24x24 images. The SVGs are 20x20 with a 2px border
1414
static var account: UIImage {
1515
UIImage(named: "IconAccount")!
16-
.resized(to: CGSize(width: 24, height: 24), trimmingBorder: 2)
16+
// .resized(to: CGSize(width: 24, height: 24), trimmingBorder: 2)
1717
}
1818

1919
static var alert: UIImage {
2020
UIImage(named: "IconAlert")!
21-
.resized(to: CGSize(width: 24, height: 24), trimmingBorder: 2)
21+
// .resized(to: CGSize(width: 24, height: 24), trimmingBorder: 2)
2222
}
2323

2424
static var info: UIImage {
@@ -27,7 +27,7 @@ extension UIImage {
2727

2828
static var settings: UIImage {
2929
UIImage(named: "IconSettings")!
30-
.resized(to: CGSize(width: 24, height: 24), trimmingBorder: 2)
30+
// .resized(to: CGSize(width: 24, height: 24), trimmingBorder: 2)
3131
}
3232

3333
static var back: UIImage {
@@ -58,11 +58,12 @@ extension UIImage {
5858

5959
static var closeSmall: UIImage {
6060
UIImage(named: "IconClose")!
61-
.resized(to: CGSize(width: 16, height: 16), trimmingBorder: 4)
61+
.resized(to: CGSize(width: 18, height: 18))
6262
}
6363

64-
static var closeLarge: UIImage {
65-
UIImage(named: "IconClose")!.resized(to: CGSize(width: 24, height: 24), trimmingBorder: 4)
64+
static var close: UIImage {
65+
UIImage(named: "IconClose")!
66+
// .resized(to: CGSize(width: 24, height: 24))
6667
}
6768
}
6869

@@ -85,7 +86,7 @@ extension UIImage {
8586

8687
static var tick: UIImage {
8788
UIImage(named: "IconTickSml")!
88-
.resized(to: CGSize(width: 16, height: 16))
89+
// .resized(to: CGSize(width: 16, height: 16))
8990
}
9091
}
9192

@@ -105,6 +106,6 @@ extension UIImage {
105106

106107
static var tick: UIImage {
107108
UIImage(named: "IconTickSml")!
108-
.resized(to: CGSize(width: 24, height: 24))
109+
// .resized(to: CGSize(width: 24, height: 24))
109110
}
110111
}

ios/MullvadVPN/View controllers/DeviceList/DeviceRowView.swift

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class DeviceRowView: UIView {
3535
}()
3636

3737
let removeButton: UIButton = {
38-
let image = UIImage.Buttons.closeLarge
38+
let image = UIImage.Buttons.close
3939
.withTintColor(
4040
.white.withAlphaComponent(0.4),
4141
renderingMode: .alwaysOriginal

0 commit comments

Comments
 (0)