Skip to content

Commit 94c4f45

Browse files
bmc08gtbmc08gt
committed
chore(fc): cover charge => message fee
Signed-off-by: Brandon McAnsh <[email protected]>
1 parent ba452a9 commit 94c4f45

File tree

7 files changed

+40
-32
lines changed

7 files changed

+40
-32
lines changed

‎flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/cover/CoverChargeScreen.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ data class CoverChargeScreen(val roomId: ID) : Screen, NamedScreen, Parcelable {
4040
override val key: ScreenKey = uniqueScreenKey
4141

4242
override val name: String
43-
@Composable get() = stringResource(R.string.title_changeCoverCharge)
43+
@Composable get() = stringResource(R.string.title_changeMessageFee)
4444

4545

4646
@Composable
@@ -66,7 +66,7 @@ data class CoverChargeScreen(val roomId: ID) : Screen, NamedScreen, Parcelable {
6666

6767
LaunchedEffect(viewModel) {
6868
viewModel.eventFlow
69-
.filterIsInstance<CoverChargeViewModel.Event.OnCoverChangedSuccessfully>()
69+
.filterIsInstance<CoverChargeViewModel.Event.OnFeeChangedSuccessfully>()
7070
.onEach {
7171
navigator.pop()
7272
}.launchIn(this)
@@ -106,7 +106,7 @@ private fun ChangeCoverScreenContent(
106106
isLoading = state.submitting,
107107
isSuccess = state.success,
108108
) {
109-
viewModel.dispatchEvent(CoverChargeViewModel.Event.OnChangeCover)
109+
viewModel.dispatchEvent(CoverChargeViewModel.Event.OnChangeFee)
110110
}
111111
}
112112
}

‎flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/cover/CoverChargeViewModel.kt‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class CoverChargeViewModel @Inject constructor(
4343
data object OnBackspace : Event
4444
data class OnEnteredNumberChanged(val backspace: Boolean = false) : Event
4545
data class OnCoverChanged(val amountAnimatedModel: AmountAnimatedInputUiModel) : Event
46-
data object OnChangeCover : Event
47-
data class OnChangingCover(val changing: Boolean): Event
48-
data object OnCoverChangedSuccessfully : Event
46+
data object OnChangeFee : Event
47+
data class OnChangingFee(val changing: Boolean): Event
48+
data object OnFeeChangedSuccessfully : Event
4949
}
5050

5151
init {
@@ -85,16 +85,16 @@ class CoverChargeViewModel @Inject constructor(
8585
}.launchIn(viewModelScope)
8686

8787
eventFlow
88-
.filterIsInstance<Event.OnChangeCover>()
89-
.onEach { dispatchEvent(Event.OnChangingCover(true)) }
88+
.filterIsInstance<Event.OnChangeFee>()
89+
.onEach { dispatchEvent(Event.OnChangingFee(true)) }
9090
.mapNotNull {
9191
stateFlow.value.roomId ?: return@mapNotNull null
9292
stateFlow.value.roomId!! to stateFlow.value.amountAnimatedModel.amountData.amount.toLong()
9393
}.map { (roomId, value) ->
94-
roomController.setCoverCharge(roomId, KinAmount.fromQuarks(value))
94+
roomController.setMessagingFee(roomId, KinAmount.fromQuarks(value))
9595
}.onResult(
9696
onError = {
97-
dispatchEvent(Event.OnChangingCover(false))
97+
dispatchEvent(Event.OnChangingFee(false))
9898
TopBarManager.showMessage(
9999
TopBarManager.TopBarMessage(
100100
resources.getString(R.string.error_title_failedToChangeCover),
@@ -103,20 +103,20 @@ class CoverChargeViewModel @Inject constructor(
103103
)
104104
},
105105
onSuccess = {
106-
dispatchEvent(Event.OnChangingCover(false))
107-
dispatchEvent(Event.OnCoverChangedSuccessfully)
106+
dispatchEvent(Event.OnChangingFee(false))
107+
dispatchEvent(Event.OnFeeChangedSuccessfully)
108108
}
109109
).launchIn(viewModelScope)
110110
}
111111

112112
companion object {
113113
val updateStateForEvent: (Event) -> ((State) -> State) = { event ->
114114
when (event) {
115-
is Event.OnChangingCover -> { state -> state.copy(submitting = event.changing) }
116-
Event.OnCoverChangedSuccessfully -> { state -> state.copy(success = true) }
115+
is Event.OnChangingFee -> { state -> state.copy(submitting = event.changing) }
116+
Event.OnFeeChangedSuccessfully -> { state -> state.copy(success = true) }
117117
Event.OnBackspace,
118118
is Event.OnEnteredNumberChanged,
119-
is Event.OnChangeCover,
119+
is Event.OnChangeFee,
120120
is Event.OnNumberPressed -> { state -> state }
121121

122122
is Event.OnCoverChanged -> { state ->

‎flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/ChatInfoViewModel.kt‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@ class ChatInfoViewModel @Inject constructor(
6969
// endregion state updates
7070

7171
// region action/reaction
72-
data class OnChangeCover(val roomId: ID) : Event
73-
data class OnCoverChanged(val cover: Kin) : Event
72+
data class OnChangeMessageFee(val roomId: ID) : Event
73+
data class OnFeeChanged(val cover: Kin) : Event
7474

7575
data class OnChangeName(val id: ID, val title: String) : Event
7676
data class OnNameChanged(val name: String) : Event
@@ -127,7 +127,7 @@ class ChatInfoViewModel @Inject constructor(
127127
}
128128
)
129129
)
130-
dispatchEvent(Event.OnCoverChanged(room.messagingFee))
130+
dispatchEvent(Event.OnFeeChanged(room.messagingFee))
131131
}
132132
} else {
133133
roomController.observeConversation(args.roomId.orEmpty())
@@ -150,7 +150,7 @@ class ChatInfoViewModel @Inject constructor(
150150
}
151151
)
152152
)
153-
dispatchEvent(Event.OnCoverChanged(cover))
153+
dispatchEvent(Event.OnFeeChanged(cover))
154154
}.launchIn(viewModelScope)
155155
}
156156
}.launchIn(viewModelScope)
@@ -322,7 +322,7 @@ class ChatInfoViewModel @Inject constructor(
322322
)
323323
}
324324

