Pixelfed
/
Impressia
mirror of https://github.com/VernissageApp/Vernissage.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve widget and fix CoreData container.

This commit is contained in:
Marcin Czachursk 2023-03-12 06:51:14 +01:00
parent 99e0429d51
commit d18e0fef7a
10 changed files with 145 additions and 85 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CoreData/CoreDataHandler.swift
View File

@ -64,6 +64,7 @@ public class CoreDataHandler {
}
})
container.viewContext.automaticallyMergesChangesFromParent = true
return container
}()

8
Vernissage.xcodeproj/project.pbxproj
View File

@ -1221,7 +1221,7 @@
CODE_SIGN_ENTITLEMENTS = VernissageWidgetExtension.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 64;
CURRENT_PROJECT_VERSION = 65;
DEVELOPMENT_TEAM = B2U9FEKYP8;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = VernissageWidget/Info.plist;
@ -1249,7 +1249,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = VernissageWidgetExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 64;
CURRENT_PROJECT_VERSION = 65;
DEVELOPMENT_TEAM = B2U9FEKYP8;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = VernissageWidget/Info.plist;
@ -1393,7 +1393,7 @@
CODE_SIGN_ENTITLEMENTS = Vernissage/Vernissage.entitlements;
CODE_SIGN_IDENTITY = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 64;
CURRENT_PROJECT_VERSION = 65;
DEVELOPMENT_ASSET_PATHS = "\"Vernissage/Preview Content\"";
DEVELOPMENT_TEAM = B2U9FEKYP8;
ENABLE_PREVIEWS = YES;
@ -1431,7 +1431,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = Vernissage/Vernissage.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 64;
CURRENT_PROJECT_VERSION = 65;
DEVELOPMENT_ASSET_PATHS = "\"Vernissage/Preview Content\"";
DEVELOPMENT_TEAM = B2U9FEKYP8;
ENABLE_PREVIEWS = YES;

BIN
VernissageWidget/Assets.xcassets/Avatar.imageset/Avatar.png vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 678 KiB

21
VernissageWidget/Assets.xcassets/Avatar.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Avatar.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

21
VernissageWidget/Assets.xcassets/Placeholder.imageset/Contents.json vendored Normal file
View File

