kumi/andOTP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Layout fixes for multi-line labels

Browse source
This commit is contained in:
Jakob Nixdorf 2021-03-08 07:08:19 +01:00
parent 943946a1b8
commit e982c63861
No known key found for this signature in database
GPG key ID: BE99BF86574A7DBC
5 changed files with 63 additions and 121 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/org/shadowice/flocke/andotp/View/EntriesCardAdapter.java
View file

@ -248,7 +248,7 @@ public class EntriesCardAdapter extends RecyclerView.Adapter<EntryViewHolder>
entryViewHolder.updateValues(entry);
entryViewHolder.setLabelSize(settings.getLabelSize());
entryViewHolder.setLabelScroll(settings.getLabelDisplay());
entryViewHolder.setLabelScroll(settings.getLabelDisplay(), settings.getCardLayout());
if(settings.getThumbnailVisible())
entryViewHolder.setThumbnailSize(settings.getThumbnailSize());

86
app/src/main/java/org/shadowice/flocke/andotp/View/EntryViewHolder.java
View file

@ -29,7 +29,12 @@ import android.graphics.ColorFilter;
import androidx.annotation.NonNull;
import androidx.cardview.widget.CardView;
import androidx.recyclerview.widget.RecyclerView;
import android.graphics.Typeface;
import android.text.Spannable;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.style.StyleSpan;
import android.view.View;
import android.view.animation.LinearInterpolator;
import android.widget.FrameLayout;
@ -55,26 +60,24 @@ import static org.shadowice.flocke.andotp.Activities.MainActivity.animatorDurati
public class EntryViewHolder extends RecyclerView.ViewHolder
implements ItemTouchHelperViewHolder {
private Context context;
private final Context context;
private Callback callback;
private boolean tapToReveal;
private CardView card;
private LinearLayout valueLayout;
private LinearLayout coverLayout;
private LinearLayout counterLayout;
private FrameLayout thumbnailFrame;
private ImageView visibleImg;
private ImageView thumbnailImg;
private ImageButton menuButton;
private ImageButton copyButton;
private TextView value;
private TextView issuer;
private TextView label;
private TextView separator;
private TextView counter;
private TextView tags;
private MaterialProgressBar progressBar;
private final CardView card;
private final LinearLayout valueLayout;
private final LinearLayout coverLayout;
private final LinearLayout counterLayout;
private final FrameLayout thumbnailFrame;
private final ImageView visibleImg;
private final ImageView thumbnailImg;
private final ImageButton menuButton;
private final ImageButton copyButton;
private final TextView value;
private final TextView label;
private final TextView counter;
private final TextView tags;
private final MaterialProgressBar progressBar;
public EntryViewHolder(Context context, final View v, boolean tapToReveal) {
super(v);
@ -88,9 +91,7 @@ public class EntryViewHolder extends RecyclerView.ViewHolder
thumbnailFrame = v.findViewById(R.id.thumbnailFrame);
thumbnailImg = v.findViewById(R.id.thumbnailImg);
coverLayout = v.findViewById(R.id.coverLayout);
issuer = v.findViewById(R.id.textViewIssuer);
label = v.findViewById(R.id.textViewLabel);
separator = v.findViewById(R.id.textViewSeparator);
tags = v.findViewById(R.id.textViewTags);
counterLayout = v.findViewById(R.id.counterLayout);
counter = v.findViewById(R.id.counter);
@ -178,36 +179,41 @@ public class EntryViewHolder extends RecyclerView.ViewHolder
final String tokenFormatted = Tools.formatToken(entry.getCurrentOTP(), settings.getTokenSplitGroupSize());
String issuerText = entry.getIssuer();
String labelText = entry.getLabel();
String contentHint = "";
String issuerText = entry.getIssuer();
SpannableStringBuilder labelBuilder = new SpannableStringBuilder();
if (!TextUtils.isEmpty(issuerText) && !settings.isHideIssuerEnabled()) {
issuer.setText(issuerText);
issuer.setVisibility(View.VISIBLE);
labelBuilder.append(issuerText);
labelBuilder.setSpan(new StyleSpan(Typeface.BOLD), 0, issuerText.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
contentHint = issuerText;
} else {
issuer.setVisibility(View.GONE);
}
String labelText = entry.getLabel();
if (!TextUtils.isEmpty(labelText)) {
label.setText(labelText);
label.setVisibility(View.VISIBLE);
contentHint = labelText;
} else {
label.setVisibility(View.GONE);
}
if (!TextUtils.isEmpty(issuerText) && !TextUtils.isEmpty(labelText) && !settings.isHideIssuerEnabled()) {
separator.setVisibility(View.VISIBLE);
String separatorText = "\u00a0-\u00a0"; // \u00a0 = non-breaking space
if (settings.getCardLayout() == Constants.CardLayouts.FULL)
separatorText = "\n";
labelBuilder.append(separatorText);
contentHint = issuerText + " - " + labelText;
} else {
separator.setVisibility(View.GONE);
}
if (!TextUtils.isEmpty(labelText)) {
labelBuilder.append(labelText);
if (TextUtils.isEmpty(issuerText) || settings.isHideIssuerEnabled())
contentHint = labelText;
}
label.setText(labelBuilder);
copyButton.setContentDescription(context.getString(R.string.button_card_copy_format, contentHint));
menuButton.setContentDescription(context.getString(R.string.button_card_options_format, contentHint));
@ -281,19 +287,19 @@ public class EntryViewHolder extends RecyclerView.ViewHolder
thumbnailImg.requestLayout();
}
public void setLabelScroll(Constants.LabelDisplay labelDisplay) {
public void setLabelScroll(Constants.LabelDisplay labelDisplay, Constants.CardLayouts cardLayout) {
switch (labelDisplay) {
case TRUNCATE:
label.setEllipsize(TextUtils.TruncateAt.END);
label.setHorizontallyScrolling(false);
label.setSelected(false);
label.setMaxLines(1);
label.setMaxLines(cardLayout == Constants.CardLayouts.FULL ? 2 : 1);
break;
case SCROLL:
label.setEllipsize(TextUtils.TruncateAt.MARQUEE);
label.setHorizontallyScrolling(true);
label.setSelected(true);
label.setMaxLines(1);
label.setMaxLines(cardLayout == Constants.CardLayouts.FULL ? 2 : 1);
break;
case MULTILINE:
label.setEllipsize(null);

37
app/src/main/res/layout/component_card_compact.xml
View file

@ -113,39 +113,14 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
<TextView
android:id="@+id/textViewLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/textViewIssuer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:textSize="18sp"
android:text="Issuer"
android:textStyle="bold" />
<TextView
android:id="@+id/textViewSeparator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textSize="18sp"
android:text="@string/card_separator" />
<TextView
android:id="@+id/textViewLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:text="Label"
android:textSize="18sp" />
</LinearLayout>
android:maxLines="1"
android:ellipsize="end"
android:text="Label"
android:textSize="18sp" />
<TextView
android:id="@+id/textViewTags"

37
app/src/main/res/layout/component_card_default.xml
View file

@ -113,39 +113,14 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
<TextView
android:id="@+id/textViewLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/textViewIssuer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:textSize="18sp"
android:text="Issuer"
android:textStyle="bold" />
<TextView
android:id="@+id/textViewSeparator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textSize="18sp"
android:text="@string/card_separator" />
<TextView
android:id="@+id/textViewLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:text="Label"
android:textSize="18sp" />
</LinearLayout>
android:maxLines="1"
android:ellipsize="end"
android:text="Label"
android:textSize="18sp" />
<TextView
android:id="@+id/textViewTags"

22
app/src/main/res/layout/component_card_full.xml
View file

@ -110,29 +110,14 @@
</LinearLayout>
</LinearLayout>
<TextView
android:id="@+id/textViewIssuer"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:textSize="18sp"
android:textStyle="bold" />
<TextView
android:id="@+id/textViewSeparator"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="0"
android:visibility="gone" />
<TextView
android:id="@+id/textViewLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:textSize="18sp" />
android:textSize="18sp"
android:text="Label"/>
<TextView
android:id="@+id/textViewTags"
@ -140,7 +125,8 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:ellipsize="end"
android:textSize="13.5sp" />
android:textSize="13.5sp"
android:text="Tags"/>
</LinearLayout>