Skip to content
This repository has been archived by the owner on Dec 28, 2024. It is now read-only.

Fix // Fix some bugs #45

Merged
merged 5 commits into from
May 11, 2023
Merged

Fix // Fix some bugs #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c57d363
proj: v1.0.0-Beta.6.61
CanglongCl May 10, 2023
b111063
fix: widget stamina view display time
CanglongCl May 10, 2023
2b84c6b
fix: add widget background crop ratio
CanglongCl May 10, 2023
7015e20
fix: small widget background configuration
CanglongCl May 10, 2023
91ecacb
repo: Update ios.yml
CanglongCl May 10, 2023
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
1 change: 0 additions & 1 deletion .github/workflows/ios.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ jobs:
build:
name: Build and Test default scheme using any available iPhone simulator
runs-on: macos-latest
needs: SwiftLint
steps:
- name: Checkout
uses: actions/checkout@v3
Expand Down
2 changes: 1 addition & 1 deletion Features/Daily Note/Widget/Common View/WidgetStaminaInformationCard.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ struct WidgetStaminaInformationCard: View {
.font(staminaFont)
.shadow(radius: 10)
Group {
if info.currentStamina == info.maxStamina {
if info.currentStamina != info.maxStamina {
(
Text(dateFormatter.string(from: info.fullTime))
+ Text("\n")
Expand Down
111 changes: 0 additions & 111 deletions ...get/Widget Configuration/Intent Configuration Model/HSRPizzaHelperWidget.intentdefinition
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1282,117 +1282,6 @@
<key>INIntentParameterType</key>
<string>Integer</string>
</dict>
<dict>
<key>INIntentParameterConfigurable</key>
<true/>
<key>INIntentParameterDisplayName</key>
<string>Dispatch Assignments</string>
<key>INIntentParameterDisplayNameID</key>
<string>DyGr5V</string>
<key>INIntentParameterDisplayPriority</key>
<integer>7</integer>
<key>INIntentParameterMetadata</key>
<dict>
<key>INIntentParameterMetadataDefaultValue</key>
<true/>
<key>INIntentParameterMetadataFalseDisplayName</key>
<string>false</string>
<key>INIntentParameterMetadataFalseDisplayNameID</key>
<string>VBT9un</string>
<key>INIntentParameterMetadataTrueDisplayName</key>
<string>true</string>
<key>INIntentParameterMetadataTrueDisplayNameID</key>
<string>osQOMd</string>
</dict>
<key>INIntentParameterName</key>
<string>showExpedition</string>
<key>INIntentParameterPromptDialogs</key>
<array>
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogType</key>
<string>Primary</string>
</dict>
</array>
<key>INIntentParameterTag</key>
<integer>18</integer>
<key>INIntentParameterType</key>
<string>Boolean</string>
</dict>
<dict>
<key>INIntentParameterConfigurable</key>
<true/>
<key>INIntentParameterDisplayName</key>
<string>Trailblaze Power Position</string>
<key>INIntentParameterDisplayNameID</key>
<string>luJuNQ</string>
<key>INIntentParameterDisplayPriority</key>
<integer>8</integer>
<key>INIntentParameterEnumType</key>
<string>IntentStaminaPosition</string>
<key>INIntentParameterEnumTypeNamespace</key>
<string>88xZPY</string>
<key>INIntentParameterMetadata</key>
<dict>
<key>INIntentParameterMetadataDefaultValue</key>
<string>left</string>
</dict>
<key>INIntentParameterName</key>
<string>staminaPosition</string>
<key>INIntentParameterPromptDialogs</key>
<array>
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogType</key>
<string>Configuration</string>
</dict>
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogType</key>
<string>Primary</string>
</dict>
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>There are ${count} options matching ‘${staminaPosition}’.</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>yd55oz</string>
<key>INIntentParameterPromptDialogType</key>
<string>DisambiguationIntroduction</string>
</dict>
<dict>
<key>INIntentParameterPromptDialogCustom</key>
<true/>
<key>INIntentParameterPromptDialogFormatString</key>
<string>Just to confirm, you wanted ‘${staminaPosition}’?</string>
<key>INIntentParameterPromptDialogFormatStringID</key>
<string>VCPWar</string>
<key>INIntentParameterPromptDialogType</key>
<string>Confirmation</string>
</dict>
</array>
<key>INIntentParameterRelationship</key>
<dict>
<key>INIntentParameterRelationshipParentName</key>
<string>showExpedition</string>
<key>INIntentParameterRelationshipPredicateName</key>
<string>BooleanHasExactValue</string>
</dict>
<key>INIntentParameterTag</key>
<integer>20</integer>
<key>INIntentParameterType</key>
<string>Integer</string>
</dict>
</array>
<key>INIntentResponse</key>
<dict>
Expand Down
10 changes: 9 additions & 1 deletion .../Widget Configuration/Intent Configuration Model/WidgetConfigurationIntentExtension.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,15 @@ extension SmallSquareWidgetConfigurationIntent: RandomBackgroundDrawable {}

// MARK: - SmallSquareWidgetConfigurationIntent + DailyNoteWidgetConfigurationErasable

extension SmallSquareWidgetConfigurationIntent: DailyNoteWidgetConfigurationErasable {}
extension SmallSquareWidgetConfigurationIntent: DailyNoteWidgetConfigurationErasable {
var showExpedition: NSNumber? {
false
}

var staminaPosition: IntentStaminaPosition {
.left
}
}

// MARK: - RectangularWidgetConfigurationIntent + RandomBackgroundDrawable

Expand Down
2 changes: 1 addition & 1 deletion Features/Setting/Widget/Widget Background/WidgetBackgroundSettingView.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -258,7 +258,7 @@ private struct AddWidgetBackgroundCover: View, ContainBackgroundType {
.fullScreenCover(isPresented: $isEditImageCoverShow, content: {
ImageCropper(
image: $image,
presetFixedRatioType: .alwaysUsingOnePresetFixedRatio(ratio: 2.2)
presetFixedRatioType: .alwaysUsingOnePresetFixedRatio(ratio: ratio)
)
})
.toolbar {
Expand Down
16 changes: 8 additions & 8 deletions HSRPizzaHelper.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,11 @@
EA477FF72A08899C0082D211 /* AccountExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA477FF62A08899C0082D211 /* AccountExtension.swift */; };
EA477FF82A08899C0082D211 /* AccountExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA477FF62A08899C0082D211 /* AccountExtension.swift */; };
EA477FF92A08899C0082D211 /* AccountExtension.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA477FF62A08899C0082D211 /* AccountExtension.swift */; };
EA5F23322A0BE87000D6D024 /* OnFocused.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5F23312A0BE87000D6D024 /* OnFocused.swift */; };
EA4DAC112A0BB1AD00D2AC5F /* Algorithms in Frameworks */ = {isa = PBXBuildFile; productRef = EA4DAC102A0BB1AD00D2AC5F /* Algorithms */; };
EA4DAC132A0BB1C300D2AC5F /* Algorithms in Frameworks */ = {isa = PBXBuildFile; productRef = EA4DAC122A0BB1C300D2AC5F /* Algorithms */; };
EA4DAC152A0BB1C800D2AC5F /* Algorithms in Frameworks */ = {isa = PBXBuildFile; productRef = EA4DAC142A0BB1C800D2AC5F /* Algorithms */; };
EA4DAC172A0BBA0A00D2AC5F /* SourceLocalizedError.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA4DAC162A0BBA0A00D2AC5F /* SourceLocalizedError.swift */; };
EA5F23322A0BE87000D6D024 /* OnFocused.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA5F23312A0BE87000D6D024 /* OnFocused.swift */; };
EA60BE5D2A05053200CBF10B /* AboutView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA60BE5B2A05053200CBF10B /* AboutView.swift */; };
EA60BE5E2A05053200CBF10B /* ThanksView.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA60BE5C2A05053200CBF10B /* ThanksView.swift */; };
EA60BE622A050C5400CBF10B /* ScenePhaseOnChange.swift in Sources */ = {isa = PBXBuildFile; fileRef = EA60BE612A050C5400CBF10B /* ScenePhaseOnChange.swift */; };
Expand Down Expand Up @@ -233,8 +233,8 @@
EA2C06542A04ACE200A328E6 /* EditAccountSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = EditAccountSheetView.swift; sourceTree = "<group>"; };
EA32764E2A03852C00774126 /* Icon.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Icon.xcassets; sourceTree = "<group>"; };
EA477FF62A08899C0082D211 /* AccountExtension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AccountExtension.swift; sourceTree = "<group>"; };
EA5F23312A0BE87000D6D024 /* OnFocused.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnFocused.swift; sourceTree = "<group>"; };
EA4DAC162A0BBA0A00D2AC5F /* SourceLocalizedError.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SourceLocalizedError.swift; sourceTree = "<group>"; };
EA5F23312A0BE87000D6D024 /* OnFocused.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OnFocused.swift; sourceTree = "<group>"; };
EA60BE5B2A05053200CBF10B /* AboutView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AboutView.swift; sourceTree = "<group>"; };
EA60BE5C2A05053200CBF10B /* ThanksView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = ThanksView.swift; sourceTree = "<group>"; };
EA60BE612A050C5400CBF10B /* ScenePhaseOnChange.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ScenePhaseOnChange.swift; sourceTree = "<group>"; };
Expand Down Expand Up @@ -1149,7 +1149,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = HSRPizzaHelperWidget/HSRPizzaHelperWidgetExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 53;
CURRENT_PROJECT_VERSION = 61;
DEVELOPMENT_TEAM = 45Z6V4YD5U;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = HSRPizzaHelperWidget/Info.plist;
Expand Down Expand Up @@ -1179,7 +1179,7 @@
ASSETCATALOG_COMPILER_WIDGET_BACKGROUND_COLOR_NAME = WidgetBackground;
CODE_SIGN_ENTITLEMENTS = HSRPizzaHelperWidget/HSRPizzaHelperWidgetExtension.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 53;
CURRENT_PROJECT_VERSION = 61;
DEVELOPMENT_TEAM = 45Z6V4YD5U;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = HSRPizzaHelperWidget/Info.plist;
Expand Down Expand Up @@ -1326,7 +1326,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = HSRPizzaHelper/HSRPizzaHelper.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 53;
CURRENT_PROJECT_VERSION = 61;
DEVELOPMENT_ASSET_PATHS = "\"HSRPizzaHelper/Preview Content\"";
DEVELOPMENT_TEAM = 45Z6V4YD5U;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -1363,7 +1363,7 @@
ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
CODE_SIGN_ENTITLEMENTS = HSRPizzaHelper/HSRPizzaHelper.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 53;
CURRENT_PROJECT_VERSION = 61;
DEVELOPMENT_ASSET_PATHS = "\"HSRPizzaHelper/Preview Content\"";
DEVELOPMENT_TEAM = 45Z6V4YD5U;
ENABLE_PREVIEWS = YES;
Expand Down Expand Up @@ -1397,7 +1397,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = HSRPizzaHelperWidget/HSRPizzaHelperWidgetConfigurationIntent/HSRPizzaHelperWidgetConfigurationIntent.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 53;
CURRENT_PROJECT_VERSION = 61;
DEVELOPMENT_TEAM = 45Z6V4YD5U;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = HSRPizzaHelperWidget/HSRPizzaHelperWidgetConfigurationIntent/Info.plist;
Expand Down Expand Up @@ -1425,7 +1425,7 @@
buildSettings = {
CODE_SIGN_ENTITLEMENTS = HSRPizzaHelperWidget/HSRPizzaHelperWidgetConfigurationIntent/HSRPizzaHelperWidgetConfigurationIntent.entitlements;
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 53;
CURRENT_PROJECT_VERSION = 61;
DEVELOPMENT_TEAM = 45Z6V4YD5U;
GENERATE_INFOPLIST_FILE = YES;
INFOPLIST_FILE = HSRPizzaHelperWidget/HSRPizzaHelperWidgetConfigurationIntent/Info.plist;
Expand Down