mirror/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-02-23 01:37:14 -05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: move message files to separate package

Browse Source
This commit is contained in:
andrekir
2024-12-03 09:14:32 -03:00
parent 2234f5a713
commit 96087cca59
8 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/geeksville/mesh/MainActivity.kt
View File

@@ -77,7 +77,7 @@ import com.geeksville.mesh.ui.SettingsFragment
import com.geeksville.mesh.ui.UsersFragment
import com.geeksville.mesh.ui.components.ScannedQrCodeDialog
import com.geeksville.mesh.ui.map.MapFragment
import com.geeksville.mesh.ui.navigateToMessages
import com.geeksville.mesh.ui.message.navigateToMessages
import com.geeksville.mesh.ui.navigateToNavGraph
import com.geeksville.mesh.ui.navigateToShareMessage
import com.geeksville.mesh.ui.theme.AppTheme

1
app/src/main/java/com/geeksville/mesh/ui/ContactsFragment.kt
View File

@@ -46,6 +46,7 @@ import com.geeksville.mesh.android.Logging
import com.geeksville.mesh.R
import com.geeksville.mesh.model.Contact
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.ui.message.navigateToMessages
import com.geeksville.mesh.ui.theme.AppTheme
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import dagger.hilt.android.AndroidEntryPoint

1
app/src/main/java/com/geeksville/mesh/ui/ShareFragment.kt
View File

@@ -22,6 +22,7 @@ import com.geeksville.mesh.R
import com.geeksville.mesh.databinding.ShareFragmentBinding
import com.geeksville.mesh.model.Contact
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.ui.message.navigateToMessages
import com.geeksville.mesh.ui.theme.AppTheme
import dagger.hilt.android.AndroidEntryPoint

1
app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt
View File

@@ -44,6 +44,7 @@ import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.ui.components.MenuItemAction
import com.geeksville.mesh.ui.components.NodeFilterTextField
import com.geeksville.mesh.ui.components.rememberTimeTickWithLifecycle
import com.geeksville.mesh.ui.message.navigateToMessages
import com.geeksville.mesh.ui.theme.AppTheme
import dagger.hilt.android.AndroidEntryPoint

5
app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt → app/src/main/java/com/geeksville/mesh/ui/message/Message.kt
View File

@@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.geeksville.mesh.ui
package com.geeksville.mesh.ui.message
import android.os.Bundle
import android.view.LayoutInflater
@@ -90,6 +90,7 @@ import com.geeksville.mesh.android.Logging
import com.geeksville.mesh.database.entity.QuickChatAction
import com.geeksville.mesh.model.UIViewModel
import com.geeksville.mesh.model.getChannel
import com.geeksville.mesh.ui.message.components.MessageList
import com.geeksville.mesh.ui.components.NodeKeyStatusIcon
import com.geeksville.mesh.ui.theme.AppTheme
import dagger.hilt.android.AndroidEntryPoint
@@ -247,7 +248,7 @@ internal fun MessageScreen(
}
) { innerPadding ->
if (messages.isNotEmpty()) {
MessageListView(
MessageList(
messages = messages,
selectedIds = selectedIds,
onUnreadChanged = { viewModel.clearUnreadCount(contactKey, it) },

2
app/src/main/java/com/geeksville/mesh/ui/MessageItem.kt → app/src/main/java/com/geeksville/mesh/ui/message/components/MessageItem.kt
View File

@@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.geeksville.mesh.ui
package com.geeksville.mesh.ui.message.components
import androidx.compose.animation.AnimatedVisibility
import androidx.compose.foundation.ExperimentalFoundationApi

5
app/src/main/java/com/geeksville/mesh/ui/MessageListView.kt → app/src/main/java/com/geeksville/mesh/ui/message/components/MessageList.kt
View File

@@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.geeksville.mesh.ui
package com.geeksville.mesh.ui.message.components
import androidx.compose.foundation.layout.PaddingValues
import androidx.compose.foundation.layout.fillMaxSize
@@ -35,14 +35,13 @@ import androidx.compose.runtime.snapshotFlow
import androidx.compose.ui.Modifier
import com.geeksville.mesh.DataPacket
import com.geeksville.mesh.model.Message
import com.geeksville.mesh.ui.components.ReactionRow
import com.geeksville.mesh.ui.components.SimpleAlertDialog
import kotlinx.coroutines.FlowPreview
import kotlinx.coroutines.flow.collectLatest
import kotlinx.coroutines.flow.debounce
@Composable
internal fun MessageListView(
internal fun MessageList(
messages: List<Message>,
selectedIds: MutableState<Set<Long>>,
onUnreadChanged: (Long) -> Unit,

3
app/src/main/java/com/geeksville/mesh/ui/components/Reaction.kt → app/src/main/java/com/geeksville/mesh/ui/message/components/Reaction.kt
View File

@@ -15,7 +15,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
package com.geeksville.mesh.ui.components
package com.geeksville.mesh.ui.message.components
import androidx.compose.foundation.background
import androidx.compose.foundation.clickable
@@ -51,6 +51,7 @@ import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.Dialog
import com.geeksville.mesh.MeshProtos
import com.geeksville.mesh.database.entity.Reaction
import com.geeksville.mesh.ui.components.EmojiPicker
import com.geeksville.mesh.ui.theme.AppTheme
@Composable