diff --git a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt index f539d8f..60feda4 100644 --- a/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt +++ b/app/src/main/java/cy/agorise/bitsybitshareswallet/activities/MainActivity.kt @@ -1,6 +1,9 @@ package cy.agorise.bitsybitshareswallet.activities +import android.content.Intent import android.os.Bundle +import android.view.Menu +import android.view.MenuItem import android.widget.Toast import com.google.android.material.bottomnavigation.BottomNavigationView import androidx.appcompat.app.AppCompatActivity @@ -52,4 +55,21 @@ class MainActivity : AppCompatActivity() { ft.replace(R.id.fragment_frame, MerchantsFragment()) ft.commit() } + + override fun onCreateOptionsMenu(menu: Menu?): Boolean { + // Inflates the menu and places it in the toolbar + menuInflater.inflate(R.menu.menu_main, menu) + + return true + } + + override fun onOptionsItemSelected(item: MenuItem?): Boolean { + return if (item!!.itemId == R.id.menu_settings) { + val intent = Intent(this, SettingsActivity::class.java) + startActivity(intent) + true + } else { + super.onOptionsItemSelected(item) + } + } } diff --git a/app/src/main/res/drawable/ic_settings.xml b/app/src/main/res/drawable/ic_settings.xml index 369d00b..ace746c 100644 --- a/app/src/main/res/drawable/ic_settings.xml +++ b/app/src/main/res/drawable/ic_settings.xml @@ -1,14 +1,9 @@ - - + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml new file mode 100644 index 0000000..bf6f71b --- /dev/null +++ b/app/src/main/res/menu/menu_main.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/menu/navigation.xml b/app/src/main/res/menu/navigation.xml index c6aff5f..ddf6911 100644 --- a/app/src/main/res/menu/navigation.xml +++ b/app/src/main/res/menu/navigation.xml @@ -2,23 +2,23 @@ + android:id="@+id/navigation_receive" + android:icon="@drawable/ic_receive" + android:title="@string/title_receive"/> + android:id="@+id/navigation_balances" + android:icon="@drawable/ic_balances" + android:title="@string/title_balances"/> + android:id="@+id/navigation_merchants" + android:icon="@drawable/ic_merchants" + android:title="@string/title_merchants"/> + android:id="@+id/navigation_send" + android:icon="@drawable/ic_send" + android:title="@string/title_send"/>