Release - 3.26.0

.cicdtemplate/.github/workflows/config/changelog-release.json

@@ -0,0 +1,35 @@
+{
+    "categories": [
+        {
+            "title": "## ✨ Features",
+            "labels": [
+                "type : feature"
+            ],
+            "empty_content": "N/A"
+        },
+        {
+            "title": "## 🐛 Bug fixes",
+            "labels": [
+                "type : bug"
+            ],
+            "empty_content": "N/A"
+        },
+        {
+            "title": "## 🧹 Chores",
+            "labels": [
+                "type : chore"
+            ],
+            "empty_content": "N/A"
+        },
+        {
+            "title": "## Others",
+            "exclude_labels": [
+                "type : feature",
+                "type : bug",
+                "type : chore",
+                "type : release"
+            ]
+        }
+    ],
+    "max_pull_requests": 200
+}

.cicdtemplate/.github/workflows/create_release_pr.yml

@@ -0,0 +1,25 @@
+name: Create the Release pull request
+
+on:
+  workflow_dispatch:
+
+jobs:
+  create_release_pr:
+    name: Create the Release pull request
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout the latest code
+        uses: actions/checkout@v3
+
+      - name: Read the current version
+        id: version
+        run: echo "version=$(perl -nle 'print $1 if /ANDROID_VERSION_NAME = \"(.*)\"$/' buildSrc/src/main/java/Versions.kt)" >> $GITHUB_OUTPUT
+
+      - uses: nimblehq/github-actions-workflows/[email protected]
+        with:
+          version: ${{ steps.version.outputs.version }}
+          changelogConfiguration: ".github/workflows/config/changelog-release.json"
+          assignee: bot-nimble

.github/workflows/config/changelog-release.json

@@ -0,0 +1,35 @@
+{
+    "categories": [
+        {
+            "title": "## ✨ Features",
+            "labels": [
+                "type : feature"
+            ],
+            "empty_content": "N/A"
+        },
+        {
+            "title": "## 🐛 Bug fixes",
+            "labels": [
+                "type : bug"
+            ],
+            "empty_content": "N/A"
+        },
+        {
+            "title": "## 🧹 Chores",
+            "labels": [
+                "type : chore"
+            ],
+            "empty_content": "N/A"
+        },
+        {
+            "title": "## Others",
+            "exclude_labels": [
+                "type : feature",
+                "type : bug",
+                "type : chore",
+                "type : release"
+            ]
+        }
+    ],
+    "max_pull_requests": 200
+}

.github/workflows/create_release_pr.yml

@@ -0,0 +1,28 @@
+name: Create the Release pull request
+
+on:
+  workflow_dispatch:
+
+jobs:
+  create_release_pr:
+    name: Create the Release pull request
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout the latest code
+        uses: actions/checkout@v3
+
+      - name: Read the current version
+        id: version
+        uses: christian-draeger/[email protected]
+        with:
+          path: "version.properties"
+          properties: "templateScriptVersion"
+
+      - uses: nimblehq/github-actions-workflows/[email protected]
+        with:
+          version: ${{ steps.version.outputs.templateScriptVersion }}
+          changelogConfiguration: ".github/workflows/config/changelog-release.json"
+          assignee: bot-nimble

sample-compose/app/proguard-rules.pro

@@ -21,5 +21,5 @@
 #-renamesourcefileattribute SourceFile
 
 # Data class
--keepclassmembers class co.nimblehq.sample.compose.data.request.** { *; }
--keepclassmembers class co.nimblehq.sample.compose.data.response.** { *; }
+-keepclassmembers class co.nimblehq.sample.compose.data.remote.models.requests.** { *; }
+-keepclassmembers class co.nimblehq.sample.compose.data.remote.models.responses.** { *; }

sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/MoshiModule.kt

@@ -1,6 +1,6 @@
 package co.nimblehq.sample.compose.di.modules
 
-import co.nimblehq.sample.compose.data.service.providers.MoshiBuilderProvider
+import co.nimblehq.sample.compose.data.remote.providers.MoshiBuilderProvider
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides

sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/PreferencesModule.kt

@@ -5,8 +5,8 @@ import androidx.datastore.core.DataStore
 import androidx.datastore.preferences.core.PreferenceDataStoreFactory
 import androidx.datastore.preferences.core.Preferences
 import androidx.datastore.preferences.preferencesDataStoreFile
