Skip to content
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
15 changes: 12 additions & 3 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools">



<application
android:allowBackup="true"
android:dataExtractionRules="@xml/data_extraction_rules"
Expand All @@ -22,13 +20,24 @@
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

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

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

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

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



</application>

</manifest>
42 changes: 42 additions & 0 deletions app/src/main/java/com/example/myapplication/LockerFragment.kt
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.example.myapplication

import android.content.Intent
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.appcompat.app.AppCompatActivity
import androidx.fragment.app.Fragment
import com.example.myapplication.databinding.FragmentLockerBinding
import com.google.android.material.tabs.TabLayoutMediator
Expand All @@ -27,8 +29,48 @@ class LockerFragment : Fragment() {
tab.text = information[position]
}.attach()

binding.lockerLoginTv.setOnClickListener {
startActivity(Intent(activity, LoginActivity::class.java))
}



return binding.root
}

override fun onStart() {
super.onStart()
initViews()
}

private fun getJwt():Int{
val spf = activity?.getSharedPreferences("auth", AppCompatActivity.MODE_PRIVATE)
return spf!!.getInt("jwt", 0)
}

private fun initViews() {
val jwt: Int = getJwt()
if (jwt == 0) {
binding.lockerLoginTv.text = "로그인"
binding.lockerLoginTv.setOnClickListener {
startActivity(Intent(activity, LoginActivity::class.java))
}
}
else {
binding.lockerLoginTv.text = "로그아웃"
binding.lockerLoginTv.setOnClickListener {
logout()
startActivity(Intent(activity, MainActivity::class.java))
}
}
}

private fun logout() {
val spf = activity?.getSharedPreferences("auth",AppCompatActivity.MODE_PRIVATE)
val editor = spf!!.edit()
editor.remove("jwt")
editor.apply()
}


}
67 changes: 67 additions & 0 deletions app/src/main/java/com/example/myapplication/LoginActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
package com.example.myapplication

import android.content.Intent
import android.os.Bundle
import android.util.Log
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import com.example.flo.SongDatabase
import com.example.myapplication.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)

user.let {
Log.d("LOGIN_ACT/GET_USER", "userId: ${user!!.id}, $user")
saveJwt(user!!.id)
startMainActivity()
}
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()
}


}
54 changes: 54 additions & 0 deletions app/src/main/java/com/example/myapplication/SignUpActivity.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
package com.example.myapplication

import android.os.Bundle
import android.util.Log
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import com.example.flo.SongDatabase
import com.example.myapplication.databinding.ActivitySignUpBinding

class SignUpActivity : AppCompatActivity() {

lateinit var binding: ActivitySignUpBinding

override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
binding = ActivitySignUpBinding.inflate(layoutInflater)
setContentView(binding.root)

binding.signUpSignUpBtn.setOnClickListener {
val signUpCompletion = signUp()
if(signUpCompletion) {
finish()
}
}

}

private fun getUser() : User {
val email : String = binding.signUpIdEt.text.toString() + "@" + binding.signUpDirectInputEt.text.toString()
val pwd : String = binding.signUpPasswordEt.text.toString()
return User(email, pwd)
}

private fun signUp() : Boolean {
if(binding.signUpIdEt.text.toString().isEmpty() || binding.signUpDirectInputEt.text.toString().isEmpty()) {
Toast.makeText(this, "이메일 형식이 잘못되었습니다.", Toast.LENGTH_SHORT).show()
return false
}

if(binding.signUpPasswordEt.text.toString() != binding.signUpPasswordCheckEt.text.toString()) {
Toast.makeText(this, "비밀번호가 일치하지 않습니다.", Toast.LENGTH_SHORT).show()
return false
}

val userDB = SongDatabase.getInstance(this)!!
userDB.UserDao().insert(getUser())

val user = userDB.UserDao().getUsers()
Log.d("sign up", user.toString())

Toast.makeText(this, "회원가입이 완료되었습니다.", Toast.LENGTH_SHORT).show()
return true
}
}
5 changes: 4 additions & 1 deletion app/src/main/java/com/example/myapplication/SongDatabase.kt
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ import androidx.room.RoomDatabase
import com.example.myapplication.Album
//import com.example.myapplication.AlbumDao
import com.example.myapplication.Song
import com.example.myapplication.User
import com.example.myapplication.UserDao


/*
Expand Down Expand Up @@ -36,10 +38,11 @@ abstract class SongDatabase: RoomDatabase() {
*/

//@Database(entities = [Song::class, Album::class], version = 1)
@Database(entities = [Song::class], version = 1)
@Database(entities = [Song::class, User::class], version = 1)
abstract class SongDatabase: RoomDatabase() {
abstract fun songDao(): SongDao
//abstract fun albumDao(): AlbumDao
abstract fun UserDao(): UserDao

companion object {
private var instance: SongDatabase? = null
Expand Down
12 changes: 12 additions & 0 deletions app/src/main/java/com/example/myapplication/User.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
package com.example.myapplication

import androidx.room.Entity
import androidx.room.PrimaryKey

@Entity(tableName = "UserTable")
data class User(
var email : String,
var password : String
) {
@PrimaryKey(autoGenerate = true) var id : Int = 0
}
15 changes: 15 additions & 0 deletions app/src/main/java/com/example/myapplication/UserDao.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.example.myapplication

import androidx.room.Dao
import androidx.room.Insert
import androidx.room.Query

@Dao
interface UserDao {
@Insert
fun insert(user : User)
@Query("select * from UserTable")
fun getUsers() : List<User>
@Query("select * from UserTable where email =:email and password = :password")
fun getUser(email : String, password : String) : User?
}
Loading