라이브 만들기 버튼 이미지에서 글자로 변경
This commit is contained in:
18
.idea/deploymentTargetSelector.xml
generated
18
.idea/deploymentTargetSelector.xml
generated
@@ -1,18 +0,0 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
|
||||||
<project version="4">
|
|
||||||
<component name="deploymentTargetSelector">
|
|
||||||
<selectionStates>
|
|
||||||
<SelectionState runConfigName="app">
|
|
||||||
<option name="selectionMode" value="DROPDOWN" />
|
|
||||||
<DropdownSelection timestamp="2025-10-23T14:41:22.468459Z">
|
|
||||||
<Target type="DEFAULT_BOOT">
|
|
||||||
<handle>
|
|
||||||
<DeviceId pluginId="PhysicalDevice" identifier="serial=ce0917195d15ab39017e" />
|
|
||||||
</handle>
|
|
||||||
</Target>
|
|
||||||
</DropdownSelection>
|
|
||||||
<DialogSelection />
|
|
||||||
</SelectionState>
|
|
||||||
</selectionStates>
|
|
||||||
</component>
|
|
||||||
</project>
|
|
||||||
@@ -88,13 +88,13 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
|
|||||||
MemberRole.USER.name
|
MemberRole.USER.name
|
||||||
) == MemberRole.CREATOR.name
|
) == MemberRole.CREATOR.name
|
||||||
) {
|
) {
|
||||||
binding.ivMakeRoom.visibility = View.VISIBLE
|
binding.llMakeLive.visibility = View.VISIBLE
|
||||||
binding.ivMakeRoom.setOnClickListener {
|
binding.llMakeLive.setOnClickListener {
|
||||||
val intent = Intent(requireContext(), LiveRoomCreateActivity::class.java)
|
val intent = Intent(requireContext(), LiveRoomCreateActivity::class.java)
|
||||||
activityResultLauncher.launch(intent)
|
activityResultLauncher.launch(intent)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
binding.ivMakeRoom.visibility = View.GONE
|
binding.llMakeLive.visibility = View.GONE
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -147,14 +147,14 @@ class LiveFragment : BaseFragment<FragmentLiveBinding>(FragmentLiveBinding::infl
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.ivMakeRoom.visibility =
|
binding.llMakeLive.visibility =
|
||||||
if (SharedPreferenceManager.role == MemberRole.CREATOR.name) {
|
if (SharedPreferenceManager.role == MemberRole.CREATOR.name) {
|
||||||
View.VISIBLE
|
View.VISIBLE
|
||||||
} else {
|
} else {
|
||||||
View.GONE
|
View.GONE
|
||||||
}
|
}
|
||||||
|
|
||||||
binding.ivMakeRoom.setOnClickListener {
|
binding.llMakeLive.setOnClickListener {
|
||||||
val intent = Intent(requireContext(), LiveRoomCreateActivity::class.java)
|
val intent = Intent(requireContext(), LiveRoomCreateActivity::class.java)
|
||||||
activityResultLauncher.launch(intent)
|
activityResultLauncher.launch(intent)
|
||||||
}
|
}
|
||||||
|
|||||||
Binary file not shown.
|
Before Width: | Height: | Size: 5.6 KiB |
BIN
app/src/main/res/drawable-xxhdpi/ic_make_live.png
Normal file
BIN
app/src/main/res/drawable-xxhdpi/ic_make_live.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 896 B |
@@ -123,8 +123,8 @@
|
|||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:fontFamily="@font/pretendard_bold"
|
|
||||||
android:layout_marginEnd="4dp"
|
android:layout_marginEnd="4dp"
|
||||||
|
android:fontFamily="@font/pretendard_bold"
|
||||||
android:text="@string/screen_live_latest_finished_prefix"
|
android:text="@string/screen_live_latest_finished_prefix"
|
||||||
android:textColor="@color/color_3bb9f1"
|
android:textColor="@color/color_3bb9f1"
|
||||||
android:textSize="24sp" />
|
android:textSize="24sp" />
|
||||||
@@ -158,8 +158,8 @@
|
|||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:fontFamily="@font/pretendard_bold"
|
|
||||||
android:layout_marginEnd="4dp"
|
android:layout_marginEnd="4dp"
|
||||||
|
android:fontFamily="@font/pretendard_bold"
|
||||||
android:text="@string/screen_live_replay_prefix"
|
android:text="@string/screen_live_replay_prefix"
|
||||||
android:textColor="@color/color_3bb9f1"
|
android:textColor="@color/color_3bb9f1"
|
||||||
android:textSize="24sp" />
|
android:textSize="24sp" />
|
||||||
@@ -190,15 +190,32 @@
|
|||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</androidx.core.widget.NestedScrollView>
|
</androidx.core.widget.NestedScrollView>
|
||||||
|
|
||||||
<ImageView
|
<LinearLayout
|
||||||
android:id="@+id/iv_make_room"
|
android:id="@+id/ll_make_live"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginEnd="16.7dp"
|
android:layout_marginEnd="16.7dp"
|
||||||
android:layout_marginBottom="16.7dp"
|
android:layout_marginBottom="16.7dp"
|
||||||
android:contentDescription="@null"
|
android:background="@drawable/bg_round_corner_44_3bb9f1"
|
||||||
android:src="@drawable/btn_make_live"
|
android:orientation="horizontal"
|
||||||
|
android:padding="13.3dp"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent" />
|
app:layout_constraintEnd_toEndOf="parent">
|
||||||
|
|
||||||
|
<ImageView
|
||||||
|
android:layout_width="20dp"
|
||||||
|
android:layout_height="20dp"
|
||||||
|
android:layout_marginEnd="5dp"
|
||||||
|
android:contentDescription="@null"
|
||||||
|
android:src="@drawable/ic_make_live" />
|
||||||
|
|
||||||
|
<TextView
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:fontFamily="@font/pretendard_bold"
|
||||||
|
android:text="@string/screen_live_room_create_title"
|
||||||
|
android:textColor="@color/white"
|
||||||
|
android:textSize="13.3sp" />
|
||||||
|
</LinearLayout>
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
|
|||||||
@@ -140,7 +140,7 @@
|
|||||||
<string name="recommend_content">おすすめコンテンツ</string>
|
<string name="recommend_content">おすすめコンテンツ</string>
|
||||||
<string name="read_more">もっと見る</string>
|
<string name="read_more">もっと見る</string>
|
||||||
<string name="read_less">折りたたむ</string>
|
<string name="read_less">折りたたむ</string>
|
||||||
<string name="action_upload_content">コンテンツをアップロード</string>
|
<string name="action_upload_content">アップロード</string>
|
||||||
<string name="company_info">- 会社名: 株式会社ソダライブ\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</string>
|
<string name="company_info">- 会社名: 株式会社ソダライブ\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</string>
|
||||||
<string name="live_paid_title">有料ライブ入場</string>
|
<string name="live_paid_title">有料ライブ入場</string>
|
||||||
<string name="live_paid_desc">%1$dCANを消費して\nライブに入場しますか?</string>
|
<string name="live_paid_desc">%1$dCANを消費して\nライブに入場しますか?</string>
|
||||||
|
|||||||
Reference in New Issue
Block a user