TP-12345 | Refactor | Publishing (#431)

app/.gitignore

@@ -1 +1 @@
-/build
+/build

app/build.gradle

@@ -7,37 +7,48 @@ plugins {
     alias libs.plugins.paparazzi
 }
 
+def VERSION_CODE = 1
+def VERSION_NAME = "1.0.0"
+
 android {
-    namespace 'com.uitron.demo'
+    namespace 'com.navi.uitron.demo'
     compileSdk 34
 
     defaultConfig {
-        applicationId "com.uitron.demo"
+        applicationId "com.navi.uitron.demo"
         minSdk 21
         targetSdk 33
-        versionCode 1
-        versionName "1.0"
+        versionCode VERSION_CODE
+        versionName VERSION_NAME
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        vectorDrawables {
-            useSupportLibrary true
+    }
+
+    signingConfigs {
+        debug {
+            storeFile file('../keystore/navi-debug-key.jks')
+            storePassword "android"
+            keyAlias "androiddebugkey"
+            keyPassword "android"
+        }
+        release {
+            storeFile file('../keystore/navi-non-prod-release-key.jks')
+            storePassword "android"
+            keyAlias "navi"
+            keyPassword "android"
         }
     }
-    signingConfigs {
-        release {
-            storeFile file('keystore/release.jks')
-            storePassword "releaseKey"
-            keyAlias "releaseKey"
-            keyPassword "releaseKey"
-        }
+    buildFeatures {
+        buildConfig true
+        compose true
     }
     buildTypes {
         release {
             debuggable false
             minifyEnabled true
             shrinkResources true
-            signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig signingConfigs.release
         }
         benchmark {
             initWith release
@@ -50,46 +61,39 @@ android {
         targetCompatibility JavaVersion.VERSION_17
     }
     kotlinOptions {
+        freeCompilerArgs += ["-Xstring-concat=inline"]
         jvmTarget = '17'
     }
-    buildFeatures {
-        compose true
-    }
     composeOptions {
         kotlinCompilerExtensionVersion libs.versions.compose.lib.get()
     }
     packagingOptions {
         resources {
-            excludes += '/META-INF/{AL2.0,LGPL2.1}'
-        }
-    }
-    testOptions {
-        unitTests.all {
-            testLogging {
-                exceptionFormat = org.gradle.api.tasks.testing.logging.TestExceptionFormat.FULL
-            }
+            excludes += "/META-INF/{AL2.0,LGPL2.1}"
         }
     }
 }
 
 dependencies {
-    implementation project(':navi-uitron')
-
     api platform(libs.firebase.bom)
+    api libs.androidx.lifecycle.runtime.compose
+    api libs.firebase.analytics
+    api libs.firebase.crashlytics
+    api libs.retrofit.converter.gson
+    api libs.retrofit.retrofit
 
+    implementation project(':navi-uitron')
     implementation platform(libs.androidx.compose.bom)
     implementation platform(libs.okhttp.bom)
-
     implementation libs.android.material
-
     implementation libs.androidx.appcompat
-    implementation libs.androidx.core.ktx
     implementation libs.androidx.activity.compose
     implementation libs.androidx.compose.material
     implementation libs.androidx.compose.ui.graphics
     implementation libs.androidx.compose.ui.toolingPreview
     implementation libs.androidx.compose.ui.ui
     implementation libs.androidx.constraintlayoutCompose
+    implementation libs.androidx.core.ktx
     implementation libs.androidx.hilt.navigation.compose
     implementation libs.androidx.lifecycle.viewmodel.ktx
     implementation libs.androidx.navigation.compose
@@ -99,31 +103,18 @@ dependencies {
     implementation libs.androidx.room.ktx
     implementation libs.androidx.room.paging
     implementation libs.androidx.room.runtime
-
     implementation libs.dagger.hiltAndroid
-
     implementation libs.gson
-
-    implementation libs.okhttp.loggingIntercepter
-
-    api libs.androidx.lifecycle.runtime.compose
-
-    api libs.firebase.analytics
-    api libs.firebase.crashlytics
-
-    api libs.retrofit.converter.gson
-    api libs.retrofit.retrofit
-
-    kapt libs.androidx.hilt.compiler
-
-    kapt libs.dagger.hiltAndroidCompiler
-
-    ksp libs.androidx.room.compiler
-
     implementation libs.navi.alfred
+    implementation libs.okhttp.loggingIntercepter
 
     androidTestImplementation libs.androidx.test.espresso.core
     androidTestImplementation libs.androidx.test.junit
 
     testImplementation libs.junit
+
+    kapt libs.androidx.hilt.compiler
+    kapt libs.dagger.hiltAndroidCompiler
+
+    ksp libs.androidx.room.compiler
 }

app/proguard-rules.pro

@@ -38,4 +38,4 @@
 -dontwarn javax.script.AbstractScriptEngine
 -dontwarn javax.script.Compilable
 -dontwarn javax.script.ScriptEngine
--dontwarn javax.script.ScriptEngineFactory
+-dontwarn javax.script.ScriptEngineFactory

app/src/androidTest/java/com/navi/uitron/ExampleInstrumentedTest.kt

@@ -1,29 +0,0 @@
-/*
- *
- *  * Copyright © 2024 by Navi Technologies Limited
- *  * All rights reserved. Strictly confidential
- *
- */
-
-package com.navi.uitron
-
-import androidx.test.ext.junit.runners.AndroidJUnit4
-import androidx.test.platform.app.InstrumentationRegistry
-import org.junit.Assert.*
-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.uitron", appContext.packageName)
-    }
-}

app/src/main/AndroidManifest.xml

@@ -6,7 +6,7 @@
     <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
-        android:name="com.uitron.demo.MainApplication"
+        android:name="com.navi.uitron.demo.MainApplication"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
@@ -18,7 +18,7 @@
         tools:targetApi="31">
         <profileable android:shell="true"/>
         <activity
-            android:name="com.uitron.demo.MainActivity"
+            android:name="com.navi.uitron.demo.MainActivity"
             android:exported="true"
             android:label="@string/title_activity_main"
             android:theme="@style/Theme.UiTron">

app/src/main/java/com/navi/uitron/demo/MainActivity.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo
+package com.navi.uitron.demo
 
 import UiTronDemoNavGraph
 import android.os.Bundle
@@ -14,8 +14,8 @@ import androidx.activity.compose.setContent
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.navigation.compose.rememberNavController
-import com.uitron.demo.home.HomeScreen
-import com.uitron.demo.theme.UiTronTheme
+import com.navi.uitron.demo.home.HomeScreen
+import com.navi.uitron.demo.theme.UiTronTheme
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint

app/src/main/java/com/navi/uitron/demo/MainApplication.kt

@@ -5,11 +5,11 @@
  *
  */
 
-package com.uitron.demo
+package com.navi.uitron.demo
 
 import android.app.Application
 import com.navi.uitron.UiTronSdkManager
-import com.uitron.demo.dazzledesignsystem.db.SharedPreferences
+import com.navi.uitron.demo.dazzledesignsystem.db.SharedPreferences
 import dagger.hilt.android.HiltAndroidApp
 
 @HiltAndroidApp

app/src/main/java/com/navi/uitron/demo/MockActivity.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo
+package com.navi.uitron.demo
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity

app/src/main/java/com/navi/uitron/demo/UiTronDependencyProvider.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo
+package com.navi.uitron.demo
 
 import android.content.Context
 import android.view.View

app/src/main/java/com/navi/uitron/demo/Utils.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo
+package com.navi.uitron.demo
 
 import android.content.Context
 import com.google.gson.JsonObject

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/CommonUtils.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem
+package com.navi.uitron.demo.dazzledesignsystem
 
 import com.navi.uitron.utils.isNull
 

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/Constants.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem
+package com.navi.uitron.demo.dazzledesignsystem
 
 const val DB_LAST_REFRESHED_TIMESTAMP = "widgetListLastRefreshedTimestamp"
 const val DB_REFRESH_TIMEOUT = 3600000L // 1 hour

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/db/DazzleDatabase.kt

@@ -5,15 +5,15 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.db
+package com.navi.uitron.demo.dazzledesignsystem.db
 
 import androidx.room.Database
 import androidx.room.RoomDatabase
 import androidx.room.TypeConverters
-import com.uitron.demo.dazzledesignsystem.db.converters.ListConverter
-import com.uitron.demo.dazzledesignsystem.db.converters.WidgetModelDefinitionConverter
-import com.uitron.demo.dazzledesignsystem.db.dao.WidgetTemplatesDao
-import com.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
+import com.navi.uitron.demo.dazzledesignsystem.db.converters.ListConverter
+import com.navi.uitron.demo.dazzledesignsystem.db.converters.WidgetModelDefinitionConverter
+import com.navi.uitron.demo.dazzledesignsystem.db.dao.WidgetTemplatesDao
+import com.navi.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
 
 @Database(entities = [WidgetTemplate::class], version = 1, exportSchema = false)
 @TypeConverters(WidgetModelDefinitionConverter::class, ListConverter::class)

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/db/SharedPreferences.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.db
+package com.navi.uitron.demo.dazzledesignsystem.db
 
 import android.app.Application
 import android.content.Context

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/db/converters/ListConverter.kt

@@ -5,12 +5,12 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.db.converters
+package com.navi.uitron.demo.dazzledesignsystem.db.converters
 
 import androidx.room.TypeConverter
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
-import com.uitron.demo.dazzledesignsystem.db.entity.TemplateVariable
+import com.navi.uitron.demo.dazzledesignsystem.db.entity.TemplateVariable
 
 class ListConverter {
     @TypeConverter

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/db/converters/WidgetModelDefinitionConverter.kt

@@ -5,11 +5,11 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.db.converters
+package com.navi.uitron.demo.dazzledesignsystem.db.converters
 
 import androidx.room.TypeConverter
 import com.google.gson.Gson
-import com.uitron.demo.dazzledesignsystem.db.entity.WidgetModelDefinition
+import com.navi.uitron.demo.dazzledesignsystem.db.entity.WidgetModelDefinition
 
 class WidgetModelDefinitionConverter {
 

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/db/dao/WidgetTemplatesDao.kt

@@ -5,13 +5,13 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.db.dao
+package com.navi.uitron.demo.dazzledesignsystem.db.dao
 
 import androidx.room.Dao
 import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
-import com.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
+import com.navi.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
 
 @Dao
 interface WidgetTemplatesDao {

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/db/entity/WidgetTemplate.kt

@@ -5,14 +5,14 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.db.entity
+package com.navi.uitron.demo.dazzledesignsystem.db.entity
 
 import androidx.room.ColumnInfo
 import androidx.room.Entity
 import androidx.room.PrimaryKey
 import androidx.room.TypeConverters
-import com.uitron.demo.dazzledesignsystem.db.converters.ListConverter
-import com.uitron.demo.dazzledesignsystem.db.converters.WidgetModelDefinitionConverter
+import com.navi.uitron.demo.dazzledesignsystem.db.converters.ListConverter
+import com.navi.uitron.demo.dazzledesignsystem.db.converters.WidgetModelDefinitionConverter
 
 @Entity(tableName = "widget_templates")
 data class WidgetTemplate(

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/di/DazzleModule.kt

@@ -5,15 +5,15 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.di
+package com.navi.uitron.demo.dazzledesignsystem.di
 
 import android.content.Context
 import androidx.room.Room
-import com.uitron.demo.dazzledesignsystem.db.DazzleDatabase
-import com.uitron.demo.dazzledesignsystem.db.dao.WidgetTemplatesDao
-import com.uitron.demo.dazzledesignsystem.network.retrofit.RetrofitProvider
-import com.uitron.demo.dazzledesignsystem.network.retrofit.RetrofitService
-import com.uitron.demo.dazzledesignsystem.repository.DazzleRepository
+import com.navi.uitron.demo.dazzledesignsystem.db.DazzleDatabase
+import com.navi.uitron.demo.dazzledesignsystem.db.dao.WidgetTemplatesDao
+import com.navi.uitron.demo.dazzledesignsystem.network.retrofit.RetrofitProvider
+import com.navi.uitron.demo.dazzledesignsystem.network.retrofit.RetrofitService
+import com.navi.uitron.demo.dazzledesignsystem.repository.DazzleRepository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/models/BottomSheetData.kt

@@ -5,9 +5,9 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.models
+package com.navi.uitron.demo.dazzledesignsystem.models
 
-import com.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
+import com.navi.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
 
 data class BottomSheetData(
     val bottomSheetType: BottomSheetType? = null,

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/models/WidgetTemplateState.kt

@@ -5,9 +5,9 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.models
+package com.navi.uitron.demo.dazzledesignsystem.models
 
-import com.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
+import com.navi.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
 
 sealed class WidgetTemplateState {
     object Loading : WidgetTemplateState()

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/models/network/NetworkResult.kt

@@ -5,6 +5,6 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.models.network
+package com.navi.uitron.demo.dazzledesignsystem.models.network
 
 data class NetworkResult<T>(var data: T? = null, var errorMessage: String? = null)

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/models/network/WidgetTemplateResponse.kt

@@ -5,9 +5,9 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.models.network
+package com.navi.uitron.demo.dazzledesignsystem.models.network
 
-import com.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
+import com.navi.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
 
 data class WidgetTemplateResponse(
     val content: List<WidgetTemplate>? = null,

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/network/HttpClient.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.network
+package com.navi.uitron.demo.dazzledesignsystem.network
 
 import java.util.concurrent.TimeUnit
 import okhttp3.OkHttpClient

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/network/retrofit/RetrofitProvider.kt

@@ -5,9 +5,9 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.network.retrofit
+package com.navi.uitron.demo.dazzledesignsystem.network.retrofit
 
-import com.uitron.demo.dazzledesignsystem.network.HttpClient
+import com.navi.uitron.demo.dazzledesignsystem.network.HttpClient
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/network/retrofit/RetrofitService.kt

@@ -5,9 +5,9 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.network.retrofit
+package com.navi.uitron.demo.dazzledesignsystem.network.retrofit
 
-import com.uitron.demo.dazzledesignsystem.models.network.WidgetTemplateResponse
+import com.navi.uitron.demo.dazzledesignsystem.models.network.WidgetTemplateResponse
 import retrofit2.Response
 import retrofit2.http.Body
 import retrofit2.http.GET

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/repository/DazzleRepository.kt

@@ -5,16 +5,16 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.repository
+package com.navi.uitron.demo.dazzledesignsystem.repository
 
+import com.navi.uitron.demo.dazzledesignsystem.DB_LAST_REFRESHED_TIMESTAMP
+import com.navi.uitron.demo.dazzledesignsystem.DB_REFRESH_TIMEOUT
+import com.navi.uitron.demo.dazzledesignsystem.db.SharedPreferences
+import com.navi.uitron.demo.dazzledesignsystem.db.dao.WidgetTemplatesDao
+import com.navi.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
+import com.navi.uitron.demo.dazzledesignsystem.models.network.NetworkResult
+import com.navi.uitron.demo.dazzledesignsystem.network.retrofit.RetrofitService
 import com.navi.uitron.utils.orFalse
-import com.uitron.demo.dazzledesignsystem.DB_LAST_REFRESHED_TIMESTAMP
-import com.uitron.demo.dazzledesignsystem.DB_REFRESH_TIMEOUT
-import com.uitron.demo.dazzledesignsystem.db.SharedPreferences
-import com.uitron.demo.dazzledesignsystem.db.dao.WidgetTemplatesDao
-import com.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
-import com.uitron.demo.dazzledesignsystem.models.network.NetworkResult
-import com.uitron.demo.dazzledesignsystem.network.retrofit.RetrofitService
 import javax.inject.Inject
 import retrofit2.Response
 

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/ui/BottomSheetContent.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.ui
+package com.navi.uitron.demo.dazzledesignsystem.ui
 
 import android.content.Context
 import android.content.Intent
@@ -52,20 +52,20 @@ import androidx.constraintlayout.compose.Dimension
 import androidx.core.content.ContextCompat.startActivity
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.google.gson.Gson
-import com.uitron.demo.R
-import com.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
-import com.uitron.demo.dazzledesignsystem.models.BottomSheetData
-import com.uitron.demo.dazzledesignsystem.models.BottomSheetType
-import com.uitron.demo.dazzledesignsystem.viewmodel.DazzleViewModel
-import com.uitron.demo.theme.Black191919
-import com.uitron.demo.theme.Black1C1C1C
-import com.uitron.demo.theme.Blue0276FE
-import com.uitron.demo.theme.Gray969696
-import com.uitron.demo.theme.GrayE8E8E8
-import com.uitron.demo.theme.Purple1F002A
-import com.uitron.demo.theme.Purple3C0050
-import com.uitron.demo.theme.WhiteFCFCFD
-import com.uitron.demo.theme.fontFamily
+import com.navi.uitron.demo.R
+import com.navi.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
+import com.navi.uitron.demo.dazzledesignsystem.models.BottomSheetData
+import com.navi.uitron.demo.dazzledesignsystem.models.BottomSheetType
+import com.navi.uitron.demo.dazzledesignsystem.viewmodel.DazzleViewModel
+import com.navi.uitron.demo.theme.Black191919
+import com.navi.uitron.demo.theme.Black1C1C1C
+import com.navi.uitron.demo.theme.Blue0276FE
+import com.navi.uitron.demo.theme.Gray969696
+import com.navi.uitron.demo.theme.GrayE8E8E8
+import com.navi.uitron.demo.theme.Purple1F002A
+import com.navi.uitron.demo.theme.Purple3C0050
+import com.navi.uitron.demo.theme.WhiteFCFCFD
+import com.navi.uitron.demo.theme.fontFamily
 
 @Composable
 fun BottomSheetContent(

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/ui/DazzleDesignSystemScreen.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.ui
+package com.navi.uitron.demo.dazzledesignsystem.ui
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
@@ -34,9 +34,9 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.uitron.demo.dazzledesignsystem.models.WidgetTemplateState
-import com.uitron.demo.dazzledesignsystem.viewmodel.DazzleViewModel
-import com.uitron.demo.theme.WhiteF7F7F7
+import com.navi.uitron.demo.dazzledesignsystem.models.WidgetTemplateState
+import com.navi.uitron.demo.dazzledesignsystem.viewmodel.DazzleViewModel
+import com.navi.uitron.demo.theme.WhiteF7F7F7
 import kotlinx.coroutines.launch
 
 @OptIn(ExperimentalMaterialApi::class)

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/ui/SearchAndFilterToolBar.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.ui
+package com.navi.uitron.demo.dazzledesignsystem.ui
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -40,13 +40,13 @@ import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import com.uitron.demo.R
-import com.uitron.demo.dazzledesignsystem.models.BottomSheetType
-import com.uitron.demo.dazzledesignsystem.viewmodel.DazzleViewModel
-import com.uitron.demo.theme.GrayA8A8A8
-import com.uitron.demo.theme.GrayE3E5E5
-import com.uitron.demo.theme.WhiteF5F5F5
-import com.uitron.demo.theme.fontFamily
+import com.navi.uitron.demo.R
+import com.navi.uitron.demo.dazzledesignsystem.models.BottomSheetType
+import com.navi.uitron.demo.dazzledesignsystem.viewmodel.DazzleViewModel
+import com.navi.uitron.demo.theme.GrayA8A8A8
+import com.navi.uitron.demo.theme.GrayE3E5E5
+import com.navi.uitron.demo.theme.WhiteF5F5F5
+import com.navi.uitron.demo.theme.fontFamily
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/ui/WidgetItemView.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.ui
+package com.navi.uitron.demo.dazzledesignsystem.ui
 
 import KeyboardUtil
 import androidx.compose.foundation.Image
@@ -34,17 +34,17 @@ import androidx.compose.ui.text.font.FontWeight
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.google.gson.Gson
+import com.navi.uitron.demo.R
+import com.navi.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
+import com.navi.uitron.demo.dazzledesignsystem.models.BottomSheetType
+import com.navi.uitron.demo.dazzledesignsystem.viewmodel.DazzleViewModel
+import com.navi.uitron.demo.stringToUiTronResponse
+import com.navi.uitron.demo.theme.Black1C1C1C
+import com.navi.uitron.demo.theme.BlueE4EEFF
+import com.navi.uitron.demo.theme.GrayE8E8E8
+import com.navi.uitron.demo.theme.Purple1F002A
+import com.navi.uitron.demo.theme.fontFamily
 import com.navi.uitron.render.UiTronRenderer
-import com.uitron.demo.R
-import com.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
-import com.uitron.demo.dazzledesignsystem.models.BottomSheetType
-import com.uitron.demo.dazzledesignsystem.viewmodel.DazzleViewModel
-import com.uitron.demo.stringToUiTronResponse
-import com.uitron.demo.theme.Black1C1C1C
-import com.uitron.demo.theme.BlueE4EEFF
-import com.uitron.demo.theme.GrayE8E8E8
-import com.uitron.demo.theme.Purple1F002A
-import com.uitron.demo.theme.fontFamily
 
 @OptIn(ExperimentalComposeUiApi::class)
 @Composable

app/src/main/java/com/navi/uitron/demo/dazzledesignsystem/viewmodel/DazzleViewModel.kt

@@ -5,16 +5,16 @@
  *
  */
 
-package com.uitron.demo.dazzledesignsystem.viewmodel
+package com.navi.uitron.demo.dazzledesignsystem.viewmodel
 
 import androidx.lifecycle.viewModelScope
+import com.navi.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
+import com.navi.uitron.demo.dazzledesignsystem.isNotNull
+import com.navi.uitron.demo.dazzledesignsystem.models.BottomSheetData
+import com.navi.uitron.demo.dazzledesignsystem.models.BottomSheetType
+import com.navi.uitron.demo.dazzledesignsystem.models.WidgetTemplateState
+import com.navi.uitron.demo.dazzledesignsystem.repository.DazzleRepository
 import com.navi.uitron.viewmodel.UiTronViewModel
-import com.uitron.demo.dazzledesignsystem.db.entity.WidgetTemplate
-import com.uitron.demo.dazzledesignsystem.isNotNull
-import com.uitron.demo.dazzledesignsystem.models.BottomSheetData
-import com.uitron.demo.dazzledesignsystem.models.BottomSheetType
-import com.uitron.demo.dazzledesignsystem.models.WidgetTemplateState
-import com.uitron.demo.dazzledesignsystem.repository.DazzleRepository
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/navi/uitron/demo/designsystem/model/DesignItem.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.designsystem.model
+package com.navi.uitron.demo.designsystem.model
 
 data class DesignItem(val id: String, val icon: String, val title: String, val description: String)
 

app/src/main/java/com/navi/uitron/demo/designsystem/model/WidgetData.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.designsystem.model
+package com.navi.uitron.demo.designsystem.model
 
 import com.navi.uitron.model.UiTronResponse
 

app/src/main/java/com/navi/uitron/demo/designsystem/ui/DesignSystemRepoScreen.kt

@@ -35,13 +35,13 @@ import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
 import com.google.gson.Gson
 import com.google.gson.reflect.TypeToken
+import com.navi.uitron.demo.R
+import com.navi.uitron.demo.designsystem.model.WidgetData
+import com.navi.uitron.demo.designsystem.viewmodel.DesignSystemVM
+import com.navi.uitron.demo.theme.fontFamily
 import com.navi.uitron.model.UiTronResponse
 import com.navi.uitron.render.UiTronRenderer
 import com.navi.uitron.viewmodel.UiTronViewModel
-import com.uitron.demo.R
-import com.uitron.demo.designsystem.model.WidgetData
-import com.uitron.demo.designsystem.viewmodel.DesignSystemVM
-import com.uitron.demo.theme.fontFamily
 import java.lang.reflect.Type
 
 @Composable

app/src/main/java/com/navi/uitron/demo/designsystem/ui/DesignSystemScreen.kt

@@ -26,10 +26,10 @@ import androidx.constraintlayout.compose.Dimension
 import androidx.navigation.NavHostController
 import coil.compose.AsyncImage
 import coil.request.ImageRequest
-import com.uitron.demo.designsystem.model.DesignItem
-import com.uitron.demo.designsystem.viewmodel.DesignSystemVM
-import com.uitron.demo.navigation.DESIGN_REPO
-import com.uitron.demo.theme.fontFamily
+import com.navi.uitron.demo.designsystem.model.DesignItem
+import com.navi.uitron.demo.designsystem.viewmodel.DesignSystemVM
+import com.navi.uitron.demo.navigation.DESIGN_REPO
+import com.navi.uitron.demo.theme.fontFamily
 
 /**
  * Copyright © 2023 by Navi Technologies Private Limited All rights reserved. Strictly confidential

app/src/main/java/com/navi/uitron/demo/designsystem/viewmodel/DesignSystemVM.kt

@@ -5,14 +5,14 @@
  *
  */
 
-package com.uitron.demo.designsystem.viewmodel
+package com.navi.uitron.demo.designsystem.viewmodel
 
 import android.content.Context
 import androidx.lifecycle.ViewModel
 import com.google.gson.reflect.TypeToken
-import com.uitron.demo.R
-import com.uitron.demo.designsystem.model.*
-import com.uitron.demo.mockApiResponse
+import com.navi.uitron.demo.R
+import com.navi.uitron.demo.designsystem.model.*
+import com.navi.uitron.demo.mockApiResponse
 import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.asStateFlow
 import kotlinx.coroutines.flow.update

app/src/main/java/com/navi/uitron/demo/home/HomeScreen.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.home
+package com.navi.uitron.demo.home
 
 import androidx.compose.foundation.Image
 import androidx.compose.foundation.background
@@ -37,18 +37,18 @@ import androidx.compose.ui.unit.sp
 import androidx.constraintlayout.compose.ConstraintLayout
 import androidx.constraintlayout.compose.Dimension
 import androidx.navigation.NavHostController
-import com.uitron.demo.R
-import com.uitron.demo.navigation.DAZZLE_DESIGN_SYSTEM
-import com.uitron.demo.navigation.DESIGN_SYSTEM
-import com.uitron.demo.navigation.LINK_INFLATOR
-import com.uitron.demo.navigation.MOCK
-import com.uitron.demo.navigation.PLAYGROUND
-import com.uitron.demo.theme.Blue0276FE
-import com.uitron.demo.theme.OrangeFF9000
-import com.uitron.demo.theme.PinkCC2FD5
-import com.uitron.demo.theme.Purple5A43E3
-import com.uitron.demo.theme.TomatoFC5130
-import com.uitron.demo.theme.fontFamily
+import com.navi.uitron.demo.R
+import com.navi.uitron.demo.navigation.DAZZLE_DESIGN_SYSTEM
+import com.navi.uitron.demo.navigation.DESIGN_SYSTEM
+import com.navi.uitron.demo.navigation.LINK_INFLATOR
+import com.navi.uitron.demo.navigation.MOCK
+import com.navi.uitron.demo.navigation.PLAYGROUND
+import com.navi.uitron.demo.theme.Blue0276FE
+import com.navi.uitron.demo.theme.OrangeFF9000
+import com.navi.uitron.demo.theme.PinkCC2FD5
+import com.navi.uitron.demo.theme.Purple5A43E3
+import com.navi.uitron.demo.theme.TomatoFC5130
+import com.navi.uitron.demo.theme.fontFamily
 
 @Composable
 fun HomeScreen(navHostController: NavHostController) {

app/src/main/java/com/navi/uitron/demo/linkinflator/LinkInflator.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.linkinflator
+package com.navi.uitron.demo.linkinflator
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -40,10 +40,10 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
+import com.navi.uitron.demo.theme.TomatoFC5130
+import com.navi.uitron.demo.theme.fontFamily
 import com.navi.uitron.render.UiTronRenderer
 import com.navi.uitron.viewmodel.UiTronViewModel
-import com.uitron.demo.theme.TomatoFC5130
-import com.uitron.demo.theme.fontFamily
 
 @Composable
 fun LinkInflator(viewModel: LinkInflatorViewModel = hiltViewModel()) {

app/src/main/java/com/navi/uitron/demo/linkinflator/LinkInflatorRepository.kt

@@ -5,9 +5,9 @@
  *
  */
 
-package com.uitron.demo.linkinflator
+package com.navi.uitron.demo.linkinflator
 
-import com.uitron.demo.dazzledesignsystem.network.retrofit.RetrofitService
+import com.navi.uitron.demo.dazzledesignsystem.network.retrofit.RetrofitService
 import javax.inject.Inject
 import okhttp3.ResponseBody.Companion.toResponseBody
 import retrofit2.Response

app/src/main/java/com/navi/uitron/demo/linkinflator/LinkInflatorState.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.linkinflator
+package com.navi.uitron.demo.linkinflator
 
 import com.navi.uitron.model.UiTronResponse
 

app/src/main/java/com/navi/uitron/demo/linkinflator/LinkInflatorViewModel.kt

@@ -5,12 +5,12 @@
  *
  */
 
-package com.uitron.demo.linkinflator
+package com.navi.uitron.demo.linkinflator
 
 import androidx.lifecycle.viewModelScope
 import com.google.gson.Gson
+import com.navi.uitron.demo.stringToUiTronResponse
 import com.navi.uitron.viewmodel.UiTronViewModel
-import com.uitron.demo.stringToUiTronResponse
 import dagger.hilt.android.lifecycle.HiltViewModel
 import javax.inject.Inject
 import kotlinx.coroutines.Dispatchers

app/src/main/java/com/navi/uitron/demo/mock/Mock.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.mock
+package com.navi.uitron.demo.mock
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -41,12 +41,12 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.hilt.navigation.compose.hiltViewModel
 import com.google.gson.reflect.TypeToken
+import com.navi.uitron.demo.mockApiResponse
+import com.navi.uitron.demo.theme.Purple5A43E3
+import com.navi.uitron.demo.theme.fontFamily
 import com.navi.uitron.model.UiTronResponse
 import com.navi.uitron.render.UiTronRenderer
 import com.navi.uitron.viewmodel.UiTronViewModel
-import com.uitron.demo.mockApiResponse
-import com.uitron.demo.theme.Purple5A43E3
-import com.uitron.demo.theme.fontFamily
 
 @Composable
 fun MockScreen(viewModel: UiTronViewModel = hiltViewModel()) {

app/src/main/java/com/navi/uitron/demo/navigation/NavigationConstants.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.navigation
+package com.navi.uitron.demo.navigation
 
 const val HOME = "home"
 const val PLAYGROUND = "playground"

app/src/main/java/com/navi/uitron/demo/navigation/UiTronDemoNavGraph.kt

@@ -11,18 +11,18 @@ import androidx.navigation.NavType
 import androidx.navigation.compose.NavHost
 import androidx.navigation.compose.composable
 import androidx.navigation.navArgument
-import com.uitron.demo.dazzledesignsystem.ui.DazzleDesignSystemScreen
-import com.uitron.demo.home.HomeScreen
-import com.uitron.demo.linkinflator.LinkInflator
-import com.uitron.demo.mock.MockScreen
-import com.uitron.demo.navigation.DAZZLE_DESIGN_SYSTEM
-import com.uitron.demo.navigation.DESIGN_REPO_WITH_NAV
-import com.uitron.demo.navigation.DESIGN_SYSTEM
-import com.uitron.demo.navigation.HOME
-import com.uitron.demo.navigation.LINK_INFLATOR
-import com.uitron.demo.navigation.MOCK
-import com.uitron.demo.navigation.PLAYGROUND
-import com.uitron.demo.playground.PlaygroundScreen
+import com.navi.uitron.demo.dazzledesignsystem.ui.DazzleDesignSystemScreen
+import com.navi.uitron.demo.home.HomeScreen
+import com.navi.uitron.demo.linkinflator.LinkInflator
+import com.navi.uitron.demo.mock.MockScreen
+import com.navi.uitron.demo.navigation.DAZZLE_DESIGN_SYSTEM
+import com.navi.uitron.demo.navigation.DESIGN_REPO_WITH_NAV
+import com.navi.uitron.demo.navigation.DESIGN_SYSTEM
+import com.navi.uitron.demo.navigation.HOME
+import com.navi.uitron.demo.navigation.LINK_INFLATOR
+import com.navi.uitron.demo.navigation.MOCK
+import com.navi.uitron.demo.navigation.PLAYGROUND
+import com.navi.uitron.demo.playground.PlaygroundScreen
 
 @Composable
 fun UiTronDemoNavGraph(navController: NavHostController) {

app/src/main/java/com/navi/uitron/demo/playground/Playground.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.playground
+package com.navi.uitron.demo.playground
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.border
@@ -37,13 +37,13 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
+import com.navi.uitron.demo.stringToUiTronResponse
+import com.navi.uitron.demo.theme.PinkCC2FD5
+import com.navi.uitron.demo.theme.UiTronTheme
+import com.navi.uitron.demo.theme.fontFamily
 import com.navi.uitron.model.UiTronResponse
 import com.navi.uitron.render.UiTronRenderer
 import com.navi.uitron.viewmodel.UiTronViewModel
-import com.uitron.demo.stringToUiTronResponse
-import com.uitron.demo.theme.PinkCC2FD5
-import com.uitron.demo.theme.UiTronTheme
-import com.uitron.demo.theme.fontFamily
 
 @Composable
 fun PlaygroundScreen() {

app/src/main/java/com/navi/uitron/demo/theme/Color.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.theme
+package com.navi.uitron.demo.theme
 
 import androidx.compose.ui.graphics.Color
 

app/src/main/java/com/navi/uitron/demo/theme/Shape.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.theme
+package com.navi.uitron.demo.theme
 
 import androidx.compose.foundation.shape.RoundedCornerShape
 import androidx.compose.material.Shapes

app/src/main/java/com/navi/uitron/demo/theme/Theme.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.theme
+package com.navi.uitron.demo.theme
 
 import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.material.MaterialTheme

app/src/main/java/com/navi/uitron/demo/theme/Type.kt

@@ -5,7 +5,7 @@
  *
  */
 
-package com.uitron.demo.theme
+package com.navi.uitron.demo.theme
 
 import androidx.compose.material.Typography
 import androidx.compose.ui.text.TextStyle

app/src/test/java/com/navi/uitron/render/TextRendererTest.kt

@@ -14,8 +14,8 @@ import androidx.compose.ui.graphics.Color
 import app.cash.paparazzi.Paparazzi
 import com.navi.uitron.TestUtil
 import com.navi.uitron.UiTronSdkManager
+import com.navi.uitron.demo.UiTronDependencyProvider
 import com.navi.uitron.viewmodel.UiTronViewModel
-import com.uitron.demo.UiTronDependencyProvider
 import org.junit.Before
 import org.junit.Rule
 import org.junit.Test

app/src/test/snapshots/images/com.navi.uitron.render_TextRendererTest_test.png

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:f4e1cdb8d64880726f44c12906c2a2cd19e3ca241252371b5d94ca0b8b8aa5f1
-size 9078