Removed some unwanted files

rajkiran20 · Mar 28, 2020 · dba75b8 · dba75b8
1 parent c9394b2
commit dba75b8
Show file tree

Hide file tree

Showing 19 changed files with 143 additions and 316 deletions.
diff --git a/android-commons.gradle b/android-commons.gradle
@@ -11,6 +11,8 @@ dependencies {
     api Deps.Koin.main
     api Deps.Koin.androidXScope
     api Deps.Koin.androidXViewModel
+    api Deps.Rx.Kotlin
+    api Deps.Rx.Android
     api Deps.Koin.test
     api Deps.AndroidX.coreKtx
     api Deps.AndroidX.coreTesting

diff --git a/app/src/main/res/menu/menu_bottom_nav.xml b/app/src/main/res/menu/menu_bottom_nav.xml
diff --git a/buildSrc/src/main/kotlin/Deps.kt b/buildSrc/src/main/kotlin/Deps.kt
@@ -38,6 +38,7 @@ object LibVersions {
     const val jacocoPalantir = "0.4.0"
     const val eventBus = "3.1.1"
     const val kappuccino = "1.2.1"
+    const val rxAndroid = "3.0.0"
 }
 
 object Modules {
@@ -112,6 +113,11 @@ object Deps {
         const val eventBus = "org.greenrobot:eventbus:${LibVersions.eventBus}"
     }
 
+    object Rx {
+        const val Kotlin = "io.reactivex.rxjava3:rxkotlin:${LibVersions.rxAndroid}"
+        const val Android = "io.reactivex.rxjava3:rxandroid:${LibVersions.rxAndroid}"
+    }
+
     object Tools {
         const val gradleVersions = "com.github.ben-manes:gradle-versions-plugin:${LibVersions.gradle}"
         const val androidStudio = "com.android.tools.build:gradle:${LibVersions.androidStudio}"

diff --git a/commons/network/src/main/java/com/skeleton/network/NetworkManager.kt b/commons/network/src/main/java/com/skeleton/network/NetworkManager.kt
@@ -1,14 +1,14 @@
 package com.skeleton.network
 
 import com.skeleton.util.constant.NetworkConstants.Companion.MOCK_WEB_SERVER_TEST_URL
-import com.skeleton.util.sharedPref.NetworkSharedPrefsManager
 import android.app.Application
 import android.content.Context
 import com.skeleton.network.interceptor.HostSelectionInterceptor
 import com.skeleton.network.interceptor.RequestInterceptor
 import com.skeleton.util.constant.NetworkConstants.Companion.CONNECT_TIMEOUT
 import com.skeleton.util.constant.NetworkConstants.Companion.READ_TIMEOUT
 import com.skeleton.util.constant.NetworkConstants.Companion.WRITE_TIMEOUT
+import com.skeleton.util.sharedPref.getAuthToken
 import okhttp3.OkHttpClient
 import okhttp3.logging.HttpLoggingInterceptor
 import retrofit2.Retrofit
@@ -17,10 +17,10 @@ import retrofit2.converter.gson.GsonConverterFactory
 import java.util.concurrent.TimeUnit
 
 fun createNetworkClient(context: Application, debug: Boolean = false) =
-    retrofitClient(getBaseUrl(context), httpClient(debug, context, NetworkSharedPrefsManager.getAuthToken(context = context)))
+    retrofitClient(getBaseUrl(context), httpClient(debug, context, context.getAuthToken()))
 
 fun getBaseUrl(context: Application): String {
-    return if (isTestingMode(context)) MOCK_WEB_SERVER_TEST_URL else NetworkSharedPrefsManager.getBaseUrl(context)!!
+    return if (isTestingMode(context)) MOCK_WEB_SERVER_TEST_URL else getBaseUrl(context)
 }
 
 private fun httpClient(debug: Boolean, context: Context, authToken: String?): OkHttpClient {

diff --git a/commons/presentation/src/main/res/drawable/ic_add.xml b/commons/presentation/src/main/res/drawable/ic_add.xml
diff --git a/commons/presentation/src/main/res/drawable/ic_arrow_right.xml b/commons/presentation/src/main/res/drawable/ic_arrow_right.xml
diff --git a/commons/presentation/src/main/res/drawable/ic_consent.xml b/commons/presentation/src/main/res/drawable/ic_consent.xml
diff --git a/commons/presentation/src/main/res/drawable/ic_deny.xml b/commons/presentation/src/main/res/drawable/ic_deny.xml
diff --git a/commons/presentation/src/main/res/drawable/ic_grant.xml b/commons/presentation/src/main/res/drawable/ic_grant.xml
diff --git a/commons/presentation/src/main/res/drawable/ic_home.xml b/commons/presentation/src/main/res/drawable/ic_home.xml
diff --git a/commons/presentation/src/main/res/drawable/ic_purpose_of_request.xml b/commons/presentation/src/main/res/drawable/ic_purpose_of_request.xml
diff --git a/commons/presentation/src/main/res/drawable/ic_requests_info.xml b/commons/presentation/src/main/res/drawable/ic_requests_info.xml
diff --git a/commons/presentation/src/main/res/values/colors.xml b/commons/presentation/src/main/res/values/colors.xml
@@ -1,30 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:tools="http://schemas.android.com/tools">
-    <color name="colorPrimary">#006353</color>
-    <color name="colorPrimaryDark">#00463A</color>
-    <color name="colorAccent">#006353</color>
-    <color name="textColorPrimary">#fff</color>
-    <color name="textColorSecondary">#666666</color>
+<resources>
+    <color name="colorPrimary">#0088ff</color>
+    <color name="colorPrimaryDark">#005ccb</color>
+    <color name="colorAccent">#ffc107</color>
+    <color name="textColorPrimary">#000000</color>
+    <color name="textColorSecondary">#000000</color>
 
-    <color name="selected_tab_color">@color/colorPrimary</color>
-    <color name="deselected_tab_color">@color/textColorSecondary</color>
-
-    <color name="gray">#F1F1F1</color>
     <color name="white">#FFF</color>
     <color name="black">#000</color>
     <color name="transparent">#00000000</color>
-
-    <color name="button_background_color" tools:override="true">@color/colorPrimary</color>
-    <color name="button_text_color" tools:override="true">@color/white</color>
-    <color name="bottom_bar_bg_color">#E8EDE8</color>
-
-    <color name="light_grey_background">#FAFAFA</color>
-    <color name="grey_background">#EDEDED</color>
-    <color name="grey_light">#F6F6F6</color>
-    <color name="rounded_grey_background" tools:override="true">#C4C4C4</color>
-    <color name="secondary_button_text_color" tools:override="true">@color/colorPrimary</color>
-    <color name="deny_button_text_color" tools:override="true">@color/red</color>
-
-    <color name="red">#C81800</color>
-    <color name="progressbar_dimmed_bg">#CC333333</color>
 </resources>
diff --git a/commons/presentation/src/main/res/values/styles.xml b/commons/presentation/src/main/res/values/styles.xml
@@ -2,149 +2,31 @@
 <resources xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <!-- Customize your theme here. -->
         <item name="colorPrimary">@color/colorPrimary</item>
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
         <item name="android:textAppearance">@style/TextAppearance</item>
         <item name="toolbarStyle">@style/Toolbar</item>
-<!--        <item name="buttonStyle">@style/Button</item>-->
-        <item name="android:tabWidgetStyle">@style/AppTabLayout</item>
         <item name="android:textViewStyle">@style/TextAppearance</item>
     </style>
 
-    <style name="AppTabLayout" parent="Widget.Design.TabLayout">
-        <item name="tabIndicatorColor">@color/colorPrimary</item>
-        <item name="tabIndicatorHeight">@dimen/tab_indictor_height</item>
-        <item name="tabBackground">@color/white</item>
-        <item name="tabTextAppearance">@style/AppTabTextAppearance</item>
-        <item name="tabSelectedTextColor">@color/colorPrimary</item>
-    </style>
-
-    <!-- for text -->
-    <style name="AppTabTextAppearance" parent="TextAppearance.Design.Tab">
-        <item name="android:textSize">@dimen/text_size_small</item>
-        <item name="android:textColor">@color/black</item>
-    </style>
-
-    <style name="AppTheme.NoActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
-    </style>
-
-    <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
-
-    <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
-
     <style name="Toolbar" parent="Widget.AppCompat.Toolbar">
         <item name="android:background">@color/colorPrimary</item>
         <item name="android:fontFamily">sans-serif-medium</item>
 
     </style>
 
-    <style name="Button.Secondary" parent="Widget.MaterialComponents.Button">
-        <item name="android:height">@dimen/secondary_button_height</item>
-        <item name="android:textAppearance">@style/TextAppearance.Button</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">@dimen/text_size_medium</item>
-        <item name="android:background">@drawable/secondary_button_background</item>
-        <item name="android:textColor">@color/secondary_button_text_color</item>
-    </style>
-
-    <style name="Button.Negative" parent="Widget.MaterialComponents.Button">
-        <item name="android:drawablePadding">@dimen/content_padding_medium</item>
-        <item name="android:height">@dimen/secondary_button_height</item>
-        <item name="android:textAppearance">@style/TextAppearance.Button</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-        <item name="android:textSize">@dimen/text_size_medium</item>
-        <item name="android:background">@drawable/secondary_button_background_red</item>
-        <item name="android:textColor">@color/deny_button_text_color</item>
-    </style>
-
-
     <style name="Button" parent="Widget.MaterialComponents.Button">
         <item name="android:height">@dimen/button_height</item>
-        <item name="android:textAppearance">@style/TextAppearance.Button</item>
         <item name="android:elevation">4dp</item>
         <item name="android:fontFamily">sans-serif-medium</item>
         <item name="android:drawablePadding">@dimen/content_margin_small</item>
         <item name="android:textSize">@dimen/text_size_medium</item>
         <item name="android:background">@drawable/button_background</item>
-        <item name="android:textColor">@color/button_text_color</item>
-    </style>
-
-    <style name="Progressbar" parent="TextAppearance.MaterialComponents.Button">
-        <item name="android:colorAccent">@color/button_background_color</item>
     </style>
 
     <style name="TextAppearance">
         <item name="android:textSize">@dimen/text_size_medium</item>
-        <item name="android:textColor">@color/black</item>
         <item name="android:fontFamily">sans-serif</item>
     </style>
-
-
-    <style name="TextAppearance.AllCaps" parent="TextAppearance">
-        <item name="android:textAllCaps">true</item>
-    </style>
-
-    <style name="TextAppearance.AllCaps.Active" parent="TextAppearance.AllCaps">
-        <item name="android:textColor">@color/colorPrimary</item>
-        <item name="android:textSize">@dimen/text_size_small</item>
-    </style>
-
-    <style name="TextAppearance.AllCaps.Inactive" parent="TextAppearance.AllCaps">
-        <item name="android:textColor">@color/black</item>
-        <item name="android:textSize">@dimen/text_size_extra_small</item>
-    </style>
-
-    <style name="TextAppearance.Button" parent="TextAppearance.AppCompat.Button"/>
-
-    <style name="TextAppearance.Heavy" parent="TextAppearance">
-        <item name="android:letterSpacing">0.03</item>
-        <item name="android:textStyle">bold</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
-    <style name="TextAppearance.ListItemHeader" parent="TextAppearance.Heavy">
-        <item name="android:textSize">@dimen/text_size_large</item>
-    </style>
-
-    <style name="TextAppearance.ListItemSubHeader" parent="TextAppearance">
-        <item name="android:letterSpacing">0.05</item>
-        <item name="android:textSize">@dimen/text_size_medium</item>
-
-    </style>
-
-    <style name="ConsentRequestHiuDetails">
-        <item name="android:letterSpacing">0.05</item>
-        <item name="android:textSize">@dimen/text_size_medium</item>
-        <item name="android:textColor">@color/black</item>
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
-    <style name="ConsentRequestItem">
-        <item name="android:textSize">@dimen/text_size_medium</item>
-        <item name="android:textColor">@color/black</item>
-    </style>
-
-    <style name="ConsentRequestItemHeader" parent="ConsentRequestItem">
-        <item name="android:fontFamily">sans-serif-light</item>
-    </style>
-
-    <style name="ConsentRequestItemValue" parent="ConsentRequestItem">
-        <item name="android:fontFamily">sans-serif-medium</item>
-    </style>
-
-    <style name="Widget.BottomNavigationView" parent="Widget.Design.BottomNavigationView">
-        <item name="fontFamily">sans-serif</item>
-        <item name="android:textSize">@dimen/text_size_extra_small</item>
-        <item name="itemBackground">@drawable/bottom_nav_tab_bg_color</item>
-        <item name="tabIndicatorHeight">@dimen/tab_indictor_height</item>
-        <item name="android:textStyle">bold</item>
-        <item name="textAllCaps">true</item>
-        <item name="itemTextAppearanceActive">@style/TextAppearance.AllCaps.Active</item>
-        <item name="itemTextAppearanceInactive">@style/TextAppearance.AllCaps.Inactive</item>
-    </style>
-
 </resources>
diff --git a/commons/utils/build.gradle b/commons/utils/build.gradle
@@ -7,7 +7,6 @@ dependencies {
     api Deps.AndroidX.lifecyleViewModel
     api Deps.AndroidX.appcompat
     api Deps.Testing.Helpers.gson
-
     api Deps.Testing.mockito
 
     testImplementation Deps.Testing.Helpers.apacheCommonsIo