merge :: (#10) MainView-Publishing

app/build.gradle.kts

@@ -9,7 +9,7 @@ android {
 
     defaultConfig {
         applicationId = "com.example.killergram_android_v1"
-        minSdk = 24
+        minSdk = 26
         targetSdk = 34
         versionCode = 1
         versionName = "1.0"

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools" >
+    xmlns:tools="http://schemas.android.com/tools">
 
     <application
         android:allowBackup="true"
@@ -10,10 +10,17 @@
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
+        android:windowSoftInputMode="adjustPan"
         android:theme="@style/Theme.KillerGram_AndroidV1"
-        tools:targetApi="31" >
+        tools:targetApi="31">
         <activity
-            android:name=".feature.enterinfo.EnterSkillsActivity"
+            android:name=".feature.submitlist.SubmitBasketballActivity"
+            android:exported="false" />
+        <activity
+            android:name=".feature.home.HomeActivity"
+            android:exported="false" />
+        <activity
+            android:name=".feature.enterinfo.enterSkill.EnterSkillsActivity"
             android:exported="false" />
         <activity
             android:name=".feature.enterinfo.EnterGenderActivity"
@@ -26,8 +33,7 @@
             android:exported="false" />
         <activity
             android:name=".SplashActivity"
-            android:exported="true"
-            android:windowSoftInputMode="adjustResize" >
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 

app/src/main/java/com/example/killergram_android_v1/SplashActivity.kt

@@ -10,12 +10,18 @@ import com.example.killergram_android_v1.databinding.ActivitySplashBinding
 import com.example.killergram_android_v1.feature.login.LoginActivity
 
 class SplashActivity : AppCompatActivity() {
+    private val binding by lazy {
+        ActivitySplashBinding.inflate(layoutInflater)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        setContentView(R.layout.activity_splash)
+        setContentView(binding.root)
 
         moveToLoginActivity()
+
+
     }
 
     private fun moveToLoginActivity() {

app/src/main/java/com/example/killergram_android_v1/feature/enterinfo/EnterGenderActivity.kt

@@ -1,18 +1,13 @@
 package com.example.killergram_android_v1.feature.enterinfo
 
 import android.content.Intent
-import android.graphics.Color
 import android.os.Bundle
-import android.provider.CalendarContract.Colors
 import android.view.View
-import android.widget.CompoundButton
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.ViewCompat
-import androidx.core.view.WindowInsetsCompat
-import androidx.core.widget.CompoundButtonCompat
 import com.example.killergram_android_v1.R
 import com.example.killergram_android_v1.databinding.ActivityEnterGenderBinding
+import com.example.killergram_android_v1.feature.enterinfo.enterSkill.EnterSkillsActivity
 
 class EnterGenderActivity : AppCompatActivity(), View.OnClickListener {
     private val binding by lazy {
@@ -22,7 +17,7 @@ class EnterGenderActivity : AppCompatActivity(), View.OnClickListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        setContentView(R.layout.activity_enter_gender)
+        setContentView(binding.root)
 
         binding.imgLeftArrow.setOnClickListener(this)
         binding.btnLogin.setOnClickListener(this)

app/src/main/java/com/example/killergram_android_v1/feature/enterinfo/EnterGradeActivity.kt

@@ -16,7 +16,7 @@ class EnterGradeActivity : AppCompatActivity(), View.OnClickListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        setContentView(R.layout.activity_enter_grade)
+        setContentView(binding.root)
 
         binding.btnLogin.setOnClickListener(this)
         binding.imgLeftArrow.setOnClickListener(this)

app/src/main/java/com/example/killergram_android_v1/feature/enterinfo/EnterNameActivity.kt

@@ -3,12 +3,10 @@ package com.example.killergram_android_v1.feature.enterinfo
 import android.content.Intent
 import android.os.Bundle
 import android.view.View
-import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.AppCompatActivity
 import com.example.killergram_android_v1.R
 import com.example.killergram_android_v1.databinding.ActivityEnterNameBinding
-import com.example.killergram_android_v1.feature.signup.InputEmailActivity
 import com.example.killergram_android_v1.feature.signup.SetPasswordActivity
 
 class EnterNameActivity : AppCompatActivity(), View.OnClickListener {
@@ -19,23 +17,23 @@ class EnterNameActivity : AppCompatActivity(), View.OnClickListener {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         enableEdgeToEdge()
-        setContentView(R.layout.activity_enter_name)
+        setContentView(binding.root)
 
         binding.btnLogin.setOnClickListener(this)
         binding.imgLeftArrow.setOnClickListener(this)
     }
 
     override fun onClick(view: View?) {
         val enterNameToEnterGrade = Intent(this, EnterGradeActivity::class.java)
-        //val enterNameTo = Intent(this, InputEmailActivity::class.java)
+        val enterNameToSetPassword = Intent(this, SetPasswordActivity::class.java)
 
 
         when(view?.id) {
             R.id.btn_login -> {
                 startActivity(enterNameToEnterGrade)
             }
             R.id.img_left_arrow -> {
-                Toast.makeText(this, "정보를 입력해주세요!", Toast.LENGTH_LONG)
+                startActivity(enterNameToSetPassword)
             }
         }
     }

app/src/main/java/com/example/killergram_android_v1/feature/enterinfo/enterSkill/EnterSkillsActivity.kt

@@ -0,0 +1,97 @@
+package com.example.killergram_android_v1.feature.enterinfo.enterSkill
+
+import android.content.Intent
+import android.os.Bundle
+import android.view.View
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.content.res.AppCompatResources
+import androidx.lifecycle.ViewModelProvider
+import com.example.killergram_android_v1.R
+import com.example.killergram_android_v1.databinding.ActivityEnterSkillsBinding
+import com.example.killergram_android_v1.feature.enterinfo.EnterGenderActivity
+import com.example.killergram_android_v1.feature.home.HomeActivity
+
+class EnterSkillsActivity : AppCompatActivity(), View.OnClickListener {
+    private val binding by lazy {
+        ActivityEnterSkillsBinding.inflate(layoutInflater)
+    }
+
+    private val enterSkillsViewModel by lazy {
+        ViewModelProvider(this@EnterSkillsActivity)[EnterSkillsViewModel::class.java]
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        enableEdgeToEdge()
+        setContentView(binding.root)
+
+        binding.btnLogin.setOnClickListener(this)
+        binding.imgLeftArrow.setOnClickListener(this)
+
+        binding.btnSkill1.setOnClickListener(this)
+        binding.btnSkill2.setOnClickListener(this)
+        binding.btnSkill3.setOnClickListener(this)
+
+        skillViewClickListener()
+    }
+
+    override fun onClick(view: View?) {
+        val enterNameToHome = Intent(this, HomeActivity::class.java)
+        val enterNameToEnterGender = Intent(this, EnterGenderActivity::class.java)
+
+        when(view?.id) {
+            R.id.btn_login -> {
+                startActivity(enterNameToHome)
+            }
+            R.id.img_left_arrow -> {
+                startActivity(enterNameToEnterGender)
+            }
+            R.id.btn_skill_1 -> {
+                setStateCheck(binding.btnSkill1)
+            }
+            R.id.btn_skill_2 -> {
+                setStateCheck(binding.btnSkill2)
+            }
+            R.id.btn_skill_3 -> {
+                setStateCheck(binding.btnSkill3)
+            }
+        }
+    }
+
+    private fun setStateCheck(view: View?) {
+        when(view?.id) {
+            R.id.btn_skill_1 -> {
+                enterSkillsViewModel.onSelectItem(1)
+            }
+            R.id.btn_skill_2 -> {
+                enterSkillsViewModel.onSelectItem(2)
+            }
+            R.id.btn_skill_3 -> {
+                enterSkillsViewModel.onSelectItem(3)
+            }
+        }
+    }
+
+    private fun skillViewClickListener() {
+        enterSkillsViewModel.buttonState.observe(this@EnterSkillsActivity) {
+            when(it) {
+                1 -> {
+                    binding.btnSkill1.background = AppCompatResources.getDrawable(this, R.drawable.button_selected)
+                    binding.btnSkill2.background = AppCompatResources.getDrawable(this, R.drawable.button_unselected)
+                    binding.btnSkill3.background = AppCompatResources.getDrawable(this, R.drawable.button_unselected)
+                }
+                2 -> {
+                    binding.btnSkill1.background = AppCompatResources.getDrawable(this, R.drawable.button_unselected)
+                    binding.btnSkill2.background = AppCompatResources.getDrawable(this, R.drawable.button_selected)
+                    binding.btnSkill3.background = AppCompatResources.getDrawable(this, R.drawable.button_unselected)
+                }
+                3 -> {
+                    binding.btnSkill1.background = AppCompatResources.getDrawable(this, R.drawable.button_unselected)
+                    binding.btnSkill2.background = AppCompatResources.getDrawable(this, R.drawable.button_unselected)
+                    binding.btnSkill3.background = AppCompatResources.getDrawable(this, R.drawable.button_selected)
+                }
+            }
+        }
+    }
+}

app/src/main/java/com/example/killergram_android_v1/feature/enterinfo/enterSkill/EnterSkillsViewModel.kt

@@ -0,0 +1,14 @@
+package com.example.killergram_android_v1.feature.enterinfo.enterSkill
+
+import androidx.lifecycle.LiveData
+import androidx.lifecycle.MutableLiveData
+import androidx.lifecycle.ViewModel
+
+class EnterSkillsViewModel : ViewModel() {
+    private val _buttonState: MutableLiveData<Int> = MutableLiveData() // setter
+    var buttonState: LiveData<Int> = _buttonState // getter
+
+    fun onSelectItem(selectedButton: Int) {
+        _buttonState.value = selectedButton
+    }
+}