-import co.nimblehq.sample.compose.data.repository.AppPreferencesRepositoryImpl
-import co.nimblehq.sample.compose.domain.repository.AppPreferencesRepository
+import co.nimblehq.sample.compose.data.repositories.AppPreferencesRepositoryImpl
+import co.nimblehq.sample.compose.domain.repositories.AppPreferencesRepository
 import dagger.*
 import dagger.hilt.InstallIn
 import dagger.hilt.android.qualifiers.ApplicationContext

sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RepositoryModule.kt

@@ -1,8 +1,8 @@
 package co.nimblehq.sample.compose.di.modules
 
-import co.nimblehq.sample.compose.data.repository.RepositoryImpl
-import co.nimblehq.sample.compose.data.service.ApiService
-import co.nimblehq.sample.compose.domain.repository.Repository
+import co.nimblehq.sample.compose.data.remote.services.ApiService
+import co.nimblehq.sample.compose.data.repositories.RepositoryImpl
+import co.nimblehq.sample.compose.domain.repositories.Repository
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/RetrofitModule.kt

@@ -1,10 +1,10 @@
 package co.nimblehq.sample.compose.di.modules
 
 import co.nimblehq.sample.compose.BuildConfig
-import co.nimblehq.sample.compose.data.service.ApiService
-import co.nimblehq.sample.compose.data.service.providers.ApiServiceProvider
-import co.nimblehq.sample.compose.data.service.providers.ConverterFactoryProvider
-import co.nimblehq.sample.compose.data.service.providers.RetrofitProvider
+import co.nimblehq.sample.compose.data.remote.providers.ApiServiceProvider
+import co.nimblehq.sample.compose.data.remote.providers.ConverterFactoryProvider
+import co.nimblehq.sample.compose.data.remote.providers.RetrofitProvider
+import co.nimblehq.sample.compose.data.remote.services.ApiService
 import com.squareup.moshi.Moshi
 import dagger.Module
 import dagger.Provides

sample-compose/app/src/main/java/co/nimblehq/sample/compose/di/modules/StorageModule.kt

@@ -1,7 +1,7 @@
 package co.nimblehq.sample.compose.di.modules
 
 import android.content.Context
-import co.nimblehq.sample.compose.data.storage.EncryptedSharedPreferences
+import co.nimblehq.sample.compose.data.local.preferences.EncryptedSharedPreferences
 import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppDestination.kt

@@ -1,7 +1,9 @@
 package co.nimblehq.sample.compose.ui
 
-import androidx.navigation.*
-import co.nimblehq.sample.compose.model.UiModel
+import androidx.navigation.NamedNavArgument
+import androidx.navigation.NavType
+import androidx.navigation.navArgument
+import co.nimblehq.sample.compose.ui.models.UiModel
 
 const val KeyId = "id"
 const val KeyModel = "model"

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/AppNavigation.kt

@@ -1,9 +1,14 @@
 package co.nimblehq.sample.compose.ui
 
 import androidx.compose.runtime.Composable
-import androidx.navigation.*
-import androidx.navigation.compose.*
-import co.nimblehq.sample.compose.model.UiModel
+import androidx.navigation.NavBackStackEntry
+import androidx.navigation.NavDeepLink
+import androidx.navigation.NavGraphBuilder
+import androidx.navigation.NavHostController
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.screens.home.HomeScreen
 import co.nimblehq.sample.compose.ui.screens.second.SecondScreen
 import co.nimblehq.sample.compose.ui.screens.third.ThirdScreen

sample-compose/app/src/main/java/co/nimblehq/sample/compose/model/UiModel.kt → sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/models/UiModel.kt

@@ -1,7 +1,7 @@
-package co.nimblehq.sample.compose.model
+package co.nimblehq.sample.compose.ui.models
 
 import android.os.Parcelable
-import co.nimblehq.sample.compose.domain.model.Model
+import co.nimblehq.sample.compose.domain.models.Model
 import kotlinx.parcelize.Parcelize
 
 @Parcelize

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreen.kt

