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 app/src/main/kotlin/be/scri/activities/AboutActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ class AboutActivity : BaseSimpleActivity(), GestureDetector.OnGestureListener{
return@OnNavigationItemSelectedListener true
}

R.id.about -> {
R.id.info -> {
return@OnNavigationItemSelectedListener true }
R.id.installation -> {
startActivity(Intent(applicationContext, MainActivity::class.java))
Expand All @@ -67,7 +67,7 @@ class AboutActivity : BaseSimpleActivity(), GestureDetector.OnGestureListener{
}
false
})
bottomNavigationView.selectedItemId = R.id.about
bottomNavigationView.selectedItemId = R.id.info
}


Expand Down
15 changes: 0 additions & 15 deletions app/src/main/kotlin/be/scri/activities/MainActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -107,21 +107,6 @@ class MainActivity : SimpleActivity(), GestureDetector.OnGestureListener {



override fun onCreateOptionsMenu(menu: Menu): Boolean {
menuInflater.inflate(R.menu.menu_main, menu)
updateMenuItemColors(menu)
return true
}

override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
R.id.settings -> launchSettings()
R.id.about -> launchAbout()
else -> return super.onOptionsItemSelected(item)
}
return true
}

private fun launchSettings() {
hideKeyboard()
startActivity(Intent(applicationContext, SettingsActivity::class.java))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class WikimediaScribeActivity : BaseSimpleActivity(){
return@OnNavigationItemSelectedListener true
}

R.id.about -> {
R.id.info -> {
return@OnNavigationItemSelectedListener true }
R.id.installation -> {
startActivity(Intent(applicationContext, MainActivity::class.java))
Expand All @@ -40,7 +40,7 @@ class WikimediaScribeActivity : BaseSimpleActivity(){
}
false
})
bottomNavigationView.selectedItemId = R.id.about
bottomNavigationView.selectedItemId = R.id.info
}

}
Expand Down
14 changes: 0 additions & 14 deletions app/src/main/res/menu/menu_main.xml

This file was deleted.