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

Migrate to Compose UI #38

Merged
merged 12 commits into from
Jan 7, 2024
Merged
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,4 @@
.externalNativeBuild
.cxx
local.properties
keystore.properties
7 changes: 5 additions & 2 deletions .idea/deploymentTargetDropDown.xml

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

1 change: 0 additions & 1 deletion .idea/gradle.xml

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

41 changes: 41 additions & 0 deletions .idea/inspectionProfiles/Project_Default.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.

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

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

55 changes: 47 additions & 8 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import java.util.Properties
plugins {
id("com.android.application")
id("org.jetbrains.kotlin.android")
id("com.google.gms.google-services")
id("kotlin-android")
id("kotlin-parcelize")
id("androidx.navigation.safeargs.kotlin")
Expand All @@ -13,17 +14,20 @@ plugins {
}

android {
namespace = "dev.baharudin.themoviedb"
namespace = "dev.baharudin.tmdb_android"
compileSdk = 34

defaultConfig {
applicationId = "dev.baharudin.themoviedb"
minSdk = 31
applicationId = "dev.baharudin.tmdb_android"
minSdk = 30
targetSdk = 34
versionCode = 2
versionName = "1.1.1"
versionCode = 3
versionName = "1.2.0"

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

signingConfigs {
Expand Down Expand Up @@ -73,8 +77,16 @@ android {
}
buildFeatures {
viewBinding = true
compose = true
}
composeOptions {
kotlinCompilerExtensionVersion = "1.5.3"
}
packaging {
resources {
excludes += "/META-INF/{AL2.0,LGPL2.1}"
}
}
dynamicFeatures += setOf(":favorite")

applicationVariants.all {
val variant = this
Expand All @@ -101,17 +113,44 @@ android {

dependencies {
implementation(project(":core"))
implementation("com.google.firebase:firebase-firestore:24.10.0")
implementation("com.google.firebase:firebase-storage:20.3.0")
implementation("com.google.firebase:firebase-auth:22.3.0")
implementation("androidx.lifecycle:lifecycle-runtime-ktx:2.6.2")
implementation("androidx.activity:activity-compose:1.8.2")
implementation(platform("androidx.compose:compose-bom:2023.08.00"))
implementation("androidx.compose.ui:ui")
implementation("androidx.compose.ui:ui-graphics")
implementation("androidx.compose.ui:ui-tooling-preview")
implementation("androidx.compose.material3:material3")
androidTestImplementation(platform("androidx.compose:compose-bom:2023.08.00"))
androidTestImplementation("androidx.compose.ui:ui-test-junit4")

// UI
applyBasicUiDependencies()
applyPagingDependencies()
applyComposeUiDependencies()

applyBasicFunctionDependencies()
applyBasicUiDependencies()


applyNetworkDependencies()
applyCoroutinesDependencies()
applyLifecycleDependencies()
applyHiltDependencies()
applyPagingDependencies()
applyLocalDbDependencies()
applyGlideDependencies()

// Specific dependencies
debugImplementation("com.squareup.leakcanary:leakcanary-android:2.12")



// Firebase BoM
implementation(platform("com.google.firebase:firebase-bom:32.7.0"))
// TODO: Add the dependencies for Firebase products you want to use
implementation("com.google.firebase:firebase-analytics")
debugImplementation("androidx.compose.ui:ui-tooling")
debugImplementation("androidx.compose.ui:ui-test-manifest")

}
55 changes: 55 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"project_info": {
"project_number": "697027570570",
"project_id": "portfolio-tmdb",
"storage_bucket": "portfolio-tmdb.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:697027570570:android:1d12b6a45f84f9ba507673",
"android_client_info": {
"package_name": "dev.baharudin.tmdb_android"
}
},
"oauth_client": [
{
"client_id": "697027570570-al2riun7ibj7mhc9uegvtsupludqghjn.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "dev.baharudin.tmdb_android",
"certificate_hash": "bff8348fecbeb598e7442ddfc80f3a1cfaa2bd3d"
}
},
{
"client_id": "697027570570-r58oe3mmhose5bqm4gfpjbp73pqidkc0.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "dev.baharudin.tmdb_android",
"certificate_hash": "34dbe753098371ab0763edead3686adc2bb256e3"
}
},
{
"client_id": "697027570570-6qt43qg29hmtb965c93rjp825t7ks0ti.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAw0UoG8QDmyaZ_zT07ij_xa5mIkZ0IRoA"
}
],
"services": {
"appinvite_service": {
"other_platform_oauth_client": [
{
"client_id": "697027570570-6qt43qg29hmtb965c93rjp825t7ks0ti.apps.googleusercontent.com",
"client_type": 3
}
]
}
}
}
],
"configuration_version": "1"
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package dev.baharudin.themoviedb
package dev.baharudin.tmdb_android

import androidx.test.platform.app.InstrumentationRegistry
import androidx.test.ext.junit.runners.AndroidJUnit4
Expand Down
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
Expand Down

This file was deleted.

This file was deleted.

Loading