gronod/talk-android
1
0
Fork 1
mirror of https://github.com/nextcloud/talk-android synced 2025-03-06 14:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

improve poll creating element sizes

Browse Source 
Signed-off-by: Andy Scherzinger <info@andy-scherzinger.de>
This commit is contained in:
Andy Scherzinger 2022-07-28 19:22:31 +02:00
parent b2d01d37db
commit bb425ef759
No known key found for this signature in database
GPG Key ID: 6CADC7E3523C308B
3 changed files with 56 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
app/src/main/res/layout/dialog_poll_create.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?><!-- <?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Andy Scherzinger
~ @author Marcel Hibbe ~ @author Marcel Hibbe
~ Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de> ~ Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -24,7 +26,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:padding="@dimen/standard_padding"
tools:background="@color/white"> tools:background="@color/white">
<LinearLayout <LinearLayout
@ -35,24 +36,30 @@
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
android:text="@string/polls_question"
android:textColor="@color/colorPrimary" android:textColor="@color/colorPrimary"
android:textStyle="bold" android:textStyle="bold" />
android:text="@string/polls_question" />
<EditText <EditText
android:id="@+id/poll_create_question" android:id="@+id/poll_create_question"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/standard_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:inputType="textMultiLine" android:inputType="textMultiLine"
tools:ignore="Autofill,LabelFor"/> tools:ignore="Autofill,LabelFor" />
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
android:textStyle="bold"
android:layout_marginTop="@dimen/standard_margin" android:layout_marginTop="@dimen/standard_margin"
android:text="@string/polls_options" /> android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
android:text="@string/polls_options"
android:textColor="@color/colorPrimary"
android:textStyle="bold" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/poll_create_options_list" android:id="@+id/poll_create_options_list"
@ -65,59 +72,75 @@
style="@style/OutlinedButton" style="@style/OutlinedButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/standard_half_margin" android:layout_marginStart="@dimen/standard_margin"
app:icon="@drawable/ic_add_grey600_24px" android:layout_marginTop="@dimen/standard_half_margin"
android:layout_marginEnd="@dimen/standard_margin"
android:minHeight="@dimen/min_size_clickable_area"
android:text="@string/polls_add_option"
app:cornerRadius="@dimen/button_corner_radius" app:cornerRadius="@dimen/button_corner_radius"
app:layout_constraintEnd_toEndOf="parent" app:icon="@drawable/ic_add_grey600_24px"
android:text="@string/polls_add_option" /> app:layout_constraintEnd_toEndOf="parent" />
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/colorPrimary"
android:textStyle="bold"
android:layout_marginTop="@dimen/standard_margin" android:layout_marginTop="@dimen/standard_margin"
android:layout_marginBottom="@dimen/standard_half_margin" android:layout_marginBottom="@dimen/standard_half_margin"
android:text="@string/polls_settings" /> android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
android:text="@string/polls_settings"
android:textColor="@color/colorPrimary"
android:textStyle="bold" />
<CheckBox <CheckBox
android:id="@+id/poll_private_poll_checkbox" android:id="@+id/poll_private_poll_checkbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/default_checkbox_dialog_start_margin"
android:minHeight="@dimen/min_size_clickable_area"
android:paddingStart="@dimen/standard_half_padding"
android:paddingEnd="@dimen/standard_padding"
android:text="@string/polls_private_poll" /> android:text="@string/polls_private_poll" />
<CheckBox <CheckBox
android:id="@+id/poll_multiple_answers_checkbox" android:id="@+id/poll_multiple_answers_checkbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="@dimen/default_checkbox_dialog_start_margin"
android:minHeight="@dimen/min_size_clickable_area"
android:paddingStart="@dimen/standard_half_padding"
android:paddingEnd="@dimen/standard_padding"
android:text="@string/polls_multiple_answers" /> android:text="@string/polls_multiple_answers" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="@dimen/standard_margin" android:layout_marginTop="@dimen/standard_margin"
android:gravity="end"> android:gravity="end"
android:orientation="horizontal"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/standard_padding"
android:paddingBottom="@dimen/standard_padding">
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/poll_dismiss" android:id="@+id/poll_dismiss"
style="@style/OutlinedButton" style="@style/OutlinedButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/standard_half_margin" android:text="@string/nc_common_dismiss"
app:cornerRadius="@dimen/button_corner_radius" app:cornerRadius="@dimen/button_corner_radius"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent" />
android:text="@string/nc_common_dismiss" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/poll_create_button" android:id="@+id/poll_create_button"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_margin="@dimen/standard_half_margin" android:layout_marginStart="@dimen/standard_margin"
app:cornerRadius="@dimen/button_corner_radius" android:layout_marginEnd="@dimen/zero"
app:layout_constraintEnd_toEndOf="parent"
android:text="@string/nc_create_poll" android:text="@string/nc_create_poll"
android:theme="@style/Button.Primary" /> android:theme="@style/Button.Primary"
app:cornerRadius="@dimen/button_corner_radius"
app:layout_constraintEnd_toEndOf="parent" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

11
app/src/main/res/layout/poll_create_options_item.xml
View File

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?><!-- <?xml version="1.0" encoding="utf-8"?><!--
~ Nextcloud Talk application ~ Nextcloud Talk application
~ ~
~ @author Andy Scherzinger
~ @author Marcel Hibbe ~ @author Marcel Hibbe
~ Copyright (C) 2022 Andy Scherzinger <info@andy-scherzinger.de>
~ Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de> ~ Copyright (C) 2022 Marcel Hibbe <dev@mhibbe.de>
~ ~
~ This program is free software: you can redistribute it and/or modify ~ This program is free software: you can redistribute it and/or modify
@ -23,7 +25,10 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="@dimen/min_size_clickable_area"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="@dimen/standard_padding"
android:paddingEnd="@dimen/zero"
tools:background="@color/white"> tools:background="@color/white">
<EditText <EditText
@ -31,15 +36,15 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:singleLine="true"
android:inputType="text" android:inputType="text"
android:singleLine="true"
tools:ignore="Autofill,LabelFor" /> tools:ignore="Autofill,LabelFor" />
<com.google.android.material.button.MaterialButton <com.google.android.material.button.MaterialButton
android:id="@+id/poll_option_delete" android:id="@+id/poll_option_delete"
style="@style/Widget.AppTheme.Button.IconButton" style="@style/Widget.AppTheme.Button.IconButton"
android:layout_width="wrap_content" android:layout_width="@dimen/min_size_clickable_area"
android:layout_height="wrap_content" android:layout_height="@dimen/min_size_clickable_area"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:contentDescription="@string/nc_action_open_main_menu" android:contentDescription="@string/nc_action_open_main_menu"
app:cornerRadius="@dimen/button_corner_radius" app:cornerRadius="@dimen/button_corner_radius"

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

@ -71,5 +71,7 @@
<dimen name="reaction_bottom_sheet_layout_size">40dp</dimen> <dimen name="reaction_bottom_sheet_layout_size">40dp</dimen>
<dimen name="standard_eighth_margin">2dp</dimen> <dimen name="standard_eighth_margin">2dp</dimen>
<dimen name="default_checkbox_dialog_start_margin">10dp</dimen>
<dimen name="mediatab_file_icon_size">50dp</dimen> <dimen name="mediatab_file_icon_size">50dp</dimen>
</resources> </resources>