@ -0,0 +1,21 @@
{
"images" : [
{
"filename" : "Placeholder.jpg",
"idiom" : "universal",
"scale" : "1x"
},
{
"idiom" : "universal",
"scale" : "2x"
},
{
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}

BIN
VernissageWidget/Assets.xcassets/Placeholder.imageset/Placeholder.jpg vendored Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.2 MiB

2
VernissageWidget/ImageFetcher.swift
View File

@ -71,7 +71,7 @@ public class ImageFetcher {
}
func placeholder() -> WidgetEntry {
WidgetEntry(date: Date(), image: nil, avatar: nil, displayName: "John Misiakiewiczowicz", statusId: "123321")
WidgetEntry(date: Date(), image: nil, avatar: nil, displayName: "Caroline Rick", statusId: "")
}
private func getImage(url: URL?) async -> UIImage? {

62
VernissageWidget/Views/LargeWidgetView.swift
View File

@ -12,42 +12,44 @@ struct LargeWidgetView: View {
var body: some View {
if let uiImage = entry.image, let uiAvatar = entry.avatar {
VStack {
Spacer()
HStack {
Image(uiImage: uiAvatar)
.resizable()
.clipShape(Circle())
.aspectRatio(contentMode: .fit)
.frame(width: 44, height: 44)
Text(entry.displayName ?? "")
Spacer()
}
.padding(.leading, 8)
.padding(.bottom, 8)
}
.background {
Image(uiImage: uiImage)
.resizable()
.aspectRatio(contentMode: .fill)
.widgetURL(URL(string: "\(AppConstants.statusUri)/\(entry.statusId ?? "")"))
}
self.getWidgetBody(uiImage: Image(uiImage: uiImage), uiAvatar: Image(uiImage: uiAvatar))
} else {
VStack {
Spacer()
HStack {
Circle()
.foregroundColor(Color(UIColor.placeholderText))
.frame(width: 44, height: 44)
self.getWidgetBody(uiImage: Image("Placeholder"), uiAvatar: Image("Avatar"))
.unredacted()
}
}
@ViewBuilder
private func getWidgetBody(uiImage: Image, uiAvatar: Image) -> some View {
VStack {
Spacer()
HStack {
uiAvatar
.resizable()
.clipShape(Circle())
.aspectRatio(contentMode: .fit)
.frame(width: 44, height: 44)
.overlay(
Circle()
.stroke(Color.white, lineWidth: 1)
.frame(width: 44, height: 44)
)
.shadow(radius: 4)
Text(entry.displayName ?? "")
Spacer()
}
Text(entry.displayName ?? "")
.fontWeight(.semibold)
.shadow(radius: 8)
Spacer()
}
.padding(.leading, 8)
.padding(.bottom, 8)
}
.background {
uiImage
.resizable()
.aspectRatio(contentMode: .fill)
.widgetURL(URL(string: "\(AppConstants.statusUri)/\(entry.statusId ?? "")"))
}
}
}

62
VernissageWidget/Views/MediumWidgetView.swift
View File

@ -12,42 +12,44 @@ struct MediumWidgetView: View {
var body: some View {
if let uiImage = entry.image, let uiAvatar = entry.avatar {
VStack {
Spacer()
HStack {
Image(uiImage: uiAvatar)
.resizable()
.clipShape(Circle())
.aspectRatio(contentMode: .fit)
.frame(width: 32, height: 32)
Text(entry.displayName ?? "")
Spacer()
}
.padding(.leading, 8)
.padding(.bottom, 8)
}
.background {
Image(uiImage: uiImage)
.resizable()
.aspectRatio(contentMode: .fill)
.widgetURL(URL(string: "\(AppConstants.statusUri)/\(entry.statusId ?? "")"))
}
self.getWidgetBody(uiImage: Image(uiImage: uiImage), uiAvatar: Image(uiImage: uiAvatar))
} else {
VStack {
Spacer()
HStack {
Circle()
.foregroundColor(Color(UIColor.placeholderText))
.frame(width: 32, height: 32)
self.getWidgetBody(uiImage: Image("Placeholder"), uiAvatar: Image("Avatar"))
.unredacted()
}
}
@ViewBuilder
private func getWidgetBody(uiImage: Image, uiAvatar: Image) -> some View {
VStack {
Spacer()
HStack {
uiAvatar
.resizable()
.clipShape(Circle())
.aspectRatio(contentMode: .fit)
.frame(width: 32, height: 32)
.overlay(
Circle()
.stroke(Color.white, lineWidth: 1)
.frame(width: 32, height: 32)
)
.shadow(radius: 4)
Text(entry.displayName ?? "")
Spacer()
}
Text(entry.displayName ?? "")
.fontWeight(.semibold)
.shadow(radius: 8)
Spacer()
}
.padding(.leading, 8)
.padding(.bottom, 8)
}
.background {
uiImage
.resizable()
.aspectRatio(contentMode: .fill)
.widgetURL(URL(string: "\(AppConstants.statusUri)/\(entry.statusId ?? "")"))
}
}
}

53
VernissageWidget/Views/SmallWidgetView.swift
View File

@ -12,27 +12,40 @@ struct SmallWidgetView: View {
var body: some View {
if let uiImage = entry.image, let uiAvatar = entry.avatar {
VStack {
Spacer()
HStack {
Image(uiImage: uiAvatar)
.resizable()
.clipShape(Circle())
.aspectRatio(contentMode: .fit)
.frame(width: 22, height: 22)
Spacer()
}
.padding(.leading, 8)
.padding(.bottom, 8)
}
.background {
Image(uiImage: uiImage)
.resizable()
.aspectRatio(contentMode: .fill)
.widgetURL(URL(string: "\(AppConstants.statusUri)/\(entry.statusId ?? "")"))
}
self.getWidgetBody(uiImage: Image(uiImage: uiImage), uiAvatar: Image(uiImage: uiAvatar))
} else {
EmptyView()
self.getWidgetBody(uiImage: Image("Placeholder"), uiAvatar: Image("Avatar"))
.unredacted()
}
}
@ViewBuilder
private func getWidgetBody(uiImage: Image, uiAvatar: Image) -> some View {
VStack {
Spacer()
HStack {
uiAvatar
.resizable()
.clipShape(Circle())
.aspectRatio(contentMode: .fit)
.frame(width: 22, height: 22)
.overlay(
Circle()
.stroke(Color.white, lineWidth: 1)
.frame(width: 22, height: 22)
)
.shadow(radius: 4)
Spacer()
}
.padding(.leading, 8)
.padding(.bottom, 8)
}
.background {
uiImage
.resizable()
.aspectRatio(contentMode: .fill)
.widgetURL(URL(string: "\(AppConstants.statusUri)/\(entry.statusId ?? "")"))
}
}
}