diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/.gitignore b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/.gitignore new file mode 100644 index 00000000..c0f21ec2 --- /dev/null +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/.gitignore @@ -0,0 +1,2 @@ +/build +/.tauri diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/build.gradle.kts b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/build.gradle.kts new file mode 100644 index 00000000..220ddcb3 --- /dev/null +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/build.gradle.kts @@ -0,0 +1,44 @@ +plugins { + id("com.android.library") + id("org.jetbrains.kotlin.android") +} + +android { + namespace = "com.plugin.safari_auth" + compileSdk = 34 + + defaultConfig { + minSdk = 21 + + testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner" + consumerProguardFiles("consumer-rules.pro") + } + + buildTypes { + release { + isMinifyEnabled = false + proguardFiles( + getDefaultProguardFile("proguard-android-optimize.txt"), + "proguard-rules.pro" + ) + } + } + compileOptions { + sourceCompatibility = JavaVersion.VERSION_1_8 + targetCompatibility = JavaVersion.VERSION_1_8 + } + kotlinOptions { + jvmTarget = "1.8" + } +} + +dependencies { + + implementation("androidx.core:core-ktx:1.9.0") + implementation("androidx.appcompat:appcompat:1.6.0") + implementation("com.google.android.material:material:1.7.0") + testImplementation("junit:junit:4.13.2") + androidTestImplementation("androidx.test.ext:junit:1.1.5") + androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") + implementation(project(":tauri-android")) +} diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/proguard-rules.pro b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/proguard-rules.pro new file mode 100644 index 00000000..481bb434 --- /dev/null +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/proguard-rules.pro @@ -0,0 +1,21 @@ +# Add project specific ProGuard rules here. +# You can control the set of applied configuration files using the +# proguardFiles setting in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile \ No newline at end of file diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/settings.gradle b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/settings.gradle new file mode 100644 index 00000000..d7782a40 --- /dev/null +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/settings.gradle @@ -0,0 +1,31 @@ +pluginManagement { + repositories { + mavenCentral() + gradlePluginPortal() + google() + } + resolutionStrategy { + eachPlugin { + switch (requested.id.id) { + case "com.android.library": + useVersion("8.0.2") + break + case "org.jetbrains.kotlin.android": + useVersion("1.8.20") + break + } + } + } +} + +dependencyResolutionManagement { + repositoriesMode.set(RepositoriesMode.FAIL_ON_PROJECT_REPOS) + repositories { + mavenCentral() + google() + + } +} + +include ':tauri-android' +project(':tauri-android').projectDir = new File('./.tauri/tauri-api') diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/androidTest/java/ExampleInstrumentedTest.kt b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/androidTest/java/ExampleInstrumentedTest.kt new file mode 100644 index 00000000..f421ced8 --- /dev/null +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/androidTest/java/ExampleInstrumentedTest.kt @@ -0,0 +1,24 @@ +package com.plugin.safari_auth + +import androidx.test.platform.app.InstrumentationRegistry +import androidx.test.ext.junit.runners.AndroidJUnit4 + +import org.junit.Test +import org.junit.runner.RunWith + +import org.junit.Assert.* + +/** + * Instrumented test, which will execute on an Android device. + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +@RunWith(AndroidJUnit4::class) +class ExampleInstrumentedTest { + @Test + fun useAppContext() { + // Context of the app under test. + val appContext = InstrumentationRegistry.getInstrumentation().targetContext + assertEquals("com.plugin.safari_auth", appContext.packageName) + } +} diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/main/AndroidManifest.xml b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/main/AndroidManifest.xml new file mode 100644 index 00000000..9a40236b --- /dev/null +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/main/AndroidManifest.xml @@ -0,0 +1,3 @@ + + + diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/main/java/Example.kt b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/main/java/Example.kt new file mode 100644 index 00000000..fc745b27 --- /dev/null +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/main/java/Example.kt @@ -0,0 +1,10 @@ +package com.plugin.safari_auth + +import android.util.Log + +class Example { + fun pong(value: String): String { + Log.i("Pong", value) + return value + } +} diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/main/java/ExamplePlugin.kt b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/main/java/ExamplePlugin.kt new file mode 100644 index 00000000..4967d91a --- /dev/null +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/main/java/ExamplePlugin.kt @@ -0,0 +1,28 @@ +package com.plugin.safari_auth + +import android.app.Activity +import app.tauri.annotation.Command +import app.tauri.annotation.InvokeArg +import app.tauri.annotation.TauriPlugin +import app.tauri.plugin.JSObject +import app.tauri.plugin.Plugin +import app.tauri.plugin.Invoke + +@InvokeArg +class PingArgs { + var value: String? = null +} + +@TauriPlugin +class ExamplePlugin(private val activity: Activity): Plugin(activity) { + private val implementation = Example() + + @Command + fun ping(invoke: Invoke) { + val args = invoke.parseArgs(PingArgs::class.java) + + val ret = JSObject() + ret.put("value", implementation.pong(args.value ?: "default value :(")) + invoke.resolve(ret) + } +} diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/test/java/ExampleUnitTest.kt b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/test/java/ExampleUnitTest.kt new file mode 100644 index 00000000..41d796eb --- /dev/null +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/android/src/test/java/ExampleUnitTest.kt @@ -0,0 +1,17 @@ +package com.plugin.safari_auth + +import org.junit.Test + +import org.junit.Assert.* + +/** + * Example local unit test, which will execute on the development machine (host). + * + * See [testing documentation](http://d.android.com/tools/testing). + */ +class ExampleUnitTest { + @Test + fun addition_isCorrect() { + assertEquals(4, 2 + 2) + } +} diff --git a/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/src/mobile.rs b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/src/mobile.rs index 56ead312..67542fca 100644 --- a/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/src/mobile.rs +++ b/apps/readest-app/src-tauri/plugins/tauri-plugin-safari-auth/src/mobile.rs @@ -14,8 +14,11 @@ pub fn init( _app: &AppHandle, api: PluginApi, ) -> crate::Result> { + #[cfg(target_os = "android")] + let handle = api.register_android_plugin("com.bilingify.safari_auth", "ExamplePlugin")?; #[cfg(target_os = "ios")] let handle = api.register_ios_plugin(init_plugin_safari_auth)?; + Ok(SafariAuth(handle)) } diff --git a/apps/readest-app/src-tauri/src/lib.rs b/apps/readest-app/src-tauri/src/lib.rs index 2be54881..bc1d5759 100644 --- a/apps/readest-app/src-tauri/src/lib.rs +++ b/apps/readest-app/src-tauri/src/lib.rs @@ -106,8 +106,7 @@ pub fn run() { .plugin(tauri_plugin_http::init()) .plugin(tauri_plugin_os::init()) .plugin(tauri_plugin_dialog::init()) - .plugin(tauri_plugin_fs::init()) - .plugin(tauri_plugin_safari_auth::init()); + .plugin(tauri_plugin_fs::init()); #[cfg(desktop)] let builder = builder.plugin(tauri_plugin_single_instance::init(|app, argv, cwd| { @@ -133,6 +132,9 @@ pub fn run() { #[cfg(target_os = "ios")] let builder = builder.plugin(tauri_plugin_sign_in_with_apple::init()); + #[cfg(target_os = "ios")] + let builder = builder.plugin(tauri_plugin_safari_auth::init()); + #[cfg(any(target_os = "ios", target_os = "android"))] let builder = builder.plugin(tauri_plugin_haptics::init());