diff --git a/app/src/main/java/com/soi/moya/HomeFragment.kt b/app/src/main/java/com/soi/moya/HomeFragment.kt index a216fc4..4bab0eb 100644 --- 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 index 804c03e..d450025 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -21,7 +21,7 @@ diff --git a/app/src/main/res/layout/activity_select_team.xml b/app/src/main/res/layout/activity_select_team.xml index 465b403..75af040 100644 --- 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 index ce7e475..fa20abe 100644 --- 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 index 5b89942..d17f876 100644 --- 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 index 9bb32b8..ae13b4c 100644 --- 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 index 123cbae..dc6b7f2 100644 --- 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 index 9ef7eed..4aee275 100644 --- 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 index a04a40b..f643801 100644 --- a/app/src/main/res/values/style.xml +++ b/app/src/main/res/values/style.xml @@ -1,7 +1,7 @@