[improvement] added the uploaded SDK to the application

wso2 · May 2, 2024 · 8dcd992 · 8dcd992
1 parent 3b2e748
commit 8dcd992
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 43 deletions.
diff --git a/petcare-sample/b2c/mobile-app/petcare-with-sdk/app/build.gradle.kts b/petcare-sample/b2c/mobile-app/petcare-with-sdk/app/build.gradle.kts
@@ -61,10 +61,6 @@ dependencies {
     implementation(platform(libs.androidx.compose.bom))
     implementation(libs.androidx.material3.android)
     implementation(libs.androidx.ui.tooling.preview.android)
-//    implementation(fileTree(mapOf(
-//        "dir" to "/Users/achintha/.m2/repository/io/asgardeo/android.ui.core/0.0.1-SNAPSHOT",
-//        "include" to listOf("*.aar", "*.jar", "*.pom"),
-//    )))
     testImplementation(libs.junit)
     androidTestImplementation(libs.androidx.junit)
     androidTestImplementation(libs.androidx.espresso.core)
@@ -84,22 +80,5 @@ dependencies {
     implementation(libs.androidx.lifecycle.runtime.compose)
 
     // Asgardeo android SDK
-    implementation("io.asgardeo:android.ui.core:0.0.1@aar")
-
-    // to remove
-    implementation("com.squareup.okhttp3:okhttp:4.12.0")
-    implementation ("com.fasterxml.jackson.module:jackson-module-kotlin:2.14.2")
-    implementation ("net.openid:appauth:0.11.1")
-    implementation("androidx.datastore:datastore-preferences:1.0.0")
-    implementation("androidx.credentials:credentials:1.3.0-alpha02")
-    // optional - needed for credentials support from play services, for devices running
-    // Android 13 and below.
-    implementation("androidx.credentials:credentials-play-services-auth:1.3.0-alpha02")
-    implementation ("com.google.android.libraries.identity.googleid:googleid:1.1.0")
-
-    implementation("com.google.android.gms:play-services-auth:21.0.0")
-
-    implementation ("androidx.browser:browser:1.8.0")
-    implementation("androidx.activity:activity-ktx:1.8.2")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
+    implementation(libs.asgardeo.android.ui)
 }
diff --git a/...ava/com/wso2_sample/api_auth_sample/features/home/presentation/screens/home/HomeScreen.kt b/...ava/com/wso2_sample/api_auth_sample/features/home/presentation/screens/home/HomeScreen.kt
@@ -10,8 +10,8 @@ import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
 import androidx.compose.foundation.verticalScroll
-import androidx.compose.material3.Divider
 import androidx.compose.material3.FabPosition
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.runtime.Composable
@@ -75,7 +75,7 @@ fun HomeScreenContent(
                 VetCard()
                 EmergencyCard()
             }
-            Divider(
+            HorizontalDivider(
                 modifier = Modifier
                     .fillMaxWidth()
                     .align(Alignment.Start),

diff --git a/...java/com/wso2_sample/api_auth_sample/features/home/presentation/util/pets_list/PetCard.kt b/...java/com/wso2_sample/api_auth_sample/features/home/presentation/util/pets_list/PetCard.kt
@@ -11,8 +11,8 @@ import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.layout.width
 import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.outlined.KeyboardArrowRight
 import androidx.compose.material.icons.outlined.DateRange
-import androidx.compose.material.icons.outlined.KeyboardArrowRight
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -81,7 +81,7 @@ fun PetCard(pet: Pet) {
             }
         }
         Icon(
-            imageVector = Icons.Outlined.KeyboardArrowRight,
+            imageVector = Icons.AutoMirrored.Outlined.KeyboardArrowRight,
             contentDescription = "Menu",
             tint = MaterialTheme.colorScheme.tertiaryContainer,
             modifier = Modifier

diff --git a/.../wso2_sample/api_auth_sample/features/home/presentation/util/profile/SettingsAttribute.kt b/.../wso2_sample/api_auth_sample/features/home/presentation/util/profile/SettingsAttribute.kt
@@ -8,8 +8,8 @@ import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
-import androidx.compose.material.icons.outlined.KeyboardArrowRight
-import androidx.compose.material3.Divider
+import androidx.compose.material.icons.automirrored.outlined.KeyboardArrowRight
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
@@ -53,14 +53,14 @@ fun SettingsAttribute(
             modifier = Modifier.padding(end = 32.dp)
         ) {
             Icon(
-                imageVector = Icons.Outlined.KeyboardArrowRight,
+                imageVector = Icons.AutoMirrored.Outlined.KeyboardArrowRight,
                 contentDescription = "Menu",
                 tint = MaterialTheme.colorScheme.tertiary,
                 modifier = Modifier.size(16.dp)
             )
         }
     }
-    Divider(
+    HorizontalDivider(
         thickness = 0.5.dp
     )
 }
diff --git a/.../wso2_sample/api_auth_sample/features/login/impl/repository/AsgardeoAuthRepositoryImpl.kt b/.../wso2_sample/api_auth_sample/features/login/impl/repository/AsgardeoAuthRepositoryImpl.kt
@@ -11,10 +11,12 @@ import javax.inject.Inject
 class AsgardeoAuthRepositoryImpl @Inject constructor() : AsgardeoAuthRepository {
     private val asgardeoAuth: AsgardeoAuth = AsgardeoAuth.getInstance(
         AuthenticationCoreConfig(
-            authorizeEndpoint = Config.getAuthorizeUrl(),
-            tokenEndpoint = Config.getTokenUrl(),
-            logoutEndpoint = Config.getLogoutUrl(),
-            userInfoEndpoint = Config.getUserInfoUrl(),
+//            Enable these configs at your discretion
+//            authorizeEndpoint = Config.getAuthorizeUrl(),
+//            tokenEndpoint = Config.getTokenUrl(),
+//            logoutEndpoint = Config.getLogoutUrl(),
+//            userInfoEndpoint = Config.getUserInfoUrl(),
+            discoveryEndpoint = Config.getDiscoveryUrl(),
             authnEndpoint = Config.getAuthnUrl(),
             redirectUri = Config.getRedirectUri(),
             clientId = Config.getClientId(),

diff --git a/..._sample/api_auth_sample/features/login/presentation/util/common_component/ContinueText.kt b/..._sample/api_auth_sample/features/login/presentation/util/common_component/ContinueText.kt
@@ -5,7 +5,7 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
-import androidx.compose.material3.Divider
+import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@@ -22,7 +22,7 @@ fun ContinueText() {
             .fillMaxWidth()
             .padding(bottom = 8.dp)
     ) {
-        Divider(
+        HorizontalDivider(
             modifier = Modifier.weight(0.9f),
             thickness = 0.5.dp
         )
@@ -32,7 +32,7 @@ fun ContinueText() {
             style = MaterialTheme.typography.labelSmall
         )
         Spacer(modifier = Modifier.padding(start = 8.dp))
-        Divider(
+        HorizontalDivider(
             modifier = Modifier.weight(0.9f),
             thickness = 0.5.dp
         )

diff --git a/petcare-sample/b2c/mobile-app/petcare-with-sdk/gradle/libs.versions.toml b/petcare-sample/b2c/mobile-app/petcare-with-sdk/gradle/libs.versions.toml
@@ -1,6 +1,7 @@
 [versions]
 activityCompose = "1.9.0"
 agp = "8.3.2"
+asgardeoAndroidUi = "0.1.1"
 arrowCore = "1.2.0"
 coilCompose = "2.5.0"
 composeBom = "2024.04.01"
@@ -22,6 +23,7 @@ uiToolingPreviewAndroid = "1.6.6"
 uiTooling = "1.6.6"
 
 [libraries]
+asgardeo-android-ui = { module = "io.asgardeo:android.ui", version.ref = "asgardeoAndroidUi" }
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
 androidx-compose-bom = { module = "androidx.compose:compose-bom", version.ref = "composeBom" }
 androidx-compose-bom-v20240400 = { module = "androidx.compose:compose-bom", version.ref = "composeBomVersion" }

diff --git a/petcare-sample/b2c/mobile-app/petcare-with-sdk/settings.gradle.kts b/petcare-sample/b2c/mobile-app/petcare-with-sdk/settings.gradle.kts
@@ -9,9 +9,6 @@ pluginManagement {
         }
         mavenCentral()
         gradlePluginPortal()
-        maven {
-            url = uri("file:/Users/achintha/.m2/repository/")
-        }
         maven {
             url = uri("https://maven.wso2.org/nexus/content/repositories/releases")
         }
@@ -22,9 +19,6 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        maven {
-            url = uri("file:/Users/achintha/.m2/repository/")
-        }
         maven {
             url = uri("https://maven.wso2.org/nexus/content/repositories/releases")
         }