Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Decorations in conversations are now related to font scale

This commit is contained in:
Thomas 2022-05-05 19:05:22 +02:00
parent 8523f7340a
commit b8dec73858
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/app/fedilab/android/helper/DividerDecoration.java
View File

@ -15,6 +15,7 @@ package app.fedilab.android.helper;
* see <http://www.gnu.org/licenses>. */ * see <http://www.gnu.org/licenses>. */
import android.content.Context; import android.content.Context;
import android.content.SharedPreferences;
import android.graphics.Canvas; import android.graphics.Canvas;
import android.graphics.DashPathEffect; import android.graphics.DashPathEffect;
import android.graphics.Paint; import android.graphics.Paint;
@ -23,6 +24,7 @@ import android.view.View;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.core.content.res.ResourcesCompat; import androidx.core.content.res.ResourcesCompat;
import androidx.preference.PreferenceManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import java.util.Arrays; import java.util.Arrays;
@ -36,6 +38,7 @@ public class DividerDecoration extends RecyclerView.ItemDecoration {
private final Context _mContext; private final Context _mContext;
private final List<Status> statusList; private final List<Status> statusList;
private final float fontScale;
private final List<Integer> colorList = Arrays.asList( private final List<Integer> colorList = Arrays.asList(
R.color.decoration_1, R.color.decoration_1,
R.color.decoration_2, R.color.decoration_2,
@ -57,6 +60,8 @@ public class DividerDecoration extends RecyclerView.ItemDecoration {
public DividerDecoration(Context context, List<Status> statuses) { public DividerDecoration(Context context, List<Status> statuses) {
_mContext = context; _mContext = context;
statusList = statuses; statusList = statuses;
SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(_mContext);
fontScale = prefs.getFloat(_mContext.getString(R.string.SET_FONT_SCALE), 1.1f);
} }
@Override @Override
@ -67,7 +72,7 @@ public class DividerDecoration extends RecyclerView.ItemDecoration {
Status status = statusAdapter.getItem(position); Status status = statusAdapter.getItem(position);
int start = (int) Helper.convertDpToPixel( int start = (int) Helper.convertDpToPixel(
6 * CommentDecorationHelper.getIndentation(status.in_reply_to_id, statusList, colorList.size()), 6 * fontScale * CommentDecorationHelper.getIndentation(status.in_reply_to_id, statusList, colorList.size()),
_mContext); _mContext);
if (parent.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR) { if (parent.getLayoutDirection() == View.LAYOUT_DIRECTION_LTR) {
@ -100,7 +105,7 @@ public class DividerDecoration extends RecyclerView.ItemDecoration {
paint.setStrokeJoin(Paint.Join.MITER); paint.setStrokeJoin(Paint.Join.MITER);
for (int j = 0; j < indentation; j++) { for (int j = 0; j < indentation; j++) {
float startPx = Helper.convertDpToPixel(6 + 6 * j, _mContext); float startPx = Helper.convertDpToPixel(6 * fontScale + 6 * fontScale * j, _mContext);
if (parent.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL) if (parent.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL)
startPx = c.getWidth() - startPx; startPx = c.getWidth() - startPx;
@ -119,9 +124,9 @@ public class DividerDecoration extends RecyclerView.ItemDecoration {
paint.setColor(ResourcesCompat.getColor(_mContext.getResources(), colorList.get(indentation - 1), _mContext.getTheme())); paint.setColor(ResourcesCompat.getColor(_mContext.getResources(), colorList.get(indentation - 1), _mContext.getTheme()));
float startDp = 6 * (indentation - 1) + 6; float startDp = 6 * fontScale * (indentation - 1) + 6 * fontScale;
float centerPx = view.getBottom() - view.getHeight() / 2F; float centerPx = view.getBottom() - view.getHeight() / 2F;
float endDp = startDp + 12; float endDp = startDp + 12 * fontScale;
float endPx = Helper.convertDpToPixel(endDp, _mContext); float endPx = Helper.convertDpToPixel(endDp, _mContext);
float startPx = Helper.convertDpToPixel(startDp, _mContext); float startPx = Helper.convertDpToPixel(startDp, _mContext);