From 7bdb84d33d924560f05dd82117d38dbe48022639 Mon Sep 17 00:00:00 2001 From: rahul bhat Date: Fri, 20 May 2022 13:28:17 +0530 Subject: [PATCH] Removed navi-resuableui --- navi-common/src/main/res/mdpi/group_34753.png | Bin 3476 -> 0 bytes .../com/navi/design/editview}/FormEditText.kt | 21 +++++---- .../com/navi/design}/spinner/FromSpinner.kt | 9 ++-- .../com/navi/design}/textview/FormTextView.kt | 8 ++-- .../java/com/navi/design/utils/Constants.kt | 12 +++++ navi-design/src/main/res/values/colors.xml | 3 ++ navi-reusableui/.gitignore | 1 - navi-reusableui/build.gradle | 43 ------------------ navi-reusableui/consumer-rules.pro | 0 navi-reusableui/proguard-rules.pro | 21 --------- .../navireusableui/ExampleInstrumentedTest.kt | 22 --------- navi-reusableui/src/main/AndroidManifest.xml | 11 ----- .../navi/navireusableui/ExampleUnitTest.kt | 16 ------- navi-widgets/build.gradle | 1 - .../navi/naviwidgets/extensions/WidgetExt.kt | 2 +- .../src/main/res/layout/layout_address.xml | 8 ++-- .../res/layout/layout_label_with_input.xml | 6 +-- .../layout/layout_label_with_radio_group.xml | 4 +- .../res/layout/layout_label_with_spinner.xml | 9 ++-- settings.gradle | 1 - 20 files changed, 50 insertions(+), 148 deletions(-) delete mode 100644 navi-common/src/main/res/mdpi/group_34753.png rename {navi-reusableui/src/main/java/com/navi/navireusableui/edittext => navi-design/src/main/java/com/navi/design/editview}/FormEditText.kt (75%) rename {navi-reusableui/src/main/java/com/navi/navireusableui => navi-design/src/main/java/com/navi/design}/spinner/FromSpinner.kt (89%) rename {navi-reusableui/src/main/java/com/navi/navireusableui => navi-design/src/main/java/com/navi/design}/textview/FormTextView.kt (73%) create mode 100644 navi-design/src/main/java/com/navi/design/utils/Constants.kt delete mode 100644 navi-reusableui/.gitignore delete mode 100644 navi-reusableui/build.gradle delete mode 100644 navi-reusableui/consumer-rules.pro delete mode 100644 navi-reusableui/proguard-rules.pro delete mode 100644 navi-reusableui/src/androidTest/java/com/navi/navireusableui/ExampleInstrumentedTest.kt delete mode 100644 navi-reusableui/src/main/AndroidManifest.xml delete mode 100644 navi-reusableui/src/test/java/com/navi/navireusableui/ExampleUnitTest.kt 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 c27477602c24fe517f0eb790dc62f93959c1f724..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3476 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 #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" /> - - -