diff --git a/navi-common/src/main/res/mdpi/group_34753.png b/navi-common/src/main/res/mdpi/group_34753.png
deleted file mode 100644
index c27477602c..0000000000
Binary files a/navi-common/src/main/res/mdpi/group_34753.png and /dev/null differ
diff --git a/navi-reusableui/src/main/java/com/navi/navireusableui/edittext/FormEditText.kt b/navi-design/src/main/java/com/navi/design/editview/FormEditText.kt
similarity index 75%
rename from navi-reusableui/src/main/java/com/navi/navireusableui/edittext/FormEditText.kt
rename to navi-design/src/main/java/com/navi/design/editview/FormEditText.kt
index 64592b8a5e..4336a719ca 100644
--- a/navi-reusableui/src/main/java/com/navi/navireusableui/edittext/FormEditText.kt
+++ b/navi-design/src/main/java/com/navi/design/editview/FormEditText.kt
@@ -5,7 +5,7 @@
*
*/
-package com.navi.navireusableui.edittext
+package com.navi.design.editview
import android.content.Context
import android.content.res.ColorStateList
@@ -13,10 +13,10 @@ import android.util.AttributeSet
import androidx.appcompat.widget.AppCompatEditText
import androidx.core.content.ContextCompat
import androidx.core.widget.addTextChangedListener
-import com.navi.common.constants.EMPTY
-import com.navi.common.extensions.orFalse
-import com.navi.navireusableui.R
-import com.navi.navireusableui.textview.FormTextView
+import com.navi.design.R
+import com.navi.design.textview.FormTextView
+import com.navi.design.utils.Constants.EMPTY
+import com.navi.design.utils.orFalse
class FormEditText(context: Context, attrs: AttributeSet) : AppCompatEditText(context, attrs) {
private var formTextView: FormTextView? = null
@@ -32,25 +32,28 @@ class FormEditText(context: Context, attrs: AttributeSet) : AppCompatEditText(co
fun setError(message: String = EMPTY, setIcon: Boolean = true) {
if (setIcon) error = message
- backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.red))
+ backgroundTintList =
+ ColorStateList.valueOf(ContextCompat.getColor(context, R.color.navi_red))
formTextView?.setError()
}
fun setDefault() {
backgroundTintList =
- ColorStateList.valueOf(ContextCompat.getColor(context, R.color.black))
+ ColorStateList.valueOf(ContextCompat.getColor(context, R.color.navi_black))
formTextView?.setDefault(defaultFormTextNeedToHide)
error = null
}
fun setErrorWithoutIcon() {
- backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.red))
+ backgroundTintList =
+ ColorStateList.valueOf(ContextCompat.getColor(context, R.color.navi_red))
formTextView?.setError()
}
fun setErrorWithoutIconWithDefaultHide() {
defaultFormTextNeedToHide = true
- backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.red))
+ backgroundTintList =
+ ColorStateList.valueOf(ContextCompat.getColor(context, R.color.navi_red))
formTextView?.setError()
}
diff --git a/navi-reusableui/src/main/java/com/navi/navireusableui/spinner/FromSpinner.kt b/navi-design/src/main/java/com/navi/design/spinner/FromSpinner.kt
similarity index 89%
rename from navi-reusableui/src/main/java/com/navi/navireusableui/spinner/FromSpinner.kt
rename to navi-design/src/main/java/com/navi/design/spinner/FromSpinner.kt
index 1470a0392f..9953db8eba 100644
--- a/navi-reusableui/src/main/java/com/navi/navireusableui/spinner/FromSpinner.kt
+++ b/navi-design/src/main/java/com/navi/design/spinner/FromSpinner.kt
@@ -5,7 +5,7 @@
*
*/
-package com.navi.navireusableui.spinner
+package com.navi.design.spinner
import android.content.Context
import android.content.res.ColorStateList
@@ -14,8 +14,8 @@ import android.view.View
import android.widget.AdapterView
import androidx.appcompat.widget.AppCompatSpinner
import androidx.core.content.ContextCompat
-import com.navi.navireusableui.R
-import com.navi.navireusableui.textview.FormTextView
+import com.navi.design.R
+import com.navi.design.textview.FormTextView
class FromSpinner(context: Context, attrs: AttributeSet) : AppCompatSpinner(context, attrs),
AdapterView.OnItemSelectedListener {
@@ -49,7 +49,8 @@ class FromSpinner(context: Context, attrs: AttributeSet) : AppCompatSpinner(cont
}
fun setError() {
- backgroundTintList = ColorStateList.valueOf(ContextCompat.getColor(context, R.color.red))
+ backgroundTintList =
+ ColorStateList.valueOf(ContextCompat.getColor(context, R.color.navi_red))
formTextView?.setError()
}
diff --git a/navi-reusableui/src/main/java/com/navi/navireusableui/textview/FormTextView.kt b/navi-design/src/main/java/com/navi/design/textview/FormTextView.kt
similarity index 73%
rename from navi-reusableui/src/main/java/com/navi/navireusableui/textview/FormTextView.kt
rename to navi-design/src/main/java/com/navi/design/textview/FormTextView.kt
index 34f37afacf..2592aa302a 100644
--- a/navi-reusableui/src/main/java/com/navi/navireusableui/textview/FormTextView.kt
+++ b/navi-design/src/main/java/com/navi/design/textview/FormTextView.kt
@@ -5,22 +5,22 @@
*
*/
-package com.navi.navireusableui.textview
+package com.navi.design.textview
import android.content.Context
import android.util.AttributeSet
import android.view.View
import androidx.appcompat.widget.AppCompatTextView
import androidx.core.content.ContextCompat
-import com.navi.navireusableui.R
+import com.navi.design.R
class FormTextView(context: Context, attrs: AttributeSet) : AppCompatTextView(context, attrs) {
fun setError() {
- setTextColor(ContextCompat.getColor(context, R.color.red))
+ setTextColor(ContextCompat.getColor(context, R.color.navi_red))
}
fun setDefault(isHide: Boolean = false) {
- setTextColor(ContextCompat.getColor(context, R.color.title_color_one))
+ setTextColor(ContextCompat.getColor(context, R.color.navi_title_color_one))
if (isHide) {
if (visibility == View.VISIBLE)
visibility = View.GONE
diff --git a/navi-design/src/main/java/com/navi/design/utils/Constants.kt b/navi-design/src/main/java/com/navi/design/utils/Constants.kt
new file mode 100644
index 0000000000..493bdc76e4
--- /dev/null
+++ b/navi-design/src/main/java/com/navi/design/utils/Constants.kt
@@ -0,0 +1,12 @@
+/*
+ *
+ * * Copyright © 2022 by Navi Technologies Private Limited
+ * * All rights reserved. Strictly confidential
+ *
+ */
+
+package com.navi.design.utils
+
+object Constants {
+ const val EMPTY = ""
+}
\ No newline at end of file
diff --git a/navi-design/src/main/res/values/colors.xml b/navi-design/src/main/res/values/colors.xml
index 055e46472e..7c6583a3ab 100644
--- a/navi-design/src/main/res/values/colors.xml
+++ b/navi-design/src/main/res/values/colors.xml
@@ -48,4 +48,7 @@
#cecece
#D1D9E6
#8F6B6B6B
+ #FF3333
+ #000000
+ #1a1a1a
diff --git a/navi-reusableui/.gitignore b/navi-reusableui/.gitignore
deleted file mode 100644
index 42afabfd2a..0000000000
--- a/navi-reusableui/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
\ No newline at end of file
diff --git a/navi-reusableui/build.gradle b/navi-reusableui/build.gradle
deleted file mode 100644
index ea3ffa1aeb..0000000000
--- a/navi-reusableui/build.gradle
+++ /dev/null
@@ -1,43 +0,0 @@
-plugins {
- id 'com.android.library'
- id 'kotlin-android'
-}
-
-android {
- compileSdkVersion 30
-
- defaultConfig {
- minSdkVersion 21
- targetSdkVersion 30
- versionCode 1
- versionName "1.0"
-
- testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
- consumerProguardFiles "consumer-rules.pro"
- }
-
- buildTypes {
- release {
- minifyEnabled false
- proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
- }
- }
- compileOptions {
- sourceCompatibility JavaVersion.VERSION_1_8
- targetCompatibility JavaVersion.VERSION_1_8
- }
- kotlinOptions {
- jvmTarget = '1.8'
- }
-}
-
-dependencies {
-
- implementation 'androidx.core:core-ktx:1.6.0'
- implementation 'androidx.appcompat:appcompat:1.3.1'
- implementation 'com.google.android.material:material:1.4.0'
- testImplementation 'junit:junit:4.+'
- androidTestImplementation 'androidx.test.ext:junit:1.1.3'
- androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
- implementation project(':navi-common')
-}
\ No newline at end of file
diff --git a/navi-reusableui/consumer-rules.pro b/navi-reusableui/consumer-rules.pro
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/navi-reusableui/proguard-rules.pro b/navi-reusableui/proguard-rules.pro
deleted file mode 100644
index 481bb43481..0000000000
--- a/navi-reusableui/proguard-rules.pro
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add project specific ProGuard rules here.
-# You can control the set of applied configuration files using the
-# proguardFiles setting in build.gradle.
-#
-# For more details, see
-# http://developer.android.com/guide/developing/tools/proguard.html
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-# public *;
-#}
-
-# Uncomment this to preserve the line number information for
-# debugging stack traces.
-#-keepattributes SourceFile,LineNumberTable
-
-# If you keep the line number information, uncomment this to
-# hide the original source file name.
-#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/navi-reusableui/src/androidTest/java/com/navi/navireusableui/ExampleInstrumentedTest.kt b/navi-reusableui/src/androidTest/java/com/navi/navireusableui/ExampleInstrumentedTest.kt
deleted file mode 100644
index 8385817b42..0000000000
--- a/navi-reusableui/src/androidTest/java/com/navi/navireusableui/ExampleInstrumentedTest.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.navi.navireusableui
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.assertEquals
-import org.junit.Test
-import org.junit.runner.RunWith
-
-/**
- * Instrumented test, which will execute on an Android device.
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-@RunWith(AndroidJUnit4::class)
-class ExampleInstrumentedTest {
- @Test
- fun useAppContext() {
- // Context of the app under test.
- val appContext = InstrumentationRegistry.getInstrumentation().targetContext
- assertEquals("com.navi.navi-reusableui.test", appContext.packageName)
- }
-}
\ No newline at end of file
diff --git a/navi-reusableui/src/main/AndroidManifest.xml b/navi-reusableui/src/main/AndroidManifest.xml
deleted file mode 100644
index 5143d6d40e..0000000000
--- a/navi-reusableui/src/main/AndroidManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/navi-reusableui/src/test/java/com/navi/navireusableui/ExampleUnitTest.kt b/navi-reusableui/src/test/java/com/navi/navireusableui/ExampleUnitTest.kt
deleted file mode 100644
index d96505d36a..0000000000
--- a/navi-reusableui/src/test/java/com/navi/navireusableui/ExampleUnitTest.kt
+++ /dev/null
@@ -1,16 +0,0 @@
-package com.navi.navireusableui
-
-import org.junit.Assert.assertEquals
-import org.junit.Test
-
-/**
- * Example local unit test, which will execute on the development machine (host).
- *
- * See [testing documentation](http://d.android.com/tools/testing).
- */
-class ExampleUnitTest {
- @Test
- fun addition_isCorrect() {
- assertEquals(4, 2 + 2)
- }
-}
\ No newline at end of file
diff --git a/navi-widgets/build.gradle b/navi-widgets/build.gradle
index b9f655c58c..02555a8fcd 100644
--- a/navi-widgets/build.gradle
+++ b/navi-widgets/build.gradle
@@ -46,7 +46,6 @@ dependencies {
androidTestImplementation 'androidx.test.ext:junit:1.1.3'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
implementation project(':navi-common')
- implementation project(":navi-reusableui")
api project(":navi-design")
implementation 'androidx.gridlayout:gridlayout:1.0.0'
diff --git a/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetExt.kt b/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetExt.kt
index 70d1397f41..9e20c0435a 100644
--- a/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetExt.kt
+++ b/navi-widgets/src/main/java/com/navi/naviwidgets/extensions/WidgetExt.kt
@@ -47,7 +47,7 @@ import com.navi.common.utils.Constants.SEMI_BOLD
import com.navi.common.utils.dpToPx
import com.navi.design.utils.CustomTypefaceSpan
import com.navi.design.utils.getFontStyle
-import com.navi.navireusableui.edittext.FormEditText
+import com.navi.design.editview.FormEditText
import com.navi.naviwidgets.R
import com.navi.naviwidgets.models.NaviWidget
import com.navi.naviwidgets.models.response.*
diff --git a/navi-widgets/src/main/res/layout/layout_address.xml b/navi-widgets/src/main/res/layout/layout_address.xml
index d5b38aca08..b5c6d60ebc 100644
--- a/navi-widgets/src/main/res/layout/layout_address.xml
+++ b/navi-widgets/src/main/res/layout/layout_address.xml
@@ -57,7 +57,7 @@
app:layout_constraintTop_toTopOf="parent"
tools:text="Property Address" />
-
-
-
-
-
-
-
-
-
+ tools:ignore="ContentDescription" />
-
-
-