-
Notifications
You must be signed in to change notification settings - Fork 7
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* Chat - Basic UI with loads of TODOs * - Chat FAB in Tradeflow; Create Offer FAB in Market; TopBar - Improvement for backBehavior, backConfirmation flags check
- Loading branch information
1 parent
be6bc51
commit 78d16d6
Showing
45 changed files
with
1,028 additions
and
25 deletions.
There are no files selected for viewing
Binary file added
BIN
+1.91 KB
shared/presentation/src/commonMain/composeResources/drawable/icon_closed_eye.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+672 Bytes
shared/presentation/src/commonMain/composeResources/drawable/icon_flag.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.8 KB
...d/presentation/src/commonMain/composeResources/drawable/icon_reaction_happy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.08 KB
...d/presentation/src/commonMain/composeResources/drawable/icon_reaction_heart.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+3.23 KB
...d/presentation/src/commonMain/composeResources/drawable/icon_reaction_laugh.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+3.96 KB
...d/presentation/src/commonMain/composeResources/drawable/icon_reaction_party.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.12 KB
...entation/src/commonMain/composeResources/drawable/icon_reaction_thumbs_down.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+2.09 KB
...esentation/src/commonMain/composeResources/drawable/icon_reaction_thumbs_up.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+702 Bytes
shared/presentation/src/commonMain/composeResources/drawable/icon_reply.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+1.9 KB
shared/presentation/src/commonMain/composeResources/drawable/icon_send.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
20 changes: 20 additions & 0 deletions
20
...ain/kotlin/network/bisq/mobile/presentation/ui/components/atoms/button/CloseIconButton.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
package network.bisq.mobile.presentation.ui.components.atoms.button | ||
|
||
import androidx.compose.foundation.layout.size | ||
import androidx.compose.material3.IconButton | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.platform.LocalClipboardManager | ||
import androidx.compose.ui.text.buildAnnotatedString | ||
import androidx.compose.ui.unit.dp | ||
import network.bisq.mobile.presentation.ui.components.atoms.icons.CloseIcon | ||
|
||
@Composable | ||
fun CloseIconButton( | ||
onClick: () -> Unit, | ||
modifier: Modifier = Modifier.size(20.dp) | ||
) { | ||
IconButton(onClick = onClick, modifier = modifier) { | ||
CloseIcon() | ||
} | ||
} |
2 changes: 1 addition & 1 deletion
2
...ion/ui/components/atoms/CopyIconButton.kt → ...components/atoms/button/CopyIconButton.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
36 changes: 36 additions & 0 deletions
36
...tlin/network/bisq/mobile/presentation/ui/components/molecules/chat/AuthorNameTimestamp.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,36 @@ | ||
package network.bisq.mobile.presentation.ui.components.molecules.chat | ||
|
||
import androidx.compose.foundation.layout.* | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.Alignment | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.layout.LastBaseline | ||
import androidx.compose.ui.semantics.semantics | ||
import androidx.compose.ui.unit.dp | ||
import network.bisq.mobile.presentation.ui.components.atoms.BisqText | ||
import network.bisq.mobile.presentation.ui.composeModels.ChatMessage | ||
import network.bisq.mobile.presentation.ui.theme.BisqTheme | ||
|
||
@Composable | ||
fun ChatAuthorNameTimestamp(msg: ChatMessage) { | ||
Row( | ||
modifier = Modifier.semantics(mergeDescendants = true) {}, | ||
verticalAlignment = Alignment.CenterVertically, | ||
horizontalArrangement = Arrangement.spacedBy(12.dp) | ||
) { | ||
if (msg.author != "me") { | ||
BisqText.baseMedium( | ||
text = msg.author, | ||
modifier = Modifier | ||
.alignBy(LastBaseline) | ||
.paddingFrom(LastBaseline, after = 8.dp) | ||
) | ||
} | ||
BisqText.baseMedium( | ||
text = msg.timestamp, | ||
color = BisqTheme.colors.grey1 | ||
) | ||
} | ||
} | ||
|
||
|
34 changes: 34 additions & 0 deletions
34
...nMain/kotlin/network/bisq/mobile/presentation/ui/components/molecules/chat/InnerBubble.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,34 @@ | ||
package network.bisq.mobile.presentation.ui.components.molecules.chat | ||
|
||
import androidx.compose.foundation.layout.* | ||
import androidx.compose.runtime.Composable | ||
import androidx.compose.ui.Alignment | ||
import androidx.compose.ui.Modifier | ||
import androidx.compose.ui.unit.dp | ||
import network.bisq.mobile.presentation.ui.components.atoms.BisqText | ||
import network.bisq.mobile.presentation.ui.components.atoms.DynamicImage | ||
import network.bisq.mobile.presentation.ui.composeModels.ChatMessage | ||
import network.bisq.mobile.presentation.ui.theme.BisqUIConstants | ||
|
||
@Composable | ||
fun ChatInnerBubble( | ||
message: ChatMessage, | ||
isUserMe: Boolean, | ||
) { | ||
Row( | ||
verticalAlignment = Alignment.Top, | ||
modifier = Modifier.padding( | ||
vertical = BisqUIConstants.ScreenPaddingHalf, | ||
horizontal = BisqUIConstants.ScreenPadding | ||
), | ||
horizontalArrangement = Arrangement.spacedBy(BisqUIConstants.ScreenPadding) | ||
) { | ||
if (!isUserMe) { | ||
DynamicImage( | ||
"drawable/img_bot_image.png", | ||
modifier = Modifier.size(24.dp) | ||
) | ||
} | ||
BisqText.baseRegular(text = message.content) | ||
} | ||
} |
Oops, something went wrong.