diff --git a/android/app/src/main/java/com/js8call/example/MainActivity.kt b/android/app/src/main/java/com/js8call/example/MainActivity.kt index 24dac83c..06e63446 100644 --- a/android/app/src/main/java/com/js8call/example/MainActivity.kt +++ b/android/app/src/main/java/com/js8call/example/MainActivity.kt @@ -17,7 +17,7 @@ import androidx.localbroadcastmanager.content.LocalBroadcastManager import androidx.navigation.fragment.NavHostFragment import androidx.navigation.ui.setupWithNavController import androidx.preference.PreferenceManager -import com.google.android.material.bottomnavigation.BottomNavigationView +import com.google.android.material.navigation.NavigationBarView import com.google.android.material.snackbar.Snackbar import com.js8call.example.model.EngineState import com.js8call.example.service.JS8EngineService @@ -28,7 +28,7 @@ import com.js8call.example.ui.TransmitViewModel class MainActivity : AppCompatActivity() { - private lateinit var bottomNav: BottomNavigationView + private lateinit var bottomNav: NavigationBarView private lateinit var decodeViewModel: DecodeViewModel private lateinit var monitorViewModel: MonitorViewModel private var spectrumBroadcastCount: Long = 0 diff --git a/android/app/src/main/java/com/js8call/example/ui/DecodeFragment.kt b/android/app/src/main/java/com/js8call/example/ui/DecodeFragment.kt index 88906949..e4630370 100644 --- a/android/app/src/main/java/com/js8call/example/ui/DecodeFragment.kt +++ b/android/app/src/main/java/com/js8call/example/ui/DecodeFragment.kt @@ -14,7 +14,7 @@ import androidx.navigation.fragment.findNavController import androidx.recyclerview.widget.RecyclerView import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.floatingactionbutton.FloatingActionButton -import com.google.android.material.bottomnavigation.BottomNavigationView +import com.google.android.material.navigation.NavigationBarView import com.google.android.material.snackbar.Snackbar import com.js8call.example.R @@ -150,7 +150,7 @@ class DecodeFragment : Fragment() { return } transmitViewModel.setDirectedTo(callsign) - val bottomNav = activity?.findViewById(R.id.bottom_navigation) + val bottomNav = activity?.findViewById(R.id.bottom_navigation) if (bottomNav != null) { bottomNav.selectedItemId = R.id.navigation_transmit } else { diff --git a/android/app/src/main/java/com/js8call/example/ui/MessagesFragment.kt b/android/app/src/main/java/com/js8call/example/ui/MessagesFragment.kt index ae159455..fc623f8f 100644 --- a/android/app/src/main/java/com/js8call/example/ui/MessagesFragment.kt +++ b/android/app/src/main/java/com/js8call/example/ui/MessagesFragment.kt @@ -60,7 +60,7 @@ class MessagesFragment : Fragment() { // Set up FAB (navigate to Transmit tab to compose new message) newMessageFab.setOnClickListener { // Navigate to Transmit tab for new message - val bottomNav = activity?.findViewById(R.id.bottom_navigation) + val bottomNav = activity?.findViewById(R.id.bottom_navigation) bottomNav?.selectedItemId = R.id.navigation_transmit } diff --git a/android/app/src/main/res/drawable/ic_chat_bubble.xml b/android/app/src/main/res/drawable/ic_chat_bubble.xml new file mode 100644 index 00000000..016fd414 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_chat_bubble.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/android/app/src/main/res/drawable/ic_graphic_eq.xml b/android/app/src/main/res/drawable/ic_graphic_eq.xml new file mode 100644 index 00000000..e143ae4f --- /dev/null +++ b/android/app/src/main/res/drawable/ic_graphic_eq.xml @@ -0,0 +1,10 @@ + + + + diff --git a/android/app/src/main/res/drawable/ic_notes.xml b/android/app/src/main/res/drawable/ic_notes.xml new file mode 100644 index 00000000..eb0f830c --- /dev/null +++ b/android/app/src/main/res/drawable/ic_notes.xml @@ -0,0 +1,13 @@ + + + + + + diff --git a/android/app/src/main/res/drawable/ic_send.xml b/android/app/src/main/res/drawable/ic_send.xml new file mode 100644 index 00000000..d1cfac11 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_send.xml @@ -0,0 +1,10 @@ + + + + diff --git a/android/app/src/main/res/drawable/ic_settings.xml b/android/app/src/main/res/drawable/ic_settings.xml new file mode 100644 index 00000000..dd427aa9 --- /dev/null +++ b/android/app/src/main/res/drawable/ic_settings.xml @@ -0,0 +1,10 @@ + + + + diff --git a/android/app/src/main/res/layout-land/activity_main.xml b/android/app/src/main/res/layout-land/activity_main.xml new file mode 100644 index 00000000..ea00c528 --- /dev/null +++ b/android/app/src/main/res/layout-land/activity_main.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/android/app/src/main/res/layout/activity_main.xml b/android/app/src/main/res/layout/activity_main.xml index 1e2de4c1..549adc74 100644 --- a/android/app/src/main/res/layout/activity_main.xml +++ b/android/app/src/main/res/layout/activity_main.xml @@ -23,6 +23,7 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintRight_toRightOf="parent" + app:labelVisibilityMode="labeled" app:menu="@menu/bottom_nav_menu" /> diff --git a/android/app/src/main/res/menu/bottom_nav_menu.xml b/android/app/src/main/res/menu/bottom_nav_menu.xml index 8700f662..7e839152 100644 --- a/android/app/src/main/res/menu/bottom_nav_menu.xml +++ b/android/app/src/main/res/menu/bottom_nav_menu.xml @@ -2,26 +2,26 @@