updated assets

This commit is contained in:
Stuart Breckenridge 2020-12-07 19:52:35 +08:00
parent c8b5caba60
commit 092415e3a9
No known key found for this signature in database
GPG Key ID: 1F11FD62007DC331
14 changed files with 40 additions and 12 deletions

View File

@ -69,7 +69,7 @@ struct AddFeedWranglerAccountView: View {
}, label: { }, label: {
HStack { HStack {
Spacer() Spacer()
Text("Sign In") Text("Add Account")
Spacer() Spacer()
} }
}).disabled(model.username.isEmpty || model.password.isEmpty) }).disabled(model.username.isEmpty || model.password.isEmpty)

View File

@ -65,7 +65,11 @@ struct AddFeedbinAccountView: View {
Button(action: { Button(action: {
model.authenticateFeedbin() model.authenticateFeedbin()
}, label: { }, label: {
Text("Sign In") HStack {
Spacer()
Text("Add Account")
Spacer()
}
}).disabled(model.username.isEmpty || model.password.isEmpty) }).disabled(model.username.isEmpty || model.password.isEmpty)
}) })

View File

@ -24,8 +24,6 @@ struct AddFeedlyAccountView: View {
NavigationView { NavigationView {
iosBody iosBody
} }
#endif #endif
} }

View File

@ -67,7 +67,7 @@ struct AddNewsBlurAccountView: View {
}, label: { }, label: {
HStack { HStack {
Spacer() Spacer()
Text("Sign In") Text("Add Account")
Spacer() Spacer()
} }
}).disabled(model.username.isEmpty || model.password.isEmpty) }).disabled(model.username.isEmpty || model.password.isEmpty)

View File

@ -71,7 +71,7 @@ struct AddReaderAPIAccountView: View {
}, label: { }, label: {
HStack { HStack {
Spacer() Spacer()
Text("Sign In") Text("Add Account")
Spacer() Spacer()
} }
}).disabled(createDisabled()) }).disabled(createDisabled())

View File

@ -1,7 +1,17 @@
{ {
"images" : [ "images" : [
{ {
"filename" : "ipad.pdf", "filename" : "ipad-any-slice.pdf",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "ipad-dark-slice.pdf",
"idiom" : "universal" "idiom" : "universal"
} }
], ],
@ -11,6 +21,6 @@
}, },
"properties" : { "properties" : {
"preserves-vector-representation" : true, "preserves-vector-representation" : true,
"template-rendering-intent" : "template" "template-rendering-intent" : "original"
} }
} }

View File

@ -1,7 +1,17 @@
{ {
"images" : [ "images" : [
{ {
"filename" : "phone.pdf", "filename" : "iphone-any-slice.pdf",
"idiom" : "universal"
},
{
"appearances" : [
{
"appearance" : "luminosity",
"value" : "dark"
}
],
"filename" : "iphone-dark-slice.pdf",
"idiom" : "universal" "idiom" : "universal"
} }
], ],
@ -11,6 +21,6 @@
}, },
"properties" : { "properties" : {
"preserves-vector-representation" : true, "preserves-vector-representation" : true,
"template-rendering-intent" : "template" "template-rendering-intent" : "original"
} }
} }

View File

@ -60,9 +60,15 @@ extension AccountType {
switch self { switch self {
case .onMyMac: case .onMyMac:
// If it's the multiplatform app, the asset catalog contains assets for // If it's the multiplatform app, the asset catalog contains assets for
#if os(macOS)
return Image("accountLocal") return Image("accountLocal")
#else
if UIDevice.current.userInterfaceIdiom == .pad {
return Image("accountLocalPad")
} else {
return Image("accountLocalPhone")
}
#endif
case .bazQux: case .bazQux:
return Image("accountBazQux") return Image("accountBazQux")
case .cloudKit: case .cloudKit: