diff --git a/.gitignore b/.gitignore index 551e9ac1..2dc0ed77 100644 --- a/.gitignore +++ b/.gitignore @@ -86,6 +86,11 @@ sw.* # macOS .DS_Store +# xCode +*.pbxproj +ios/app/Podfile + + # Vim swap files *.swp diff --git a/android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt b/android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt index 9007f748..e240a116 100644 --- a/android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt +++ b/android/app/src/main/java/com/audiobookshelf/app/data/DeviceClasses.kt @@ -18,6 +18,7 @@ data class ServerConnectionConfig( data class DeviceSettings( var disableAutoRewind:Boolean, + var enableAltView:Boolean, var jumpBackwardsTime:Int, var jumpForwardTime:Int ) { diff --git a/ios/App/App/plugins/AbsDatabase.swift b/ios/App/App/plugins/AbsDatabase.swift index 4cdc31f8..9c724b3d 100644 --- a/ios/App/App/plugins/AbsDatabase.swift +++ b/ios/App/App/plugins/AbsDatabase.swift @@ -88,10 +88,12 @@ public class AbsDatabase: CAPPlugin { } @objc func updateDeviceSettings(_ call: CAPPluginCall) { let disableAutoRewind = call.getBool("disableAutoRewind") ?? false + let enableAltView = call.getBool("enableAltView") ?? false let jumpBackwardsTime = call.getInt("jumpBackwardsTime") ?? 10 let jumpForwardTime = call.getInt("jumpForwardTime") ?? 10 let settings = DeviceSettings() settings.disableAutoRewind = disableAutoRewind + settings.enableAltView = enableAltView settings.jumpBackwardsTime = jumpBackwardsTime settings.jumpForwardTime = jumpForwardTime diff --git a/ios/App/Podfile b/ios/App/Podfile index 89125e80..dcdae730 100644 --- a/ios/App/Podfile +++ b/ios/App/Podfile @@ -9,12 +9,12 @@ install! 'cocoapods', :disable_input_output_paths => true def capacitor_pods pod 'Capacitor', :path => '../../node_modules/@capacitor/ios' pod 'CapacitorCordova', :path => '../../node_modules/@capacitor/ios' - pod 'CapacitorApp', :path => '..\..\node_modules\@capacitor\app' - pod 'CapacitorDialog', :path => '..\..\node_modules\@capacitor\dialog' - pod 'CapacitorHaptics', :path => '..\..\node_modules\@capacitor\haptics' - pod 'CapacitorNetwork', :path => '..\..\node_modules\@capacitor\network' - pod 'CapacitorStatusBar', :path => '..\..\node_modules\@capacitor\status-bar' - pod 'CapacitorStorage', :path => '..\..\node_modules\@capacitor\storage' + pod 'CapacitorApp', :path => '../../node_modules/@capacitor/app' + pod 'CapacitorDialog', :path => '../../node_modules/@capacitor/dialog' + pod 'CapacitorHaptics', :path => '../../node_modules/@capacitor/haptics' + pod 'CapacitorNetwork', :path => '../../node_modules/@capacitor/network' + pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar' + pod 'CapacitorStorage', :path => '../../node_modules/@capacitor/storage' end target 'App' do diff --git a/ios/App/Shared/models/DeviceSettings.swift b/ios/App/Shared/models/DeviceSettings.swift index 9fafa2aa..cd823916 100644 --- a/ios/App/Shared/models/DeviceSettings.swift +++ b/ios/App/Shared/models/DeviceSettings.swift @@ -10,6 +10,7 @@ import RealmSwift class DeviceSettings: Object { @Persisted var disableAutoRewind: Bool + @Persisted var enableAltView: Bool @Persisted var jumpBackwardsTime: Int @Persisted var jumpForwardTime: Int } @@ -17,6 +18,7 @@ class DeviceSettings: Object { func getDefaultDeviceSettings() -> DeviceSettings { let settings = DeviceSettings() settings.disableAutoRewind = false + settings.enableAltView = false settings.jumpForwardTime = 10 settings.jumpBackwardsTime = 10 return settings @@ -26,6 +28,7 @@ func deviceSettingsToJSON(settings: DeviceSettings) -> Dictionary { return Database.realmQueue.sync { return [ "disableAutoRewind": settings.disableAutoRewind, + "enableAltView": settings.enableAltView, "jumpBackwardsTime": settings.jumpBackwardsTime, "jumpForwardTime": settings.jumpForwardTime ] diff --git a/package-lock.json b/package-lock.json index 17cd099f..29decf91 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5,6 +5,7 @@ "requires": true, "packages": { "": { + "name": "audiobookshelf-app", "version": "0.9.54-beta", "dependencies": { "@capacitor/android": "^3.4.3", @@ -32981,4 +32982,4 @@ "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==" } } -} \ No newline at end of file +} diff --git a/pages/settings.vue b/pages/settings.vue index 4c703ba5..f4344207 100644 --- a/pages/settings.vue +++ b/pages/settings.vue @@ -6,6 +6,12 @@

Disable Auto Rewind

+
+
+ +
+

Alternative Bookshelf View

+
{{ currentJumpBackwardsTimeIcon }} @@ -28,6 +34,7 @@ export default { deviceData: null, settings: { disableAutoRewind: false, + enableAltView: false, jumpForwardTime: 10, jumpBackwardsTime: 10 } @@ -60,6 +67,10 @@ export default { this.settings.disableAutoRewind = !this.settings.disableAutoRewind this.saveSettings() }, + toggleEnableAltView() { + this.settings.enableAltView = !this.settings.enableAltView + this.saveSettings() + }, toggleJumpForward() { var next = (this.currentJumpForwardTimeIndex + 1) % 3 this.settings.jumpForwardTime = this.jumpForwardItems[next].value @@ -85,6 +96,7 @@ export default { const deviceSettings = this.deviceData.deviceSettings || {} this.settings.disableAutoRewind = !!deviceSettings.disableAutoRewind + this.settings.enableAltView = !!deviceSettings.enableAltView this.settings.jumpForwardTime = deviceSettings.jumpForwardTime || 10 this.settings.jumpBackwardsTime = deviceSettings.jumpBackwardsTime || 10 } diff --git a/static/grey_panel.jpg b/static/grey_panel.jpg new file mode 100644 index 00000000..787334a7 Binary files /dev/null and b/static/grey_panel.jpg differ