Skip to content

Commit 3b8de9e

Browse files
bmc08gtbmc08gt
committed
chore(fc): Room => Flipchat
Signed-off-by: Brandon McAnsh <[email protected]>
1 parent cf328b3 commit 3b8de9e

File tree

3 files changed

+25
-28
lines changed

3 files changed

+25
-28
lines changed

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

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

3-
import android.content.Context
43
import android.os.Parcelable
54
import androidx.activity.compose.BackHandler
65
import androidx.compose.foundation.Image
@@ -42,8 +41,6 @@ import cafe.adriel.voyager.core.screen.Screen
4241
import cafe.adriel.voyager.core.screen.ScreenKey
4342
import cafe.adriel.voyager.core.screen.uniqueScreenKey
4443
import cafe.adriel.voyager.hilt.getViewModel
45-
import com.getcode.manager.BottomBarAction
46-
import com.getcode.manager.BottomBarManager
4744
import com.getcode.navigation.NavScreenProvider
4845
import com.getcode.navigation.RoomInfoArgs
4946
import com.getcode.navigation.core.LocalCodeNavigator

‎flipchatApp/src/main/kotlin/xyz/flipchat/app/features/chat/lookup/LookupRoomScreen.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class LookupRoomScreen : Screen, NamedScreen, Parcelable {
7575
.filterIsInstance<LookupRoomViewModel.Event.OnOpenConfirmation>()
7676
.map { it.args }
7777
.onEach {
78-
navigator.push(ScreenRegistry.get(NavScreenProvider.Room.Info(it)))
78+
navigator.push(ScreenRegistry.get(NavScreenProvider.Room.Info(it, returnToSender = true)))
7979
}.launchIn(this)
8080
}
8181
}
@@ -93,7 +93,7 @@ class LookupRoomScreen : Screen, NamedScreen, Parcelable {
9393
modifier = Modifier.weight(1f),
9494
state.amountAnimatedModel,
9595
prefix = "#",
96-
hint = "Enter Room Number",
96+
hint = stringResource(R.string.subtitle_enterRoomNumber),
9797
onNumberPressed = { viewModel.dispatchEvent(LookupRoomViewModel.Event.OnNumberPressed(it)) },
9898
onBackspace = { viewModel.dispatchEvent(LookupRoomViewModel.Event.OnBackspace) },
9999
)

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

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
33
<string name="subtitle_yourName">Your Name</string>
4-
<string name="subtitle_roomName">Room Name</string>
4+
<string name="subtitle_roomName">Flipchat Name</string>
55

66
<string name="action_nevermind">Nevermind</string>
77

@@ -12,20 +12,20 @@
1212
<string name="action_payToChat">Send %1$s to Start Chatting</string>
1313
<string name="subtitle_loadingBalanceAndTransactions">Loading your balance and transaction history</string>
1414
<string name="subtitle_loadingChats">Loading your chats</string>
15-
<string name="action_joinRoom">Join Room</string>
15+
<string name="action_joinRoom">Join Flipchats</string>
1616
<string name="action_startListening">Start Listening</string>
17-
<string name="action_findRoom">Find Room</string>
17+
<string name="action_findRoom">Find a Flipchat</string>
1818
<string name="title_chat">Chat</string>
1919

2020
<string name="title_speakers">Speakers</string>
2121
<string name="title_listeners">Listeners</string>
2222
<string name="title_listener">Listener</string>
2323

2424
<string name="error_title_failedToCreateRoom">Something Went Wrong</string>
25-
<string name="error_description_failedToCreateRoom">You were unable to create a new room at this time. Please try again later</string>
25+
<string name="error_description_failedToCreateRoom">You were unable to create a new Flipchat at this time. Please try again later</string>
2626

27-
<string name="error_title_failedToGetRoom">Room Doesn\’t Exist Yet</string>
28-
<string name="error_description_failedToGetRoom">Please try a different room number</string>
27+
<string name="error_title_failedToGetRoom">Flipchat Doesn\’t Exist Yet</string>
28+
<string name="error_description_failedToGetRoom">Please try a different Flipchat number</string>
2929

3030
<string name="error_title_failedToChangeCover">Something Went Wrong</string>
3131
<string name="error_description_failedToChangeCover">Your new cover charge couldn\’t be saved. Please check your network connection and try again</string>
@@ -72,17 +72,17 @@
7272
<string name="error_title_failedToPurchaseItem">Purchase Failed</string>
7373
<string name="error_description_failedToPurchaseItem">Something went wrong during payment. Please try again later</string>
7474

75-
<string name="error_title_failedToChangeRoomNameBecauseInappropriate">Inappropriate Room Name</string>
76-
<string name="error_description_failedToChangeRoomNameBecauseInappropriate">Room names need to be appropriate for all ages</string>
75+
<string name="error_title_failedToChangeRoomNameBecauseInappropriate">Inappropriate Flipchat Name</string>
76+
<string name="error_description_failedToChangeRoomNameBecauseInappropriate">Flipchat names need to be appropriate for all ages</string>
7777

