Merge pull request #5 from SOPT-29th-Joint-Seminar-10/subeen

[Pull request]

.gitattributes

@@ -0,0 +1 @@
+*.psd filter=lfs diff=lfs merge=lfs -text

app/build.gradle

@@ -3,10 +3,18 @@ plugins {
     id 'kotlin-android'
 }
 
+//build오류 해결 코드
+configurations.all { resolutionStrategy { force 'androidx.core:core-ktx:1.6.0' } }
+
+
 android {
     compileSdkVersion 30
     buildToolsVersion "30.0.2"
 
+    buildFeatures{
+        viewBinding true
+    }
+
     defaultConfig {
         applicationId "kr.ac.smu.cs.soptsocar"
         minSdkVersion 26
@@ -34,12 +42,17 @@ android {
 
 dependencies {
 
+     //viewpager2 추가
+    implementation "androidx.viewpager2:viewpager2:1.1.0-beta01"
+
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
     implementation 'androidx.core:core-ktx:1.7.0'
     implementation 'androidx.appcompat:appcompat:1.3.1'
     implementation 'com.google.android.material:material:1.4.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.1.1'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.+'
     androidTestImplementation 'androidx.test.ext:junit:1.1.3'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+
 }

app/src/main/java/kr/ac/smu/cs/soptsocar/CarPlanFragment.kt

@@ -0,0 +1,21 @@
+package kr.ac.smu.cs.soptsocar
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+
+class CarPlanFragment : Fragment() {
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_car_plan, container, false)
+    }
+
+}

app/src/main/java/kr/ac/smu/cs/soptsocar/HomeFragment.kt

@@ -0,0 +1,21 @@
+package kr.ac.smu.cs.soptsocar
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+class HomeFragment : Fragment() {
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_home, container, false)
+    }
+
+
+}

app/src/main/java/kr/ac/smu/cs/soptsocar/MainActivity.kt

@@ -2,10 +2,66 @@ package kr.ac.smu.cs.soptsocar
 
 import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
+import androidx.viewpager2.widget.ViewPager2
+import kr.ac.smu.cs.soptsocar.databinding.ActivityMainBinding
 
 class MainActivity : AppCompatActivity() {
+
+    private lateinit var binding: ActivityMainBinding
+    private lateinit var mainViewPagerAdapter: MainViewPagerAdapter
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_main)
+        binding= ActivityMainBinding.inflate(layoutInflater)
+
+        initViewPagerAdapter()
+        initBottomNavigation()
+        setContentView(binding.root)
+    }
+
+    private fun initViewPagerAdapter(){
+        val fragmentList=listOf(HomeFragment(),CarPlanFragment(),PairingFragment(),MyPageFragment())
+
+        mainViewPagerAdapter= MainViewPagerAdapter(this)
+        mainViewPagerAdapter.fragments.addAll(fragmentList)
+
+        binding.vpMain.adapter=mainViewPagerAdapter
+    }
+
+    private fun initBottomNavigation(){
+        binding.vpMain.registerOnPageChangeCallback(object: ViewPager2.OnPageChangeCallback(){
+            override fun onPageSelected(position: Int) {
+                binding.bnvMain.menu.getItem(position).isChecked=true
+            }
+        })
+
+        binding.bnvMain.setOnItemSelectedListener {
+            when(it.itemId){
+                R.id.menu_home ->{
+                    binding.vpMain.currentItem=FIRST_FRAGMENT
+                    return@setOnItemSelectedListener true
+                }
+                R.id.menu_carplan->{
+                    binding.vpMain.currentItem=SECOND_FRAGMENT
+                    return@setOnItemSelectedListener true
+                }
+                R.id.menu_pairing ->{
+                    binding.vpMain.currentItem=THIRD_FRAGMENT
+                    return@setOnItemSelectedListener true
+                }
+                else->{
+                    binding.vpMain.currentItem= FOURTH_FRAGMENT
+                    return@setOnItemSelectedListener true
+                }
+            }
+        }
+    }
+
+    companion object{
+        const val FIRST_FRAGMENT=0
+        const val SECOND_FRAGMENT=1
+        const val THIRD_FRAGMENT=2
+        const val FOURTH_FRAGMENT=3
+
     }
 }

app/src/main/java/kr/ac/smu/cs/soptsocar/MainViewPagerAdapter.kt

@@ -0,0 +1,14 @@
+package kr.ac.smu.cs.soptsocar
+
+import androidx.fragment.app.Fragment
+import androidx.fragment.app.FragmentActivity
+import androidx.viewpager2.adapter.FragmentStateAdapter
+
+class MainViewPagerAdapter (fragmentActivity: FragmentActivity):
+        FragmentStateAdapter(fragmentActivity){
+        val fragments=mutableListOf<Fragment>()
+
+        override fun getItemCount()=fragments.size
+
+        override fun createFragment(position: Int): Fragment =fragments[position]
+    }

app/src/main/java/kr/ac/smu/cs/soptsocar/MyPageFragment.kt

