From 713766c032f67bb9b56ba02b66cfa97f8d6994b0 Mon Sep 17 00:00:00 2001 From: nuclearfog Date: Wed, 28 Dec 2022 21:46:09 +0100 Subject: [PATCH] layout fix --- .../nuclearfog/twidda/adapter/holder/PollHolder.java | 11 +++-------- .../twidda/adapter/holder/StatusHolder.java | 5 +++++ app/src/main/res/drawable/poll.xml | 4 ++-- app/src/main/res/layout/item_poll.xml | 9 +++------ app/src/main/res/layout/item_status.xml | 5 +++++ app/src/main/res/layout/page_status.xml | 1 + app/src/main/res/values-de-rDE/strings.xml | 4 ++-- app/src/main/res/values/dimens.xml | 4 +++- app/src/main/res/values/strings.xml | 3 ++- 9 files changed, 26 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/holder/PollHolder.java b/app/src/main/java/org/nuclearfog/twidda/adapter/holder/PollHolder.java index d5158449..55ae9b86 100644 --- a/app/src/main/java/org/nuclearfog/twidda/adapter/holder/PollHolder.java +++ b/app/src/main/java/org/nuclearfog/twidda/adapter/holder/PollHolder.java @@ -1,7 +1,6 @@ package org.nuclearfog.twidda.adapter.holder; import android.view.LayoutInflater; -import android.view.View; import android.view.ViewGroup; import android.widget.TextView; @@ -26,7 +25,6 @@ import org.nuclearfog.twidda.model.Poll; public class PollHolder extends ViewHolder implements OnOptionClickListener { private TextView votesCount; - private TextView expiresAt; private OptionsAdapter adapter; @@ -42,11 +40,9 @@ public class PollHolder extends ViewHolder implements OnOptionClickListener { CardView cardBackground = (CardView) itemView; RecyclerView optionsList = itemView.findViewById(R.id.item_poll_options_list); votesCount = itemView.findViewById(R.id.item_poll_votes_count); - expiresAt = itemView.findViewById(R.id.item_poll_expiration_date); cardBackground.setCardBackgroundColor(settings.getCardColor()); votesCount.setTextColor(settings.getFontColor()); - expiresAt.setTextColor(settings.getFontColor()); itemView.getLayoutParams().width = parent.getMeasuredHeight() * 2; adapter = new OptionsAdapter(settings, this); @@ -70,13 +66,12 @@ public class PollHolder extends ViewHolder implements OnOptionClickListener { * @param poll poll information */ public void setContent(Poll poll) { - votesCount.setText(R.string.poll_total_votes); - votesCount.append(StringTools.NUMBER_FORMAT.format(poll.voteCount())); if (poll.closed()) { - expiresAt.setText(R.string.poll_finished); + votesCount.setText(R.string.poll_finished); } else { - expiresAt.setVisibility(View.GONE); + votesCount.setText(R.string.poll_total_votes); } + votesCount.append(StringTools.NUMBER_FORMAT.format(poll.voteCount())); adapter.addAll(poll); } diff --git a/app/src/main/java/org/nuclearfog/twidda/adapter/holder/StatusHolder.java b/app/src/main/java/org/nuclearfog/twidda/adapter/holder/StatusHolder.java index 731f6c6f..23bd3cf1 100644 --- a/app/src/main/java/org/nuclearfog/twidda/adapter/holder/StatusHolder.java +++ b/app/src/main/java/org/nuclearfog/twidda/adapter/holder/StatusHolder.java @@ -221,6 +221,11 @@ public class StatusHolder extends ViewHolder implements OnClickListener { text = resources.getString(R.string.info_user_favorited, name); iconRes = R.drawable.favorite; break; + + case Notification.TYPE_POLL: + text = resources.getString(R.string.notification_status_poll); + iconRes = R.drawable.poll; + break; } label.setVisibility(View.VISIBLE); label.setText(text); diff --git a/app/src/main/res/drawable/poll.xml b/app/src/main/res/drawable/poll.xml index 5a12a8c2..c454d470 100644 --- a/app/src/main/res/drawable/poll.xml +++ b/app/src/main/res/drawable/poll.xml @@ -1,6 +1,6 @@ + android:layout_height="wrap_content" + android:textSize="@dimen/tiem_poll_text_size" + android:lines="1"/> - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_status.xml b/app/src/main/res/layout/item_status.xml index 54b9de1d..30cee6c2 100644 --- a/app/src/main/res/layout/item_status.xml +++ b/app/src/main/res/layout/item_status.xml @@ -165,6 +165,7 @@ android:id="@+id/item_status_text" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/item_status_layout_margin" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_status_text_barrier" app:layout_constraintEnd_toEndOf="parent" /> @@ -173,6 +174,7 @@ android:id="@+id/item_status_attachment_list" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginTop="@dimen/item_status_layout_margin" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_status_text" app:layout_constraintEnd_toEndOf="parent" /> @@ -181,6 +183,7 @@ android:id="@+id/item_status_indicator_placeholder" android:layout_width="0dp" android:layout_height="@dimen/item_status_icon_size" + android:layout_marginTop="@dimen/item_status_layout_margin" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/item_status_attachment_list" app:layout_constraintEnd_toStartOf="@id/item_status_repost_icon" /> @@ -190,6 +193,7 @@ android:layout_width="@dimen/item_status_icon_size" android:layout_height="@dimen/item_status_icon_size" android:src="@drawable/repost" + android:layout_marginTop="@dimen/item_status_layout_margin" app:layout_constraintStart_toEndOf="@id/item_status_indicator_placeholder" app:layout_constraintTop_toBottomOf="@id/item_status_attachment_list" app:layout_constraintEnd_toStartOf="@id/item_status_repost_count" @@ -213,6 +217,7 @@ android:layout_width="@dimen/item_status_icon_size" android:layout_height="@dimen/item_status_icon_size" android:src="@drawable/favorite" + android:layout_marginTop="@dimen/item_status_layout_margin" app:layout_constraintStart_toEndOf="@id/item_status_repost_count" app:layout_constraintTop_toBottomOf="@id/item_status_attachment_list" app:layout_constraintEnd_toStartOf="@id/item_status_favorite_count" diff --git a/app/src/main/res/layout/page_status.xml b/app/src/main/res/layout/page_status.xml index b7240e74..c826b683 100644 --- a/app/src/main/res/layout/page_status.xml +++ b/app/src/main/res/layout/page_status.xml @@ -226,6 +226,7 @@ android:linksClickable="false" android:singleLine="true" android:textSize="@dimen/page_status_textsize_small" + android:layout_marginTop="@dimen/page_status_textview_margin" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/page_status_api_barrier" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index bc50be61..346e2a26 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -247,7 +247,7 @@ Statusmetriken Text ist leer! Fehler! API Zugang wurde von Twitter beschränkt. - "Total:\u0020" + "Anzahl:\u0020" abgestimmt - Resultat + Abstimmung beendet:\u0020 \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index eafab3b3..d1705c89 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -72,6 +72,7 @@ 36sp 5dp + 3dp 5dp 8dp 5dp @@ -246,7 +247,7 @@ 36sp - 12sp + 11sp 5dp 5dp @@ -255,6 +256,7 @@ 5dp + 11sp 28sp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1655b374..1a78ac54 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -285,8 +285,9 @@ Media preview Video preview button Total votes:\u0020 - final results + Vote finished:\u0020 voted Status/Message attachment + vote finished \ No newline at end of file