mirror
/
Tusky
mirror of https://github.com/tuskyapp/Tusky.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

improve poll voting button layout (#5095) 

Before / After


![Screenshot_20250501_214540](https://github.com/user-attachments/assets/a78b0445-fab2-4d84-9744-6c24e8a69c23)


![Screenshot_20250501_214153](https://github.com/user-attachments/assets/d65e4fe9-fb24-4589-a292-a92ad72c7776)
pull/5100/head
Konrad Pozniak 11 months ago committed by GitHub
parent
d35dcecf9f
commit
d296bd9704
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 124 additions and 106 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 78
      app/src/main/res/layout/item_conversation.xml
  2. 72
      app/src/main/res/layout/item_status.xml
  3. 75
      app/src/main/res/layout/item_status_detailed.xml
  4. 5
      app/src/main/res/values/strings.xml

78
app/src/main/res/layout/item_conversation.xml
Unescape View File

@ -102,10 +102,10 @@
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?android:textColorSecondary"
android:textSize="?attr/status_text_medium"
android:paddingStart="@dimen/status_display_name_padding_end"
android:paddingEnd="@dimen/status_display_name_padding_end"
android:textColor="?android:textColorSecondary"
android:textSize="?attr/status_text_medium"
app:layout_constraintEnd_toStartOf="@id/status_meta_info"
app:layout_constraintStart_toEndOf="@id/status_display_name"
app:layout_constraintTop_toTopOf="@id/status_display_name"
@ -216,42 +216,48 @@
app:layout_constraintStart_toStartOf="@id/status_display_name"
app:layout_constraintTop_toBottomOf="@id/status_media_preview_container" />
<Button
android:id="@+id/status_poll_button"
style="@style/TuskyButton.Outlined"
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/status_poll_button_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center"
android:minWidth="150dp"
android:minHeight="0dp"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:text="@string/poll_vote"
android:textSize="?attr/status_text_medium"
android:layout_marginTop="2dp"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/status_display_name"
app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
app:layout_constraintTop_toBottomOf="@id/status_poll_options">
<Button
android:id="@+id/status_poll_results_button"
style="@style/TuskyButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center"
android:minWidth="150dp"
android:minHeight="0dp"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:layout_marginStart="4dp"
android:text="@string/poll_show_results"
android:textSize="?attr/status_text_medium"
app:layout_constraintStart_toEndOf="@id/status_poll_button"
app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
<Button
android:id="@+id/status_poll_button"
style="@style/TuskyButton.Outlined"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:minHeight="0dp"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:text="@string/poll_vote"
android:textSize="?attr/status_text_medium" />
<Button
android:id="@+id/status_poll_results_button"
style="@style/TuskyButton.Outlined"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="6dp"
android:layout_weight="1"
android:gravity="center"
android:minHeight="0dp"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:text="@string/poll_show_results"
android:textSize="?attr/status_text_medium" />
</LinearLayout>
<TextView
android:id="@+id/status_poll_description"
@ -260,7 +266,7 @@
android:layout_marginTop="6dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/status_display_name"
app:layout_constraintTop_toBottomOf="@id/status_poll_button"
app:layout_constraintTop_toBottomOf="@id/status_poll_button_container"
tools:text="7 votes • 7 hours remaining" />
<ImageButton

72
app/src/main/res/layout/item_status.xml
Unescape View File

@ -253,43 +253,49 @@
app:layout_constraintStart_toStartOf="@id/status_display_name"
app:layout_constraintTop_toBottomOf="@id/status_media_preview_container" />
<Button
android:id="@+id/status_poll_button"
style="@style/TuskyButton.Outlined"
<LinearLayout
android:id="@+id/status_poll_button_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="2dp"
android:gravity="center"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:minHeight="0dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:text="@string/poll_vote"
android:textSize="?attr/status_text_medium"
app:layout_constraintEnd_toStartOf="@id/status_poll_results_button"
app:layout_constraintStart_toStartOf="@id/status_display_name"
app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
<Button
android:id="@+id/status_poll_results_button"
style="@style/TuskyButton.Outlined"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="6dp"
android:layout_marginTop="2dp"
android:layout_marginEnd="14dp"
android:gravity="center"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:minHeight="0dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:text="@string/poll_show_results"
android:textSize="?attr/status_text_medium"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/status_poll_button"
app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
app:layout_constraintStart_toStartOf="@id/status_display_name"
app:layout_constraintTop_toBottomOf="@id/status_poll_options">
<Button
android:id="@+id/status_poll_button"
style="@style/TuskyButton.Outlined"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:minHeight="0dp"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:text="@string/poll_vote"
android:textSize="?attr/status_text_medium" />
<Button
android:id="@+id/status_poll_results_button"
style="@style/TuskyButton.Outlined"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="6dp"
android:layout_weight="1"
android:gravity="center"
android:minHeight="0dp"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:text="@string/poll_show_results"
android:textSize="?attr/status_text_medium" />
</LinearLayout>
<TextView
android:id="@+id/status_poll_description"
@ -300,7 +306,7 @@
android:textSize="?attr/status_text_medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@id/status_display_name"
app:layout_constraintTop_toBottomOf="@id/status_poll_button"
app:layout_constraintTop_toBottomOf="@id/status_poll_button_container"
tools:text="7 votes • 7 hours remaining" />
<com.keylesspalace.tusky.view.ClickableSpanTextView

75
app/src/main/res/layout/item_status_detailed.xml
Unescape View File

@ -204,43 +204,50 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/status_media_preview_container" />
<Button
android:id="@+id/status_poll_button"
style="@style/TuskyButton.Outlined"
android:layout_width="wrap_content"
<LinearLayout
android:id="@+id/status_poll_button_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="14dp"
android:layout_marginTop="4dp"
android:gravity="center"
android:minWidth="150dp"
android:minHeight="0dp"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:text="@string/poll_vote"
android:textSize="?attr/status_text_medium"
android:layout_marginTop="2dp"
android:layout_marginEnd="14dp"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
app:layout_constraintTop_toBottomOf="@id/status_poll_options">
<Button
android:id="@+id/status_poll_results_button"
style="@style/TuskyButton.Outlined"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="4dp"
android:gravity="center"
android:minWidth="150dp"
android:minHeight="0dp"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:layout_marginStart="4dp"
android:text="@string/poll_show_results"
android:textSize="?attr/status_text_medium"
app:layout_constraintStart_toEndOf="@id/status_poll_button"
app:layout_constraintTop_toBottomOf="@id/status_poll_options" />
<Button
android:id="@+id/status_poll_button"
style="@style/TuskyButton.Outlined"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:gravity="center"
android:minHeight="0dp"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:text="@string/poll_vote"
android:textSize="?attr/status_text_medium" />
<Button
android:id="@+id/status_poll_results_button"
style="@style/TuskyButton.Outlined"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_marginStart="6dp"
android:layout_weight="1"
android:gravity="center"
android:minHeight="0dp"
android:paddingLeft="16dp"
android:paddingTop="4dp"
android:paddingRight="16dp"
android:paddingBottom="4dp"
android:text="@string/poll_show_results"
android:textSize="?attr/status_text_medium" />
</LinearLayout>
<TextView
android:id="@+id/status_poll_description"
@ -252,7 +259,7 @@
android:textSize="?attr/status_text_medium"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/status_poll_button"
app:layout_constraintTop_toBottomOf="@id/status_poll_button_container"
tools:text="7 votes • 7 hours remaining" />
<com.keylesspalace.tusky.view.ClickableSpanTextView

5
app/src/main/res/values/strings.xml
Unescape View File

@ -642,9 +642,8 @@
<string name="notification_clear_text">Are you sure you want to permanently clear all your notifications?</string>
<string name="compose_preview_image_description">Actions for image %1$s</string>
<string name="poll_info_format">
<!-- 15 votes • 1 hour left -->
%1$s • %2$s</string>
<!-- 15 votes • 1 hour left -->
<string name="poll_info_format">%1$s • %2$s</string>
<plurals name="poll_info_votes">
<item quantity="one">%1$s vote</item>
<item quantity="other">%1$s votes</item>

Write Preview
Loading…
Cancel
Save