Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions BeanJuice.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -401,7 +401,7 @@
attributes = {
BuildIndependentTargetsInParallel = 1;
LastSwiftUpdateCheck = 1340;
LastUpgradeCheck = 1620;
LastUpgradeCheck = 2600;
TargetAttributes = {
345A0D8C2896CA47004702DD = {
CreatedOnToolsVersion = 13.4.1;
Expand Down Expand Up @@ -563,6 +563,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = dwarf;
DEVELOPMENT_TEAM = LBHT4Q3RSF;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_TESTABILITY = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand All @@ -585,6 +586,7 @@
MTL_FAST_MATH = YES;
ONLY_ACTIVE_ARCH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG;
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
};
Expand Down Expand Up @@ -625,6 +627,7 @@
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
DEVELOPMENT_TEAM = LBHT4Q3RSF;
ENABLE_NS_ASSERTIONS = NO;
ENABLE_STRICT_OBJC_MSGSEND = YES;
ENABLE_USER_SCRIPT_SANDBOXING = YES;
Expand All @@ -640,6 +643,7 @@
MTL_ENABLE_DEBUG_INFO = NO;
MTL_FAST_MATH = YES;
SDKROOT = iphoneos;
STRING_CATALOG_GENERATE_SYMBOLS = YES;
SWIFT_COMPILATION_MODE = wholemodule;
SWIFT_OPTIMIZATION_LEVEL = "-O";
VALIDATE_PRODUCT = YES;
Expand All @@ -655,7 +659,6 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"BeanJuice/Preview Content\"";
DEVELOPMENT_TEAM = LBHT4Q3RSF;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = BeanJuice/Info.plist;
Expand All @@ -668,12 +671,12 @@
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.0.0;
MARKETING_VERSION = 6.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.niftytreestudios.beanjuice;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand All @@ -695,7 +698,6 @@
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_ASSET_PATHS = "\"BeanJuice/Preview Content\"";
DEVELOPMENT_TEAM = LBHT4Q3RSF;
ENABLE_PREVIEWS = YES;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = BeanJuice/Info.plist;
Expand All @@ -708,12 +710,12 @@
INFOPLIST_KEY_UISupportedInterfaceOrientations = UIInterfaceOrientationPortrait;
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPad = "UIInterfaceOrientationPortrait UIInterfaceOrientationPortraitUpsideDown UIInterfaceOrientationLandscapeLeft UIInterfaceOrientationLandscapeRight";
INFOPLIST_KEY_UISupportedInterfaceOrientations_iPhone = UIInterfaceOrientationPortrait;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
IPHONEOS_DEPLOYMENT_TARGET = 26.0;
LD_RUNPATH_SEARCH_PATHS = (
"$(inherited)",
"@executable_path/Frameworks",
);
MARKETING_VERSION = 5.0.0;
MARKETING_VERSION = 6.0.0;
PRODUCT_BUNDLE_IDENTIFIER = com.niftytreestudios.beanjuice;
PRODUCT_NAME = "$(TARGET_NAME)";
SUPPORTED_PLATFORMS = "iphoneos iphonesimulator";
Expand All @@ -732,7 +734,6 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = LBHT4Q3RSF;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MARKETING_VERSION = 1.0;
Expand All @@ -751,7 +752,6 @@
BUNDLE_LOADER = "$(TEST_HOST)";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 1;
DEVELOPMENT_TEAM = LBHT4Q3RSF;
GENERATE_INFOPLIST_FILE = YES;
IPHONEOS_DEPLOYMENT_TARGET = 17.0;
MARKETING_VERSION = 1.0;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<Scheme
LastUpgradeVersion = "1620"
LastUpgradeVersion = "2600"
version = "1.7">
<BuildAction
parallelizeBuildables = "YES"
Expand Down
12 changes: 4 additions & 8 deletions BeanJuice/Utilities/Helpers/StoreReviewHelper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ struct StoreReviewHelper {
UserDefaults.standard.set(appOpenCount, forKey: UserDefaultsKeys.APPOPENEDCOUNT)
}

static func checkAndAskForReview() {
@MainActor static func checkAndAskForReview() {
// Call this whenever appropriate.
// This will not be shown everytime. Apple has some internal logic on how to show this.
guard let appOpenCount = UserDefaults.standard.value(forKey: UserDefaultsKeys.APPOPENEDCOUNT) as? Int else {
Expand All @@ -38,13 +38,9 @@ struct StoreReviewHelper {
}
}

func requestReview() {
if #available(iOS 14.0, *) {
if let scene = UIApplication.shared.currentScene {
SKStoreReviewController.requestReview(in: scene)
}
} else {
SKStoreReviewController.requestReview()
@MainActor func requestReview() {
if let scene = UIApplication.shared.currentScene {
AppStore.requestReview(in: scene)
}
}
}
Expand Down
28 changes: 9 additions & 19 deletions BeanJuice/Views/Views/Components/CircleImage.swift
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@
import SwiftUI

struct CircleImage: View {

@Namespace var namespace
@State var imageTapped = false
@State var seconds = 0
let timer = Timer.publish(every: 1, on: .main, in: .common).autoconnect()
Expand All @@ -22,15 +20,15 @@

var body: some View {
ZStack {
Image(decorative: methodName + "-Big")
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 250, height: 250, alignment: .center)
.clipShape(Circle())
.shadow(radius: imageTapped ? 0 : 5)
.blur(radius: imageTapped ? 5 : 0)
.glassEffect(.regular.tint(.background), in: .circle, isEnabled: imageTapped)

Check failure on line 30 in BeanJuice/Views/Views/Components/CircleImage.swift

View check run for this annotation

Xcode Cloud / Bean Juice | Test on PRs | Build - iOS

BeanJuice/Views/Views/Components/CircleImage.swift#L30

Cannot infer contextual base in reference to member 'background'

Check failure on line 30 in BeanJuice/Views/Views/Components/CircleImage.swift

View check run for this annotation

Xcode Cloud / Bean Juice | Test on PRs | Build - iOS

BeanJuice/Views/Views/Components/CircleImage.swift#L30

Value of type 'some View' has no member 'glassEffect'

Check failure on line 30 in BeanJuice/Views/Views/Components/CircleImage.swift

View check run for this annotation

Xcode Cloud / Bean Juice | Test on PRs | Build - iOS

BeanJuice/Views/Views/Components/CircleImage.swift#L30

Cannot infer contextual base in reference to member 'circle'

Check failure on line 30 in BeanJuice/Views/Views/Components/CircleImage.swift

View check run for this annotation

Xcode Cloud / Bean Juice | Test on PRs | Build - iOS

BeanJuice/Views/Views/Components/CircleImage.swift#L30

Cannot infer contextual base in reference to member 'regular'
if imageTapped {
Image(decorative: methodName + "-Big")
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 250, height: 250, alignment: .center)
.clipShape(Circle())
.shadow(radius: 5)
.blur(radius: 5)
.matchedGeometryEffect(id: "CircleImage", in: namespace)
VStack {
Spacer()
HStack {
Expand Down Expand Up @@ -64,21 +62,13 @@
}
Spacer()
}
} else {
Image(decorative: methodName + "-Big")
.resizable()
.aspectRatio(contentMode: .fill)
.frame(width: 250, height: 250, alignment: .center)
.clipShape(Circle())
.shadow(radius: 5)
.matchedGeometryEffect(id: "CircleImage", in: namespace)
}
}
.padding(.top, 30)
.padding(.bottom, 10)
.onTapGesture(perform: {
seconds = 0
withAnimation(.easeInOut(duration: 1)) {imageTapped.toggle()}
withAnimation(.easeInOut(duration: 1)) { imageTapped.toggle() }
})
.padding(.top, -20)
}
Expand Down
2 changes: 1 addition & 1 deletion BeanJuice/Views/Views/InformationScreen.swift
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ func markdownString(method: String) -> String {
guard let filepath = Bundle.main.url(forResource: method, withExtension: "md") else {
return "Filepath not found"
}
let info = (try? String(contentsOf: filepath)) ?? "Nothing found"
let info = (try? String(contentsOf: filepath, encoding: .utf8)) ?? "Nothing found"
return info
}
Loading