Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Multimodule #3

Open
wants to merge 37 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
37 commits
Select commit Hold shift + click to select a range
f186117
add application compose convention plugin.
OkelloSam21 Jan 29, 2025
3d9b4e4
Add Android Application Convention Plugin
OkelloSam21 Jan 29, 2025
dec5254
configure android compose
OkelloSam21 Jan 29, 2025
6baf528
Add AndroidLibraryComposeConventionPlugin to support compose in libra…
OkelloSam21 Jan 29, 2025
416a7f3
Introduce AndroidLibraryConventionPlugin for library modules
OkelloSam21 Jan 29, 2025
ca27732
Add app configurations to build logic convention
OkelloSam21 Jan 29, 2025
9171c1c
configure base Kotlin with Android options
OkelloSam21 Jan 29, 2025
7f01d0d
feat: Add settings.gradle.kts in build-logic
OkelloSam21 Jan 29, 2025
d66fa78
setup multi-module project structure with core dependencies
OkelloSam21 Jan 29, 2025
bb236d9
Implement Network module for API interactions
OkelloSam21 Feb 3, 2025
fa0d508
refactor: Use 'com.android.convention.application' plugin in AndroidA…
OkelloSam21 Feb 3, 2025
20b64a7
Relocate `AuthApiService` and `LoginResponse`
OkelloSam21 Feb 3, 2025
a4db0c3
Introduce convention plugins for Kotlin, Hilt, KSP, Kotlinx Serializa…
OkelloSam21 Feb 4, 2025
e3fe943
feat: Update and add new dependencies in `libs.versions.toml`
OkelloSam21 Feb 4, 2025
c0999f0
feat: Setup core module with DataStore and utility classes
OkelloSam21 Feb 8, 2025
f64965f
refactor: Migrate Room database to a separate module
OkelloSam21 Feb 8, 2025
b5d6bb8
feat: Introduce data storage with Room and DataStore
OkelloSam21 Feb 10, 2025
972cecc
Introduce Room Database Convention Plugin
OkelloSam21 Feb 10, 2025
e8f30f4
Introduce Room Database Convention Plugin
OkelloSam21 Feb 10, 2025
73cdd1b
refactor: Move Room database to `local` module and update related cla…
OkelloSam21 Feb 13, 2025
9303693
Migrate Network Components and Remove Unused Files
OkelloSam21 Feb 13, 2025
a64016f
Migrate Cart-related classes and screens to core module
OkelloSam21 Feb 13, 2025
0e6541b
Update dependencies and plugins, introduce new conventions
OkelloSam21 Feb 22, 2025
bb3c311
feat: auth
OkelloSam21 Feb 23, 2025
60012d9
feat: common-ui
OkelloSam21 Feb 25, 2025
a5ed23e
bottom navigation
OkelloSam21 Feb 25, 2025
f06870a
feat: home
OkelloSam21 Feb 25, 2025
ea80a20
feat:Order
OkelloSam21 Feb 25, 2025
4f4239b
feat:core
OkelloSam21 Feb 25, 2025
420a505
data layer
OkelloSam21 Feb 25, 2025
b383e65
core
OkelloSam21 Feb 25, 2025
7ae7b7b
bottom navigation
OkelloSam21 Feb 25, 2025
9c7d641
auth
OkelloSam21 Feb 25, 2025
49c71d3
feat: search
OkelloSam21 Feb 25, 2025
c3c894d
feat: search
OkelloSam21 Feb 25, 2025
daccfde
app
OkelloSam21 Feb 25, 2025
73cc403
app
OkelloSam21 Feb 25, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/deploymentTargetSelector.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

31 changes: 31 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion .idea/kotlinc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions .idea/ktlint-plugin.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

17 changes: 17 additions & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/studiobot.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

90 changes: 20 additions & 70 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
@@ -1,58 +1,34 @@
plugins {
alias(libs.plugins.android.application)
alias(libs.plugins.kotlin.android)
id("org.jetbrains.kotlin.plugin.serialization") version "1.9.10"
id("com.google.devtools.ksp")
id("com.android.convention.application")
id("com.android.convention.application.compose")
id("com.samuelokello.convention.hilt")
alias(libs.plugins.compose.compiler)
}

android {
namespace = "com.samuelokello.shopspot"
compileSdk = 35

defaultConfig {
applicationId = "com.samuelokello.shopspot"
minSdk = 25
targetSdk = 35
versionCode = 1
versionName = "1.0"

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables {
useSupportLibrary = true
}
}

buildTypes {
release {
isMinifyEnabled = 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"
}
buildFeatures {
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.1"
}
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
}
}
}

dependencies {

implementation(project(":common-ui"))
implementation(project(":core"))
implementation(project(":domain"))
implementation(project(":sources:network"))
implementation(project(":feature:auth"))
implementation(project(":feature:bottom-navigation"))
implementation(project(":feature:cart"))
implementation(project(":feature:home"))
implementation(project(":feature:order"))
implementation(project(":feature:products"))
implementation(project(":feature:profile"))
implementation(project(":feature:search"))
implementation(project(":feature:wishlist"))

implementation(libs.androidx.core.ktx)
implementation(libs.androidx.lifecycle.runtime.ktx)
implementation(libs.androidx.activity.compose)
Expand All @@ -63,7 +39,7 @@ dependencies {
implementation(libs.androidx.material3)
implementation(libs.androidx.junit.ktx)
implementation(libs.androidx.compose.material)
implementation("androidx.datastore:datastore-preferences:1.0.0")
implementation(libs.androidx.room.ktx)
testImplementation(libs.junit)
androidTestImplementation(libs.androidx.junit)
androidTestImplementation(libs.androidx.espresso.core)
Expand All @@ -73,32 +49,6 @@ dependencies {
debugImplementation(libs.androidx.ui.test.manifest)
implementation(libs.androidx.navigation.compose)

//extended icons
implementation(libs.androidx.material.icons.extended.android)

// GSON
implementation(libs.converter.gson)

// Kotlin serialization
implementation(libs.kotlinx.serialization.json)

implementation(libs.androidx.lifecycle.viewmodel.compose)

// retrofit
implementation(libs.retrofit)

/// Retrofit with Kotlin serialization Converter
implementation(libs.retrofit2.kotlinx.serialization.converter)
implementation(libs.okhttp)

// coil
implementation(libs.coil.compose)

testImplementation(libs.junit)
testImplementation(libs.kotlinx.coroutines.test)

//Room
implementation(libs.androidx.room.runtime)
ksp(libs.androidx.room.compiler)
implementation(libs.androidx.room.ktx)
}
}
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package com.samuelokello.shopspot.data

import com.samuelokello.shopspot.data.network.product.dto.ProductDto
import com.samuelokello.shopspot.data.network.product.ProductApiService

class FakeProductApiService: ProductApiService {
override suspend fun getProducts(): List<ProductDto> {
return FakeDataSource.productApiList
}

override suspend fun getCategories(): List<String> {
TODO("Not yet implemented")
}

}
// package com.samuelokello.shopspot.data
//
// import com.samuelokello.shopspot.data.network.product.dto.ProductDto
// import com.samuelokello.shopspot.data.network.product.ProductApiService
//
// class FakeProductApiService: ProductApiService {
// override suspend fun getProducts(): List<ProductDto> {
// return FakeDataSource.productApiList
// }
//
// override suspend fun getCategories(): List<String> {
// TODO("Not yet implemented")
// }
//
// }
Loading