Merge pull request #14 from Gwamegis/fix/scrollTab

탭 뷰 스크롤 이슈
Gwamegis · Apr 21, 2023 · e2b7d44 · e2b7d44
2 parents d3ffe18 + 9140513
commit e2b7d44
Show file tree

Hide file tree

Showing 10 changed files with 10 additions and 13 deletions.
diff --git a/app/src/main/java/com/soi/moya/HomeFragment.kt b/app/src/main/java/com/soi/moya/HomeFragment.kt
@@ -65,9 +65,6 @@ class HomeFragment : Fragment() {
         mainBanner.setImageResource(mainBannerImageSrc)
         mainBanner.clipToOutline = true
 
-//        val selectedTeam = arguments?.getString("selectedTeam")
-//        fetchColor(selectedTeam!!)
-
         // setting Tab view
         viewModel = ViewModelProvider(requireActivity())[MusicViewModel::class.java]
 

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -21,7 +21,7 @@
         <com.google.android.material.bottomnavigation.BottomNavigationView
             android:id="@+id/bottomNavigationView"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="56dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/activity_play_song.xml b/app/src/main/res/layout/activity_play_song.xml
@@ -21,7 +21,7 @@
             android:text="song Title"
             android:fontFamily="@font/pretendard_bold"
             android:textColor="@color/gray"
-            android:textSize="20sp"
+            android:textSize="20dp"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />

diff --git a/app/src/main/res/layout/activity_select_team.xml b/app/src/main/res/layout/activity_select_team.xml
@@ -15,7 +15,7 @@
         android:layout_margin="20dp"
         android:text="어느 팀을 응원하시나요?"
         android:fontFamily="@font/pretendard_bold"
-        android:textSize="20sp"
+        android:textSize="20dp"
         android:textColor="@color/custom_black"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"

diff --git a/app/src/main/res/layout/activity_stadium_detail.xml b/app/src/main/res/layout/activity_stadium_detail.xml
@@ -14,7 +14,7 @@
         android:text="stadium title"
         android:fontFamily="@font/pretendard_bold"
         android:textColor="@color/black"
-        android:textSize="20sp"
+        android:textSize="20dp"
         android:textStyle="bold"
         android:gravity="center"
         android:layout_margin="20dp"

diff --git a/app/src/main/res/layout/fragment_search.xml b/app/src/main/res/layout/fragment_search.xml
@@ -33,7 +33,7 @@
         android:text="선수 이름, 응원가를 검색해주세요"
         android:textColor="@color/darkGray"
         android:fontFamily="@font/pretendard_medium"
-        android:textSize="16sp"
+        android:textSize="16dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="30dp"
@@ -45,7 +45,7 @@
         android:text="검색 결과가 없어요"
         android:textColor="@color/darkGray"
         android:fontFamily="@font/pretendard_medium"
-        android:textSize="16sp"
+        android:textSize="16dp"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_margin="30dp"

diff --git a/app/src/main/res/layout/fragment_stadium.xml b/app/src/main/res/layout/fragment_stadium.xml
@@ -12,7 +12,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:text="야구장 좌석 배치도"
-        android:textSize="20sp"
+        android:textSize="20dp"
         android:textStyle="bold"
         android:gravity="center"
         android:layout_marginVertical="20dp"

diff --git a/app/src/main/res/layout/song_listview_item.xml b/app/src/main/res/layout/song_listview_item.xml
@@ -12,7 +12,7 @@
             android:layout_height="wrap_content"
             android:fontFamily="@font/pretendard_medium"
             android:textColor="@color/black"
-            android:textSize="16sp"
+            android:textSize="16dp"
             android:layout_margin="20dp"
             android:text="Song title"/>
 

diff --git a/app/src/main/res/layout/stadium_listview_item.xml b/app/src/main/res/layout/stadium_listview_item.xml
@@ -10,7 +10,7 @@
         android:layout_height="wrap_content"
         android:fontFamily="@font/pretendard_medium"
         android:textColor="@color/black"
-        android:textSize="16sp"
+        android:textSize="16dp"
         android:layout_margin="20dp"
         android:text="지도"/>
 

diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <style name="TabTextAppearance" parent="TextAppearance.Design.Tab">
-        <item name="android:textSize">20sp</item>
+        <item name="android:textSize">20dp</item>
         <item name="android:textColor">@color/white</item>
         <item name="android:fontFamily">@font/pretendard_bold</item>
         <item name="marginHorizontal">10dp</item>