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

[Simba/#47] feat :: 10주차 구현 #50

Open
wants to merge 4 commits into
base: simba/main
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
23 changes: 23 additions & 0 deletions UMC_6th/app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,12 @@ android {
kotlinOptions {
jvmTarget = "1.8"
}
// repositories {
// google()
// mavenCentral()
// maven { url = uri("https://devrepo.kakao.com/nexus/content/groups/public/") }
// }

}

dependencies {
Expand All @@ -56,6 +62,23 @@ dependencies {
implementation("androidx.room:room-runtime:2.6.0")
kapt("androidx.room:room-compiler:2.6.0")

// Retrofit
implementation("com.squareup.retrofit2:retrofit:2.9.0")
implementation("com.squareup.retrofit2:converter-gson:2.9.0")
implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2")
implementation("com.squareup.retrofit2:adapter-rxjava2:2.9.0")

// okHttp
implementation("com.squareup.okhttp3:okhttp:4.9.0")
implementation("com.squareup.okhttp3:logging-interceptor:4.9.0")

// Glide
implementation("com.github.bumptech.glide:glide:4.12.0")
annotationProcessor("com.github.bumptech.glide:compiler:4.12.0")

androidTestImplementation("androidx.test.ext:junit:1.1.5")
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1")

//kakao login
implementation("com.kakao.sdk:v2-user:2.10.0")
}
29 changes: 23 additions & 6 deletions UMC_6th/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,19 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/Theme.UMC_6th"
tools:targetApi="31">
tools:targetApi="31"
android:name=".GlobalApplication">

<service
android:name=".ForegroundService"
android:name=".service.ForegroundService"
android:enabled="true"
android:exported="true"></service>

<activity android:name=".SignUpActivity"/>
<activity android:name=".LoginActivity"/>
<activity android:name=".activity.SignUpActivity"/>
<activity android:name=".activity.LoginActivity"/>

<activity
android:name=".MainActivity"
android:name=".activity.MainActivity"
android:exported="true"
android:theme="@style/SplashTheme">
<intent-filter>
Expand All @@ -34,8 +36,23 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>

<!--카카오 로그인 구현-->
<activity
android:name="com.kakao.sdk.auth.AuthCodeHandlerActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
<category android:name="android.intent.category.DEFAULT" />
<category android:name="android.intent.category.BROWSABLE" />
<data
android:host="oauth"
android:scheme="kakaodb0a6ee868ee324207d083d8d5de7fcd" />
</intent-filter>
</activity>

<activity
android:name=".SongActivity"
android:name=".activity.SongActivity"
android:exported="true" />
</application>

Expand Down
12 changes: 12 additions & 0 deletions UMC_6th/app/src/main/java/com/example/umc_6th/GlobalApplication.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.example.umc_6th

import android.app.Application
import com.kakao.sdk.common.KakaoSdk

class GlobalApplication : Application() {
override fun onCreate() {
super.onCreate()

KakaoSdk.init(this, "db0a6ee868ee324207d083d8d5de7fcd")
}
}
65 changes: 0 additions & 65 deletions UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt

This file was deleted.

114 changes: 0 additions & 114 deletions UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt

This file was deleted.

12 changes: 0 additions & 12 deletions UMC_6th/app/src/main/java/com/example/umc_6th/User.kt

This file was deleted.

Loading