empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Fix quote text sizing.

Browse source
This commit is contained in:
Alex Hart 2022-05-27 15:23:34 -03:00 • committed by Greyson Parrelli
parent 7bf2ae3d5e
commit 28edd18e55
3 changed files with 37 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
View file

@ -1482,7 +1482,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
quoteView.setWallpaperEnabled(hasWallpaper);
quoteView.setVisibility(View.VISIBLE);
quoteView.setTextSize(TypedValue.COMPLEX_UNIT_SP, SignalStore.settings().getMessageFontSize());
quoteView.setTextSize(TypedValue.COMPLEX_UNIT_SP, SignalStore.settings().getMessageQuoteFontSize(context));
quoteView.getLayoutParams().width = ViewGroup.LayoutParams.WRAP_CONTENT;
quoteView.setOnClickListener(view -> {

34
app/src/main/java/org/thoughtcrime/securesms/keyvalue/SettingsValues.java
View file

@ -11,6 +11,7 @@ import androidx.lifecycle.LiveData;
import org.signal.core.util.concurrent.SignalExecutors;
import org.signal.core.util.logging.Log;
import org.thoughtcrime.securesms.R;
import org.thoughtcrime.securesms.database.SignalDatabase;
import org.thoughtcrime.securesms.dependencies.ApplicationDependencies;
import org.thoughtcrime.securesms.mms.SentMediaQuality;
@ -194,6 +195,15 @@ public final class SettingsValues extends SignalStoreValues {
return getInteger(MESSAGE_FONT_SIZE, TextSecurePreferences.getMessageBodyTextSize(ApplicationDependencies.getApplication()));
}
public int getMessageQuoteFontSize(@NonNull Context context) {
String messageFontSize = String.valueOf(getMessageFontSize());
String[] messageSizes = context.getResources().getStringArray(R.array.pref_message_font_size_values);
String[] quoteSizes = context.getResources().getStringArray(R.array.pref_message_font_quote_size_values);
int index = Arrays.binarySearch(messageSizes, messageFontSize);
return Integer.parseInt(quoteSizes[index]);
}
public void setMessageFontSize(int messageFontSize) {
putInteger(MESSAGE_FONT_SIZE, messageFontSize);
}
@ -421,10 +431,14 @@ public final class SettingsValues extends SignalStoreValues {
public static CensorshipCircumventionEnabled deserialize(int value) {
switch (value) {
case 0: return DEFAULT;
case 1: return ENABLED;
case 2: return DISABLED;
default: throw new IllegalArgumentException("Bad value: " + value);
case 0:
return DEFAULT;
case 1:
return ENABLED;
case 2:
return DISABLED;
default:
throw new IllegalArgumentException("Bad value: " + value);
}
}
@ -448,10 +462,14 @@ public final class SettingsValues extends SignalStoreValues {
public static @NonNull Theme deserialize(@NonNull String value) {
switch (value) {
case "system": return SYSTEM;
case "light": return LIGHT;
case "dark": return DARK;
default: throw new IllegalArgumentException("Unrecognized value " + value);
case "system":
return SYSTEM;
case "light":
return LIGHT;
case "dark":
return DARK;
default:
throw new IllegalArgumentException("Unrecognized value " + value);
}
}
}

13
app/src/main/res/values/arrays.xml
View file

@ -344,10 +344,17 @@
</string-array>
<string-array name="pref_message_font_size_values">
<item>13</item>
<item>14</item>
<item>16</item>
<item>20</item>
<item>30</item>
<item>22</item>
<item>28</item>
</string-array>
<string-array name="pref_message_font_quote_size_values">
<item>12</item>
<item>14</item>
<item>18</item>
<item>22</item>
</string-array>
<string-array name="pref_notification_priority_entries">