1. Boost Verticalization - Arantoo - Services - Customer Enquiries - …

…Android (59558)

2. Boost Verticalization - Arantoo - Services - More Settings - Android (59551)

appService/src/arantoo/res/values/colors.xml

@@ -10,4 +10,5 @@
     <color name="colorPrimaryDark">#044BB1</color>
     <color name="yellow_ffb900">@color/primaryColorDark</color>
     <color name="ButtoncolorAccent">#FFB800</color>
+    <color name="secondary_toolbar_color">@color/primaryColorDark</color>
 </resources>

appService/src/main/java/com/appservice/ui/bankaccount/AccountFragmentContainerActivity.kt

@@ -47,6 +47,7 @@ open class AccountFragmentContainerActivity : AppBaseActivity<ActivityFragmentCo
   override fun customTheme(): Int? {
     return when (type) {
       FragmentType.ADD_BANK_ACCOUNT_START -> R.style.CatalogTheme
+      FragmentType.BANK_ACCOUNT_DETAILS -> R.style.CatalogTheme
       else -> super.customTheme()
     }
   }

appService/src/main/java/com/appservice/ui/bankaccount/BankAccountFragment.kt

@@ -26,6 +26,7 @@ import com.framework.extensions.gone
 import com.framework.extensions.observeOnce
 import com.framework.extensions.visible
 import com.framework.firebaseUtils.firestore.FirestoreManager
+import com.framework.pref.APPLICATION_ARANTOO_ID
 import com.framework.pref.clientId
 import com.framework.utils.ValidationUtils
 import com.framework.webengageconstant.BANK_ACCOUNT
@@ -219,7 +220,11 @@ class BankAccountFragment : AppBaseFragment<FragmentBankAccountDetailsBinding, A
     binding?.edtIfsc?.hint = if (isEditable) resources.getString(R.string.type_ifsc_code) else ""
     if (isEditable) {
       (baseActivity as? AccountFragmentContainerActivity)?.setToolbarTitleNew(resources.getString(R.string.adding_bank_account), resources.getDimensionPixelSize(R.dimen.size_36))
-      (baseActivity as? AccountFragmentContainerActivity)?.changeTheme(R.color.color_primary, R.color.color_primary_dark)
+      if ((baseActivity as AccountFragmentContainerActivity).packageName.equals(APPLICATION_ARANTOO_ID, true)) {
+        (baseActivity as? AccountFragmentContainerActivity)?.changeTheme(R.color.colorPrimaryDark, R.color.colorPrimaryDark)
+      } else {
+        (baseActivity as? AccountFragmentContainerActivity)?.changeTheme(R.color.color_primary, R.color.color_primary_dark)
+      }
     }
   }
 

appService/src/main/java/com/appservice/ui/domainbooking/DomainBookingActivity.kt

@@ -11,6 +11,8 @@ import android.text.Spanned
 import android.text.style.ClickableSpan
 import android.text.style.StyleSpan
 import android.view.View
+import android.view.Window
+import androidx.core.content.ContextCompat
 import androidx.databinding.DataBindingUtil
 import androidx.recyclerview.widget.LinearLayoutManager
 import com.appservice.R
@@ -20,7 +22,6 @@ import com.appservice.databinding.ActivityDomainBookingBinding
 import com.appservice.databinding.BsheetDomainIntegrationOptionsBinding
 import com.appservice.databinding.BsheetInputOwnDomainBinding
 import com.appservice.databinding.BsheetInputSubDomainBinding
-import com.appservice.model.domainBooking.DomainDetailsResponse
 import com.appservice.model.domainBooking.request.ExistingDomainRequest
 import com.appservice.recyclerView.AppBaseRecyclerViewAdapter
 import com.appservice.recyclerView.BaseRecyclerViewItem
@@ -30,13 +31,14 @@ import com.appservice.utils.WebEngageController
 import com.appservice.utils.getDomainSplitValues
 import com.appservice.utils.removeWWWFromDomain
 import com.appservice.viewmodel.DomainBookingViewModel
-import com.framework.base.BaseActivity
 import com.framework.extensions.afterTextChanged
 import com.framework.extensions.gone
 import com.framework.extensions.observeOnce
 import com.framework.extensions.visible
 import com.framework.firebaseUtils.FirebaseRemoteConfigUtil.featureDomainEnable
 import com.framework.firebaseUtils.firestore.FirestoreManager
+import com.framework.pref.APPLICATION_ARANTOO_ID
+import com.framework.pref.APPLICATION_JIO_ID
 import com.framework.pref.Key_Preferences.GET_FP_DETAILS_CATEGORY
 import com.framework.pref.UserSessionManager
 import com.framework.pref.clientId
@@ -47,6 +49,7 @@ import com.framework.utils.showKeyBoard
 import com.framework.webengageconstant.*
 import com.google.android.material.bottomsheet.BottomSheetDialog
 
+
 class DomainBookingActivity : AppBaseActivity<ActivityDomainBookingBinding, DomainBookingViewModel>(), RecyclerItemClickListener {
 
   private lateinit var existingDomainRequest: ExistingDomainRequest
@@ -68,6 +71,12 @@ class DomainBookingActivity : AppBaseActivity<ActivityDomainBookingBinding, Doma
     binding?.tvDomainAssigned?.text = domainSplit?.domainExtension
     setupUI()
     onClickListeners()
+
+    // setting status bar color
+    if (packageName.equals(APPLICATION_ARANTOO_ID, ignoreCase = true).not()) {
+      val window: Window = this.window
+      window.statusBarColor = ContextCompat.getColor(this, R.color.colorPrimaryDark)
+    }
   }
 
   private fun onClickListeners() {

appService/src/main/res/layout/toolbar_domain.xml

@@ -14,7 +14,6 @@
     android:layout_height="wrap_content"
     android:background="@color/secondary_toolbar_color">
 
-
     <com.framework.views.customViews.CustomToolbar
       android:layout_width="0dp"
       android:layout_height="wrap_content"

dashboard/src/main/java/com/dashboard/controller/DashboardActivity.kt

@@ -406,7 +406,12 @@ class DashboardActivity : AppBaseActivity<ActivityDashboardBinding, DashboardVie
       1 -> showToolbar(getString(R.string.website))
       2 -> showToolbar(getString(R.string.enquiry))
       3 -> if (this.packageName.equals(APPLICATION_JIO_ID, true)) showToolbar(getString(R.string.more))
-      4 -> showToolbar(getString(R.string.more))
+      4 -> {
+        showToolbar(getString(R.string.more))
+        if (this.packageName.equals(APPLICATION_ARANTOO_ID, true)) {
+          changeTheme(R.color.colorPrimaryDark, R.color.colorPrimaryDark)
+        }
+      }
       else -> {
         if (packageName.equals(APPLICATION_JIO_ID, ignoreCase = true).not()) {
           changeTheme(R.color.dashboard_status_bar_color, R.color.dashboard_status_bar_color)

framework/src/main/java/com/framework/pref/Constants.kt

@@ -6,6 +6,7 @@ import java.util.*
 
 var APPLICATION_JIO_ID = "com.jio.online"
 var APPLICATION_HEALTHGRO_ID = "com.healthgro.nowfloats"
+var APPLICATION_ARANTOO_ID = "com.arantoo.nowfloats"
 
 val REFERRAL_CAMPAIGN_CODE = 26277