diff --git a/android/app/build.gradle b/android/app/build.gradle index 618d0ac8..acee43f6 100644 --- a/android/app/build.gradle +++ b/android/app/build.gradle @@ -36,6 +36,9 @@ android { versionCode 97 versionName "0.9.66-beta" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + manifestPlaceholders = [ + "appAuthRedirectScheme": "com.audiobookshelf.app" + ] aaptOptions { // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps. // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61 diff --git a/android/app/capacitor.build.gradle b/android/app/capacitor.build.gradle index 0b3b2509..5f72c9ea 100644 --- a/android/app/capacitor.build.gradle +++ b/android/app/capacitor.build.gradle @@ -2,13 +2,14 @@ android { compileOptions { - sourceCompatibility JavaVersion.VERSION_11 - targetCompatibility JavaVersion.VERSION_11 + sourceCompatibility JavaVersion.VERSION_17 + targetCompatibility JavaVersion.VERSION_17 } } apply from: "../capacitor-cordova-android-plugins/cordova.variables.gradle" dependencies { + implementation project(':byteowls-capacitor-oauth2') implementation project(':capacitor-app') implementation project(':capacitor-clipboard') implementation project(':capacitor-dialog') diff --git a/android/app/src/debug/res/values/strings.xml b/android/app/src/debug/res/values/strings.xml new file mode 100644 index 00000000..ddb4bf3d --- /dev/null +++ b/android/app/src/debug/res/values/strings.xml @@ -0,0 +1,14 @@ + + + audiobookshelf + audiobookshelf + com.audiobookshelf.app + com.audiobookshelf.app.debug + Add widget + Simple widget for audiobookshelf playback + Jump Forward + Jump Backward + Skip Forward + Skip Backward + Change Playback Speed + diff --git a/android/app/src/main/assets/capacitor.plugins.json b/android/app/src/main/assets/capacitor.plugins.json index 6f3b2923..0c6f1cf9 100644 --- a/android/app/src/main/assets/capacitor.plugins.json +++ b/android/app/src/main/assets/capacitor.plugins.json @@ -1,4 +1,8 @@ [ + { + "pkg": "@byteowls/capacitor-oauth2", + "classpath": "com.byteowls.capacitor.oauth2.OAuth2ClientPlugin" + }, { "pkg": "@capacitor/app", "classpath": "com.capacitorjs.plugins.app.AppPlugin" diff --git a/android/capacitor.settings.gradle b/android/capacitor.settings.gradle index f0bda7e1..4cd3db7b 100644 --- a/android/capacitor.settings.gradle +++ b/android/capacitor.settings.gradle @@ -2,6 +2,9 @@ include ':capacitor-android' project(':capacitor-android').projectDir = new File('../node_modules/@capacitor/android/capacitor') +include ':byteowls-capacitor-oauth2' +project(':byteowls-capacitor-oauth2').projectDir = new File('../node_modules/@byteowls/capacitor-oauth2/android') + include ':capacitor-app' project(':capacitor-app').projectDir = new File('../node_modules/@capacitor/app/android') diff --git a/components/connection/ServerConnectForm.vue b/components/connection/ServerConnectForm.vue index 8c4efa6c..c2909281 100644 --- a/components/connection/ServerConnectForm.vue +++ b/components/connection/ServerConnectForm.vue @@ -41,7 +41,7 @@ edit
-
+ @@ -51,6 +51,8 @@ {{ networkConnected ? 'Submit' : 'No Internet' }}
+
+ Login with OpenId
@@ -78,6 +80,7 @@