sudoxreboot/audiobookshelf-atv
1
0
Fork 0
mirror of https://github.com/sudoxnym/audiobookshelf-atv.git synced 2026-05-17 11:18:29 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #455 from benonymity/vertical-bounce

Browse source 
Don't allow webview to scroll out of bounds vertically
This commit is contained in:
advplyr 2022-12-07 16:13:17 -06:00 committed by GitHub
commit ea6b21169e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 17 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
android/app/src/main/res/xml/config.xml
View file

@ -2,9 +2,5 @@
<widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<access origin="*" />
<feature name="CDVOrientation">
<param name="android-package" value="cordova.plugins.screenorientation.CDVOrientation"/>
</feature>
</widget>

8
ios/App/App/AppDelegate.swift
View file

@ -14,7 +14,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
// Override point for customization after application launch.
let configuration = Realm.Configuration(
schemaVersion: 4,
schemaVersion: 5,
migrationBlock: { [weak self] migration, oldSchemaVersion in
if (oldSchemaVersion < 1) {
self?.logger.log("Realm schema version was \(oldSchemaVersion)")
@ -30,6 +30,12 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
indexCounter += 1
}
}
if (oldSchemaVersion < 5) {
self?.logger.log("Realm schema version was \(oldSchemaVersion)... Adding lockOrientation setting")
migration.enumerateObjects(ofType: DeviceSettings.className()) { oldObject, newObject in
newObject?["lockOrientation"] = "NONE"
}
}
}
)
Realm.Configuration.defaultConfiguration = configuration

4
ios/App/App/config.xml
View file

@ -2,9 +2,5 @@
<widget version="1.0.0" xmlns="http://www.w3.org/ns/widgets" xmlns:cdv="http://cordova.apache.org/ns/1.0">
<access origin="*" />
<feature name="CDVOrientation">
<param name="ios-package" value="CDVOrientation"/>
</feature>
</widget>

1
ios/App/App/plugins/AbsAudioPlayer.swift
View file

@ -26,6 +26,7 @@ public class AbsAudioPlayer: CAPPlugin {
NotificationCenter.default.addObserver(self, selector: #selector(onLocalMediaProgressUpdate), name: NSNotification.Name(PlayerEvents.localProgress.rawValue), object: nil)
self.bridge?.webView?.allowsBackForwardNavigationGestures = true;
self.bridge?.webView?.scrollView.alwaysBounceVertical = false;
}

4
ios/App/App/plugins/AbsDatabase.swift
View file

@ -236,13 +236,13 @@ public class AbsDatabase: CAPPlugin {
let enableAltView = call.getBool("enableAltView") ?? false
let jumpBackwardsTime = call.getInt("jumpBackwardsTime") ?? 10
let jumpForwardTime = call.getInt("jumpForwardTime") ?? 10
let lockOrientation call.getString("lockOrientation") ?? "NONE"
let lockOrientation = call.getString("lockOrientation") ?? "NONE"
let settings = DeviceSettings()
settings.disableAutoRewind = disableAutoRewind
settings.enableAltView = enableAltView
settings.jumpBackwardsTime = jumpBackwardsTime
settings.jumpForwardTime = jumpForwardTime
settings.lockOrientation = LockOrientationSetting(rawValue: lockOrientation)
settings.lockOrientation = lockOrientation
Database.shared.setDeviceSettings(deviceSettings: settings)

13
ios/App/Podfile
View file

@ -9,13 +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 'CordovaPlugins', :path => '../capacitor-cordova-ios-plugins'
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 'Audiobookshelf' do

8
ios/App/Shared/models/DeviceSettings.swift
View file

@ -8,18 +8,12 @@
import Foundation
import RealmSwift
enum LockOrientationSetting: Codable {
case NONE
case PORTRAIT
case LANDSCAPE
}
class DeviceSettings: Object {
@Persisted var disableAutoRewind: Bool = false
@Persisted var enableAltView: Bool = false
@Persisted var jumpBackwardsTime: Int = 10
@Persisted var jumpForwardTime: Int = 10
@Persisted var lockOrientation: LockOrientationSetting = LockOrientationSetting.NONE
@Persisted var lockOrientation: String = "NONE"
}
func getDefaultDeviceSettings() -> DeviceSettings {