diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt index 8ee57738..63a56907 100644 --- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt +++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt @@ -65,6 +65,7 @@ import com.geeksville.mesh.databinding.ActivityMainBinding import com.geeksville.mesh.model.BluetoothViewModel import com.geeksville.mesh.model.DeviceVersion import com.geeksville.mesh.model.UIViewModel +import com.geeksville.mesh.navigation.navigateToNavGraph import com.geeksville.mesh.service.MeshService import com.geeksville.mesh.service.MeshServiceNotifications import com.geeksville.mesh.service.ServiceRepository @@ -78,7 +79,6 @@ 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.message.navigateToMessages -import com.geeksville.mesh.ui.navigateToNavGraph import com.geeksville.mesh.ui.navigateToShareMessage import com.geeksville.mesh.ui.theme.AppTheme import com.geeksville.mesh.util.Exceptions diff --git a/app/src/main/java/com/geeksville/mesh/ui/NavGraph.kt b/app/src/main/java/com/geeksville/mesh/navigation/NavGraph.kt similarity index 93% rename from app/src/main/java/com/geeksville/mesh/ui/NavGraph.kt rename to app/src/main/java/com/geeksville/mesh/navigation/NavGraph.kt index 4eae460b..349c7cce 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/NavGraph.kt +++ b/app/src/main/java/com/geeksville/mesh/navigation/NavGraph.kt @@ -15,7 +15,7 @@ * along with this program. If not, see . */ -package com.geeksville.mesh.ui +package com.geeksville.mesh.navigation import android.os.Bundle import android.view.LayoutInflater @@ -36,11 +36,7 @@ import androidx.navigation.compose.NavHost import androidx.navigation.compose.rememberNavController import com.geeksville.mesh.R import com.geeksville.mesh.android.Logging -import com.geeksville.mesh.navigation.Route -import com.geeksville.mesh.navigation.addNodDetailSection -import com.geeksville.mesh.navigation.addRadioConfigSection -import com.geeksville.mesh.navigation.navigateToSharedMessage -import com.geeksville.mesh.navigation.shareScreen +import com.geeksville.mesh.ui.ScreenFragment import com.geeksville.mesh.ui.components.BaseScaffold import com.geeksville.mesh.ui.radioconfig.RadioConfigViewModel import com.geeksville.mesh.ui.theme.AppTheme diff --git a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt index 8650d955..c9adfe5f 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/UsersFragment.kt @@ -41,8 +41,9 @@ import com.geeksville.mesh.DataPacket import com.geeksville.mesh.android.Logging import com.geeksville.mesh.model.Node import com.geeksville.mesh.model.UIViewModel -import com.geeksville.mesh.ui.components.NodeMenuAction +import com.geeksville.mesh.navigation.navigateToNavGraph import com.geeksville.mesh.ui.components.NodeFilterTextField +import com.geeksville.mesh.ui.components.NodeMenuAction import com.geeksville.mesh.ui.components.rememberTimeTickWithLifecycle import com.geeksville.mesh.ui.message.navigateToMessages import com.geeksville.mesh.ui.theme.AppTheme diff --git a/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt b/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt index 8266df0e..bcb94fb0 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/message/Message.kt @@ -92,11 +92,11 @@ import com.geeksville.mesh.database.entity.QuickChatAction import com.geeksville.mesh.model.Node import com.geeksville.mesh.model.UIViewModel import com.geeksville.mesh.model.getChannel +import com.geeksville.mesh.navigation.navigateToNavGraph import com.geeksville.mesh.ui.components.BaseScaffold import com.geeksville.mesh.ui.components.NodeKeyStatusIcon import com.geeksville.mesh.ui.components.NodeMenuAction import com.geeksville.mesh.ui.message.components.MessageList -import com.geeksville.mesh.ui.navigateToNavGraph import com.geeksville.mesh.ui.theme.AppTheme import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch