Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commite0cd10b

Browse files
authored
Sync load insets from window (#524)
* Sync load insets from window* For older android also* Remove navbar color setting* Later getter* rename
1 parent6b17f3d commite0cd10b

File tree

47 files changed

+17
-99
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+17
-99
lines changed

‎app/build.gradle‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ android {
66
compileSdk35
77
minSdkVersion19
88
targetSdkVersion35
9-
versionCode117
10-
versionName"5.31"
9+
versionCode118
10+
versionName"5.32"
1111
}
1212
buildTypes {
1313
release {

‎app/src/main/java/rkr/simplekeyboard/inputmethod/keyboard/KeyboardView.java‎

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -94,9 +94,6 @@ public class KeyboardView extends View {
9494
privatefinalRectmKeyBackgroundPadding =newRect();
9595
privatestaticfinalfloatKET_TEXT_SHADOW_RADIUS_DISABLED = -1.0f;
9696
publicintmCustomColor =0;
97-
// Must be static to persist last known navbar height between View recreations
98-
// as setOnApplyWindowInsetsListener is only invoked on layout changes
99-
privatestaticintmSystemBarHeight =0;
10097

10198
// The maximum key label width in the proportion to the key width.
10299
privatestaticfinalfloatMAX_LABEL_RATIO =0.90f;
@@ -157,14 +154,6 @@ public KeyboardView(final Context context, final AttributeSet attrs, final int d
157154
keyAttr.recycle();
158155

159156
mPaint.setAntiAlias(true);
160-
161-
if (Build.VERSION.SDK_INT >=Build.VERSION_CODES.R) {
162-
setOnApplyWindowInsetsListener((v,windowInsets) -> {
163-
Insetsinsets =windowInsets.getInsets(WindowInsets.Type.systemBars());
164-
mSystemBarHeight =insets.bottom;
165-
returnWindowInsets.CONSUMED;
166-
});
167-
}
168157
}
169158

170159
privatestaticvoidblendAlpha(finalPaintpaint,finalintalpha) {
@@ -217,10 +206,18 @@ protected void onMeasure(final int widthMeasureSpec, final int heightMeasureSpec
217206
}
218207
// The main keyboard expands to the entire this {@link KeyboardView}.
219208
finalintwidth =keyboard.mOccupiedWidth +getPaddingLeft() +getPaddingRight();
220-
finalintheight =keyboard.mOccupiedHeight +getPaddingTop() +getPaddingBottom() +mSystemBarHeight;
209+
finalintheight =keyboard.mOccupiedHeight +getPaddingTop() +getPaddingBottom() +getSystemBarHeight();
221210
setMeasuredDimension(width,height);
222211
}
223212

213+
privateintgetSystemBarHeight() {
214+
if (Build.VERSION.SDK_INT >=Build.VERSION_CODES.R) {
215+
finalInsetsinsets =getRootWindowInsets().getInsets(WindowInsets.Type.navigationBars());
216+
returninsets.bottom;
217+
}
218+
return0;
219+
}
220+
224221
@Override
225222
protectedvoidonDraw(finalCanvascanvas) {
226223
super.onDraw(canvas);

‎app/src/main/java/rkr/simplekeyboard/inputmethod/latin/LatinIME.java‎

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
importandroid.content.Intent;
2323
importandroid.content.IntentFilter;
2424
importandroid.content.res.Configuration;
25-
importandroid.content.SharedPreferences;
2625
importandroid.inputmethodservice.InputMethodService;
2726
importandroid.media.AudioManager;
2827
importandroid.os.Build;
@@ -39,6 +38,7 @@
3938
importandroid.view.View;
4039
importandroid.view.ViewGroup.LayoutParams;
4140
importandroid.view.Window;
41+
importandroid.view.WindowManager;
4242
importandroid.view.inputmethod.EditorInfo;
4343

4444
importjava.io.FileDescriptor;
@@ -65,7 +65,6 @@
6565
importrkr.simplekeyboard.inputmethod.latin.settings.SettingsValues;
6666
importrkr.simplekeyboard.inputmethod.latin.utils.ApplicationUtils;
6767
importrkr.simplekeyboard.inputmethod.latin.utils.LeakGuardHandlerWrapper;
68-
importrkr.simplekeyboard.inputmethod.latin.utils.ResourceUtils;
6968
importrkr.simplekeyboard.inputmethod.latin.utils.ViewLayoutUtils;
7069

7170
/**
@@ -459,7 +458,7 @@ void onStartInputViewInternal(final EditorInfo editorInfo, final boolean restart
459458
publicvoidonWindowShown() {
460459
super.onWindowShown();
461460
if (isInputViewShown())
462-
setNavigationBarColor();
461+
clearNavigationBar();
463462
}
464463

465464
@Override
@@ -469,7 +468,6 @@ public void onWindowHidden() {
469468
if (mainKeyboardView !=null) {
470469
mainKeyboardView.closing();
471470
}
472-
clearNavigationBarColor();
473471
}
474472

475473
voidonFinishInputInternal() {
@@ -928,36 +926,14 @@ public boolean shouldShowLanguageSwitchKey() {
928926
returnshouldSwitchToOtherInputMethods(token);
929927
}
930928

931-
privatevoidsetNavigationBarColor() {
932-
if (Build.VERSION.SDK_INT >=Build.VERSION_CODES.P &&mSettings.getCurrent().mUseMatchingNavbarColor) {
933-
finalSharedPreferencesprefs =PreferenceManagerCompat.getDeviceSharedPreferences(this);
934-
finalintkeyboardColor =Settings.readKeyboardColor(prefs,this);
929+
privatevoidclearNavigationBar() {
930+
if (Build.VERSION.SDK_INT >=Build.VERSION_CODES.R) {
935931
finalWindowwindow =getWindow().getWindow();
936932
if (window ==null) {
937933
return;
938934
}
939-
mOriginalNavBarColor =window.getNavigationBarColor();
940-
window.setNavigationBarColor(keyboardColor);
941-
942-
finalViewview =window.getDecorView();
943-
mOriginalNavBarFlags =view.getSystemUiVisibility();
944-
if (ResourceUtils.isBrightColor(keyboardColor)) {
945-
view.setSystemUiVisibility(mOriginalNavBarFlags |View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
946-
}else {
947-
view.setSystemUiVisibility(mOriginalNavBarFlags & ~View.SYSTEM_UI_FLAG_LIGHT_NAVIGATION_BAR);
948-
}
949-
}
950-
}
951-
952-
privatevoidclearNavigationBarColor() {
953-
if (Build.VERSION.SDK_INT >=Build.VERSION_CODES.P &&mSettings.getCurrent().mUseMatchingNavbarColor) {
954-
finalWindowwindow =getWindow().getWindow();
955-
if (window ==null) {
956-
return;
957-
}
958-
window.setNavigationBarColor(mOriginalNavBarColor);
959-
finalViewview =window.getDecorView();
960-
view.setSystemUiVisibility(mOriginalNavBarFlags);
935+
window.setNavigationBarContrastEnforced(false);
936+
window.setFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS,WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS);
961937
}
962938
}
963939
}

‎app/src/main/java/rkr/simplekeyboard/inputmethod/latin/settings/AppearanceSettingsFragment.java‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,6 @@ public void onCreate(final Bundle icicle) {
3434
super.onCreate(icicle);
3535
addPreferencesFromResource(R.xml.prefs_screen_appearance);
3636

37-
if (Build.VERSION.SDK_INT <Build.VERSION_CODES.P) {
38-
removePreference(Settings.PREF_MATCHING_NAVBAR_COLOR);
39-
}
40-
4137
setupKeyboardHeightSettings();
4238
setupBottomOffsetPortraitSettings();
4339
setupKeyboardColorSettings();

‎app/src/main/java/rkr/simplekeyboard/inputmethod/latin/settings/Settings.java‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
5353
publicstaticfinalStringPREF_SHOW_NUMBER_ROW ="pref_show_number_row";
5454
publicstaticfinalStringPREF_SPACE_SWIPE ="pref_space_swipe";
5555
publicstaticfinalStringPREF_DELETE_SWIPE ="pref_delete_swipe";
56-
publicstaticfinalStringPREF_MATCHING_NAVBAR_COLOR ="pref_matching_navbar_color";
5756

5857
privatestaticfinalfloatUNDEFINED_PREFERENCE_VALUE_FLOAT = -1.0f;
5958
privatestaticfinalintUNDEFINED_PREFERENCE_VALUE_INT = -1;
@@ -235,8 +234,4 @@ public static boolean readHasHardwareKeyboard(final Configuration conf) {
235234
returnconf.keyboard !=Configuration.KEYBOARD_NOKEYS
236235
&&conf.hardKeyboardHidden !=Configuration.HARDKEYBOARDHIDDEN_YES;
237236
}
238-
239-
publicstaticbooleanreadUseMatchingNavbarColor(finalSharedPreferencesprefs) {
240-
returnprefs.getBoolean(PREF_MATCHING_NAVBAR_COLOR,false);
241-
}
242237
}

‎app/src/main/java/rkr/simplekeyboard/inputmethod/latin/settings/SettingsValues.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ public class SettingsValues {
4545
publicfinalbooleanmShowNumberRow;
4646
publicfinalbooleanmSpaceSwipeEnabled;
4747
publicfinalbooleanmDeleteSwipeEnabled;
48-
publicfinalbooleanmUseMatchingNavbarColor;
4948

5049
// From the input box
5150
publicfinalInputAttributesmInputAttributes;
@@ -87,7 +86,6 @@ public SettingsValues(final SharedPreferences prefs, final Resources res,
8786
mShowNumberRow =Settings.readShowNumberRow(prefs);
8887
mSpaceSwipeEnabled =Settings.readSpaceSwipeEnabled(prefs);
8988
mDeleteSwipeEnabled =Settings.readDeleteSwipeEnabled(prefs);
90-
mUseMatchingNavbarColor =Settings.readUseMatchingNavbarColor(prefs);
9189
}
9290

9391
publicbooleanisWordSeparator(finalintcode) {

‎app/src/main/res/values-b+sr+Latn/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,5 @@
4747
<stringname="show_number_row">Prikaži odvojeni red sa brojevima</string>
4848
<stringname="space_swipe">Prevlačenjem preko razmaka pomera se selektor</string>
4949
<stringname="delete_swipe">Brisanje prevlačenjem</string>
50-
<stringname="matching_navbar_color">Koristi boju navigacione trake</string>
5150
<stringname="setup_message">Simple Keyboard nije omogućena. Kliknite OK da otvorite podešavanja jezika i unosa. Treba da selektujete Simple Keyboard kao vašu podrazumevanu tastaturu da biste je koristili.</string>
5251
</resources>

‎app/src/main/res/values-be-rBY/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
<stringname="show_number_row">Паказаць шэраг з лічбамі</string>
5252
<stringname="space_swipe">Перамяшчэнне курсора прабелам</string>
5353
<stringname="delete_swipe">Выдаліць рух</string>
54-
<stringname="matching_navbar_color">Выкарыстоўвайце адпаведны колер панэлі навігацыі</string>
5554
<stringname="setup_message">Simple Keyboard не ўключана. Націсніце «ОК», каб адкрыць мовы ў наладах ўводу. Вам трэба будзе абраць Simple Keyboard бягучай клавіятурай, каб выкарыстоўваць яе.</string>
5655
<stringname="user_languages">Ўключаныя мовы</string>
5756
<stringname="add_language">Дадаць мову</string>

‎app/src/main/res/values-bg/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
<stringname="show_number_row">Показвай отделен ред с цифри</string>
5353
<stringname="space_swipe">Местене на курсора с плъзгане върху интервал</string>
5454
<stringname="delete_swipe">Изтриване с плъзгане</string>
55-
<stringname="matching_navbar_color">Използвайте съвпадащия цвят на навигационната лента</string>
5655
<stringname="setup_message">Simple Keyboard не е активирана. Щракнете върху OK, за да отворите настройките за въвеждане на езици. Ще трябва да изберете Simple Keyboard в текущата клавиатура, за да я използвате.</string>
5756
<stringname="user_languages">Активирани клавиатурни езици</string>
5857
<stringname="add_language">Добави език</string>

‎app/src/main/res/values-bn-rBD/strings.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
<stringname="show_number_row">পৃথক নম্বর সারি প্রদর্শন</string>
5656
<stringname="space_swipe">কার্সর সরাতে স্পেস সোয়াইপ</string>
5757
<stringname="delete_swipe">বিলোপ সোয়াইপ</string>
58-
<stringname="matching_navbar_color">ন্যাভিগেশন বারে সদৃশ রং</string>
5958
<stringname="setup_message">Simple Keyboard সক্রিয় নয়। ভাষা ও ইনপুট সেটিংস খোলার জন্য ঠিক আছে ক্লিক করুন। Simple Keyboard ব্যবহার করার জন্য বর্তমান কিবোর্ড হিসেবে নির্বাচন করতে হবে।</string>
6059
<stringname="user_languages">কিবোর্ডের সক্রিয় ভাষা</string>
6160
<stringname="add_language">ভাষা সংযোজন</string>

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp