Merge pull request #79 from ZeepyForTeam/hotfix/naver_login

fix: version code

Author: SONPYEONGHWA

app/build.gradle

@@ -18,8 +18,8 @@ android {
         applicationId "com.zeepy.zeepyforandroid"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 1
-        versionName "1.0"
+        versionCode 2
+        versionName "1.0.1"
 
         buildConfigField "String", "NAVER_CLIENT_ID", properties['naver_client_id']
         buildConfigField "String", "NAVER_CLIENT_SECRET_ID", properties['naver_client_secret_id']

app/src/main/AndroidManifest.xml

@@ -16,7 +16,8 @@
 
     <application
         android:name="com.zeepy.zeepyforandroid.application.ZeepyApplication"
-        android:allowBackup="true"
+        android:allowBackup="false"
+        android:fullBackupContent="false"
         android:icon="@mipmap/zeepy_logo_round"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/zeepy_logo_round"

app/src/main/java/com/zeepy/zeepyforandroid/home/HomeFragment.kt

@@ -3,12 +3,14 @@ package com.zeepy.zeepyforandroid.home
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.viewModels
 import androidx.navigation.fragment.NavHostFragment
 import androidx.navigation.fragment.findNavController
+import androidx.recyclerview.widget.RecyclerView
 import com.zeepy.zeepyforandroid.R
 import com.zeepy.zeepyforandroid.base.BaseFragment
 import com.zeepy.zeepyforandroid.community.frame.view.CommunityFrameFragment
@@ -105,6 +107,21 @@ class HomeFragment: BaseFragment<FragmentHomeBinding>() {
             adapter = HomeFilterAdapter {
                 setSelectLookAround(CommunityTendency.findTendency(it.tendency))
             }
+
+            addOnItemTouchListener(object: RecyclerView.OnItemTouchListener{
+                override fun onInterceptTouchEvent(recyclerview: RecyclerView, event: MotionEvent): Boolean {
+                    when (event.action) {
+                        MotionEvent.ACTION_DOWN -> {
+                            recyclerview.parent?.requestDisallowInterceptTouchEvent(true)
+                        }
+                    }
+                    return false
+                }
+
+                override fun onTouchEvent(rv: RecyclerView, e: MotionEvent) {}
+                override fun onRequestDisallowInterceptTouchEvent(disallowIntercept: Boolean) {}
+            })
+
             (adapter as HomeFilterAdapter).notifyDataSetChanged()
             addItemDecoration(ItemDecoration(0, 8))
         }

app/src/main/java/com/zeepy/zeepyforandroid/lookaround/LookAroundFragment.kt

@@ -275,7 +275,6 @@ class LookAroundFragment : BaseFragment<FragmentLookaroundBinding>() {
 
     private fun subscribeObservers() {
         viewModel.buildingListLiveData.observe(viewLifecycleOwner) {
-            //Log.e("buildinglistlivedata in observer SIZEEEEEEEE", it.size.toString())
             if (it.size == viewModel.fetchedBuildingsCount.value && viewModel.isOnFiltered.value == false) {
                 if (it.size != 0) {
                     buildingsAdapter.notifyItemRemoved(buildingsAdapter.itemCount)
@@ -294,7 +293,6 @@ class LookAroundFragment : BaseFragment<FragmentLookaroundBinding>() {
             }
         }
         viewModel.filteredBuildingList.observe(viewLifecycleOwner) {
-            //Log.e("filtered List size", it.size.toString())
             if (it.size != 0) {
                 val prevLastItemPosition =
                     if (buildingsAdapter.itemCount == 0) 0 else buildingsAdapter.itemCount
@@ -312,7 +310,6 @@ class LookAroundFragment : BaseFragment<FragmentLookaroundBinding>() {
             binding.toolbar.apply {
                 setTitle(it.cityDistinct)
             }
-            //Log.e("selectedAddress", it.cityDistinct)
             if (viewModel.buildingListLiveData.value.isNullOrEmpty()) {
                 viewModel.searchBuildingsByAddress()
             }

app/src/main/java/com/zeepy/zeepyforandroid/mainframe/MainActivity.kt

@@ -34,6 +34,7 @@ class MainActivity : AppCompatActivity() {
         setContentView(binding.root)
         disableDarkMode()
         initNavController()
+
     }
 
     private fun disableDarkMode() {
@@ -45,6 +46,7 @@ class MainActivity : AppCompatActivity() {
         navController = navHostFragment.navController
     }
 
+
     fun getDeviceSize(): List<Int> {
         var deviceWidth = 0
         var deviceHeight = 0

app/src/main/java/com/zeepy/zeepyforandroid/signin/SignInFragment.kt

@@ -68,7 +68,6 @@ class SignInFragment : BaseFragment<FragmentSignInBinding>(){
             if (success) {
                 viewModel.getUserNicknameAndEmail(userPreferenceManager.fetchUserEmail())
                 findNavController().popBackStack()
-                Log.e("access token", "${userPreferenceManager.fetchUserAccessToken()}")
             } else {
                 Toast.makeText(requireContext(), "사용자를 찾을 수 없습니다.", Toast.LENGTH_SHORT).show()
             }