Skip to content

Commit 6186cb1

Browse files
committed
Fix not apply term theme
1 parent abc5d15 commit 6186cb1

File tree

3 files changed

+10
-7
lines changed

3 files changed

+10
-7
lines changed

app/src/main/AndroidManifest.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,9 @@
125125
<activity
126126
android:name="jackpal.androidterm.TermPreferencesActivity"
127127
android:label="@string/preferences" />
128-
<activity android:name="com.duy.editor.theme.ThemeActivity" />
128+
<activity
129+
android:name="com.duy.editor.theme.ThemeActivity"
130+
android:windowSoftInputMode="stateAlwaysHidden" />
129131
</application>
130132

131133
</manifest>

app/src/main/java/jackpal/androidterm/TermSettings.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public class TermSettings {
9393
private static final String ACTIONBAR_KEY = "actionbar";
9494
private static final String ORIENTATION_KEY = "orientation";
9595
private static final String FONTSIZE_KEY = "fontsize";
96-
private static final String COLOR_KEY = "color";
96+
private static final String COLOR_KEY = "pref_terminal_color";
9797
private static final String UTF8_KEY = "utf8_by_default";
9898
private static final String BACKACTION_KEY = "backaction";
9999
private static final String CONTROLKEY_KEY = "controlkey";

editor-view/src/main/java/com/jecelyin/editor/v2/Preferences.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -402,17 +402,18 @@ public int getAppTheme() {
402402
}
403403

404404
public void setAppTheme(@IntRange(from = 0, to = 1) int index) {
405-
preferences.edit().putInt(context.getString(R.string.pref_app_theme), index).apply();
406-
}
407-
408-
public void setTerminalTheme(int index) {
409-
preferences.edit().putInt(context.getString(R.string.pref_terminal_theme), index).apply();
405+
preferences.edit().putString(context.getString(R.string.pref_app_theme), String.valueOf(index)).apply();
410406
}
411407

412408
public boolean isUseLightTheme() {
413409
return getAppTheme() == THEMES[0];
414410
}
415411

412+
public void setTerminalTheme(int index) {
413+
preferences.edit().putString("pref_terminal_color", String.valueOf(index)).apply();
414+
}
415+
416+
416417
@IntDef({SCREEN_ORIENTATION_AUTO, SCREEN_ORIENTATION_LANDSCAPE, SCREEN_ORIENTATION_PORTRAIT})
417418
public @interface ScreenOrientation {
418419
}

0 commit comments

Comments
 (0)