diff --git a/.idea/gradle.xml b/.idea/gradle.xml index dba811c8..54874b2c 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -16,7 +16,6 @@ diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt index e64a7c2c..1d82ab49 100644 --- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt +++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt @@ -142,7 +142,8 @@ class MainActivity : AppCompatActivity(), Logging, TabInfo( "Channel", R.drawable.ic_twotone_contactless_24, - ComposeFragment("Channel", 4) { ChannelContent(UIState.getChannel()) }), + ChannelFragment() + ), TabInfo( "Map", R.drawable.ic_twotone_map_24, diff --git a/app/src/main/java/com/geeksville/mesh/ui/Channel.kt b/app/src/main/java/com/geeksville/mesh/ui/Channel.kt index 168dfd77..66677122 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/Channel.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/Channel.kt @@ -1,6 +1,10 @@ package com.geeksville.mesh.ui import android.content.Intent +import android.os.Bundle +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup import androidx.compose.Composable import androidx.ui.core.ContextAmbient import androidx.ui.foundation.Text @@ -21,6 +25,20 @@ import com.geeksville.mesh.model.toHumanString object ChannelLog : Logging +class ChannelFragment : ScreenFragment("Channel"), Logging { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? = inflater.inflate(R.layout.channel_fragment, container, false) + + + override fun onViewCreated(view: View, savedInstanceState: Bundle?) { + super.onViewCreated(view, savedInstanceState) + } +} + + @Composable fun ChannelContent(channel: Channel?) { diff --git a/app/src/main/res/layout/channel_fragment.xml b/app/src/main/res/layout/channel_fragment.xml index 1cc2727d..22120ee8 100644 --- a/app/src/main/res/layout/channel_fragment.xml +++ b/app/src/main/res/layout/channel_fragment.xml @@ -1,14 +1,90 @@ -