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

디자인 시스템 추가 및 메인 지도 화면 구현 #3

Open
wants to merge 14 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
117 changes: 117 additions & 0 deletions .idea/codeStyles/Project.xml

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

5 changes: 5 additions & 0 deletions .idea/codeStyles/codeStyleConfig.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/gradle.xml

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

14 changes: 14 additions & 0 deletions .idea/misc.xml

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

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

This file was deleted.

70 changes: 61 additions & 9 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,10 @@ plugins {
id 'com.google.secrets_gradle_plugin' version '0.6'
}

apply plugin: "androidx.navigation.safeargs.kotlin"
apply plugin: "io.gitlab.arturbosch.detekt"
apply plugin: 'dagger.hilt.android.plugin'
apply plugin: "dagger.hilt.android.plugin"
apply plugin: "kotlin-kapt"

android {
compileSdkVersion 30
Expand Down Expand Up @@ -39,6 +41,10 @@ android {
proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
}
}
buildFeatures {
dataBinding true
viewBinding true
}
compileOptions {
sourceCompatibility JavaVersion.VERSION_1_8
targetCompatibility JavaVersion.VERSION_1_8
Expand Down Expand Up @@ -72,9 +78,9 @@ android {

dependencies {

implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.32"
implementation 'androidx.core:core-ktx:1.3.2'
implementation 'androidx.appcompat:appcompat:1.2.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.5.10"
implementation 'androidx.core:core-ktx:1.5.0'
implementation 'androidx.appcompat:appcompat:1.3.0'
implementation 'com.google.android.material:material:1.3.0'
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'

Expand All @@ -84,19 +90,20 @@ dependencies {
// instrumentation test
androidTestImplementation 'androidx.test.ext:junit:1.1.2'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
androidTestImplementation 'com.google.dagger:hilt-android-testing:2.31.2-alpha'
androidTestImplementation 'com.google.dagger:hilt-android-testing:2.36'
// androidx test
androidTestImplementation "androidx.arch.core:core-testing:2.1.0"
// fluent assertions for Java and Android
androidTestImplementation "com.google.truth:truth:1.1"


// Detekt
detektPlugins "io.gitlab.arturbosch.detekt:detekt-formatting:1.16.0"
// Memory leak detection
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'

// coroutines
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.3'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-android:1.4.3'
// coroutine test
androidTestImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.3"
Expand All @@ -110,10 +117,52 @@ dependencies {
testImplementation "androidx.room:room-testing:2.3.0"

// dagger hilt
implementation "com.google.dagger:hilt-android:2.31.2-alpha"
kapt "com.google.dagger:hilt-android-compiler:2.31.2-alpha"
implementation 'androidx.hilt:hilt-lifecycle-viewmodel:1.0.0-alpha03'
implementation "com.google.dagger:hilt-android:2.36"
kapt "com.google.dagger:hilt-android-compiler:2.36"
// dagger-hilt test
kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.31.2-alpha'
kaptAndroidTest 'com.google.dagger:hilt-android-compiler:2.36'

// google map
implementation 'com.google.android.gms:play-services-maps:17.0.1'
implementation 'com.google.android.gms:play-services-location:18.0.0'
implementation 'com.google.android.libraries.places:places:2.4.0'
// google map kotlin extensions
implementation 'com.google.maps.android:maps-ktx:2.3.0'
implementation 'com.google.maps.android:maps-utils-ktx:2.3.0'

// fragment-ktx
implementation "androidx.fragment:fragment-ktx:1.3.5"
// Kotlin
implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
implementation "androidx.navigation:navigation-ui-ktx:$nav_version"

// Feature module Support
implementation "androidx.navigation:navigation-dynamic-features-fragment:$nav_version"

// Testing Navigation
androidTestImplementation "androidx.navigation:navigation-testing:$nav_version"

// debug
implementation "com.jakewharton.timber:timber:4.7.1"

// recycler view
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

// Lifecycle + ViewModel & LiveData
def lifecycle_version = "2.3.1"
implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:$lifecycle_version"
implementation "androidx.lifecycle:lifecycle-common-java8:$lifecycle_version"

// DataStore
implementation "androidx.datastore:datastore-preferences:1.0.0-beta02"
implementation "androidx.datastore:datastore-core:1.0.0-beta02"
}

kapt {
correctErrorTypes true
}

// detekt
Expand Down Expand Up @@ -208,6 +257,9 @@ configurations {
ktlint
}
dependencies {
implementation 'androidx.recyclerview:recyclerview:1.2.1'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
// ktlint
ktlint "com.pinterest:ktlint:0.41.0"
}
task ktlint(type: JavaExec, group: "verification") {
Expand Down
Loading