diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml deleted file mode 100644 index 171f6d77..00000000 --- a/.idea/deploymentTargetSelector.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt index b4433da7..f9e55581 100644 --- a/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt +++ b/app/src/main/java/kr/co/vividnext/sodalive/live/LiveFragment.kt @@ -88,13 +88,13 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl MemberRole.USER.name ) == MemberRole.CREATOR.name ) { - binding.ivMakeRoom.visibility = View.VISIBLE - binding.ivMakeRoom.setOnClickListener { + binding.llMakeLive.visibility = View.VISIBLE + binding.llMakeLive.setOnClickListener { val intent = Intent(requireContext(), LiveRoomCreateActivity::class.java) activityResultLauncher.launch(intent) } } else { - binding.ivMakeRoom.visibility = View.GONE + binding.llMakeLive.visibility = View.GONE } } } @@ -147,14 +147,14 @@ class LiveFragment : BaseFragment(FragmentLiveBinding::infl } } - binding.ivMakeRoom.visibility = + binding.llMakeLive.visibility = if (SharedPreferenceManager.role == MemberRole.CREATOR.name) { View.VISIBLE } else { View.GONE } - binding.ivMakeRoom.setOnClickListener { + binding.llMakeLive.setOnClickListener { val intent = Intent(requireContext(), LiveRoomCreateActivity::class.java) activityResultLauncher.launch(intent) } diff --git a/app/src/main/res/drawable-xxhdpi/btn_make_live.png b/app/src/main/res/drawable-xxhdpi/btn_make_live.png deleted file mode 100644 index 2d5e53ce..00000000 Binary files a/app/src/main/res/drawable-xxhdpi/btn_make_live.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_make_live.png b/app/src/main/res/drawable-xxhdpi/ic_make_live.png new file mode 100644 index 00000000..087aef9d Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/ic_make_live.png differ diff --git a/app/src/main/res/layout/fragment_live.xml b/app/src/main/res/layout/fragment_live.xml index e274ad14..cc1d45f1 100644 --- a/app/src/main/res/layout/fragment_live.xml +++ b/app/src/main/res/layout/fragment_live.xml @@ -123,8 +123,8 @@ @@ -158,8 +158,8 @@ @@ -190,15 +190,32 @@ - + app:layout_constraintEnd_toEndOf="parent"> + + + + + diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml index ba371c9a..a923a0b2 100644 --- a/app/src/main/res/values-ja/strings.xml +++ b/app/src/main/res/values-ja/strings.xml @@ -140,7 +140,7 @@ おすすめコンテンツ もっと見る 折りたたむ - コンテンツをアップロード + アップロード - 会社名: 株式会社ソダライブ\n\n- 代表者: イ・ジェヒョン\n\n- 住所: 京畿道 城南市 盆唐区 ファンセウル路335番キル10, 5階 563A号\n\n- 事業者登録番号: 870-81-03220\n\n- 通信販売業申告: 第2024-城南盆唐B-1012号\n\n- カスタマーセンター: 02-2055-1477(営業時間 10:00~19:00)\n\n- 代表メール: sodalive.official@gmail.com 有料ライブ入場 %1$dCANを消費して\nライブに入場しますか?