Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Individual zoom setting based on display ID #3208

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Individual zoom setting based on display ID #3208

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f22fde2
Individual zoom setting based on display ID
babaric-dev Jan 23, 2023
7dfa68c
Merge branch 'master' into individual-zoom
babaric-dev Oct 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
22 changes: 20 additions & 2 deletions ...c/main/java/com/termux/shared/termux/settings/preferences/TermuxAppSharedPreferences.java
View file
Open in desktop
Expand Up @@ -2,6 +2,9 @@

import android.content.Context;
import android.util.TypedValue;
import android.os.Build;
import android.view.Display;
import android.view.WindowManager;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand Down Expand Up @@ -151,13 +154,28 @@ public void setFontVariables(Context context) {
MAX_FONTSIZE = sizes[2];
}

private String getDisplayIdAsString() {
Context context = getContext();
Display display;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
display = context.getDisplay();
} else {
display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
}
int d = display.getDisplayId();
if (d == Display.DEFAULT_DISPLAY)
return "";
else
return Integer.toString(d);
}

public int getFontSize() {
int fontSize = SharedPreferenceUtils.getIntStoredAsString(mSharedPreferences, TERMUX_APP.KEY_FONTSIZE, DEFAULT_FONTSIZE);
int fontSize = SharedPreferenceUtils.getIntStoredAsString(mSharedPreferences, TERMUX_APP.KEY_FONTSIZE + getDisplayIdAsString(), DEFAULT_FONTSIZE);
return DataUtils.clamp(fontSize, MIN_FONTSIZE, MAX_FONTSIZE);
}

public void setFontSize(int value) {
SharedPreferenceUtils.setIntStoredAsString(mSharedPreferences, TERMUX_APP.KEY_FONTSIZE, value, false);
SharedPreferenceUtils.setIntStoredAsString(mSharedPreferences, TERMUX_APP.KEY_FONTSIZE + getDisplayIdAsString(), value, false);
}

public void changeFontSize(boolean increase) {
Expand Down
22 changes: 20 additions & 2 deletions ...n/java/com/termux/shared/termux/settings/preferences/TermuxFloatAppSharedPreferences.java
View file
Open in desktop
@@ -1,6 +1,9 @@
package com.termux.shared.termux.settings.preferences;

import android.content.Context;
import android.os.Build;
import android.view.Display;
import android.view.WindowManager;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
Expand Down Expand Up @@ -115,13 +118,28 @@ public void setFontVariables(Context context) {
MAX_FONTSIZE = sizes[2];
}

private String getDisplayIdAsString() {
Context context = getContext();
Display display;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
display = context.getDisplay();
} else {
display = ((WindowManager) context.getSystemService(Context.WINDOW_SERVICE)).getDefaultDisplay();
}
int d = display.getDisplayId();
if (d == Display.DEFAULT_DISPLAY)
return "";
else
return Integer.toString(d);
}

public int getFontSize() {
int fontSize = SharedPreferenceUtils.getIntStoredAsString(mSharedPreferences, TERMUX_FLOAT_APP.KEY_FONTSIZE, DEFAULT_FONTSIZE);
int fontSize = SharedPreferenceUtils.getIntStoredAsString(mSharedPreferences, TERMUX_FLOAT_APP.KEY_FONTSIZE + getDisplayIdAsString(), DEFAULT_FONTSIZE);
return DataUtils.clamp(fontSize, MIN_FONTSIZE, MAX_FONTSIZE);
}

public void setFontSize(int value) {
SharedPreferenceUtils.setIntStoredAsString(mSharedPreferences, TERMUX_FLOAT_APP.KEY_FONTSIZE, value, false);
SharedPreferenceUtils.setIntStoredAsString(mSharedPreferences, TERMUX_FLOAT_APP.KEY_FONTSIZE + getDisplayIdAsString(), value, false);
}

public void changeFontSize(boolean increase) {
Expand Down