[week7] level1

README.md

@@ -134,3 +134,31 @@
     )
   }
   ```
+
+  ### week4
+
+- 필수 과제  
+- 
+1. 온보딩 화면
+
+|화면1|화면2|화면3|  
+|---|---|---|  
+|<img src="https://user-images.githubusercontent.com/62435316/146689906-c5d17a5d-07a3-4384-8843-ff4e564e29e3.png"/>|<img src="https://user-images.githubusercontent.com/62435316/146689915-f47fc37c-5654-4936-8027-a28b1a7cbf44.png"/>|<img src="https://user-images.githubusercontent.com/62435316/146689924-415e4410-f11f-467b-8699-7295dbb2b2b2.png"/>|  
+
+
+2. 자동로그인
+
+3. 패키징
+
+![image](https://user-images.githubusercontent.com/62435316/146689974-c812a4a1-16b0-4c3e-bdf2-ae423729b09e.png)
+
+패키징 구조
+
+data : 서버 통신의 request, response data 파일들
+di : -
+ui : ui와 관련된 파일들. 화면에 따라 다른 파일에 넣었다.
+  - home
+  - onboard
+  - signin
+  - signup
+util

app/build.gradle

@@ -36,6 +36,16 @@ android {
 }
 
 dependencies {
+    def fragment_version = '1.2.0-rc04'
+    def nav_version = "2.2.0-rc04"
+    implementation "androidx.fragment:fragment-ktx:$fragment_version"
+    implementation "androidx.fragment:fragment-testing:$fragment_version"
+
+    implementation "androidx.navigation:navigation-fragment-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-ui-ktx:$nav_version"
+    implementation "androidx.navigation:navigation-compose:1.0.0-alpha01"
+    implementation "androidx.navigation:navigation-fragment-ktx:2.3.5"
+    implementation "androidx.navigation:navigation-ui-ktx:2.3.5"
     implementation "com.squareup.retrofit2:retrofit:2.9.0"
     implementation "com.squareup.retrofit2:converter-gson:2.9.0"
     implementation "com.google.code.gson:gson:2.8.6"

app/src/main/AndroidManifest.xml

@@ -13,13 +13,13 @@
         android:supportsRtl="true"
         android:theme="@style/Theme.AndroidSemina_week1">
         <activity
-            android:name=".HomeActivity"
+            android:name=".ui.home.HomeActivity"
             android:exported="true" />
         <activity
-            android:name=".SignUpActivity"
+            android:name=".ui.signup.SignUpActivity"
             android:exported="true" />
         <activity
-            android:name=".SignInActivity"
+            android:name=".ui.signin.SignInActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />

app/src/main/java/org/sopt/androidsemina_week1/RepoData.kt → app/src/main/java/org/sopt/androidsemina_week1/data/RepoData.kt

@@ -1,4 +1,4 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.data
 
 data class RepoData(
     val name: String,

app/src/main/java/org/sopt/androidsemina_week1/RequestLoginData.kt → app/src/main/java/org/sopt/androidsemina_week1/data/RequestLoginData.kt

@@ -1,4 +1,4 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.data
 
 import com.google.gson.annotations.SerializedName
 

app/src/main/java/org/sopt/androidsemina_week1/ResponseLoginData.kt → app/src/main/java/org/sopt/androidsemina_week1/data/ResponseLoginData.kt

@@ -1,4 +1,4 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.data
 
 data class ResponseLoginData(
     val status : Int,

app/src/main/java/org/sopt/androidsemina_week1/UserData.kt → app/src/main/java/org/sopt/androidsemina_week1/data/UserData.kt

@@ -1,4 +1,4 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.data
 
 data class UserData(
     val name: String,

app/src/main/java/org/sopt/androidsemina_week1/CameraFragment.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/CameraFragment.kt

@@ -1,10 +1,11 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import org.sopt.androidsemina_week1.R
 
 class CameraFragment : Fragment() {
 

app/src/main/java/org/sopt/androidsemina_week1/FollowerAdapter.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/FollowerAdapter.kt

@@ -1,8 +1,9 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
+import org.sopt.androidsemina_week1.data.UserData
 import org.sopt.androidsemina_week1.databinding.FollowerListBinding
 
 class FollowerAdapter : RecyclerView.Adapter<FollowerAdapter.FollowerViewHolder>() {

app/src/main/java/org/sopt/androidsemina_week1/FollowerListFragment.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/FollowerListFragment.kt

@@ -1,10 +1,11 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import org.sopt.androidsemina_week1.R
 
 class FollowerListFragment : Fragment() {
 

app/src/main/java/org/sopt/androidsemina_week1/FollowingListFragment.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/FollowingListFragment.kt

@@ -1,10 +1,11 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import org.sopt.androidsemina_week1.R
 
 class FollowingListFragment : Fragment() {
 

app/src/main/java/org/sopt/androidsemina_week1/HomeActivity.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/HomeActivity.kt

@@ -1,12 +1,10 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
-import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.widget.Toast
 import androidx.viewpager2.widget.ViewPager2
+import org.sopt.androidsemina_week1.R
 import org.sopt.androidsemina_week1.databinding.ActivitySecondBinding
-import org.sopt.androidsemina_week1.databinding.FragmentFollowerBinding
 
 class HomeActivity : AppCompatActivity() {
     private lateinit var viewPagerAdapter: ViewPagerAdapter
@@ -24,7 +22,7 @@ class HomeActivity : AppCompatActivity() {
     }
 
     private fun initAdapter(){
-        val fragmentList = listOf(ProfileFragment(),HomeFragment(),CameraFragment())
+        val fragmentList = listOf(ProfileFragment(), HomeFragment(), CameraFragment())
 
         viewPagerAdapter = ViewPagerAdapter(this)
         viewPagerAdapter.fragments.addAll(fragmentList)

app/src/main/java/org/sopt/androidsemina_week1/HomeFragment.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/HomeFragment.kt

@@ -1,4 +1,4 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
@@ -7,7 +7,6 @@ import android.view.View
 import android.view.ViewGroup
 import com.google.android.material.tabs.TabLayoutMediator
 import org.sopt.androidsemina_week1.databinding.FragmentHomeBinding
-import org.sopt.androidsemina_week1.databinding.FragmentProfileBinding
 
 class HomeFragment : Fragment() {
     private lateinit var tabViewPagerAdapter : TabViewPagerAdapter

app/src/main/java/org/sopt/androidsemina_week1/ProfileFragment.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/ProfileFragment.kt

@@ -1,10 +1,11 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import org.sopt.androidsemina_week1.R
 import org.sopt.androidsemina_week1.databinding.FragmentProfileBinding
 
 

app/src/main/java/org/sopt/androidsemina_week1/RepositoryAdapter.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/RepositoryAdapter.kt

@@ -1,9 +1,9 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.recyclerview.widget.RecyclerView
-import org.sopt.androidsemina_week1.databinding.FollowerListBinding
+import org.sopt.androidsemina_week1.data.RepoData
 import org.sopt.androidsemina_week1.databinding.RepositoryListBinding
 
 class RepositoryAdapter : RecyclerView.Adapter<RepositoryAdapter.RepositoryViewHolder>() {

app/src/main/java/org/sopt/androidsemina_week1/RepositoryFragment.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/RepositoryFragment.kt

@@ -1,11 +1,11 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import org.sopt.androidsemina_week1.databinding.FragmentFollowerBinding
+import org.sopt.androidsemina_week1.data.RepoData
 import org.sopt.androidsemina_week1.databinding.FragmentRepositoryBinding
 
 private const val ARG_PARAM1 = "param1"

app/src/main/java/org/sopt/androidsemina_week1/SampleService.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/SampleService.kt

@@ -1,5 +1,7 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
+import org.sopt.androidsemina_week1.data.RequestLoginData
+import org.sopt.androidsemina_week1.data.ResponseLoginData
 import retrofit2.Call
 import retrofit2.http.Body
 import retrofit2.http.Headers

app/src/main/java/org/sopt/androidsemina_week1/ServiceCreator.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/ServiceCreator.kt

@@ -1,4 +1,4 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import retrofit2.Retrofit
 import retrofit2.converter.gson.GsonConverterFactory

app/src/main/java/org/sopt/androidsemina_week1/TabViewPagerAdapter.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/TabViewPagerAdapter.kt

@@ -1,4 +1,4 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import androidx.fragment.app.Fragment
 import androidx.viewpager2.adapter.FragmentStateAdapter

app/src/main/java/org/sopt/androidsemina_week1/ui/home/ViewExt.kt

@@ -0,0 +1,13 @@
+package org.sopt.androidsemina_week1.ui.home
+
+import android.content.Context
+import android.widget.Toast
+
+// cotext 확장
+fun Context.shortToast(message : String){
+    Toast.makeText(this, message, Toast.LENGTH_SHORT).show()
+    // 이미 상속받아서 this를 쓸 수 있음.
+
+    // mainActivity에 가서 어떻게 쓰냐...
+    // shortToast("텍스트") 쓰면 됨.
+}

app/src/main/java/org/sopt/androidsemina_week1/ViewPagerAdapter.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/ViewPagerAdapter.kt

@@ -1,4 +1,4 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import android.provider.ContactsContract
 import androidx.fragment.app.Fragment

app/src/main/java/org/sopt/androidsemina_week1/followerFragment.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/home/followerFragment.kt

@@ -1,12 +1,11 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.home
 
 import android.os.Bundle
 import androidx.fragment.app.Fragment
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import org.sopt.androidsemina_week1.databinding.ActivityHomeBinding
-import org.sopt.androidsemina_week1.databinding.ActivitySecondBinding
+import org.sopt.androidsemina_week1.data.UserData
 import org.sopt.androidsemina_week1.databinding.FragmentFollowerBinding
 
 private const val ARG_PARAM1 = "param1"

app/src/main/java/org/sopt/androidsemina_week1/SignInActivity.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/signin/SignInActivity.kt

@@ -1,12 +1,17 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.signin
 
-import android.app.Activity
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.util.Log
 import android.widget.Toast
+import org.sopt.androidsemina_week1.ui.home.HomeActivity
+import org.sopt.androidsemina_week1.ui.home.ServiceCreator
+import org.sopt.androidsemina_week1.data.RequestLoginData
+import org.sopt.androidsemina_week1.data.ResponseLoginData
 import org.sopt.androidsemina_week1.databinding.ActivitySigninBinding
+import org.sopt.androidsemina_week1.ui.home.shortToast
+import org.sopt.androidsemina_week1.ui.signup.SignUpActivity
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response
@@ -24,6 +29,8 @@ class SignInActivity : AppCompatActivity() {
 
         binding.longinBtn.setOnClickListener {
             initNetwork()
+            initAutoLogin()
+            checkAutoLogin()
         }
 
         binding.signupBtn.setOnClickListener {
@@ -34,13 +41,24 @@ class SignInActivity : AppCompatActivity() {
         setContentView(binding.root)
     }
 
+    private fun checkAutoLogin() {
+        shortToast("자동로그인 되었습니다.")
+        startActivity(Intent(this, HomeActivity::class.java))
+        finish()
+    }
+
+    private fun initAutoLogin() {
+        binding.clAutoLogin.setOnClickListener {
+            binding.ivCheck.isSelected = !binding.ivCheck.isSelected
+        }
+    }
+
     private fun initNetwork() {
         val requestLoginData = RequestLoginData(
             binding.idEditText.text.toString(),
             binding.pwEditText.text.toString()
         )
         val call : Call<ResponseLoginData> = ServiceCreator.sampleService.postLogin(requestLoginData)
-
         call.enqueue(object : Callback<ResponseLoginData>{
             override fun onResponse(
                 call: Call<ResponseLoginData>,

app/src/main/java/org/sopt/androidsemina_week1/SignUpActivity.kt → app/src/main/java/org/sopt/androidsemina_week1/ui/signup/SignUpActivity.kt

@@ -1,9 +1,10 @@
-package org.sopt.androidsemina_week1
+package org.sopt.androidsemina_week1.ui.signup
 
 import android.content.Intent
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
 import android.widget.Toast
+import org.sopt.androidsemina_week1.ui.home.HomeActivity
 import org.sopt.androidsemina_week1.databinding.ActivityHomeBinding
 
 class SignUpActivity : AppCompatActivity() {

app/src/main/res/drawable/ic_checkbox_off.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22C17.5,22 22,17.5 22,12C22,6.5 17.5,2 12,2C6.5,2 2,6.5 2,12C2,17.5 6.5,22 12,22Z"
+      android:fillColor="#C9C9C9"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M7,13L10,16L17,9"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+</vector>

app/src/main/res/drawable/ic_checkbox_on.xml

@@ -0,0 +1,15 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,22C17.5,22 22,17.5 22,12C22,6.5 17.5,2 12,2C6.5,2 2,6.5 2,12C2,17.5 6.5,22 12,22Z"
+      android:fillColor="@color/teal_700"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M7,13L10,16L17,9"
+      android:fillColor="#00000000"
+      android:strokeColor="#ffffff"
+      android:strokeLineCap="round"/>
+</vector>