Skip to content

Commit

Permalink
✨ Small bug fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
@sunsetsonwheels
sunsetsonwheels committed Feb 10, 2023
1 parent 4ea070a commit 819fa33
Show file tree
Hide file tree
Showing 7 changed files with 57 additions and 16 deletions.
23 changes: 23 additions & 0 deletions App/Assets.xcassets/AboutAppIcon.imageset/Contents.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
{
"images" : [
{
"filename" : "icon_64x64.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "icon_64x64@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "icon_64x64@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
Binary file added App/Assets.xcassets/AboutAppIcon.imageset/icon_64x64.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added App/Assets.xcassets/AboutAppIcon.imageset/icon_64x64@2x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added App/Assets.xcassets/AboutAppIcon.imageset/icon_64x64@3x.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions App/Views/Settings/AboutSettingsView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ struct AboutSettingsView: View {
Section {
HStack {
Group {
if let icon: UIImage = UIImage(named: "AppIcon") {
Image(uiImage: icon)
if let uiImage = UIImage(named: "AboutAppIcon") {
Image(uiImage: uiImage)
.resizable()

} else {
Expand Down
22 changes: 20 additions & 2 deletions App/Views/Uploads/PendingUploadView.swift
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ struct PendingUploadView: View {
HStack {
UniversalDataImage(data: uploadContainer.file.data)
.frame(width: 64, height: 64)
.scaledToFit()
.clipShape(self.roundedRectangle)
.overlay {
self.roundedRectangle
Expand Down Expand Up @@ -53,6 +54,17 @@ struct PendingUploadView: View {
}
.padding(.leading, 4)
.padding(.trailing, 4)
Spacer()
if self.model.error != nil {
Button {
Task {
await self.upload()
}
} label: {
Label("Retry", systemImage: "arrow.clockwise")
.labelStyle(.iconOnly)
}
}
}
.task {
self.model.viewContext = self.viewContext
Expand All @@ -64,13 +76,19 @@ struct PendingUploadView: View {
}
}
.contextMenu {
if self.model.error != nil {
if let error = self.model.error {
Button(action: {
Task {
await self.upload()
}
}) {
Label("Retry upload", systemImage: "")
Label("Retry upload", systemImage: "arrow.clockwise")
}
Divider()
Button {
UIPasteboard.general.string = "Error: \(error.localizedDescription)\nRecovery: \(error.recoverySuggestion ?? "None")"
} label: {
Label("Copy error", systemImage: "doc.on.doc")
}
}
}
Expand Down
24 changes: 12 additions & 12 deletions Iamages.xcodeproj/project.pbxproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -969,7 +969,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 24;
CURRENT_PROJECT_VERSION = 25;
DEVELOPMENT_TEAM = 2VZNUT7D2E;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Widgets/Info.plist;
Expand All @@ -981,7 +981,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 4.0.1;
MARKETING_VERSION = 4.0.2;
PRODUCT_BUNDLE_IDENTIFIER = me.jkelol111.Iamages.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand All @@ -1003,7 +1003,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 24;
CURRENT_PROJECT_VERSION = 25;
DEVELOPMENT_TEAM = 2VZNUT7D2E;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = Widgets/Info.plist;
Expand All @@ -1015,7 +1015,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 4.0.1;
MARKETING_VERSION = 4.0.2;
PRODUCT_BUNDLE_IDENTIFIER = me.jkelol111.Iamages.Widgets;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand All @@ -1036,7 +1036,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 24;
CURRENT_PROJECT_VERSION = 25;
DEVELOPMENT_TEAM = 2VZNUT7D2E;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = ShareExtension/Info.plist;
Expand All @@ -1048,7 +1048,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 4.0.1;
MARKETING_VERSION = 4.0.2;
PRODUCT_BUNDLE_IDENTIFIER = me.jkelol111.Iamages.ShareExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand All @@ -1068,7 +1068,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 24;
CURRENT_PROJECT_VERSION = 25;
DEVELOPMENT_TEAM = 2VZNUT7D2E;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = ShareExtension/Info.plist;
Expand All @@ -1080,7 +1080,7 @@
"@executable_path/Frameworks",
"@executable_path/../../Frameworks",
);
MARKETING_VERSION = 4.0.1;
MARKETING_VERSION = 4.0.2;
PRODUCT_BUNDLE_IDENTIFIER = me.jkelol111.Iamages.ShareExtension;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = iphoneos;
Expand Down Expand Up @@ -1215,7 +1215,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 24;
CURRENT_PROJECT_VERSION = 25;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"App/Preview Content\"";
DEVELOPMENT_TEAM = 2VZNUT7D2E;
Expand All @@ -1240,7 +1240,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 4.0.1;
MARKETING_VERSION = 4.0.2;
PRODUCT_BUNDLE_IDENTIFIER = me.jkelol111.Iamages;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand All @@ -1264,7 +1264,7 @@
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "Apple Development";
"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 24;
CURRENT_PROJECT_VERSION = 25;
DEAD_CODE_STRIPPING = YES;
DEVELOPMENT_ASSET_PATHS = "\"App/Preview Content\"";
DEVELOPMENT_TEAM = 2VZNUT7D2E;
Expand All @@ -1289,7 +1289,7 @@
LD_RUNPATH_SEARCH_PATHS = "@executable_path/Frameworks";
"LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks";
MACOSX_DEPLOYMENT_TARGET = 13.0;
MARKETING_VERSION = 4.0.1;
MARKETING_VERSION = 4.0.2;
PRODUCT_BUNDLE_IDENTIFIER = me.jkelol111.Iamages;
PRODUCT_NAME = "$(TARGET_NAME)";
SDKROOT = auto;
Expand Down

0 comments on commit 819fa33

Please sign in to comment.