Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions android/app/src/main/java/com/js8call/example/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -150,7 +150,7 @@ class DecodeFragment : Fragment() {
return
}
transmitViewModel.setDirectedTo(callsign)
val bottomNav = activity?.findViewById<BottomNavigationView>(R.id.bottom_navigation)
val bottomNav = activity?.findViewById<NavigationBarView>(R.id.bottom_navigation)
if (bottomNav != null) {
bottomNav.selectedItemId = R.id.navigation_transmit
} else {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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<com.google.android.material.bottomnavigation.BottomNavigationView>(R.id.bottom_navigation)
val bottomNav = activity?.findViewById<com.google.android.material.navigation.NavigationBarView>(R.id.bottom_navigation)
bottomNav?.selectedItemId = R.id.navigation_transmit
}

Expand Down
13 changes: 13 additions & 0 deletions android/app/src/main/res/drawable/ic_chat_bubble.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<group android:translateY="960">
<path
android:fillColor="@android:color/white"
android:pathData="M80,-80v-720q0,-33 23.5,-56.5T160,-880h640q33,0 56.5,23.5T880,-800v480q0,33 -23.5,56.5T800,-240L240,-240L80,-80ZM206,-320h594v-480L160,-800v525l46,-45ZM160,-320v-480 480Z" />
</group>
</vector>
10 changes: 10 additions & 0 deletions android/app/src/main/res/drawable/ic_graphic_eq.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M7,18h2V6H7v12zM11,22h2V2h-2v20zM3,14h2v-4H3v4zM15,18h2V6h-2v12zM19,10v4h2v-4h-2z" />
</vector>
13 changes: 13 additions & 0 deletions android/app/src/main/res/drawable/ic_notes.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="960"
android:viewportHeight="960"
android:tint="?attr/colorControlNormal">
<group android:translateY="960">
<path
android:fillColor="@android:color/white"
android:pathData="M160,-200v-80h400v80L160,-200ZM160,-440v-80h640v80L160,-440ZM160,-680v-80h640v80L160,-680Z" />
</group>
</vector>
10 changes: 10 additions & 0 deletions android/app/src/main/res/drawable/ic_send.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
</vector>
10 changes: 10 additions & 0 deletions android/app/src/main/res/drawable/ic_settings.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M19.14,12.94c0.04,-0.3 0.06,-0.61 0.06,-0.94c0,-0.32 -0.02,-0.64 -0.07,-0.94l2.03,-1.58c0.18,-0.14 0.23,-0.41 0.12,-0.61l-1.92,-3.32c-0.12,-0.22 -0.37,-0.29 -0.59,-0.22l-2.39,0.96c-0.5,-0.38 -1.03,-0.7 -1.62,-0.94L14.4,2.81c-0.04,-0.24 -0.24,-0.41 -0.48,-0.41h-3.84c-0.24,0 -0.43,0.17 -0.47,0.41L9.25,5.35C8.66,5.59 8.12,5.92 7.63,6.29L5.24,5.33c-0.22,-0.08 -0.47,0 -0.59,0.22L2.74,8.87C2.62,9.08 2.66,9.34 2.86,9.48l2.03,1.58C4.84,11.36 4.8,11.69 4.8,12s0.02,0.64 0.07,0.94l-2.03,1.58c-0.18,0.14 -0.23,0.41 -0.12,0.61l1.92,3.32c0.12,0.22 0.37,0.29 0.59,0.22l2.39,-0.96c0.5,0.38 1.03,0.7 1.62,0.94l0.36,2.54c0.04,0.24 0.24,0.41 0.48,0.41h3.84c0.24,0 0.44,-0.17 0.47,-0.41l0.36,-2.54c0.59,-0.24 1.13,-0.56 1.62,-0.94l2.39,0.96c0.22,0.08 0.47,0 0.59,-0.22l1.92,-3.32c0.12,-0.22 0.07,-0.47 -0.12,-0.61L19.14,12.94zM12,15.6c-1.98,0 -3.6,-1.62 -3.6,-3.6s1.62,-3.6 3.6,-3.6s3.6,1.62 3.6,3.6S13.98,15.6 12,15.6z" />
</vector>
30 changes: 30 additions & 0 deletions android/app/src/main/res/layout-land/activity_main.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">

<com.google.android.material.navigationrail.NavigationRailView
android:id="@+id/bottom_navigation"
android:layout_width="wrap_content"
android:layout_height="0dp"
app:labelVisibilityMode="labeled"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:menu="@menu/bottom_nav_menu"
app:menuGravity="center" />

<androidx.fragment.app.FragmentContainerView
android:id="@+id/nav_host_fragment"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:defaultNavHost="true"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/bottom_navigation"
app:layout_constraintTop_toTopOf="parent"
app:navGraph="@navigation/mobile_navigation" />

</androidx.constraintlayout.widget.ConstraintLayout>
1 change: 1 addition & 0 deletions android/app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

</androidx.constraintlayout.widget.ConstraintLayout>
10 changes: 5 additions & 5 deletions android/app/src/main/res/menu/bottom_nav_menu.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:id="@+id/navigation_monitor"
android:icon="@android:drawable/ic_menu_view"
android:icon="@drawable/ic_graphic_eq"
android:title="@string/nav_monitor" />

<item
android:id="@+id/navigation_decodes"
android:icon="@android:drawable/ic_menu_sort_by_size"
android:icon="@drawable/ic_notes"
android:title="@string/nav_decodes" />

<item
android:id="@+id/navigation_messages"
android:icon="@android:drawable/ic_dialog_email"
android:icon="@drawable/ic_chat_bubble"
android:title="@string/nav_messages" />

<item
android:id="@+id/navigation_transmit"
android:icon="@android:drawable/ic_menu_send"
android:icon="@drawable/ic_send"
android:title="@string/nav_transmit" />

<item
android:id="@+id/navigation_settings"
android:icon="@android:drawable/ic_menu_preferences"
android:icon="@drawable/ic_settings"
android:title="@string/nav_settings" />
</menu>
Loading