[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[taler-taler-ios] 14/69: remove Apple Sounds
From: |
gnunet |
Subject: |
[taler-taler-ios] 14/69: remove Apple Sounds |
Date: |
Fri, 19 Jan 2024 09:01:47 +0100 |
This is an automated email from the git hooks/post-receive script.
marc-stibane pushed a commit to branch master
in repository taler-ios.
commit eb9f01ffd059c91e2b3ce4e2443c38c52f53aa32
Author: Marc Stibane <marc@taler.net>
AuthorDate: Wed Jan 3 17:38:02 2024 +0100
remove Apple Sounds
---
TalerWallet1/Controllers/Controller.swift | 3 ++-
TalerWallet1/Helper/Controller+playSound.swift | 4 ++--
TalerWallet1/Views/Main/MainView.swift | 7 +++++--
TalerWallet1/Views/Settings/SettingsView.swift | 14 ++++++++++++--
4 files changed, 21 insertions(+), 7 deletions(-)
diff --git a/TalerWallet1/Controllers/Controller.swift
b/TalerWallet1/Controllers/Controller.swift
index c545f3c..cb24e39 100644
--- a/TalerWallet1/Controllers/Controller.swift
+++ b/TalerWallet1/Controllers/Controller.swift
@@ -37,7 +37,8 @@ class Controller: ObservableObject {
@Published var backendState: BackendState = .none // only used for
launch animation
@Published var currencyTicker: Int = 0 // updates
whenever a new currency is added
@AppStorage("useHaptics") var useHaptics: Bool = true // extension
mustn't define this, so it must be here
- @AppStorage("playSounds") var playSounds: Int = 1 // extension
mustn't define this, so it must be here
+ @AppStorage("playSoundsI") var playSoundsI: Int = 1 // extension
mustn't define this, so it must be here
+ @AppStorage("playSoundsB") var playSoundsB: Bool = true
@AppStorage("talerFont") var talerFont: Int = 0 // extension
mustn't define this, so it must be here
let hapticCapability = CHHapticEngine.capabilitiesForHardware()
let logger = Logger(subsystem: "net.taler.gnu", category: "Controller")
diff --git a/TalerWallet1/Helper/Controller+playSound.swift
b/TalerWallet1/Helper/Controller+playSound.swift
index cad7b3b..8f83435 100644
--- a/TalerWallet1/Helper/Controller+playSound.swift
+++ b/TalerWallet1/Helper/Controller+playSound.swift
@@ -55,9 +55,9 @@ extension Controller {
AudioServicesCreateSystemSoundID(fileURL as CFURL, &soundID)
logger.log("\(sound, privacy: .public) \(soundID)")
}
- if number == 0 || number > 9 || playSounds < 0 {
+ if number == 0 || number > 9 || playSoundsI < 0 {
AudioServicesPlaySystemSound(soundID);
- } else if playSounds > 0 {
+ } else if playSoundsI > 0 && playSoundsB {
if let url = Bundle.main.url(forResource: (number == 1) ?
"payment_sent"
:
"payment_received",
withExtension: "m4a") {
diff --git a/TalerWallet1/Views/Main/MainView.swift
b/TalerWallet1/Views/Main/MainView.swift
index 108ea64..15d2510 100644
--- a/TalerWallet1/Views/Main/MainView.swift
+++ b/TalerWallet1/Views/Main/MainView.swift
@@ -23,7 +23,8 @@ struct MainView: View {
@EnvironmentObject private var viewState: ViewState //
popToRootView()
@EnvironmentObject private var controller: Controller
@AppStorage("talerFont") var talerFont: Int = 0 // extension
mustn't define this, so it must be here
- @AppStorage("playSounds") var playSounds: Int = 1 // extension
mustn't define this, so it must be here
+ @AppStorage("playSoundsI") var playSoundsI: Int = 1 // extension
mustn't define this, so it must be here
+ @AppStorage("playSoundsB") var playSoundsB: Bool = true
@State private var sheetPresented = false
@State private var urlToOpen: URL? = nil
@@ -42,9 +43,11 @@ struct MainView: View {
// any change to rootViewId triggers popToRootView behaviour
.id(viewState.rootViewId)
.onAppear() {
- if playSounds != 0 && !soundPlayed {
+#if DEBUG
+ if playSoundsI != 0 && playSoundsB && !soundPlayed {
controller.playSound(1008) // Startup chime
}
+#endif
soundPlayed = true
}
} else if controller.backendState == .error {
diff --git a/TalerWallet1/Views/Settings/SettingsView.swift
b/TalerWallet1/Views/Settings/SettingsView.swift
index 97ab20a..777bc3a 100644
--- a/TalerWallet1/Views/Settings/SettingsView.swift
+++ b/TalerWallet1/Views/Settings/SettingsView.swift
@@ -29,7 +29,8 @@ struct SettingsView: View {
@AppStorage("developerMode") var developerMode: Bool = false
#endif
@AppStorage("useHaptics") var useHaptics: Bool = true
- @AppStorage("playSounds") var playSounds: Int = 1
+ @AppStorage("playSoundsI") var playSoundsI: Int = 1
+ @AppStorage("playSoundsB") var playSoundsB: Bool = true
@AppStorage("talerFont") var talerFont: Int = 0
@AppStorage("developDelay") var developDelay: Bool = false
@AppStorage("myListStyle") var myListStyle: MyListStyle = .automatic
@@ -113,11 +114,20 @@ struct SettingsView: View {
description: hideDescriptions ? nil :
String(localized: "Vibration Feedback"))
.id("playHaptics")
}
- SettingsSpeaker(name: String(localized: "Play Payment
Sounds"), value: $playSounds,
+ let playToggle = SettingsToggle(name: String(localized: "Play
Payment Sounds"), value: $playSoundsB,
+ description: hideDescriptions ? nil :
String(localized: "When a transaction finished"))
+ .id("playSounds")
+#if DEBUG
+ if Double.random(in: -100.0...100.0) > 0 {
+ SettingsSpeaker(name: String(localized: "Play Payment
Sounds"), value: $playSoundsI,
description: hideDescriptions ? nil :
String(localized: "When a transaction finished"))
.id("playSounds")
SettingsFont(title: String(localized: "Font:"), value:
talerFont, action: redraw)
.id("font")
+ } else { playToggle }
+#else
+ playToggle
+#endif
SettingsStyle(title: String(localized: "Liststyle:"),
myListStyle: $myListStyle)
.id("liststyle")
SettingsToggle(name: String(localized: "Minimalistic"), value:
$iconOnly, id1: "minimal",
--
To stop receiving notification emails like this one, please contact
gnunet@gnunet.org.
- [taler-taler-ios] 31/69: Withdraw only once, (continued)
- [taler-taler-ios] 31/69: Withdraw only once, gnunet, 2024/01/19
- [taler-taler-ios] 22/69: Summary in ThreeAmountsV, gnunet, 2024/01/19
- [taler-taler-ios] 30/69: Layout Balances, gnunet, 2024/01/19
- [taler-taler-ios] 20/69: button color if disabled, gnunet, 2024/01/19
- [taler-taler-ios] 10/69: Exchanges->Banking, gnunet, 2024/01/19
- [taler-taler-ios] 32/69: Warnings for tx buttons, gnunet, 2024/01/19
- [taler-taler-ios] 16/69: remove about protocols, gnunet, 2024/01/19
- [taler-taler-ios] 18/69: ToS for P2P, gnunet, 2024/01/19
- [taler-taler-ios] 29/69: clearDb (instead of reset), gnunet, 2024/01/19
- [taler-taler-ios] 27/69: use minor for Status, gnunet, 2024/01/19
- [taler-taler-ios] 14/69: remove Apple Sounds,
gnunet <=
- [taler-taler-ios] 21/69: TransactionDone popToRootView, gnunet, 2024/01/19
- [taler-taler-ios] 09/69: API 2:0:1, gnunet, 2024/01/19
- [taler-taler-ios] 15/69: hapticFeedback, gnunet, 2024/01/19
- [taler-taler-ios] 08/69: fixes, gnunet, 2024/01/19
- [taler-taler-ios] 11/69: Landscape, gnunet, 2024/01/19
- [taler-taler-ios] 17/69: Summary in ThreeAmountsV, gnunet, 2024/01/19
- [taler-taler-ios] 50/69: txStates, gnunet, 2024/01/19
- [taler-taler-ios] 24/69: dbg+cleanup, gnunet, 2024/01/19
- [taler-taler-ios] 13/69: definitions, gnunet, 2024/01/19
- [taler-taler-ios] 23/69: aborting Notification, gnunet, 2024/01/19