@@ -0,0 +1,21 @@
+package kr.ac.smu.cs.soptsocar
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+
+class MyPageFragment : Fragment() {
+
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_home, container, false)
+    }
+
+}

app/src/main/java/kr/ac/smu/cs/soptsocar/PairingFragment.kt

@@ -0,0 +1,20 @@
+package kr.ac.smu.cs.soptsocar
+
+import android.os.Bundle
+import androidx.fragment.app.Fragment
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+
+class PairingFragment : Fragment() {
+
+    override fun onCreateView(
+        inflater: LayoutInflater, container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? {
+        // Inflate the layout for this fragment
+        return inflater.inflate(R.layout.fragment_pairing, container, false)
+    }
+
+
+    }

app/src/main/res/color/selector_bottom_navi.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:color="#28323c" android:state_checked="true"/>
+    <item android:color="#28323c" android:state_checked="false"  />
+
+</selector>

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

@@ -0,0 +1,12 @@
+<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="M5.982,16.15h2.85V18a1,1 0,0 1,-1 1h-0.85a1,1 0,0 1,-1 -1v-1.85zM14.531,16.15h2.85V18a1,1 0,0 1,-1 1h-0.85a1,1 0,0 1,-1 -1v-1.85zM7.901,15.157a0.928,0.928 0,1 0,0 -1.856,0.928 0.928,0 0,0 0,1.856zM15.83,15.157a0.928,0.928 0,1 0,0 -1.856,0.928 0.928,0 0,0 0,1.856z"
+      android:fillColor="#28323C"/>
+  <path
+      android:pathData="M6.973,5v-0.5h-0.296l-0.142,0.26 0.438,0.24zM4,10.451l-0.439,-0.239 -0.061,0.112v0.127L4,10.451zM16.885,5l0.44,-0.24 -0.143,-0.26h-0.297L16.885,5zM19.859,10.451h0.5v-0.127l-0.061,-0.112 -0.44,0.24zM19.859,16.398v0.5h0.5v-0.5h-0.5zM4,16.398h-0.5v0.5L4,16.898v-0.5zM6.478,10.451 L6.044,10.203 5.616,10.951h0.862v-0.5zM17.381,10.451v0.5h0.861l-0.427,-0.748 -0.434,0.248zM15.398,6.982 L15.833,6.734 15.689,6.482h-0.29v0.5zM8.46,6.982v-0.5h-0.29l-0.144,0.252 0.434,0.248zM6.535,4.761 L3.56,10.212l0.878,0.479 2.973,-5.452 -0.877,-0.478zM16.885,4.5L6.973,4.5v1h9.912v-1zM20.298,10.212 L17.324,4.761 16.446,5.239 19.42,10.691 20.298,10.212zM19.358,10.452v5.946h1v-5.947h-1zM19.858,15.898L4,15.898v1h15.859v-1zM4.5,16.398v-5.947h-1v5.947h1zM6.478,10.951L17.38,10.951v-1L6.478,9.951v1zM14.964,7.231 L16.947,10.7 17.815,10.203 15.833,6.734 14.964,7.23zM8.46,7.482h6.938v-1L8.46,6.482v1zM6.912,10.7l1.982,-3.47 -0.868,-0.496 -1.982,3.47 0.868,0.495z"
+      android:fillColor="#28323C"/>
+</vector>

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

@@ -0,0 +1,9 @@
+<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.38,4 L5,11.38v8.72h5.175v-6.038h4.217V20.1h5.366v-8.72L12.38,4z"
+      android:fillColor="#28323C"/>
+</vector>

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

@@ -0,0 +1,17 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="25dp"
+    android:viewportWidth="24"
+    android:viewportHeight="25">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M12,5.5L12,5.5A7.5,7.5 0,0 1,19.5 13L19.5,13A7.5,7.5 0,0 1,12 20.5L12,20.5A7.5,7.5 0,0 1,4.5 13L4.5,13A7.5,7.5 0,0 1,12 5.5z"
+      android:fillColor="#00000000"
+      android:strokeColor="#28323C"/>
+  <path
+      android:pathData="M12,10m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"
+      android:fillColor="#28323C"/>
+  <path
+      android:pathData="M8,17a4,4 0,0 1,8 0H8z"
+      android:fillColor="#28323C"/>
+</vector>

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

@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:strokeWidth="1"
+      android:pathData="M4.5,5.5h11.727v9.182H4.5z"
+      android:fillColor="#00000000"
+      android:strokeColor="#28323C"/>
+  <path
+      android:strokeWidth="1"
+      android:pathData="M8.318,9.318h11.727V18.5H8.318z"
+      android:fillColor="#fff"
+      android:strokeColor="#28323C"/>
+</vector>

app/src/main/res/font/spoqa_han_sans_neo.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:android="http://schemas.android.com/apk/res/android">
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="500"
+        android:font="@font/spoqa_han_sans_neo_medium" />
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="700"
+        android:font="@font/spoqa_han_sans_neo_bold" />
+    <font
+        android:fontStyle="normal"
+        android:fontWeight="400"
+        android:font="@font/spoqa_han_sans_neo_regular" />
+</font-family>
+