From 0bb791e7ebff6f50a40e4d6031935c52b8670b6f Mon Sep 17 00:00:00 2001
From: AdityaGaikwad <adityagaikwad@wdimails.com>
Date: Fri, 4 Oct 2024 20:18:12 +0530
Subject: [PATCH] base url changed to betadelivery

Some bug changes
---
 app/build.gradle                                          | 4 ++--
 app/src/main/java/com/woka/networking/RetrofitHelper.kt   | 2 +-
 .../com/woka/onboard/fragments/SelectAvatarFragment.kt    | 1 +
 .../main/java/com/woka/userPreference/UserPreference.kt   | 2 +-
 gradle.properties                                         | 8 +++++++-
 5 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 9538e15..120837e 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -24,7 +24,7 @@ android {
 
     buildTypes {
         release {
-            buildConfigField "String", "WOKA_STAGINNG_BASE_URL", WOKA_STAGINNG_BASE_URL
+            buildConfigField "String", "WOKA_BASE_URL", WOKA_BASE_URL
             buildConfigField "String", "WOKA_USER_NAME", WOKA_USER_NAME
             buildConfigField "String", "WOKA_PASSWORD", WOKA_PASSWORD
 
@@ -33,7 +33,7 @@ android {
         }
 
         debug{
-            buildConfigField "String", "WOKA_STAGINNG_BASE_URL", WOKA_STAGINNG_BASE_URL
+            buildConfigField "String", "WOKA_BASE_URL", WOKA_BASE_URL
             buildConfigField "String", "WOKA_USER_NAME", WOKA_USER_NAME
             buildConfigField "String", "WOKA_PASSWORD", WOKA_PASSWORD
         }
diff --git a/app/src/main/java/com/woka/networking/RetrofitHelper.kt b/app/src/main/java/com/woka/networking/RetrofitHelper.kt
index 4854d13..739c105 100644
--- a/app/src/main/java/com/woka/networking/RetrofitHelper.kt
+++ b/app/src/main/java/com/woka/networking/RetrofitHelper.kt
@@ -51,7 +51,7 @@ object RetrofitHelper {
         clientBuilder.callTimeout(20, TimeUnit.SECONDS)
 
         retrofit = Retrofit.Builder()
-            .baseUrl(BuildConfig.WOKA_STAGINNG_BASE_URL)
+            .baseUrl(BuildConfig.WOKA_BASE_URL)
             .addConverterFactory(GsonConverterFactory.create())
             .client(clientBuilder.build())
             .build()
diff --git a/app/src/main/java/com/woka/onboard/fragments/SelectAvatarFragment.kt b/app/src/main/java/com/woka/onboard/fragments/SelectAvatarFragment.kt
index ca26965..ef75e98 100644
--- a/app/src/main/java/com/woka/onboard/fragments/SelectAvatarFragment.kt
+++ b/app/src/main/java/com/woka/onboard/fragments/SelectAvatarFragment.kt
@@ -161,6 +161,7 @@ class SelectAvatarFragment : Fragment() {
                                 // logging out
                                 if (userPrefs?.userType == UserType.GUARDIAN || userPrefs?.userType == UserType.CHILD){
                                     progressView.show(getString(R.string.logging_you_out))
+                                    userPrefs?.clearData()
                                     UserRepository.logout()
                                 }
 
diff --git a/app/src/main/java/com/woka/userPreference/UserPreference.kt b/app/src/main/java/com/woka/userPreference/UserPreference.kt
index 93c41df..c60ec99 100644
--- a/app/src/main/java/com/woka/userPreference/UserPreference.kt
+++ b/app/src/main/java/com/woka/userPreference/UserPreference.kt
@@ -121,7 +121,7 @@ class UserPreference(val context: Context) {
         clearData()
     }
 
-    private fun clearData(){
+    fun clearData(){
         MyListRepository.clearData()
         ShopRepository.clearCart()
         NotificationRepository.clearNotifications()
diff --git a/gradle.properties b/gradle.properties
index a379cea..213a997 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,6 +25,12 @@ android.enableJetifier=true
 
 
 # BASE URLS
-WOKA_STAGINNG_BASE_URL="https://wokaland.com/secret-panel-10102023/hidden-admin-portal-20092023/api/"
+
+# staging
+#WOKA_BASE_URL="https://wokaland.com/secret-panel-10102023/hidden-admin-portal-20092023/api/"
+
+# testing
+WOKA_BASE_URL="https://wokanative.betadelivery.com/api/"
+
 WOKA_USER_NAME="admin"
 WOKA_PASSWORD="Woka@1234"
\ No newline at end of file