Skip to content

Commit da31ac4

Browse files
committed
Allow typing "Ae" for 'Æ' for ligature multipress.
Also, enable the hidden toolbar option on debug builds.
1 parent 9d0b91e commit da31ac4

File tree

4 files changed

+14
-2
lines changed

4 files changed

+14
-2
lines changed

app/build.gradle.kts

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ android {
1212
minSdk = 29
1313
targetSdk = 33
1414
versionCode = 1
15-
versionName = "0.77-beta1"
15+
versionName = "0.77.2"
1616
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
1717
}
1818

1919
buildTypes {
20-
debug {
20+
buildFeatures { buildConfig = true }
21+
debug {
2122
applicationIdSuffix = ".dev"
2223
}
2324
release {

app/src/main/java/io/github/rickybrent/minimal_symlayer_keyboard/MultipressController.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ class MultipressController(val substitutions: Array<HashMap<Int, Array<Char>>>)
7777
private var lastPrintedChar: Char = '\u0000'
7878
private val ligatureMap = mapOf(
7979
"ae" to 'æ', "oe" to 'œ',
80+
"Ae" to 'Æ', "Oe" to 'Œ',
8081
"AE" to 'Æ', "OE" to 'Œ',
8182
)
8283

app/src/main/java/io/github/rickybrent/minimal_symlayer_keyboard/SettingsActivity.kt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,9 @@ class SettingsActivity : AppCompatActivity(), PreferenceFragmentCompat.OnPrefere
9393
setPreferencesFromResource(R.xml.preferences, rootKey)
9494
val context = activity
9595
if(context != null) {
96+
if (BuildConfig.DEBUG) {
97+
findPreference<Preference>("pref_show_toolbar")?.isVisible = true
98+
}
9699
findPreference<Preference>("Reset")?.onPreferenceClickListener = Preference.OnPreferenceClickListener {
97100
AlertDialog.Builder(context, R.style.AlertDialogTheme)
98101
.setTitle("Reset settings")

app/src/main/res/xml/preferences.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,5 +112,12 @@
112112
<Preference
113113
android:title="About"
114114
app:fragment="io.github.rickybrent.minimal_symlayer_keyboard.SettingsActivity$AboutFragment" />
115+
<SwitchPreference
116+
android:key="pref_show_toolbar"
117+
android:defaultValue="false"
118+
android:title="Show Toolbar"
119+
android:summary="[Experimental] Show a toolbar with the modifier status."
120+
android:visible="false"
121+
app:widgetLayout="@layout/settings_widget_switch" />
115122
</PreferenceCategory>
116123
</PreferenceScreen>

0 commit comments

Comments
 (0)