diff --git a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
index 18a11ca5237903a050e3aff7ea851375e7fd8e0c..d86bd3e90dcaa6ea58c70f2f147ab9b11bda5243 100644
--- a/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
+++ b/src/main/kotlin/org/briarproject/briar/desktop/BriarService.kt
@@ -8,7 +8,7 @@ import org.briarproject.bramble.api.crypto.PasswordStrengthEstimator
import org.briarproject.bramble.api.lifecycle.LifecycleManager
import org.briarproject.briar.desktop.dialogs.Login
import org.briarproject.briar.desktop.dialogs.Registration
-import org.briarproject.briar.desktop.paul.views.briarUIStateManager
+import org.briarproject.briar.desktop.paul.views.BriarUIStateManager
import javax.annotation.concurrent.Immutable
import javax.inject.Inject
import javax.inject.Singleton
@@ -66,7 +66,7 @@ constructor(
})
is Screen.Main ->
- briarUIStateManager()
+ BriarUIStateManager()
}
}
}
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 85454f9c579868ced390782a84a93bb025006362..dbbca6fa622ffda909414df5489b3ebf153b2a44 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
@@ -22,7 +22,7 @@ import org.briarproject.briar.desktop.paul.theme.briarBlack
import org.briarproject.briar.desktop.paul.theme.briarBlue
@Composable
-fun briarSidebar(UIMode: String, onModeChange: (String) -> Unit) {
+fun BriarSidebar(UIMode: String, onModeChange: (String) -> Unit) {
Surface(modifier = Modifier.width(66.dp).fillMaxHeight(), color = briarBlue) {
Column(verticalArrangement = Arrangement.Top) {
IconButton(
@@ -36,25 +36,25 @@ fun briarSidebar(UIMode: String, onModeChange: (String) -> Unit) {
).border(2.dp, color = Color.White, CircleShape)
)
}
- briarSidebarButton(
+ BriarSidebarButton(
UIMode = UIMode,
onModeChange = onModeChange,
"Contacts",
Icons.Filled.Contacts
)
- briarSidebarButton(
+ BriarSidebarButton(
UIMode = UIMode,
onModeChange = onModeChange,
"Private Groups",
Icons.Filled.Group
)
- briarSidebarButton(
+ BriarSidebarButton(
UIMode = UIMode,
onModeChange = onModeChange,
"Forums",
Icons.Filled.Forum
)
- briarSidebarButton(
+ BriarSidebarButton(
UIMode = UIMode,
onModeChange = onModeChange,
"Blogs",
@@ -62,19 +62,19 @@ fun briarSidebar(UIMode: String, onModeChange: (String) -> Unit) {
)
}
Column(verticalArrangement = Arrangement.Bottom) {
- briarSidebarButton(
+ BriarSidebarButton(
UIMode = UIMode,
onModeChange = onModeChange,
"Transports",
Icons.Filled.WifiTethering
)
- briarSidebarButton(
+ BriarSidebarButton(
UIMode = UIMode,
onModeChange = onModeChange,
"Settings",
Icons.Filled.Settings
)
- briarSidebarButton(
+ BriarSidebarButton(
UIMode = UIMode,
onModeChange = onModeChange,
"Sign Out",
@@ -85,7 +85,7 @@ fun briarSidebar(UIMode: String, onModeChange: (String) -> Unit) {
}
@Composable
-fun briarSidebarButton(
+fun BriarSidebarButton(
UIMode: String,
onModeChange: (String) -> Unit,
thisMode: String,
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 a58fa8f036d6c3b345a5bb161e695c217508ee64..b729efbff73b2d7b2118da2d3a75d20651b3a1c5 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
@@ -20,7 +20,7 @@ import org.briarproject.briar.desktop.paul.theme.briarBlack
* Multiplatform, stateless, composable are found in briarCompose (possible briar-compose project in the future)
*/
@Composable
-fun briarUIStateManager() {
+fun BriarUIStateManager() {
//current selected mode, changed using the sidebar buttons
val (UIMode, onModeChange) = remember { mutableStateOf("Contacts") }
//current selected contact
@@ -39,9 +39,9 @@ fun briarUIStateManager() {
var Profile: String;
//Other global state that we need to track should go here also
Row() {
- briarSidebar(UIMode, onModeChange)
+ BriarSidebar(UIMode, onModeChange)
when (UIMode) {
- "Contacts" -> privateMessageView(UIContact, onContactSelect)
+ "Contacts" -> PrivateMessageView(UIContact, onContactSelect)
else -> Box(modifier = Modifier.fillMaxSize().background(briarBlack)) {
Text("TBD", modifier = Modifier.align(Alignment.Center), color = Color.White)
}
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 fc8544d5e9e8ffa10511fbe91471f9f0db732188..da9dad214bd7b208bba757835af14c8cfb9b1daf 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
@@ -29,10 +29,10 @@ import org.briarproject.briar.desktop.paul.theme.*
val HEADER_SIZE = 66.dp;
@Composable
-fun privateMessageView(UIContact: Contact, onContactSelect: (Contact) -> Unit) {
+fun PrivateMessageView(UIContact: Contact, onContactSelect: (Contact) -> Unit) {
//Local State for managing the Add Contact Popup
val (AddContactDialog, onCancelAdd) = remember { mutableStateOf(false) }
- addContactDialog(AddContactDialog, onCancelAdd)
+ AddContactDialog(AddContactDialog, onCancelAdd)
Column(modifier = Modifier.fillMaxHeight()) {
Row(modifier = Modifier.fillMaxWidth()) {
Divider(color = divider, modifier = Modifier.fillMaxHeight().width(1.dp))
@@ -57,21 +57,21 @@ fun privateMessageView(UIContact: Contact, onContactSelect: (Contact) -> Unit) {
Divider(color = divider, thickness = 1.dp, modifier = Modifier.fillMaxWidth())
Column(modifier = Modifier.verticalScroll(rememberScrollState())) {
for (c in ContactList.contacts) {
- contactCard(c, UIContact, onSel = onContactSelect)
+ ContactCard(c, UIContact, onSel = onContactSelect)
}
}
}
Divider(color = divider, modifier = Modifier.fillMaxHeight().width(1.dp))
Column(modifier = Modifier.weight(1f).fillMaxHeight().background(color = darkGray)) {
- drawMessageRow(UIContact)
+ DrawMessageRow(UIContact)
}
}
}
}
@Composable
-fun addContactDialog(isVisible: Boolean, onCancel: (Boolean) -> Unit) {
+fun AddContactDialog(isVisible: Boolean, onCancel: (Boolean) -> Unit) {
if (isVisible) {
AlertDialog(
onDismissRequest = {
@@ -146,7 +146,7 @@ fun addContactDialog(isVisible: Boolean, onCancel: (Boolean) -> Unit) {
}
@Composable
-fun contactCard(contact: Contact, selContact: Contact, onSel: (Contact) -> Unit) {
+fun ContactCard(contact: Contact, selContact: Contact, onSel: (Contact) -> Unit) {
var bgColor = briarBlack
if (selContact.name == contact.name) {
bgColor = darkGray
@@ -203,7 +203,7 @@ fun contactCard(contact: Contact, selContact: Contact, onSel: (Contact) -> Unit)
}
@Composable
-fun textBubble(m: Message) {
+fun TextBubble(m: Message) {
Column(Modifier.fillMaxWidth()) {
if (m.from == null) {
Column(Modifier.fillMaxWidth(fraction = 0.9f).align(Alignment.End)) {
@@ -258,7 +258,7 @@ fun textBubble(m: Message) {
}
@Composable
-fun drawTextBubbles(msgList: List<Message>) {
+fun DrawTextBubbles(msgList: List<Message>) {
LazyColumn(
Modifier.fillMaxWidth().padding(horizontal = 8.dp),
verticalArrangement = Arrangement.spacedBy(8.dp),
@@ -266,13 +266,13 @@ fun drawTextBubbles(msgList: List<Message>) {
contentPadding = PaddingValues(vertical = 8.dp)
) {
items(msgList) { m ->
- textBubble(m)
+ TextBubble(m)
}
}
}
@Composable
-fun drawMessageRow(UIContact: Contact) {
+fun DrawMessageRow(UIContact: Contact) {
Box(Modifier.fillMaxHeight()) {
Box(modifier = Modifier.fillMaxWidth().height(HEADER_SIZE + 1.dp)) {
Row(modifier = Modifier.align(Alignment.Center)) {
@@ -298,7 +298,7 @@ fun drawMessageRow(UIContact: Contact) {
Divider(color = divider, thickness = 1.dp, modifier = Modifier.fillMaxWidth().align(Alignment.BottomCenter))
}
Box(Modifier.padding(top = HEADER_SIZE + 1.dp, bottom = HEADER_SIZE)) {
- drawTextBubbles(UIContact.privateMessages)
+ DrawTextBubbles(UIContact.privateMessages)
}
var text by remember { mutableStateOf(TextFieldValue("")) }
Box(Modifier.align(Alignment.BottomCenter).background(darkGray)) {