325-
is Event.OnChangeCover,
325+
is Event.OnChangeMessageFee,
326326
Event.OnLeaveRoomConfirmed,
327327
is Event.OnChangeName,
328328
is Event.OnShareRoomClicked,
@@ -335,7 +335,7 @@ class ChatInfoViewModel @Inject constructor(
335335
Event.OnLeftRoom -> { state -> state }
336336

337337
is Event.OnHostStatusChanged -> { state -> state.copy(isHost = event.isHost) }
338-
is Event.OnCoverChanged -> { state ->
338+
is Event.OnFeeChanged -> { state ->
339339
state.copy(
340340
roomInfo = state.roomInfo.copy(
341341
messagingFee = event.cover,

‎flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/RoomContentMenu.kt‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,24 @@
11
package xyz.flipchat.app.features.chat.info
22

33
import androidx.compose.material.icons.Icons
4-
import androidx.compose.material.icons.automirrored.filled.Reply
54
import androidx.compose.material.icons.automirrored.outlined.Logout
65
import androidx.compose.material.icons.filled.Bedtime
7-
import androidx.compose.material.icons.outlined.Bedtime
8-
import androidx.compose.material.icons.outlined.DoorFront
96
import androidx.compose.material.icons.outlined.LightMode
107
import androidx.compose.runtime.Composable
118
import androidx.compose.ui.graphics.painter.Painter
129
import androidx.compose.ui.graphics.vector.rememberVectorPainter
1310
import androidx.compose.ui.res.painterResource
1411
import androidx.compose.ui.res.stringResource
15-
import com.getcode.navigation.screens.ContextSheet
1612
import com.getcode.ui.components.contextmenu.ContextMenuAction
1713
import xyz.flipchat.app.R
1814

1915

2016
sealed interface RoomControlAction : ContextMenuAction {
21-
data class CoverCharge(override val onSelect: () -> Unit) : RoomControlAction {
17+
data class MessageFee(override val onSelect: () -> Unit) : RoomControlAction {
2218
override val isDestructive: Boolean = false
2319
override val delayUponSelection: Boolean = true
2420
override val title: String
25-
@Composable get() = stringResource(R.string.action_changeCoverCharge)
21+
@Composable get() = stringResource(R.string.action_changeMessagingFee)
2622
override val painter: Painter
2723
@Composable get() = painterResource(R.drawable.ic_kin_white_small)
2824
}

‎flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/info/RoomInfoScreen.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ class RoomInfoScreen(
103103

104104
LaunchedEffect(viewModel) {
105105
viewModel.eventFlow
106-
.filterIsInstance<ChatInfoViewModel.Event.OnChangeCover>()
106+
.filterIsInstance<ChatInfoViewModel.Event.OnChangeMessageFee>()
107107
.map { it.roomId }
108108
.onEach {
109109
navigator.push(ScreenRegistry.get(NavScreenProvider.Room.ChangeCover(it)), delay = 100)
@@ -390,8 +390,8 @@ private fun buildActions(
390390
return buildList {
391391
if (state.isHost) {
392392
add(
393-
RoomControlAction.CoverCharge {
394-
dispatch(ChatInfoViewModel.Event.OnChangeCover(state.roomInfo.id!!))
393+
RoomControlAction.MessageFee {
394+
dispatch(ChatInfoViewModel.Event.OnChangeMessageFee(state.roomInfo.id!!))
395395
}
396396
)
397397
if (state.isOpen) {

‎flipchatApp/src/main/res/values/strings.xml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@
103103
<string name="subtitle_enterRoomNumber">Enter Flipchat Number</string>
104104
<string name="title_joinRoom">Join Flipchat</string>
105105
<string name="title_changeCoverCharge">Change Cover Charge</string>
106+
<string name="title_changeMessageFee">Change Listener Message Fee</string>
106107

107108
<string name="action_joinRoomByName">Join %1$s</string>
108109
<string name="action_joinRoomWithCost">Join Room: ⬢ %1$s</string>
@@ -125,6 +126,14 @@
125126
<string name="subtitle_muteUserInRoom">They will no longer be able send messages in this room</string>
126127
<string name="action_mute">Mute</string>
127128

129+
<string name="title_promoteUserInRoom">Make %1$s a Speaker?</string>
130+
<string name="subtitle_promoteUserInRoom">They will be able to message for free</string>
131+
<string name="action_promote">Make a Speaker</string>
132+
133+
<string name="title_demoteUserInRoom">Remove %1$s as a Speaker?</string>
134+
<string name="subtitle_demoteUserInRoom">They will no longer be able to message for free</string>
135+
<string name="action_demote">Remove as Speaker</string>
136+
128137
<string name="title_blockUserInRoom">Block %1$s?</string>
129138
<string name="subtitle_blockUserInRoom">All messages from this user will be hidden</string>
130139
<string name="action_block">Block</string>
@@ -210,6 +219,7 @@
210219
<string name="title_finalizeAccountCreation">Finalize Account Creation</string>
211220
<string name="subtitle_finalizeAccountCreation">Accounts on Flipchat must be purchased for %1$s to reduce spam</string>
212221
<string name="action_changeCoverCharge">Change Cover Charge</string>
222+
<string name="action_changeMessagingFee">Change Listener Message Fee</string>
213223
<string name="action_addRoomName">Add Flipchat Name</string>
214224
<string name="action_editRoomName">Edit Flipchat Name</string>
215225
<string name="action_changeRoomName">Change Flipchat Name</string>

‎ui/resources/src/main/res/values/strings.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,12 @@
1414
<string name="action_copyMessage">Copy Message</string>
1515
<string name="action_deleteMessage">Delete</string>
1616
<string name="action_blockUser">Block User</string>
17-
<string name="action_blockUserByName">Block %1$s</string>
17+
<string name="action_blockUserByName">Block User</string>
1818
<string name="action_unblockUser">Unblock User</string>
1919
<string name="action_removeUser">Remove %1$s</string>
2020
<string name="action_reportUser">Report %1$s</string>
2121
<string name="action_report">Report</string>
22-
<string name="action_muteUser">Mute %1$s</string>
22+
<string name="action_muteUser">Mute User</string>
23+
<string name="action_promote">Make a Speaker</string>
24+
<string name="action_demote">Remove as Speaker</string>
2325
</resources>

0 commit comments

Comments
 (0)