mirror
/
FairEmail
mirror of https://github.com/M66B/FairEmail.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Added tiny font size and padding for messages widget

This commit is contained in:
M66B 2021-08-04 17:49:07 +02:00
parent 6a0803cdd1
commit 25326c35e3
3 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/src/main/java/eu/faircode/email/ActivityWidgetUnified.java
View File

@ -45,6 +45,7 @@ import com.flask.colorpicker.builder.ColorPickerClickListener;
import com.flask.colorpicker.builder.ColorPickerDialogBuilder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.List;
@ -147,6 +148,19 @@ public class ActivityWidgetUnified extends ActivityBase {
else
editor.remove("widget." + appWidgetId + ".name");
int font = spFontSize.getSelectedItemPosition();
int padding = spPadding.getSelectedItemPosition();
if (font == 1) // tiny
font = 4;
else if (font > 1)
font--;
if (padding == 1) // tiny
padding = 4;
else if (padding > 1)
padding--;
editor.putLong("widget." + appWidgetId + ".account", account == null ? -1L : account.id);
editor.putLong("widget." + appWidgetId + ".folder", folder == null ? -1L : folder.id);
editor.putString("widget." + appWidgetId + ".type", folder == null ? null : folder.type);
@ -154,8 +168,8 @@ public class ActivityWidgetUnified extends ActivityBase {
editor.putBoolean("widget." + appWidgetId + ".flagged", cbFlagged.isChecked());
editor.putBoolean("widget." + appWidgetId + ".semi", cbSemiTransparent.isChecked());
editor.putInt("widget." + appWidgetId + ".background", btnColor.getColor());
editor.putInt("widget." + appWidgetId + ".font", spFontSize.getSelectedItemPosition());
editor.putInt("widget." + appWidgetId + ".padding", spPadding.getSelectedItemPosition());
editor.putInt("widget." + appWidgetId + ".font", font);
editor.putInt("widget." + appWidgetId + ".padding", padding);
editor.putInt("widget." + appWidgetId + ".version", BuildConfig.VERSION_CODE);
editor.apply();
@ -247,7 +261,9 @@ public class ActivityWidgetUnified extends ActivityBase {
}
});
String[] sizes = getResources().getStringArray(R.array.fontSizeNames);
List<String> sizes = new ArrayList<>();
sizes.addAll(Arrays.asList(getResources().getStringArray(R.array.fontSizeNames)));
sizes.add(1, getString(R.string.title_size_tiny));
adapterFontSize = new ArrayAdapter<>(this, R.layout.spinner_item1, android.R.id.text1, sizes);
adapterFontSize.setDropDownViewResource(R.layout.spinner_item1_dropdown);

4
app/src/main/java/eu/faircode/email/WidgetUnified.java
View File

@ -137,6 +137,8 @@ public class WidgetUnified extends AppWidgetProvider {
return 14;
case 3: // large
return 22;
case 4: // tiny
return 10;
default: // medium
return 18;
}
@ -148,6 +150,8 @@ public class WidgetUnified extends AppWidgetProvider {
return Helper.dp2pixels(context, 3);
case 3: // large
return Helper.dp2pixels(context, 9);
case 4: // tiny
return Helper.dp2pixels(context, 1);
default: // medium
return Helper.dp2pixels(context, 6);
}

2
app/src/main/res/values/strings.xml
View File

@ -1886,6 +1886,8 @@
<item>Large</item>
</string-array>
<string name="title_size_tiny">Tiny</string>
<string-array name="receiptNames">
<item>Read receipt only</item>
<item>Delivery receipt only</item>