@@ -15,8 +15,8 @@ import co.nimblehq.sample.compose.R
 import co.nimblehq.sample.compose.extensions.collectAsEffect
 import co.nimblehq.sample.compose.extensions.showToast
 import co.nimblehq.sample.compose.lib.IsLoading
-import co.nimblehq.sample.compose.model.UiModel
 import co.nimblehq.sample.compose.ui.AppDestination
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.screens.AppBar
 import co.nimblehq.sample.compose.ui.showToast
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/HomeViewModel.kt

@@ -1,16 +1,21 @@
 package co.nimblehq.sample.compose.ui.screens.home
 
 import androidx.lifecycle.viewModelScope
-import co.nimblehq.sample.compose.domain.usecase.GetModelsUseCase
-import co.nimblehq.sample.compose.domain.usecase.IsFirstTimeLaunchPreferencesUseCase
-import co.nimblehq.sample.compose.domain.usecase.UpdateFirstTimeLaunchPreferencesUseCase
-import co.nimblehq.sample.compose.model.UiModel
-import co.nimblehq.sample.compose.model.toUiModel
+import co.nimblehq.sample.compose.domain.usecases.GetModelsUseCase
+import co.nimblehq.sample.compose.domain.usecases.IsFirstTimeLaunchPreferencesUseCase
+import co.nimblehq.sample.compose.domain.usecases.UpdateFirstTimeLaunchPreferencesUseCase
 import co.nimblehq.sample.compose.ui.AppDestination
 import co.nimblehq.sample.compose.ui.base.BaseViewModel
+import co.nimblehq.sample.compose.ui.models.UiModel
+import co.nimblehq.sample.compose.ui.models.toUiModel
 import co.nimblehq.sample.compose.util.DispatchersProvider
 import dagger.hilt.android.lifecycle.HiltViewModel
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.flow.catch
+import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.flow.launchIn
+import kotlinx.coroutines.flow.onEach
 import javax.inject.Inject
 
 @HiltViewModel

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/Item.kt

@@ -8,7 +8,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import co.nimblehq.sample.compose.R
-import co.nimblehq.sample.compose.model.UiModel
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.theme.*
 import co.nimblehq.sample.compose.ui.theme.AppTheme.dimensions
 

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/home/ItemList.kt

@@ -6,7 +6,7 @@ import androidx.compose.material.Divider
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import co.nimblehq.sample.compose.model.UiModel
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme
 
 @Composable

sample-compose/app/src/main/java/co/nimblehq/sample/compose/ui/screens/third/ThirdScreen.kt

@@ -13,8 +13,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.hilt.navigation.compose.hiltViewModel
 import co.nimblehq.sample.compose.R
-import co.nimblehq.sample.compose.model.UiModel
 import co.nimblehq.sample.compose.ui.AppDestination
+import co.nimblehq.sample.compose.ui.models.UiModel
 import co.nimblehq.sample.compose.ui.screens.AppBar
 import co.nimblehq.sample.compose.ui.theme.ComposeTheme
 

sample-compose/app/src/test/java/co/nimblehq/sample/compose/test/MockUtil.kt

@@ -1,6 +1,6 @@
 package co.nimblehq.sample.compose.test
 