7878
<string name="error_title_failedToChangeRoomNameOtherReason">Something Went Wrong</string>
79-
<string name="error_description_failedToChangeRoomNameOtherReason">We were unable to change the room name at this time. Please try again later</string>
79+
<string name="error_description_failedToChangeRoomNameOtherReason">We were unable to change the Flipchat name at this time. Please try again later</string>
8080

8181
<string name="error_title_failedToReopenRoom">Something Went Wrong</string>
82-
<string name="error_description_failedToReopenRoom">You were unable to reopen this room at this time. Please try again later</string>
82+
<string name="error_description_failedToReopenRoom">You were unable to reopen this Flipchat at this time. Please try again later</string>
8383

8484
<string name="error_title_failedToCloseRoom">Something Went Wrong</string>
85-
<string name="error_description_failedToCloseRoom">You were unable to close this room at this time. Please try again later</string>
85+
<string name="error_description_failedToCloseRoom">You were unable to close this Flipchat at this time. Please try again later</string>
8686

8787
<string name="error_title_failedToSendTip">Something Went Wrong</string>
8888
<string name="error_description_failedToSendTip">You were unable to send a tip at this time. Please try again later</string>
@@ -93,20 +93,20 @@
9393
<string name="subtitle_linkingTwitterToLogin">%1$s I’d like to connect my X</string>
9494
<string name="action_messageToConnect">Message %1$s to Connect</string>
9595
<string name="title_cashTab">Balance</string>
96-
<string name="title_chatsTab">Rooms</string>
96+
<string name="title_chatsTab">Flipchats</string>
9797
<string name="title_settingsTab">Settings</string>
98-
<string name="action_enterRoomNumber">Enter Room Number</string>
99-
<string name="action_createNewRoom">Create New Room</string>
100-
<string name="title_lookupRoom">Enter Room Number</string>
101-
<string name="title_joinRoom">Join Room</string>
98+
<string name="action_enterRoomNumber">Enter Flipchat Number</string>
99+
<string name="action_createNewRoom">Create a New Flipchat</string>
100+
<string name="title_lookupRoom">Enter Flipchat Number</string>
101+
<string name="subtitle_enterRoomNumber">Enter Flipchat Number</string>
102+
<string name="title_joinRoom">Join Flipchat</string>
102103
<string name="title_changeCoverCharge">Change Cover Charge</string>
103104

104105
<string name="action_joinRoomByName">Join %1$s</string>
105106
<string name="action_joinRoomWithCost">Join Room: ⬢ %1$s</string>
106107
<string name="action_payToChatInRoom">Pay to Chat: ⬢ %1$s</string>
107-
<string name="action_watchRoom">Watch Room</string>
108108

109-
<string name="title_leaveRoom">Leave Room?</string>
109+
<string name="title_leaveRoom">Leave Flipchat?</string>
110110
<string name="subtitle_leaveRoom">You will need to pay to get back in, but we won\’t tell people you left</string>
111111
<string name="action_leaveRoomByName">Leave %1$s</string>
112112

@@ -201,17 +201,17 @@
201201
<string name="title_betaFlags">Labs</string>
202202

203203
<string name="action_notNow">Not Now</string>
204-
<string name="title_createAccountToJoinRooms">Create an Account to Join Rooms</string>
204+
<string name="title_createAccountToJoinRooms">Create an Account to Join Flipchats</string>
205205
<string name="action_purchaseAccount">Purchase Your Account</string>
206206
<string name="title_newAccountsCost">New accounts cost %1$s</string>
207207
<string name="title_finalizeAccountCreation">Finalize Account Creation</string>
208208
<string name="subtitle_finalizeAccountCreation">Accounts on Flipchat must be purchased for %1$s to reduce spam</string>
209209
<string name="action_changeCoverCharge">Change Cover Charge</string>
210-
<string name="action_addRoomName">Add Room Name</string>
211-
<string name="action_editRoomName">Edit Room Name</string>
212-
<string name="action_changeRoomName">Change Room Name</string>
210+
<string name="action_addRoomName">Add Flipchat Name</string>
211+
<string name="action_editRoomName">Edit Flipchat Name</string>
212+
<string name="action_changeRoomName">Change Flipchat Name</string>
213213
<string name="action_customize">Customize</string>
214-
<string name="action_customizeRoom">Customize Room</string>
214+
<string name="action_customizeRoom">Customize Flipchat</string>
215215
<string name="action_leaveRoom">Leave Flipchat</string>
216216
<string name="action_shareRoomLinkAsHost">Share a Link to Your Flipchat</string>
217217
<string name="action_shareRoomLinkAsMember">Share a Link to Their Flipchat</string>

0 commit comments

Comments
 (0)