diff --git a/Stores/src/main/AndroidManifest.xml b/Stores/src/main/AndroidManifest.xml
index c85fe934..580d7d01 100644
--- a/Stores/src/main/AndroidManifest.xml
+++ b/Stores/src/main/AndroidManifest.xml
@@ -24,7 +24,7 @@
tools:targetApi="UPSIDE_DOWN_CAKE">
diff --git a/Stores/src/standard/java/com/infomaniak/lib/stores/reviewmanagers/InAppReviewManager.kt b/Stores/src/standard/java/com/infomaniak/lib/stores/reviewmanagers/InAppReviewManager.kt
index f355e4f1..13c8da8f 100644
--- a/Stores/src/standard/java/com/infomaniak/lib/stores/reviewmanagers/InAppReviewManager.kt
+++ b/Stores/src/standard/java/com/infomaniak/lib/stores/reviewmanagers/InAppReviewManager.kt
@@ -21,7 +21,7 @@ import androidx.fragment.app.FragmentActivity
import androidx.lifecycle.LifecycleOwner
import com.infomaniak.lib.stores.BaseInAppReviewManager
import com.infomaniak.lib.stores.StoreUtils.launchInAppReview
-import com.infomaniak.lib.stores.ui.FeedbackWebViewActivity
+import com.infomaniak.lib.core.ui.WebViewActivity
import com.infomaniak.lib.stores.ui.dialogs.ReviewAlertDialog
import com.infomaniak.lib.stores.ui.dialogs.ReviewAlertDialogData
import com.infomaniak.lib.core.R as RCore
@@ -83,7 +83,7 @@ class InAppReviewManager(
onPositiveButtonClicked = ::onUserWantToReview,
onNegativeButtonClicked = {
onUserWantsToGiveFeedback?.invoke()
- FeedbackWebViewActivity.startActivity(this, getString(feedbackUrlResId))
+ WebViewActivity.startActivity(this, getString(feedbackUrlResId))
},
),
).show()
diff --git a/build.gradle b/build.gradle
index 2a24d113..9dadc41d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -3,6 +3,7 @@ apply plugin: 'kotlin-android'
apply plugin: 'kotlin-parcelize'
apply plugin: 'kotlinx-serialization'
apply plugin: 'com.google.devtools.ksp'
+apply plugin: 'androidx.navigation.safeargs.kotlin'
android {
namespace 'com.infomaniak.lib.core'
diff --git a/src/main/AndroidManifest.xml b/src/main/AndroidManifest.xml
index ab6b74f4..e8d5db70 100644
--- a/src/main/AndroidManifest.xml
+++ b/src/main/AndroidManifest.xml
@@ -21,4 +21,12 @@
+
+
+
+
+
+
diff --git a/Stores/src/standard/java/com/infomaniak/lib/stores/ui/FeedbackWebViewActivity.kt b/src/main/java/com/infomaniak/lib/core/ui/WebViewActivity.kt
similarity index 74%
rename from Stores/src/standard/java/com/infomaniak/lib/stores/ui/FeedbackWebViewActivity.kt
rename to src/main/java/com/infomaniak/lib/core/ui/WebViewActivity.kt
index 8bf8280e..ce18953f 100644
--- a/Stores/src/standard/java/com/infomaniak/lib/stores/ui/FeedbackWebViewActivity.kt
+++ b/src/main/java/com/infomaniak/lib/core/ui/WebViewActivity.kt
@@ -15,7 +15,7 @@
* You should have received a copy of the GNU General Public License
* along with this program. If not, see .
*/
-package com.infomaniak.lib.stores.ui
+package com.infomaniak.lib.core.ui
import android.annotation.SuppressLint
import android.content.Context
@@ -23,12 +23,12 @@ import android.content.Intent
import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.navArgs
-import com.infomaniak.lib.stores.databinding.ActivityFeedbackWebviewBinding
+import com.infomaniak.lib.core.databinding.ActivityWebviewBinding
-class FeedbackWebViewActivity : AppCompatActivity() {
+class WebViewActivity : AppCompatActivity() {
- private val binding by lazy { ActivityFeedbackWebviewBinding.inflate(layoutInflater) }
- private val navArgs: FeedbackWebViewActivityArgs by navArgs()
+ private val binding by lazy { ActivityWebviewBinding.inflate(layoutInflater) }
+ private val navArgs: WebViewActivityArgs by navArgs()
@SuppressLint("SetJavaScriptEnabled")
override fun onCreate(savedInstanceState: Bundle?) {
@@ -43,8 +43,8 @@ class FeedbackWebViewActivity : AppCompatActivity() {
companion object {
fun startActivity(context: Context, url: String) {
- Intent(context, FeedbackWebViewActivity::class.java).apply {
- putExtras(FeedbackWebViewActivityArgs(url).toBundle())
+ Intent(context, WebViewActivity::class.java).apply {
+ putExtras(WebViewActivityArgs(url).toBundle())
}.also(context::startActivity)
}
}
diff --git a/Stores/src/main/res/layout/activity_feedback_webview.xml b/src/main/res/layout/activity_webview.xml
similarity index 100%
rename from Stores/src/main/res/layout/activity_feedback_webview.xml
rename to src/main/res/layout/activity_webview.xml
diff --git a/Stores/src/main/res/navigation/feedback_webview_navigation.xml b/src/main/res/navigation/webview_navigation.xml
similarity index 76%
rename from Stores/src/main/res/navigation/feedback_webview_navigation.xml
rename to src/main/res/navigation/webview_navigation.xml
index 5ee48380..4253f2d8 100644
--- a/Stores/src/main/res/navigation/feedback_webview_navigation.xml
+++ b/src/main/res/navigation/webview_navigation.xml
@@ -18,14 +18,14 @@
+ android:id="@+id/webview_navigation"
+ app:startDestination="@id/webViewActivity">
+ android:id="@+id/webViewActivity"
+ android:name="com.infomaniak.lib.core.ui.WebViewActivity"
+ android:label="WebViewActivity"
+ tools:layout="@layout/activity_webview">