⬆️(Gradle): Upgrade Dependencies

Upgrade dependencies also Readme
EndikaCo · Jan 10, 2024 · 5bd68d5 · 5bd68d5
1 parent 014255d
commit 5bd68d5
Show file tree

Hide file tree

Showing 50 changed files with 220 additions and 186 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,26 @@
+name: Build
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Grant execute permission to Gradle wrapper
+        run: chmod +x ./gradlew
+
+      - name: Build with Gradle
+        uses: gradle/gradle-build-action@v2.6.0
+        with:
+          arguments: build
diff --git a/.github/workflows/testing.yml b/.github/workflows/testing.yml
@@ -0,0 +1,33 @@
+name: Testing
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+permissions:
+  contents: read
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+        with:
+          fetch-depth: 1 # Limit fetch depth to improve performance
+
+      - name: Set up JDK 17
+        uses: actions/setup-java@v3
+        with:
+          java-version: '17'
+          distribution: 'adopt'
+
+      - name: Grant execute permission to Gradle wrapper
+        run: chmod +x ./gradlew
+
+      - name: Unit Test
+        run: ./gradlew testDebugUnitTest
+        continue-on-error: true # Enable error handling and continue on failure
+
+      - name: Android Test Report
+        uses: asadmansr/android-test-report-action@v1.2.0
+        if: ${{ always() }}
diff --git a/README.md b/README.md
@@ -1,15 +1,18 @@
-# My invoice
+My invoice
+=====
+
+[![License](https://img.shields.io/badge/License-MIT-blue.svg)](https://github.com/EndikaCo/app_my_invoice/LICENSE)
+[![CI](https://github.com/EndikaCo/app_my_invoice/actions/workflows/testing.yml/badge.svg)](https://github.com/EndikaCo/app_my_invoice/actions/workflows/testing.yml)
 
 This is a example of a billing app, where you can add customers, items and create invoices.
 Firebase Login is used to authenticate users.
 
-[![Android](https://img.shields.io/badge/Android-grey?style=for-the-badge&logo=android&logoColor=green)](https://www.android.com/)
-[![KOTLIN](https://img.shields.io/badge/Kotlin-grey?style=for-the-badge&logo=Kotlin&logoColor=-5C2D91)](https://kotlinlang.org/)
-[![Compose](https://img.shields.io/badge/Compose-grey?style=for-the-badge&logo=android&logoColor=green)](https://kotlinlang.org/)
-[![MVVM](https://img.shields.io/badge/Arch-MVVM-blue.svg?style=for-the-badge)](https://developer.android.com/jetpack/guide#recommended-app-arch)
-[![MVVM](https://img.shields.io/badge/Arch-MVVM-blue.svg?style=for-the-badge)](https://developer.android.com/jetpack/guide#recommended-app-arch)
+[![Android](https://img.shields.io/badge/Android-grey?style=&logo=android&logoColor=green)](https://www.android.com/)
+[![KOTLIN](https://img.shields.io/badge/Kotlin-grey?style=none&logo=Kotlin&logoColor=-5C2D91)](https://kotlinlang.org/)
+[![Compose](https://img.shields.io/badge/Jetpack_Compose-blue?style=none&logo=)](https://kotlinlang.org/)
+[![Room](https://img.shields.io/badge/Room-grey?style=&logo=)]()
+[![MVVM](https://img.shields.io/badge/MVVM-orange?style=&logo=)]()
+[![State Flow](https://img.shields.io/badge/State_Flow-grey?style=&logo=)]()
 
-|                            |                                    |
-|----------------------------|------------------------------------|
-| ![login](images/login.png) | ![customers](images/customers.png) |
-| ![items](images/items.png) |  |
+| ![login](images/login.png) | ![customers](images/customers.png) | ![customer_info](images/customer_info.png) |
+|----------------------------|------------------------------------|--------------------------------------------|
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -66,7 +66,7 @@ dependencies {
 
     implementation("androidx.core:core-ktx:1.12.0")
     implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
-    implementation("androidx.activity:activity-compose:1.8.1")
+    implementation("androidx.activity:activity-compose:1.8.2")
     implementation(platform("androidx.compose:compose-bom:2023.10.01"))
     implementation("androidx.compose.ui:ui")
     implementation("androidx.compose.ui:ui-graphics")
@@ -80,15 +80,15 @@ dependencies {
     // Optional -- Robolectric environment
     //testImplementation ("androidx.test:core:1.5.0")
     // Mockito framework
-    testImplementation ("org.mockito:mockito-core:3.12.4")
+    testImplementation ("org.mockito:mockito-core:5.4.0")
     // Optional -- mockito-kotlin
     //testImplementation ("org.mockito.kotlin:mockito-kotlin:3.2.0")
     // Optional -- Mockk framework
     testImplementation ("io.mockk:mockk:1.12.0")
 
-    testImplementation("org.junit.jupiter:junit-jupiter:5.8.1")
+    testImplementation("org.junit.jupiter:junit-jupiter:5.9.3")
     testImplementation("junit:junit:4.13.2")
-    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.8.1")
+    testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:5.9.3")
 
     androidTestImplementation("androidx.test.ext:junit:1.1.5")
     androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")
@@ -107,7 +107,7 @@ dependencies {
     implementation("com.google.firebase:firebase-common-ktx:20.4.2")
 
     //navigation
-    implementation("androidx.navigation:navigation-compose:2.7.5")
+    implementation("androidx.navigation:navigation-compose:2.7.6")
 
     //viewModel()
     implementation("androidx.lifecycle:lifecycle-viewmodel-compose:2.6.2")

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,7 +18,7 @@
         android:theme="@style/Theme.MyInvoice"
         tools:targetApi="31">
         <activity
-            android:name=".ui.MainActivity"
+            android:name=".presentation.MainActivity"
             android:exported="true"
             android:theme="@style/Theme.MyInvoice">
             <intent-filter>

diff --git a/...com/endcodev/myinvoice/ui/MainActivity.kt → ...ev/myinvoice/presentation/MainActivity.kt b/...com/endcodev/myinvoice/ui/MainActivity.kt → ...ev/myinvoice/presentation/MainActivity.kt
@@ -1,4 +1,4 @@
-package com.endcodev.myinvoice.ui
+package com.endcodev.myinvoice.presentation
 
 import android.os.Bundle
 import androidx.activity.ComponentActivity
@@ -7,8 +7,8 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Surface
 import androidx.compose.ui.Modifier
-import com.endcodev.myinvoice.ui.navigation.MyInvoiceNav
-import com.endcodev.myinvoice.ui.theme.MyInvoiceTheme
+import com.endcodev.myinvoice.presentation.navigation.MyInvoiceNav
+import com.endcodev.myinvoice.presentation.theme.MyInvoiceTheme
 import dagger.hilt.android.AndroidEntryPoint
 
 @AndroidEntryPoint

diff --git a/.../ui/compose/components/CountrySelector.kt → ...ion/compose/components/CountrySelector.kt b/.../ui/compose/components/CountrySelector.kt → ...ion/compose/components/CountrySelector.kt
@@ -1,4 +1,4 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import android.content.res.Configuration
 import androidx.compose.foundation.background
@@ -22,7 +22,7 @@ import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.endcodev.myinvoice.domain.models.common.allCountriesList
-import com.endcodev.myinvoice.ui.theme.MyInvoiceTheme
+import com.endcodev.myinvoice.presentation.theme.MyInvoiceTheme
 
 @Composable
 fun CountrySelection(modifier: Modifier, onSelection: (String) -> Unit) {

diff --git a/...ice/ui/compose/components/DocSelection.kt → ...tation/compose/components/DocSelection.kt b/...ice/ui/compose/components/DocSelection.kt → ...tation/compose/components/DocSelection.kt
@@ -1,4 +1,4 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import android.content.res.Configuration
 import androidx.compose.foundation.background
@@ -19,7 +19,7 @@ import androidx.compose.ui.Modifier
 import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.endcodev.myinvoice.ui.theme.MyInvoiceTheme
+import com.endcodev.myinvoice.presentation.theme.MyInvoiceTheme
 
 @Composable
 fun DocSelection(onSelection: (String) -> Unit, docs: List<String>) {

diff --git a/.../ui/compose/components/FilteredPainter.kt → ...ion/compose/components/FilteredPainter.kt b/.../ui/compose/components/FilteredPainter.kt → ...ion/compose/components/FilteredPainter.kt
@@ -1,12 +1,10 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import android.net.Uri
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.graphics.ColorFilter
 import androidx.compose.ui.graphics.painter.Painter
-import androidx.compose.ui.res.painterResource
-import com.endcodev.myinvoice.R
 
 data class FilteredImageModel(
     val image: Painter,

diff --git a/...yinvoice/ui/compose/components/Filters.kt → ...resentation/compose/components/Filters.kt b/...yinvoice/ui/compose/components/Filters.kt → ...resentation/compose/components/Filters.kt
@@ -1,4 +1,4 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import androidx.compose.foundation.clickable
 import androidx.compose.foundation.layout.Box

diff --git a/...ui/compose/components/MyAcctionButtons.kt → ...on/compose/components/MyAcctionButtons.kt b/...ui/compose/components/MyAcctionButtons.kt → ...on/compose/components/MyAcctionButtons.kt
@@ -1,7 +1,6 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import android.content.res.Configuration
-import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
@@ -10,16 +9,14 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Check
 import androidx.compose.material.icons.filled.Close
 import androidx.compose.material3.Button
-import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
-import com.endcodev.myinvoice.ui.theme.MyInvoiceTheme
+import com.endcodev.myinvoice.presentation.theme.MyInvoiceTheme
 
 @Composable
 fun MyActionButtons(

diff --git a/...oice/ui/compose/components/MyBottomBar.kt → ...ntation/compose/components/MyBottomBar.kt b/...oice/ui/compose/components/MyBottomBar.kt → ...ntation/compose/components/MyBottomBar.kt
@@ -1,11 +1,10 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.Arrangement
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.size
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
@@ -23,7 +22,7 @@ import androidx.compose.ui.draw.alpha
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.endcodev.myinvoice.ui.theme.MyInvoiceTheme
+import com.endcodev.myinvoice.presentation.theme.MyInvoiceTheme
 
 @Composable
 fun MyBottomBar(

diff --git a/...ice/ui/compose/components/MyDatePicker.kt → ...tation/compose/components/MyDatePicker.kt b/...ice/ui/compose/components/MyDatePicker.kt → ...tation/compose/components/MyDatePicker.kt
@@ -1,4 +1,4 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import android.content.res.Configuration
 import androidx.compose.foundation.layout.wrapContentWidth
@@ -13,7 +13,7 @@ import androidx.compose.material3.rememberDatePickerState
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.tooling.preview.Preview
-import com.endcodev.myinvoice.ui.theme.MyInvoiceTheme
+import com.endcodev.myinvoice.presentation.theme.MyInvoiceTheme
 
 @OptIn(ExperimentalMaterial3Api::class)
 @Composable

diff --git a/...ui/compose/components/MyFloatingButton.kt → ...on/compose/components/MyFloatingButton.kt b/...ui/compose/components/MyFloatingButton.kt → ...on/compose/components/MyFloatingButton.kt
@@ -1,4 +1,4 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import android.content.res.Configuration
 import androidx.compose.foundation.shape.CircleShape
@@ -11,7 +11,7 @@ import androidx.compose.ui.graphics.painter.Painter
 import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.tooling.preview.Preview
 import com.endcodev.myinvoice.R
-import com.endcodev.myinvoice.ui.theme.MyInvoiceTheme
+import com.endcodev.myinvoice.presentation.theme.MyInvoiceTheme
 
 @Composable
 fun MyFloatingButton(

diff --git a/.../ui/compose/components/MyNavigationBar.kt → ...ion/compose/components/MyNavigationBar.kt b/.../ui/compose/components/MyNavigationBar.kt → ...ion/compose/components/MyNavigationBar.kt
@@ -1,4 +1,4 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import android.content.res.Configuration
 import androidx.compose.material.icons.Icons
@@ -18,9 +18,9 @@ import androidx.navigation.NavGraph.Companion.findStartDestination
 import androidx.navigation.NavHostController
 import androidx.navigation.compose.rememberNavController
 import com.endcodev.myinvoice.domain.models.common.NavBarItem
-import com.endcodev.myinvoice.ui.compose.screens.home.ItemBadge
-import com.endcodev.myinvoice.ui.navigation.Routes
-import com.endcodev.myinvoice.ui.theme.MyInvoiceTheme
+import com.endcodev.myinvoice.presentation.compose.screens.home.ItemBadge
+import com.endcodev.myinvoice.presentation.navigation.Routes
+import com.endcodev.myinvoice.presentation.theme.MyInvoiceTheme
 
 @Composable
 fun MyNavigationBar(

diff --git a/...nvoice/ui/compose/components/SearchBar.kt → ...sentation/compose/components/SearchBar.kt b/...nvoice/ui/compose/components/SearchBar.kt → ...sentation/compose/components/SearchBar.kt
@@ -1,4 +1,4 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import android.content.res.Configuration
 import androidx.compose.foundation.clickable
@@ -19,7 +19,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.endcodev.myinvoice.R
-import com.endcodev.myinvoice.ui.theme.MyInvoiceTheme
+import com.endcodev.myinvoice.presentation.theme.MyInvoiceTheme
 
 @Composable
 fun MySearchBar(

diff --git a/...myinvoice/ui/compose/components/UiText.kt → ...presentation/compose/components/UiText.kt b/...myinvoice/ui/compose/components/UiText.kt → ...presentation/compose/components/UiText.kt
@@ -1,4 +1,4 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import android.content.Context
 import androidx.annotation.StringRes

diff --git a/...ice/ui/compose/components/UriToPainter.kt → ...tation/compose/components/UriToPainter.kt b/...ice/ui/compose/components/UriToPainter.kt → ...tation/compose/components/UriToPainter.kt
@@ -1,4 +1,4 @@
-package com.endcodev.myinvoice.ui.compose.components
+package com.endcodev.myinvoice.presentation.compose.components
 
 import android.net.Uri
 import androidx.compose.runtime.Composable

diff --git a/...i/compose/dialogs/CustomerFilterDialog.kt → ...n/compose/dialogs/CustomerFilterDialog.kt b/...i/compose/dialogs/CustomerFilterDialog.kt → ...n/compose/dialogs/CustomerFilterDialog.kt
@@ -1,14 +1,11 @@
-package com.endcodev.myinvoice.ui.compose.dialogs
+package com.endcodev.myinvoice.presentation.compose.dialogs
 
 import androidx.compose.foundation.background
 import androidx.compose.foundation.layout.Column
-import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material3.Card
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Alignment
@@ -22,9 +19,9 @@ import androidx.compose.ui.unit.sp
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import com.endcodev.myinvoice.domain.models.common.FilterModel
-import com.endcodev.myinvoice.ui.compose.components.CountrySelection
-import com.endcodev.myinvoice.ui.compose.components.MyActionButtons
-import com.endcodev.myinvoice.ui.theme.MyInvoiceTheme
+import com.endcodev.myinvoice.presentation.compose.components.CountrySelection
+import com.endcodev.myinvoice.presentation.compose.components.MyActionButtons
+import com.endcodev.myinvoice.presentation.theme.MyInvoiceTheme
 
 @Composable
 fun FiltersDialog(

diff --git a/.../ui/compose/dialogs/CustomerListDialog.kt → ...ion/compose/dialogs/CustomerListDialog.kt b/.../ui/compose/dialogs/CustomerListDialog.kt → ...ion/compose/dialogs/CustomerListDialog.kt
@@ -1,4 +1,4 @@
-package com.endcodev.myinvoice.ui.compose.dialogs
+package com.endcodev.myinvoice.presentation.compose.dialogs
 
 import android.content.res.Configuration
 import androidx.compose.foundation.clickable
@@ -24,10 +24,10 @@ import androidx.hilt.navigation.compose.hiltViewModel
 import com.endcodev.myinvoice.data.database.entities.toDomain
 import com.endcodev.myinvoice.domain.models.customer.Customer
 import com.endcodev.myinvoice.domain.usecases.GetCustomersUseCase
-import com.endcodev.myinvoice.ui.compose.components.MySearchBar
-import com.endcodev.myinvoice.ui.compose.screens.home.content.CustomerItem
-import com.endcodev.myinvoice.ui.theme.MyInvoiceTheme
-import com.endcodev.myinvoice.ui.viewmodels.DialogViewModel
+import com.endcodev.myinvoice.presentation.compose.components.MySearchBar
+import com.endcodev.myinvoice.presentation.compose.screens.home.content.CustomerItem
+import com.endcodev.myinvoice.presentation.theme.MyInvoiceTheme
+import com.endcodev.myinvoice.presentation.viewmodels.DialogViewModel
 
 @Composable
 fun ChooseCustomerDialogActions(