-import co.nimblehq.sample.compose.domain.model.Model
+import co.nimblehq.sample.compose.domain.models.Model
 
 object MockUtil {
 

sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeScreenTest.kt

@@ -7,7 +7,7 @@ import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.test.ext.junit.rules.ActivityScenarioRule
 import androidx.test.rule.GrantPermissionRule
 import co.nimblehq.sample.compose.R
-import co.nimblehq.sample.compose.domain.usecase.*
+import co.nimblehq.sample.compose.domain.usecases.*
 import co.nimblehq.sample.compose.test.MockUtil
 import co.nimblehq.sample.compose.ui.AppDestination
 import co.nimblehq.sample.compose.ui.screens.BaseScreenTest

sample-compose/app/src/test/java/co/nimblehq/sample/compose/ui/screens/home/HomeViewModelTest.kt

@@ -1,18 +1,25 @@
 package co.nimblehq.sample.compose.ui.screens.home
 
 import app.cash.turbine.test
-import co.nimblehq.sample.compose.domain.usecase.GetModelsUseCase
-import co.nimblehq.sample.compose.domain.usecase.IsFirstTimeLaunchPreferencesUseCase
-import co.nimblehq.sample.compose.domain.usecase.UpdateFirstTimeLaunchPreferencesUseCase
-import co.nimblehq.sample.compose.model.toUiModel
+import co.nimblehq.sample.compose.domain.usecases.GetModelsUseCase
+import co.nimblehq.sample.compose.domain.usecases.IsFirstTimeLaunchPreferencesUseCase
+import co.nimblehq.sample.compose.domain.usecases.UpdateFirstTimeLaunchPreferencesUseCase
 import co.nimblehq.sample.compose.test.CoroutineTestRule
 import co.nimblehq.sample.compose.test.MockUtil
 import co.nimblehq.sample.compose.ui.AppDestination
+import co.nimblehq.sample.compose.ui.models.toUiModel
 import co.nimblehq.sample.compose.util.DispatchersProvider
 import io.kotest.matchers.shouldBe
-import io.mockk.*
+import io.mockk.Runs
+import io.mockk.coEvery
+import io.mockk.coVerify
+import io.mockk.every
+import io.mockk.just
+import io.mockk.mockk
 import kotlinx.coroutines.ExperimentalCoroutinesApi
-import kotlinx.coroutines.flow.*
+import kotlinx.coroutines.flow.first
+import kotlinx.coroutines.flow.flow
+import kotlinx.coroutines.flow.flowOf
 import kotlinx.coroutines.test.StandardTestDispatcher
 import kotlinx.coroutines.test.advanceUntilIdle
 import kotlinx.coroutines.test.runTest

sample-compose/buildSrc/src/main/java/Versions.kt

@@ -6,7 +6,7 @@ object Versions {
     const val ANDROID_TARGET_SDK_VERSION = 33
 
     const val ANDROID_VERSION_CODE = 1
-    const val ANDROID_VERSION_NAME = "3.25.0"
+    const val ANDROID_VERSION_NAME = "3.26.0"
 
     // Dependencies (Alphabet sorted)
     const val ACCOMPANIST_PERMISSIONS_VERSION = "0.30.1"

sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/extensions/ResponseMapping.kt

@@ -1,8 +1,8 @@
 package co.nimblehq.sample.compose.data.extensions
 
-import co.nimblehq.sample.compose.data.response.ErrorResponse
-import co.nimblehq.sample.compose.data.response.toModel
-import co.nimblehq.sample.compose.data.service.providers.MoshiBuilderProvider
+import co.nimblehq.sample.compose.data.remote.models.responses.ErrorResponse
+import co.nimblehq.sample.compose.data.remote.models.responses.toModel
+import co.nimblehq.sample.compose.data.remote.providers.MoshiBuilderProvider
 import co.nimblehq.sample.compose.domain.exceptions.ApiException
 import co.nimblehq.sample.compose.domain.exceptions.NoConnectivityException
 import com.squareup.moshi.JsonDataException

sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/storage/BaseSharedPreferences.kt → sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/BaseSharedPreferences.kt

@@ -1,4 +1,4 @@
-package co.nimblehq.sample.compose.data.storage
+package co.nimblehq.sample.compose.data.local.preferences
 
 import android.content.SharedPreferences
 

template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/EncryptedSharedPreferences.kt → sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/EncryptedSharedPreferences.kt

@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.storages
+package co.nimblehq.sample.compose.data.local.preferences
 
 import android.content.Context
 import androidx.security.crypto.EncryptedSharedPreferences

template-compose/data/src/main/java/co/nimblehq/template/compose/data/storages/SharedPreferencesExt.kt → sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/local/preferences/SharedPreferencesExt.kt

@@ -1,4 +1,4 @@
-package co.nimblehq.template.compose.data.storages
+package co.nimblehq.sample.compose.data.local.preferences
 
 import android.content.SharedPreferences
 

sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/response/ErrorResponse.kt → sample-compose/data/src/main/java/co/nimblehq/sample/compose/data/remote/models/responses/ErrorResponse.kt

@@ -1,6 +1,6 @@
-package co.nimblehq.sample.compose.data.response
+package co.nimblehq.sample.compose.data.remote.models.responses
 
-import co.nimblehq.sample.compose.domain.model.Error
+import co.nimblehq.sample.compose.domain.models.Error
 import com.squareup.moshi.Json
 
 data class ErrorResponse(