aboutsummaryrefslogtreecommitdiffhomepage
path: root/app/src/main
diff options
context:
space:
mode:
authorMarvin Borner2018-08-29 23:44:58 +0200
committerMarvin Borner2018-08-29 23:44:58 +0200
commit91f2e2e884503fa370aca76c329eff232c2fc8c9 (patch)
tree578860858c473babd1c6e73cf5c497e49dfe148d /app/src/main
parentb07b486eead6e208bbd5b3f13085d842175c0307 (diff)
Added opening of settings on menu click
Diffstat (limited to 'app/src/main')
-rw-r--r--app/src/main/java/com/no_name/no_name/MainActivity.kt7
1 files changed, 5 insertions, 2 deletions
diff --git a/app/src/main/java/com/no_name/no_name/MainActivity.kt b/app/src/main/java/com/no_name/no_name/MainActivity.kt
index 299f5eb..2417181 100644
--- a/app/src/main/java/com/no_name/no_name/MainActivity.kt
+++ b/app/src/main/java/com/no_name/no_name/MainActivity.kt
@@ -39,7 +39,7 @@ class MainActivity : AppCompatActivity() {
longToast("No internet connection!")
fab.setOnClickListener { view ->
- startActivity<SettingsActivity>()
+ // TODO: Add camera support
}
}
@@ -57,7 +57,10 @@ class MainActivity : AppCompatActivity() {
*/
override fun onOptionsItemSelected(item: MenuItem): Boolean {
return when (item.itemId) {
- R.id.action_settings -> true
+ R.id.action_settings -> {
+ startActivity<SettingsActivity>()
+ true
+ }
else -> super.onOptionsItemSelected(item)
}
}