From 648bcee6051943de891948b8786fdb2a3c337a62 Mon Sep 17 00:00:00 2001
From: Patrick Goldinger <patrick.goldinger@pm.me>
Date: Tue, 28 Apr 2020 21:20:46 +0200
Subject: [PATCH] Fix issues / Update README.md

---
 README.md                                       |  7 +++++--
 app/src/main/AndroidManifest.xml                |  1 -
 .../patrickgold/florisboard/ime/key/KeyView.kt  | 17 ++++++++---------
 app/src/main/res/xml/prefs_advanced.xml         |  2 +-
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/README.md b/README.md
index 9c643d7f..c4610fda 100644
--- a/README.md
+++ b/README.md
@@ -13,15 +13,18 @@ An open-source keyboard for Android. Currently in early-alpha stage.
 * [ ] Emoji layout
 * [x] Caps + Caps Lock
 * [x] Key popups (buggy atm)
+* [x] Key press sound/vibration
 * [x] More characters on long press
-* [ ] Preferences screen
+* [x] Preferences screen
 * [ ] Customize look and behaviour of keyboard
 * [ ] Theme customization
 * [ ] Adapt to situation in app (password, url, text, etc. )
-* [ ] Auto suggest words
+* [ ] Auto suggest words from user dictionary
+* [ ] Auto suggest contacts
 * [ ] Layout selection
 * [ ] Clipboard manager
 * [ ] One-hand mode
+* [ ] Full integration in IME service list of Android (xml/method)
 * [ ] ...
 
 ## Used libraries and icons
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 26ad513d..57e40404 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -46,7 +46,6 @@
             android:label="@string/app_name"
             android:launchMode="singleTop"
             android:targetActivity="dev.patrickgold.florisboard.settings.SettingsMainActivity"
-            android:enabled="false"
             android:theme="@style/SettingsTheme.Light">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
diff --git a/app/src/main/java/dev/patrickgold/florisboard/ime/key/KeyView.kt b/app/src/main/java/dev/patrickgold/florisboard/ime/key/KeyView.kt
index 7f760276..4181bb1d 100644
--- a/app/src/main/java/dev/patrickgold/florisboard/ime/key/KeyView.kt
+++ b/app/src/main/java/dev/patrickgold/florisboard/ime/key/KeyView.kt
@@ -124,16 +124,15 @@ class KeyView(
     private fun keyPressSound() {
         if (florisboard.prefs!!.soundEnabled) {
             var soundVolume = florisboard.prefs!!.soundVolume
-            if (soundVolume == 0 && florisboard.prefs!!.soundEnabledSystem) {
-                soundVolume = 36
+            val effect = when (data.code) {
+                KeyCode.SPACE -> AudioManager.FX_KEYPRESS_SPACEBAR
+                KeyCode.DELETE -> AudioManager.FX_KEYPRESS_DELETE
+                KeyCode.ENTER -> AudioManager.FX_KEYPRESS_RETURN
+                else -> AudioManager.FX_KEYPRESS_STANDARD
             }
-            if (soundVolume > 0) {
-                val effect = when (data.code) {
-                    KeyCode.SPACE -> AudioManager.FX_KEYPRESS_SPACEBAR
-                    KeyCode.DELETE -> AudioManager.FX_KEYPRESS_DELETE
-                    KeyCode.ENTER -> AudioManager.FX_KEYPRESS_RETURN
-                    else -> AudioManager.FX_KEYPRESS_STANDARD
-                }
+            if (soundVolume == 0 && florisboard.prefs!!.soundEnabledSystem) {
+                florisboard.audioManager!!.playSoundEffect(effect)
+            } else if (soundVolume > 0) {
                 florisboard.audioManager!!.playSoundEffect(effect, soundVolume / 100f)
             }
         }
diff --git a/app/src/main/res/xml/prefs_advanced.xml b/app/src/main/res/xml/prefs_advanced.xml
index 94e9a3be..9cd1b792 100644
--- a/app/src/main/res/xml/prefs_advanced.xml
+++ b/app/src/main/res/xml/prefs_advanced.xml
@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <SwitchPreferenceCompat
-        android:defaultValue="false"
+        android:defaultValue="true"
         app:key="advanced__show_app_icon"
         app:iconSpaceReserved="false"
         app:title="@string/pref__advanced__show_app_icon__label"