Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

small fixes #21

Merged
merged 5 commits into from
Oct 22, 2023
Merged

small fixes #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6204807
enter to send
zoff99 Oct 22, 2023
509fa79
send on enter
zoff99 Oct 22, 2023
b2f9b14
remove unused parameter
zoff99 Oct 22, 2023
ba9898e
.gitignore
zoff99 Oct 22, 2023
25f4f5e
catch an exception
zoff99 Oct 22, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,4 @@ _BACKUP/
datadir/
tempdir/
main.db-journal
savedata.tox__backup
2 changes: 1 addition & 1 deletion src/main/kotlin/com/zoffcc/applications/trifa2/GroupMessages.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ internal fun GroupMessages(groupmessages: List<UIGroupMessage>, ui_scale: Float)
try
{
// listState.animateScrollToItem(groupmessages.lastIndex, scrollOffset = 0)
listState.scrollToItem(groupmessages.lastIndex, scrollOffset = 2)
listState.scrollToItem(groupmessages.lastIndex)
}
catch (e : Exception)
{
Expand Down
45 changes: 32 additions & 13 deletions src/main/kotlin/com/zoffcc/applications/trifa2/GroupSendMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,15 @@ import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.focusTarget
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.key.Key
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.ui.input.key.isAltPressed
import androidx.compose.ui.input.key.isCtrlPressed
import androidx.compose.ui.input.key.isMetaPressed
import androidx.compose.ui.input.key.isShiftPressed
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.key.type
import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp
Expand All @@ -40,7 +49,28 @@ fun GroupSendMessage(sendGroupMessage: (String) -> Unit) {
modifier = Modifier.fillMaxWidth()
.background(MaterialTheme.colors.background)
.padding(1.dp)
.focusRequester(textFieldFocusRequester),
.focusRequester(textFieldFocusRequester)
.onPreviewKeyEvent {
when {
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyUp) -> {
sendGroupMessage(inputText)
inputText = ""
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyUp) -> {
sendGroupMessage(inputText)
inputText = ""
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyDown) -> {
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyDown) -> {
true
}
else -> false
}
},
colors = TextFieldDefaults.textFieldColors(backgroundColor = Color.White),
keyboardOptions = KeyboardOptions(
capitalization = KeyboardCapitalization.None,
Expand All @@ -51,18 +81,7 @@ fun GroupSendMessage(sendGroupMessage: (String) -> Unit) {
Text(text = "Type Group Message...", fontSize = 14.sp)
},
onValueChange = {
// ?? haXX0r ??
if (it == inputText + "\n")
{
// ?? haXX0r ??
// Log.i(TAG, "enter key pressed")
sendGroupMessage(inputText)
inputText = ""
}
else
{
inputText = it
}
inputText = it
},
trailingIcon = {
if (inputText.isNotEmpty()) {
Expand Down
24 changes: 12 additions & 12 deletions src/main/kotlin/com/zoffcc/applications/trifa2/MessageReducer.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,21 +52,21 @@ fun chatReducer(state: MessageState, action: MessageAction): MessageState = when
is MessageAction.UpdateMessage ->
{
val TAG = "UpdateMessage"
val item_position = state.messages.binarySearchBy(action.message_db.id) { it.id }
// Log.i(TAG, "item_position = " + item_position)
val item = state.messages[item_position]
if (action.filetransfer_db != null)
try
{
state.messages[item_position] = item.copy(
filesize = action.filetransfer_db.filesize,
currentfilepos = action.filetransfer_db.current_position,
filename_fullpath = action.message_db.filename_fullpath
)
val item_position = state.messages.binarySearchBy(action.message_db.id) { it.id } // Log.i(TAG, "item_position = " + item_position)
val item = state.messages[item_position]
if (action.filetransfer_db != null)
{
state.messages[item_position] = item.copy(filesize = action.filetransfer_db.filesize, currentfilepos = action.filetransfer_db.current_position, filename_fullpath = action.message_db.filename_fullpath)
} else
{
Log.i(TAG, "UpdateMessage:ft=null");
state.messages[item_position] = item.copy(filename_fullpath = null, currentfilepos = 0, filesize = 0)
}
}
else
catch (e: Exception)
{
Log.i(TAG, "UpdateMessage:ft=null");
state.messages[item_position] = item.copy(filename_fullpath = null, currentfilepos = 0, filesize = 0)
}
state.copy(messages = state.messages)
}
Expand Down
2 changes: 1 addition & 1 deletion src/main/kotlin/com/zoffcc/applications/trifa2/Messages.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ internal fun Messages(messages: List<UIMessage>, ui_scale: Float) {
try
{
// listState.animateScrollToItem(messages.lastIndex, scrollOffset = 0)
listState.scrollToItem(messages.lastIndex, scrollOffset = 2)
listState.scrollToItem(messages.lastIndex)
}
catch (e : Exception)
{
Expand Down
51 changes: 37 additions & 14 deletions src/main/kotlin/com/zoffcc/applications/trifa2/SendMessage.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,13 @@ import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.height
import androidx.compose.ui.Modifier
import androidx.compose.ui.input.key.Key
import androidx.compose.ui.input.key.isCtrlPressed
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.input.key.type
import androidx.compose.ui.input.key.KeyEventType
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
Expand All @@ -19,11 +26,16 @@ import androidx.compose.runtime.mutableStateOf
import androidx.compose.runtime.remember
import androidx.compose.runtime.setValue
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.focus.focusTarget
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.input.key.isAltPressed
import androidx.compose.ui.input.key.isCtrlPressed
import androidx.compose.ui.input.key.isMetaPressed
import androidx.compose.ui.input.key.isShiftPressed
import androidx.compose.ui.input.key.key
import androidx.compose.ui.input.key.onPreviewKeyEvent
import androidx.compose.ui.text.input.KeyboardCapitalization
import androidx.compose.ui.text.input.KeyboardType
import androidx.compose.ui.unit.dp
Expand All @@ -40,7 +52,29 @@ fun SendMessage(sendMessage: (String) -> Unit) {
modifier = Modifier.fillMaxWidth()
.background(MaterialTheme.colors.background)
.padding(1.dp)
.focusRequester(textFieldFocusRequester),
.focusRequester(textFieldFocusRequester)
.onPreviewKeyEvent {
when {
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyUp) -> {
sendMessage(inputText)
inputText = ""
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyUp) -> {
sendMessage(inputText)
inputText = ""
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.Enter && it.type == KeyEventType.KeyDown) -> {
true
}
(!it.isMetaPressed && !it.isAltPressed && !it.isCtrlPressed && !it.isShiftPressed && it.key == Key.NumPadEnter && it.type == KeyEventType.KeyDown) -> {
true
}
else -> false
}
}
,
colors = TextFieldDefaults.textFieldColors(backgroundColor = Color.White),
keyboardOptions = KeyboardOptions(
capitalization = KeyboardCapitalization.None,
Expand All @@ -51,18 +85,7 @@ fun SendMessage(sendMessage: (String) -> Unit) {
Text(text = "Type message...", fontSize = 14.sp)
},
onValueChange = {
// ?? haXX0r ??
if (it == inputText + "\n")
{
// ?? haXX0r ??
// Log.i(TAG, "enter key pressed")
sendMessage(inputText)
inputText = ""
}
else
{
inputText = it
}
inputText = it
},
trailingIcon = {
if (inputText.isNotEmpty()) {
Expand Down
Loading