[#13] 뱃지가 달린 Round Image View 추가

- Style Package 논의 내용 적용 및 Resolve Conflict
MoyeoRun · Apr 15, 2022 · d5e2855 · d5e2855
1 parent 9705d3b
commit d5e2855
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,16 +1,18 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
+    id 'kotlin-kapt'
     id 'com.google.gms.google-services'
     id 'com.google.firebase.crashlytics'
+    id 'dagger.hilt.android.plugin'
 }
 
 android {
     compileSdk 32
 
     defaultConfig {
         applicationId "com.moyerun.moyeorun_android"
-        minSdk 21
+        minSdk 26
         targetSdk 32
         versionCode 1
         versionName "1.0"
@@ -79,6 +81,10 @@ dependencies {
     implementation 'com.google.firebase:firebase-analytics-ktx'
     implementation 'com.google.firebase:firebase-crashlytics-ktx'
 
+    // Hilt
+    implementation "com.google.dagger:hilt-android:$hilt_version"
+    kapt "com.google.dagger:hilt-android-compiler:$hilt_version"
+
     // Glide
     implementation "com.github.bumptech.glide:glide:$glide_version"
     annotationProcessor "com.github.bumptech.glide:compiler:$glide_version"

diff --git a/app/src/main/res/values/styles_views.xml → app/src/main/res/values/styles_imageview.xml b/app/src/main/res/values/styles_views.xml → app/src/main/res/values/styles_imageview.xml