Product Fetch Complete

Author: aveek

feature/login/src/main/java/com/moneybox/minimb/feature/login/ui/LoginActivity.kt

@@ -53,7 +53,6 @@ class LoginActivity : AppCompatActivity() {
             })
             loginResult.observe(this@LoginActivity, Observer{ response->
 
-                Toast.makeText(this@LoginActivity, "Login Clicked", Toast.LENGTH_LONG).show()
                 when(response.status){
                     ApiResponseResult.Status.SUCCESS ->{
                         loginViewModel.storeLoginResponse(response.data)

feature/products/src/main/java/com/moneybox/minimb/feature/products/ProductsActivity.kt

@@ -44,6 +44,7 @@ class ProductsActivity : AppCompatActivity() {
                         binding.tvPlanValue.text = response.data?.let {
                             it.totalPlanValue.toString()
                         }
+                        binding.progressbarProducts.visibility = View.GONE
                     }
                     ApiResponseResult.Status.ERROR ->{
                         binding.progressbarProducts.visibility = View.GONE

network/src/main/java/com/moneybox/minimb/network/core/HeaderInterceptor.kt

@@ -19,10 +19,10 @@ class NoAuthenticationInterceptor : Interceptor {
     }
 
     companion object {
-        private const val APP_ID_HEADER_NAME = "AppId"
-        private const val API_VERSION_HEADER_NAME = "ApiVersion"
-        private const val APP_VERSION_HEADER_NAME = "AppVersion"
-        private const val CONTENT_HEADER_NAME = "ContentDetail-Type"
-        private const val CONTENT_HEADER_VALUE = "application/json"
+        internal const val APP_ID_HEADER_NAME = "AppId"
+        internal const val API_VERSION_HEADER_NAME = "ApiVersion"
+        internal const val APP_VERSION_HEADER_NAME = "AppVersion"
+        internal const val CONTENT_HEADER_NAME = "ContentDetail-Type"
+        internal const val CONTENT_HEADER_VALUE = "application/json"
     }
 }

network/src/main/java/com/moneybox/minimb/network/core/TokenInterceptor.kt

@@ -2,6 +2,14 @@ package com.moneybox.minimb.network.core
 
 import android.content.SharedPreferences
 import com.moneybox.minimb.network.NetworkConstants
+import com.moneybox.minimb.network.core.INetworkCoreDataService.Companion.API_VERSION
+import com.moneybox.minimb.network.core.INetworkCoreDataService.Companion.APP_ID
+import com.moneybox.minimb.network.core.INetworkCoreDataService.Companion.VERSION_NAME
+import com.moneybox.minimb.network.core.NoAuthenticationInterceptor.Companion.API_VERSION_HEADER_NAME
+import com.moneybox.minimb.network.core.NoAuthenticationInterceptor.Companion.APP_ID_HEADER_NAME
+import com.moneybox.minimb.network.core.NoAuthenticationInterceptor.Companion.APP_VERSION_HEADER_NAME
+import com.moneybox.minimb.network.core.NoAuthenticationInterceptor.Companion.CONTENT_HEADER_NAME
+import com.moneybox.minimb.network.core.NoAuthenticationInterceptor.Companion.CONTENT_HEADER_VALUE
 import okhttp3.Interceptor
 import okhttp3.Response
 import javax.inject.Inject
@@ -14,12 +22,18 @@ class TokenInterceptor @Inject constructor(val sharedPreferences: SharedPreferen
 //        val sessionManager = "w9NfHyRTz+MyT/NLKFNJGIiH/w0wO0O3CVrVgY5EYDA="
 
         val requestBuilder = chain.request().newBuilder()
-
+            .addHeader(APP_ID_HEADER_NAME, APP_ID)
+            .addHeader(API_VERSION_HEADER_NAME, API_VERSION)
+            .addHeader(APP_VERSION_HEADER_NAME, VERSION_NAME)
+            .addHeader(CONTENT_HEADER_NAME, CONTENT_HEADER_VALUE)
         // If token has been saved, add it to the request
         sessionManager?.let {
-            requestBuilder.addHeader("Authorization", "Bearer $it")
+            requestBuilder.addHeader(APP_AUTHORIZATION_HEADER_NAME, "Bearer $it")
         }
 
         return chain.proceed(requestBuilder.build())
     }
+    companion object {
+        private const val APP_AUTHORIZATION_HEADER_NAME = "Authorization"
+    }
 }