diff --git a/UMC_6th/app/build.gradle.kts b/UMC_6th/app/build.gradle.kts index 5868840..5882167 100644 --- a/UMC_6th/app/build.gradle.kts +++ b/UMC_6th/app/build.gradle.kts @@ -38,6 +38,12 @@ android { kotlinOptions { jvmTarget = "1.8" } +// repositories { +// google() +// mavenCentral() +// maven { url = uri("https://devrepo.kakao.com/nexus/content/groups/public/") } +// } + } dependencies { @@ -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") } \ No newline at end of file diff --git a/UMC_6th/app/src/main/AndroidManifest.xml b/UMC_6th/app/src/main/AndroidManifest.xml index e996aa9..314e0ad 100644 --- a/UMC_6th/app/src/main/AndroidManifest.xml +++ b/UMC_6th/app/src/main/AndroidManifest.xml @@ -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"> + - - + + @@ -34,8 +36,23 @@ + + + + + + + + + + + diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/GlobalApplication.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/GlobalApplication.kt new file mode 100644 index 0000000..fa6d646 --- /dev/null +++ b/UMC_6th/app/src/main/java/com/example/umc_6th/GlobalApplication.kt @@ -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") + } +} \ No newline at end of file diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt deleted file mode 100644 index 8052100..0000000 --- a/UMC_6th/app/src/main/java/com/example/umc_6th/LoginActivity.kt +++ /dev/null @@ -1,65 +0,0 @@ -package com.example.umc_6th - -import android.content.Intent -import android.os.Bundle -import android.util.Log -import android.widget.Toast -import androidx.appcompat.app.AppCompatActivity -import com.example.umc_6th.databinding.ActivityLoginBinding - -class LoginActivity:AppCompatActivity() { - - lateinit var binding : ActivityLoginBinding - - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - binding = ActivityLoginBinding.inflate(layoutInflater) - setContentView(binding.root) - - binding.loginSignUpTv.setOnClickListener { - startActivity(Intent(this, SignUpActivity::class.java)) - } - binding.loginSignInBtn.setOnClickListener{ - login() - } - } - - private fun login() { - if (binding.loginIdEt.text.toString().isEmpty() || binding.loginDirectInputEt.text.toString().isEmpty()) { - Toast.makeText(this, "이메일을 입력해주세요", Toast.LENGTH_SHORT).show() - return - } - - if (binding.loginPasswordEt.text.toString().isEmpty()) { - Toast.makeText(this, "비밀번호를 입력해주세요", Toast.LENGTH_SHORT).show() - return - } - - val email : String = binding.loginIdEt.text.toString() + "@" + binding.loginDirectInputEt.text.toString() - val pwd : String = binding.loginPasswordEt.text.toString() - - val songDB = SongDatabase.getInstance(this)!! - val user = songDB.userDao().getUser(email, pwd) - - if (user != null) { - Log.d("LoginActivity", user.id.toString()) - saveJwt(user.id) - startMainActivity() - } else { - Toast.makeText(this, "회원 정보가 존재하지 않습니다", Toast.LENGTH_SHORT).show() - } - } - - private fun startMainActivity() { - val intent = Intent(this, MainActivity::class.java) - startActivity(intent) - } - private fun saveJwt(jwt: Int) { - val spf = getSharedPreferences("auth", MODE_PRIVATE) - val editor = spf.edit() - - editor.putInt("jwt", jwt) - editor.apply() - } - -} \ No newline at end of file diff --git a/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt b/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt deleted file mode 100644 index 4e86200..0000000 --- a/UMC_6th/app/src/main/java/com/example/umc_6th/LookFragment.kt +++ /dev/null @@ -1,114 +0,0 @@ -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import android.widget.Button -import android.widget.ScrollView -import android.widget.TextView -import androidx.fragment.app.Fragment -import androidx.recyclerview.widget.LinearLayoutManager -import com.example.umc_6th.LockerAlbumRVAdapter -import com.example.umc_6th.R -import com.example.umc_6th.Song -import com.example.umc_6th.SongDatabase -import com.example.umc_6th.databinding.FragmentLookBinding - -class LookFragment : Fragment() { - - lateinit var binding: FragmentLookBinding - private lateinit var songDB: SongDatabase - - private lateinit var chartBtn : Button - private lateinit var videoBtn : Button - private lateinit var genreBtn : Button - private lateinit var situationBtn : Button - private lateinit var audioBtn : Button - private lateinit var atmosphereBtn : Button - - private lateinit var buttonList: List