diff --git a/app/build.gradle b/app/build.gradle index 31c741e3..a4d5d94c 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,8 +19,8 @@ android { minSdk 23 compileSdkVersion 34 targetSdk 34 - versionCode 3 - versionName "1.1.1" + versionCode 4 + versionName "1.1.2" buildConfigField "String", "BASE_URL", properties["BASE_URL"] diff --git a/app/src/main/java/com/eatssu/android/base/BaseActivity.kt b/app/src/main/java/com/eatssu/android/base/BaseActivity.kt index b5044b4a..cfb9c124 100644 --- a/app/src/main/java/com/eatssu/android/base/BaseActivity.kt +++ b/app/src/main/java/com/eatssu/android/base/BaseActivity.kt @@ -22,6 +22,7 @@ import com.eatssu.android.ui.common.ForceUpdateDialogActivity import com.eatssu.android.ui.common.VersionViewModel import com.eatssu.android.ui.common.VersionViewModelFactory import com.eatssu.android.util.NetworkConnection +import com.google.android.material.card.MaterialCardView abstract class BaseActivity( @@ -33,7 +34,7 @@ abstract class BaseActivity( protected lateinit var toolbar: Toolbar protected lateinit var toolbarTitle: TextView - protected lateinit var backBtn: ImageButton + protected lateinit var backBtn: MaterialCardView private lateinit var versionViewModel: VersionViewModel private lateinit var firebaseRemoteConfigRepository: FirebaseRemoteConfigRepository @@ -49,7 +50,7 @@ abstract class BaseActivity( toolbar = findViewById(R.id.toolbar) toolbarTitle = findViewById(R.id.toolbar_title) - backBtn =findViewById(R.id.btn_back) + backBtn =findViewById(R.id.mcv_setting) setSupportActionBar(toolbar) supportActionBar?.setDisplayShowTitleEnabled(false) // 툴바 기본 제목 비활성화 diff --git a/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt b/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt index 615aa555..056e1923 100644 --- a/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/login/SocialLoginActivity.kt @@ -56,7 +56,7 @@ class SocialLoginActivity : BaseActivity(ActivitySoc val context = this - binding.imbKakao.setOnClickListener { + binding.mcvKakaoLogin.setOnClickListener { Log.d("post", "버튼 클릭") lifecycleScope.launch { diff --git a/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt b/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt index 753b0d10..124c5f92 100644 --- a/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/MainActivity.kt @@ -72,7 +72,7 @@ class MainActivity : BaseActivity(ActivityMainBinding::infl // 2. TabLayout과 ViewPager2를 연결하고, TabItem의 메뉴명을 설정한다. TabLayoutMediator(tabLayout, viewPager) { tab, position -> tab.text = tabTitles[position] }.attach() - binding.btnSetting.setOnClickListener { + binding.mcvSetting.setOnClickListener { val intent = Intent(this, MyPageActivity::class.java) // 인텐트를 생성해줌, startActivity(intent) // 화면 전환을 시켜줌 } diff --git a/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt b/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt index f4cbbc1b..d7eebc2e 100644 --- a/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/ViewPager2Adapter.kt @@ -9,8 +9,14 @@ import com.eatssu.android.ui.main.menu.MenuFragment class ViewPager2Adapter(fragmentActivity: FragmentActivity) : FragmentStateAdapter(fragmentActivity) { + // 1. ViewPager2에 연결할 Fragment 들을 생성 - val fragmentList = listOf(MenuFragment(Time.MORNING), MenuFragment(Time.LUNCH), MenuFragment(Time.DINNER)) + private val fragmentList = listOf( + MenuFragment.newInstance(Time.MORNING), + MenuFragment.newInstance(Time.LUNCH), + MenuFragment.newInstance(Time.DINNER) + ) + lateinit var menuDate : String // 2. ViesPager2에서 노출시킬 Fragment 의 갯수 설정 diff --git a/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt index b5b9fd34..6170e20a 100644 --- a/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt +++ b/app/src/main/java/com/eatssu/android/ui/main/menu/MenuFragment.kt @@ -29,7 +29,7 @@ import java.time.LocalDate import java.time.LocalDateTime import java.time.format.DateTimeFormatter -class MenuFragment(val time: Time) : Fragment() { +class MenuFragment : Fragment() { private var _binding: FragmentMenuBinding? = null private val binding get() = _binding!! @@ -46,6 +46,20 @@ class MenuFragment(val time: Time) : Fragment() { private val totalMenuList = ArrayList
() + + companion object { + fun newInstance(time: Time): MenuFragment { + val fragment = MenuFragment() + val args = Bundle() + args.putSerializable("TIME", time) + fragment.arguments = args + return fragment + } + } + + private val time: Time + get() = arguments?.getSerializable("TIME") as Time //Todo deprecated + override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml index a25d6074..3242eae6 100644 --- a/app/src/main/res/layout/activity_base.xml +++ b/app/src/main/res/layout/activity_base.xml @@ -1,35 +1,52 @@ - - + + + + android:backgroundTint="@android:color/transparent" + android:clickable="true" + android:focusable="true"> + + + + android:textColor="@color/Primary_Light" /> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index dc54acc5..286c49b9 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -21,30 +21,40 @@ app:layout_constraintTop_toTopOf="parent" /> - + app:rippleColor="#fff"> + + + + + + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/tv_eat_ssu"> @@ -38,19 +38,25 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/tv_title_for_eatssu" /> - - + app:layout_constraintStart_toStartOf="parent" + app:rippleColor="@color/gray100" + android:focusable="true"> + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 9803c2d8..9f86a995 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,5 +1,5 @@ - EatSSU + EAT-SSU