Skip to content

Commit a8fc532

Browse files
othynothyn
committed
chore: Merge branch 'main' into staging
2 parents 080ef84 + 31f42af commit a8fc532

File tree

10 files changed

+71
-12
lines changed

10 files changed

+71
-12
lines changed

‎.DS_Store‎

6 KB
Binary file not shown.

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ All the auto clickers out there were either really outdated, old, buggy and/or h
108108

109109
## :floppy_disk: Download
110110

111-
**Download for macOS Ventura (13), Sonoma (14), Sequoia (15) and higher:** [v1.7.28](https://github.com/othyn/macos-auto-clicker/releases/download/v1.7.28/AutoClicker.zip)
111+
**Download for macOS Ventura (13), Sonoma (14), Sequoia (15) and higher:** [v1.8.0](https://github.com/othyn/macos-auto-clicker/releases/download/v1.8.0/AutoClicker.zip)
112112

113113
**Legacy download for macOS Big Sur (11) or Monterey (12):** [v1.6.1](https://github.com/othyn/macos-auto-clicker/releases/download/v1.6.1/Auto.Clicker.1.6.1.dmg)
114114

‎auto-clicker.xcodeproj/project.pbxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -786,7 +786,7 @@
786786
"@executable_path/../Frameworks",
787787
);
788788
MACOSX_DEPLOYMENT_TARGET = 13.0;
789-
MARKETING_VERSION = "v1.7.28-beta-a45b8dddf261f0c89da774d7f9f89794b2a5594e";
789+
MARKETING_VERSION = 1.8.0;
790790
PRODUCT_BUNDLE_IDENTIFIER = "com.othyn.auto-clicker";
791791
PRODUCT_NAME = AutoClicker;
792792
SWIFT_EMIT_LOC_STRINGS = YES;
@@ -818,7 +818,7 @@
818818
"@executable_path/../Frameworks",
819819
);
820820
MACOSX_DEPLOYMENT_TARGET = 13.0;
821-
MARKETING_VERSION = "v1.7.28-beta-a45b8dddf261f0c89da774d7f9f89794b2a5594e";
821+
MARKETING_VERSION = 1.8.0;
822822
PRODUCT_BUNDLE_IDENTIFIER = "com.othyn.auto-clicker";
823823
PRODUCT_NAME = AutoClicker;
824824
SWIFT_EMIT_LOC_STRINGS = YES;

‎auto-clicker/Build Assets/Info.plist‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
</dict>
3131
</array>
3232
<key>CFBundleVersion</key>
33-
<string>cdbf0b7</string>
33+
<string>2f419ac</string>
3434
<key>LSApplicationCategoryType</key>
3535
<string>public.app-category.utilities</string>
3636
<key>LSMinimumSystemVersion</key>

‎auto-clicker/Constants/FieldConstants.swift‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,8 @@ let MIN_PRESS_INTERVAL: Int = 1
1515
let MAX_PRESS_INTERVAL: Int = 100_000_000
1616

1717
let DEFAULT_PRESS_INTERVAL: Int = 50
18+
let DEFAULT_PRESS_INTERVAL_MIN: Int = 50 // for range
19+
let DEFAULT_PRESS_INTERVAL_MAX: Int = 100 // for range
1820

1921
// MARK: - Press Amount
2022

‎auto-clicker/Localisation/de.lproj/Localizable.strings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"main_window_stat_box_next_press_at" = "NÄCHSTER KLICK UM";
2525
"main_window_stat_box_final_press_at" = "LETZTER KLICK UM";
2626
"main_window_repo_vanity" = "mit ♥️ von Othyn";
27+
"main_window_to" = "bis";
2728

2829
"duration_milliseconds" = "Millisekunde(n)";
2930
"duration_seconds" = "Sekunde(n)";

‎auto-clicker/Localisation/en-GB.lproj/Localizable.strings‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"main_window_stat_box_next_press_at" = "NEXT PRESS AT";
2525
"main_window_stat_box_final_press_at" = "FINAL PRESS AT";
2626
"main_window_repo_vanity" = "with ♥️ by Othyn";
27+
"main_window_to" = "to";
2728

2829
"duration_milliseconds" = "Millisecond(s)";
2930
"duration_seconds" = "Second(s)";

‎auto-clicker/Models/FormState.swift‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,18 @@
77

88
import Defaults
99

10+
enum IntervalMode: String, Codable, CaseIterable, Identifiable {
11+
case staticInterval
12+
case rangeInterval
13+
14+
var id: String { self.rawValue }
15+
}
16+
1017
struct FormState: Codable, Defaults.Serializable {
18+
var intervalMode: IntervalMode // new: static or range
1119
var pressInterval: Int
20+
var pressIntervalMin: Int? // new: for range
21+
var pressIntervalMax: Int? // new: for range
1222
var pressIntervalDuration: Duration
1323
var pressInput: Input
1424
var pressAmount: Int
@@ -18,7 +28,10 @@ struct FormState: Codable, Defaults.Serializable {
1828

1929
extension FormState {
2030
init() {
31+
self.intervalMode = .staticInterval
2132
self.pressInterval = DEFAULT_PRESS_INTERVAL
33+
self.pressIntervalMin = nil
34+
self.pressIntervalMax = nil
2235
self.pressIntervalDuration = Duration.milliseconds
2336
self.pressInput = Input()
2437
self.pressAmount = DEFAULT_PRESS_AMOUNT

‎auto-clicker/Observable Objects/AutoClickSimulator.swift‎

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,14 @@ final class AutoClickSimulator: ObservableObject {
4848
self.activity = ProcessInfo.processInfo.beginActivity(.autoClicking)
4949

5050
self.duration = Defaults[.autoClickerState].pressIntervalDuration
51-
self.interval = Defaults[.autoClickerState].pressInterval
51+
let intervalMode = Defaults[.autoClickerState].intervalMode
52+
if intervalMode == .rangeInterval {
53+
let min = Defaults[.autoClickerState].pressIntervalMin ?? DEFAULT_PRESS_INTERVAL_MIN
54+
let max = Defaults[.autoClickerState].pressIntervalMax ?? DEFAULT_PRESS_INTERVAL_MAX
55+
self.interval = Int.random(in: min...max)
56+
} else {
57+
self.interval = Defaults[.autoClickerState].pressInterval
58+
}
5259
self.input = Defaults[.autoClickerState].pressInput
5360
self.amountOfPresses = Defaults[.autoClickerState].pressAmount
5461
self.remainingInterations = Defaults[.autoClickerState].repeatAmount
@@ -103,6 +110,16 @@ final class AutoClickSimulator: ObservableObject {
103110

104111
self.press()
105112

113+
// Update interval if in range mode
114+
let intervalMode = Defaults[.autoClickerState].intervalMode
115+
if intervalMode == .rangeInterval {
116+
let min = Defaults[.autoClickerState].pressIntervalMin ?? DEFAULT_PRESS_INTERVAL_MIN
117+
let max = Defaults[.autoClickerState].pressIntervalMax ?? DEFAULT_PRESS_INTERVAL_MAX
118+
self.interval = Int.random(in: min...max)
119+
} else {
120+
self.interval = Defaults[.autoClickerState].pressInterval
121+
}
122+
106123
self.nextClickAt = .init(timeInterval: self.duration.asTimeInterval(interval: self.interval), since: .init())
107124

108125
if self.remainingInterations <= 0 {

‎auto-clicker/Views/Main/MainView.swift‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,14 +81,39 @@ struct MainView: View {
8181
ActionStageLine {
8282
Text("main_window_every", comment: "Main window 'Every'")
8383

84-
DynamicWidthNumberField(text: "",
85-
min: MIN_PRESS_INTERVAL,
86-
max: MAX_PRESS_INTERVAL,
87-
number: self.$formState.pressInterval)
88-
.disabled(self.hasStarted)
84+
Picker("Interval Mode", selection: self.$formState.intervalMode) {
85+
Text("Static").tag(IntervalMode.staticInterval)
86+
Text("Range").tag(IntervalMode.rangeInterval)
87+
}
88+
.pickerStyle(SegmentedPickerStyle())
89+
.frame(width: 120)
90+
.disabled(self.hasStarted)
8991

90-
DurationSelector(selectedDuration: self.$formState.pressIntervalDuration)
91-
.disabled(self.hasStarted)
92+
if self.formState.intervalMode == .staticInterval {
93+
DynamicWidthNumberField(text: "",
94+
min: MIN_PRESS_INTERVAL,
95+
max: MAX_PRESS_INTERVAL,
96+
number: self.$formState.pressInterval)
97+
.disabled(self.hasStarted)
98+
DurationSelector(selectedDuration: self.$formState.pressIntervalDuration)
99+
.disabled(self.hasStarted)
100+
Text("main_window_comma", comment: "Main window comma")
101+
} else {
102+
DynamicWidthNumberField(text: "Min",
103+
min: MIN_PRESS_INTERVAL,
104+
max: MAX_PRESS_INTERVAL,
105+
number: Binding(get: { self.formState.pressIntervalMin ?? DEFAULT_PRESS_INTERVAL_MIN }, set: { self.formState.pressIntervalMin = $0 }))
106+
.disabled(self.hasStarted)
107+
Text("main_window_to", comment: "Range separator 'to'")
108+
DynamicWidthNumberField(text: "Max",
109+
min: MIN_PRESS_INTERVAL,
110+
max: MAX_PRESS_INTERVAL,
111+
number: Binding(get: { self.formState.pressIntervalMax ?? DEFAULT_PRESS_INTERVAL_MAX }, set: { self.formState.pressIntervalMax = $0 }))
112+
.disabled(self.hasStarted)
113+
DurationSelector(selectedDuration: self.$formState.pressIntervalDuration)
114+
.disabled(self.hasStarted)
115+
Text("main_window_comma", comment: "Main window comma")
116+
}
92117

93118
Text("main_window_comma", comment: "Main window comma")
94119
}

0 commit comments

Comments
 (0)