Skip to content

Commit 3875a26

Browse files
committed
adding a More Apps From Us menu button
1 parent 33ab62b commit 3875a26

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,12 @@
2929

3030
<activity
3131
android:name=".activities.MainActivity"
32+
android:configChanges="orientation"
3233
android:exported="false" />
3334

3435
<activity
3536
android:name=".activities.ManageClipboardItemsActivity"
37+
android:configChanges="orientation"
3638
android:exported="false"
3739
android:label="@string/manage_clipboard_items"
3840
android:parentActivityName=".activities.SettingsActivity" />
@@ -52,6 +54,7 @@
5254

5355
<activity
5456
android:name=".activities.SettingsActivity"
57+
android:configChanges="orientation"
5558
android:exported="true"
5659
android:label="@string/settings"
5760
android:parentActivityName=".activities.MainActivity">
@@ -68,11 +71,13 @@
6871

6972
<activity
7073
android:name="com.simplemobiletools.commons.activities.AboutActivity"
74+
android:configChanges="orientation"
7175
android:label="@string/about"
7276
android:parentActivityName=".activities.MainActivity" />
7377

7478
<activity
7579
android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
80+
android:configChanges="orientation"
7681
android:label="@string/customize_colors"
7782
android:parentActivityName=".activities.SettingsActivity" />
7883

app/src/main/kotlin/com/simplemobiletools/keyboard/activities/MainActivity.kt

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,10 @@ class MainActivity : SimpleActivity() {
1818
override fun onCreate(savedInstanceState: Bundle?) {
1919
super.onCreate(savedInstanceState)
2020
setContentView(R.layout.activity_main)
21-
setupOptionsMenu()
2221
appLaunched(BuildConfig.APPLICATION_ID)
22+
setupOptionsMenu()
23+
refreshMenuItems()
24+
2325
change_keyboard_holder.setOnClickListener {
2426
(getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager).showInputMethodPicker()
2527
}
@@ -48,6 +50,7 @@ class MainActivity : SimpleActivity() {
4850
private fun setupOptionsMenu() {
4951
main_toolbar.setOnMenuItemClickListener { menuItem ->
5052
when (menuItem.itemId) {
53+
R.id.more_apps_from_us -> launchMoreAppsFromUsIntent()
5154
R.id.settings -> launchSettings()
5255
R.id.about -> launchAbout()
5356
else -> return@setOnMenuItemClickListener false
@@ -56,6 +59,12 @@ class MainActivity : SimpleActivity() {
5659
}
5760
}
5861

62+
private fun refreshMenuItems() {
63+
main_toolbar.menu.apply {
64+
findItem(R.id.more_apps_from_us).isVisible = !resources.getBoolean(R.bool.hide_google_relations)
65+
}
66+
}
67+
5968
private fun launchSettings() {
6069
hideKeyboard()
6170
startActivity(Intent(applicationContext, SettingsActivity::class.java))

app/src/main/res/menu/menu_main.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto">
4+
<item
5+
android:id="@+id/more_apps_from_us"
6+
android:icon="@drawable/ic_google_play_vector"
7+
android:title="@string/more_apps_from_us"
8+
app:showAsAction="always" />
49
<item
510
android:id="@+id/settings"
611
android:icon="@drawable/ic_settings_cog_vector"

0 commit comments

Comments
 (0)