diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fc70310..7de39c7 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -17,6 +17,10 @@ android:supportsRtl="true" android:theme="@style/AppTheme"> + + - - + android:label="@string/settings" + android:parentActivityName=".activities.MainActivity"> + + startActivity(Intent(applicationContext, SettingsActivity::class.java)) + R.id.about -> launchAbout() + else -> return super.onOptionsItemSelected(item) + } + return true + } + + private fun launchAbout() { + val licenses = 0 + + val faqItems = arrayListOf( + FAQItem(R.string.faq_2_title_commons, R.string.faq_2_text_commons), + FAQItem(R.string.faq_6_title_commons, R.string.faq_6_text_commons), + ) + + startAboutActivity(R.string.app_name, licenses, BuildConfig.VERSION_NAME, faqItems, true) + } } diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 6940e3a..1b13619 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -1 +1,14 @@ - + + + + +