diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt
index e4e3dccf4a511a26126b8f72c935ab61c98ae50c..b87a5d5d83b8701c31c52ac9097af44ec6222b2e 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarSidebar.kt
@@ -33,7 +33,7 @@ import org.briarproject.briar.desktop.paul.theme.briarBlack
import org.briarproject.briar.desktop.paul.theme.briarBlue
@Composable
-fun BriarSidebar(uiMode: String, setMode: (String) -> Unit) {
+fun BriarSidebar(uiMode: String, setUiMode: (String) -> Unit) {
Surface(modifier = Modifier.width(56.dp).fillMaxHeight(), color = briarBlue) {
Column(verticalArrangement = Arrangement.Top) {
IconButton(
@@ -50,25 +50,25 @@ fun BriarSidebar(uiMode: String, setMode: (String) -> Unit) {
}
BriarSidebarButton(
uiMode = uiMode,
- setMode = setMode,
+ setUiMode = setUiMode,
"Contacts",
Icons.Filled.Contacts
)
BriarSidebarButton(
uiMode = uiMode,
- setMode = setMode,
+ setUiMode = setUiMode,
"Private Groups",
Icons.Filled.Group
)
BriarSidebarButton(
uiMode = uiMode,
- setMode = setMode,
+ setUiMode = setUiMode,
"Forums",
Icons.Filled.Forum
)
BriarSidebarButton(
uiMode = uiMode,
- setMode = setMode,
+ setUiMode = setUiMode,
"Blogs",
Icons.Filled.ChromeReaderMode
)
@@ -76,19 +76,19 @@ fun BriarSidebar(uiMode: String, setMode: (String) -> Unit) {
Column(verticalArrangement = Arrangement.Bottom) {
BriarSidebarButton(
uiMode = uiMode,
- setMode = setMode,
+ setUiMode = setUiMode,
"Transports",
Icons.Filled.WifiTethering
)
BriarSidebarButton(
uiMode = uiMode,
- setMode = setMode,
+ setUiMode = setUiMode,
"Settings",
Icons.Filled.Settings
)
BriarSidebarButton(
uiMode = uiMode,
- setMode = setMode,
+ setUiMode = setUiMode,
"Sign Out",
Icons.Filled.Logout
)
@@ -97,13 +97,13 @@ fun BriarSidebar(uiMode: String, setMode: (String) -> Unit) {
}
@Composable
-fun BriarSidebarButton(uiMode: String, setMode: (String) -> Unit, thisMode: String, icon: ImageVector) {
+fun BriarSidebarButton(uiMode: String, setUiMode: (String) -> Unit, thisMode: String, icon: ImageVector) {
val bg = if (uiMode == thisMode) briarBlack else briarBlue
Column {
IconButton(
modifier = Modifier.align(Alignment.CenterHorizontally).background(color = bg)
.padding(vertical = 4.dp, horizontal = 12.dp),
- onClick = { setMode(thisMode) }
+ onClick = { setUiMode(thisMode) }
) {
Icon(icon, thisMode, tint = Color.White, modifier = Modifier.size(30.dp))
}
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt
index 188ca429701b4c14b78dc4480925d68c522bc04e..7a1e34c58f397df37c42c93c73b232266a0c86de 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/BriarUIStateManager.kt
@@ -24,7 +24,7 @@ fun BriarUIStateManager(
contacts: List<Contact>
) {
// current selected mode, changed using the sidebar buttons
- val (uiMode, setMode) = remember { mutableStateOf("Contacts") }
+ val (uiMode, setUiMode) = remember { mutableStateOf("Contacts") }
// TODO Figure out how to handle accounts with 0 contacts
// current selected contact
val (contact, setContact) = remember { mutableStateOf(contacts[0]) }
@@ -38,7 +38,7 @@ fun BriarUIStateManager(
val (setting, setSetting) = remember { mutableStateOf(0) }
// Other global state that we need to track should go here also
Row() {
- BriarSidebar(uiMode, setMode)
+ BriarSidebar(uiMode, setUiMode)
when (uiMode) {
"Contacts" -> PrivateMessageView(
contact,
diff --git a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt
index d8483431ddf0c2d9193db55313726d2bcaf40f2e..f5cd8ac01be1a4f17e297532345406f949c100de 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/paul/views/PrivateMessageView.kt
@@ -473,7 +473,7 @@ fun Loader() {
fun ContactDropDown(
expanded: Boolean,
isExpanded: (Boolean) -> Unit,
- isInfoDrawer: (Boolean) -> Unit
+ setInfoDrawer: (Boolean) -> Unit
) {
var connectionMode by remember { mutableStateOf(false) }
var contactMode by remember { mutableStateOf(false) }
@@ -482,7 +482,7 @@ fun ContactDropDown(
onDismissRequest = { isExpanded(false) },
modifier = Modifier.background(briarBlack)
) {
- DropdownMenuItem(onClick = { isInfoDrawer(true); isExpanded(false) }) {
+ DropdownMenuItem(onClick = { setInfoDrawer(true); isExpanded(false) }) {
Text("Make Introduction", fontSize = 14.sp)
}
DropdownMenuItem(onClick = {}) {
@@ -542,10 +542,10 @@ fun ContactDropDown(
@Composable
fun MsgColumnHeader(
- uiContact: Contact,
+ contact: Contact,
expanded: Boolean,
isExpanded: (Boolean) -> Unit,
- isInfoDrawer: (Boolean) -> Unit
+ setInfoDrawer: (Boolean) -> Unit
) {
Box(modifier = Modifier.fillMaxWidth().height(HEADER_SIZE + 1.dp)) {
Row(modifier = Modifier.align(Alignment.Center)) {
@@ -578,7 +578,7 @@ fun MsgColumnHeader(
}
)
Text(
- uiContact.author.name,
+ contact.author.name,
color = Color.White,
modifier = Modifier.align(Alignment.CenterVertically).padding(start = 12.dp),
fontSize = 20.sp
@@ -589,7 +589,7 @@ fun MsgColumnHeader(
modifier = Modifier.align(Alignment.CenterEnd).padding(end = 16.dp)
) {
Icon(Icons.Filled.MoreVert, "contact info", tint = Color.White, modifier = Modifier.size(24.dp))
- ContactDropDown(expanded, isExpanded, isInfoDrawer)
+ ContactDropDown(expanded, isExpanded, setInfoDrawer)
}
Divider(color = divider, thickness = 1.dp, modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter))
}
@@ -649,14 +649,14 @@ fun MsgInput(currContact: Contact) {
}
@Composable
-fun ContactDrawerMakeIntro(currContact: Contact, contacts: List<Contact>, isInfoDrawer: (Boolean) -> Unit) {
+fun ContactDrawerMakeIntro(currContact: Contact, contacts: List<Contact>, setInfoDrawer: (Boolean) -> Unit) {
var introNextPg by remember { mutableStateOf(false) }
val (introContact, onCancelSel) = remember { mutableStateOf(currContact) }
if (!introNextPg) {
Column() {
Row(Modifier.fillMaxWidth().height(HEADER_SIZE)) {
IconButton(
- onClick = { isInfoDrawer(false) },
+ onClick = { setInfoDrawer(false) },
Modifier.padding(horizontal = 11.dp).size(32.dp).align(Alignment.CenterVertically)
) {
Icon(Icons.Filled.Close, "close make intro screen", tint = Color.White)
@@ -740,7 +740,7 @@ fun ContactDrawerMakeIntro(currContact: Contact, contacts: List<Contact>, isInfo
}
Row(Modifier.padding(8.dp)) {
TextButton(
- onClick = { isInfoDrawer(false); introNextPg = false; },
+ onClick = { setInfoDrawer(false); introNextPg = false; },
Modifier.fillMaxWidth().background(briarDarkGray)
) {
Text("MAKE INTRODUCTION")
@@ -754,12 +754,12 @@ fun ContactDrawerMakeIntro(currContact: Contact, contacts: List<Contact>, isInfo
fun ContactInfoDrawer(
currContact: Contact,
contacts: List<Contact>,
- isInfoDrawer: (Boolean) -> Unit,
+ setInfoDrawer: (Boolean) -> Unit,
drawerState: ContactInfoDrawerState
) {
Row() {
when (drawerState) {
- ContactInfoDrawerState.MakeIntro -> ContactDrawerMakeIntro(currContact, contacts, isInfoDrawer)
+ ContactInfoDrawerState.MakeIntro -> ContactDrawerMakeIntro(currContact, contacts, setInfoDrawer)
}
}
}