Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pm rounded button #2897

Merged
merged 51 commits into from
Dec 11, 2024
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
e850fbb
Merge remote-tracking branch 'origin/master'
pm-dimagi Nov 15, 2024
06e6611
-ui changes for rounded button
pm-dimagi Nov 15, 2024
2b46881
-ui changes for rounded button
pm-dimagi Nov 15, 2024
eeab8d2
-ui changes for rounded button
pm-dimagi Nov 15, 2024
573ca4d
- pr request changes
pm-dimagi Nov 19, 2024
6cc54e7
-title bar color changes
pm-dimagi Nov 19, 2024
b7156c8
Merge branch 'master' of https://github.com/dimagi/commcare-android i…
pm-dimagi Nov 20, 2024
10eadc6
-pr requested changes
pm-dimagi Nov 20, 2024
3ae3643
-pr requested changes
pm-dimagi Nov 22, 2024
ad7c456
-pr requested changes
pm-dimagi Nov 22, 2024
a3af6b6
-added launch icon and title bar icon in commcare
pm-dimagi Nov 22, 2024
8e070fd
-requested pr changes
pm-dimagi Nov 22, 2024
9f15541
-requested pr changes
pm-dimagi Nov 22, 2024
99bc8f8
-requested change for activity_drawing_boundary
pm-dimagi Nov 22, 2024
ccf96c2
-changes of button color
pm-dimagi Nov 27, 2024
1754bda
-changes of date widget
pm-dimagi Nov 28, 2024
42a347b
-changes of date widget
pm-dimagi Nov 28, 2024
e7cd5e8
Merge branch 'pm_rounded_button' into pm_CCCT_534
pm-dimagi Nov 29, 2024
29eb7f7
Merge pull request #2899 from dimagi/pm_CCCT_534
pm-dimagi Nov 29, 2024
affabbf
-changes for home button text size
pm-dimagi Nov 29, 2024
1d4a933
-changes for home button text size and old icons
pm-dimagi Dec 1, 2024
cfe8594
-text size change in square box
pm-dimagi Dec 3, 2024
ed3c688
Update square button icons
avazirna Dec 3, 2024
7ea3cf6
Update square tile font size
avazirna Dec 3, 2024
b79797c
Update square tile layout
avazirna Dec 3, 2024
2c5eefe
-button spacing in the dialog box
pm-dimagi Dec 3, 2024
2182e23
Merge branch 'master' into pm_rounded_button
avazirna Dec 4, 2024
063e95c
Update primary colour
avazirna Dec 4, 2024
53befeb
Update repeat group control dialog
avazirna Dec 4, 2024
5f33c64
Change dialog negative action style
avazirna Dec 4, 2024
732c706
Use positive button style in negative button
avazirna Dec 4, 2024
1def181
Update primary colour
avazirna Dec 4, 2024
322e1aa
Update Wifi direct UI tiles
avazirna Dec 4, 2024
4ac0f10
Make dialog buttons rounded cornered
avazirna Dec 6, 2024
3dcb2f1
Refactor
avazirna Dec 6, 2024
1e5f9d8
Change active controls colour to primary colour
avazirna Dec 6, 2024
5f22c1a
-ui overview design changes
pm-dimagi Dec 8, 2024
6c9ba8c
Update audio recorging widget buttons
avazirna Dec 8, 2024
3ea45c8
Update style
avazirna Dec 9, 2024
9365782
Update notification icon
avazirna Dec 9, 2024
c06692c
Refactor
avazirna Dec 9, 2024
67d2919
Refactor
avazirna Dec 9, 2024
44c763e
Update rounded buttons style
avazirna Dec 10, 2024
edbc979
Optimize map buttons styles
avazirna Dec 10, 2024
13ae017
Merge remote-tracking branch 'origin/pm_rounded_button' into pm_round…
pm-dimagi Dec 10, 2024
180db27
-- change of negative button style
pm-dimagi Dec 11, 2024
dde40f5
-change in the date picker color
pm-dimagi Dec 11, 2024
2e275f5
Revert "Optimize map buttons styles"
avazirna Dec 11, 2024
9e87ddb
Update map buttons style
avazirna Dec 11, 2024
4ef0149
Use selector to set rounded button background
avazirna Dec 11, 2024
eb6ce41
Improve RTL support
avazirna Dec 11, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/res/drawable/button_green_background.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<item android:drawable="@color/green_900" android:state_pressed="true" />
<item android:drawable="@color/green_500" />

</selector>
</selector>
6 changes: 2 additions & 4 deletions app/res/layout-land/activity_crash_warning.xml
Original file line number Diff line number Diff line change
Expand Up @@ -93,12 +93,10 @@
</LinearLayout>
</ScrollView>

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/RestartCommCare"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_margin="@dimen/content_min_margin"
android:background="@color/cc_brand_color"
android:textColor="@color/cc_neutral_bg"/>
android:layout_margin="@dimen/content_min_margin"/>
Comment on lines +96 to +101
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add missing attributes for MaterialButton

The MaterialButton implementation needs the following improvements:

  1. Missing text attribute for the restart action
  2. No style attribute for UI consistency

Apply this diff to enhance the button implementation:

 <com.google.android.material.button.MaterialButton
     android:id="@+id/RestartCommCare"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_alignParentBottom="true"
-    android:layout_margin="@dimen/content_min_margin"/>
+    android:layout_margin="@dimen/content_min_margin"
+    style="@style/CustomButtonStyle"
+    android:text="@string/restart_commcare"
+    android:contentDescription="@string/restart_commcare_description"/>

Committable suggestion skipped: line range outside the PR's diff.

</RelativeLayout>
6 changes: 2 additions & 4 deletions app/res/layout/activity_crash_warning.xml
Original file line number Diff line number Diff line change
Expand Up @@ -108,12 +108,10 @@
</LinearLayout>
</LinearLayout>

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/RestartCommCare"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_margin="@dimen/content_min_margin"
android:background="@color/cc_brand_color"
android:textColor="@color/cc_neutral_bg"/>
android:layout_margin="@dimen/content_min_margin"/>
</RelativeLayout>
16 changes: 8 additions & 8 deletions app/res/layout/activity_drawing_boundary.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,32 +44,32 @@
android:layout_width="match_parent"
android:orientation="horizontal">

<Button
style="@style/MapButtonGreen"
pm-dimagi marked this conversation as resolved.
Show resolved Hide resolved
<com.google.android.material.button.MaterialButton
android:backgroundTint="@color/green_500"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The old styled defined a selector that changes based on pressed button state, any reason we are no longer doing that ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see anything in response to my comment above, as so curious why was this resolved ?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see anything in response to my comment above, as so curious why was this resolved ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is updated in the last commit i have created the new style for this which is of same behaviour as the previous one

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you please link me to the style you are referring to ?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shubham by mistake i have made that correction in title bar color change pr . You can check the code over here

android:id="@+id/start_tracking_button"
android:layout_height="wrap_content"
android:layout_weight="1"
android:visibility="gone"
android:layout_width="0dp" />

<Button
style="@style/MapButtonRed"
<com.google.android.material.button.MaterialButton
android:id="@+id/stop_tracking_button"
android:backgroundTint="@color/red_500"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_width="0dp"
android:visibility="gone" />

<Button
style="@style/MapButtonOrange"
<com.google.android.material.button.MaterialButton
android:backgroundTint="@color/orange_500"
android:id="@+id/redo_tracking_button"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_width="0dp"
android:visibility="gone" />

<Button
style="@style/MapButtonGreen"
<com.google.android.material.button.MaterialButton
android:backgroundTint="@color/green_500"
android:id="@+id/ok_tracking_button"
android:layout_height="wrap_content"
android:layout_weight="1"
Expand Down
6 changes: 2 additions & 4 deletions app/res/layout/activity_mapbox_location_picker.xml
Original file line number Diff line number Diff line change
Expand Up @@ -56,21 +56,19 @@
android:maxLines="3"
android:minLines="3" />

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/confirm_location_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:enabled="false"
style="@style/Commcare.Button.Primary"
android:text="@string/confirm_location" />
Comment on lines +59 to 65
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Add visual feedback for disabled state

The confirm location button is disabled by default, but there's no clear visual indication of this state.

Add style and state list animator:

 <com.google.android.material.button.MaterialButton
     android:id="@+id/confirm_location_button"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:layout_gravity="bottom"
     android:enabled="false"
+    style="@style/Widget.MaterialComponents.Button"
+    android:stateListAnimator="@null"
     android:text="@string/confirm_location" />
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
<com.google.android.material.button.MaterialButton
android:id="@+id/confirm_location_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:enabled="false"
style="@style/Commcare.Button.Primary"
android:text="@string/confirm_location" />
<com.google.android.material.button.MaterialButton
android:id="@+id/confirm_location_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
android:enabled="false"
style="@style/Widget.MaterialComponents.Button"
android:stateListAnimator="@null"
android:text="@string/confirm_location" />


<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/cancel_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
style="@style/Commcare.Button.Primary"
android:text="@string/cancel" />

</LinearLayout>
Expand Down
3 changes: 2 additions & 1 deletion app/res/layout/activity_report_problem.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

<RelativeLayout
android:layout_width="match_parent"
android:layout_margin="16dp"
android:layout_height="wrap_content">

<ImageView
Expand Down Expand Up @@ -46,7 +47,7 @@
android:lines="5"
android:textColor="@color/black"/>

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/ReportButton01"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down
5 changes: 3 additions & 2 deletions app/res/layout/activity_target_mismatch_error.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@
tools:text="In order to install CommCare LTS, Please click on install button below. Then try installing your app again."/>
</LinearLayout>

<Button
style="@style/PromptedUpdateButtonUpdateLater"
<com.google.android.material.button.MaterialButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_spacer_large"
android:layout_below="@+id/error_info_container"
android:id="@+id/install_app_button"
Expand Down
2 changes: 1 addition & 1 deletion app/res/layout/app_manager.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
android:layout_centerHorizontal="true"
android:gravity="center"/>

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/install_app_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
4 changes: 2 additions & 2 deletions app/res/layout/blank_missing_multimedia_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
android:paddingStart="20px">
</ImageView>

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/skip_verification_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
Expand All @@ -31,7 +31,7 @@
android:layout_above="@+id/screen_multimedia_retry"
android:visibility="gone" />

<Button
<com.google.android.material.button.MaterialButton
android:id="@id/screen_multimedia_retry"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
Expand Down
9 changes: 5 additions & 4 deletions app/res/layout/blue_outlined_button.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<Button xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.button.MaterialButton xmlns:android="http://schemas.android.com/apk/res/android"
shubham1g5 marked this conversation as resolved.
Show resolved Hide resolved
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
style="@style/CustomButtonStyleOutline"
app:strokeColor="@color/primary_button_background"
android:id="@+id/blue_outlined_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
Copy link

@coderabbitai coderabbitai bot Dec 4, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🛠️ Refactor suggestion

Update deprecated layout_gravity value

Replace android:layout_gravity="right" with android:layout_gravity="end" to support right-to-left (RTL) layouts properly.

-    android:layout_gravity="right"
+    android:layout_gravity="end"
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
android:layout_gravity="right"
android:layout_gravity="end"

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@avazirna this would be nice to correct.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like the humans are having a chat. I'll hop back into my burrow for now. If you need me again, just tag @coderabbitai in a new comment, and I'll come hopping out!

android:textColor="@color/blue"
android:visibility="gone"
style="@style/CommCare.Button.Default"
android:background="@drawable/blue_outlined_view"
android:padding="10dp"
tools:viewBindingIgnore="true"/>
tools:viewBindingIgnore="true" />
6 changes: 3 additions & 3 deletions app/res/layout/choice_dialog_three_panel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
android:layout_marginEnd="@dimen/standard_spacer_large"
android:layout_marginStart="@dimen/standard_spacer_large">

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/choice_dialog_panel_1"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand All @@ -35,7 +35,7 @@
android:paddingTop="15dp"
android:layout_marginEnd="@dimen/standard_spacer" />

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/choice_dialog_panel_2"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand All @@ -48,7 +48,7 @@
android:layout_marginStart="@dimen/standard_spacer"
android:layout_marginEnd="@dimen/standard_spacer" />

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/choice_dialog_panel_3"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand Down
10 changes: 5 additions & 5 deletions app/res/layout/choice_dialog_view.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,19 +25,19 @@
android:layout_marginEnd="@dimen/standard_spacer_large">
</ListView>

<Button xmlns:android="http://schemas.android.com/apk/res/android"
<com.google.android.material.button.MaterialButton
shubham1g5 marked this conversation as resolved.
Show resolved Hide resolved
style="@style/CustomButtonStyleOutline"
xmlns:android="http://schemas.android.com/apk/res/android"
app:strokeColor="@color/primary_button_background"
android:id="@+id/optional_button"
android:layout_width="wrap_content"
android:layout_height="@dimen/min_button_height"
android:padding="@dimen/standard_spacer"
android:layout_gravity="end"
android:layout_marginRight="@dimen/standard_spacer"
android:background="@android:color/transparent"
android:textSize="@dimen/font_size_dp_medium"
android:textColor="@color/dialog_button_color"
android:visibility="gone"
android:layout_marginEnd="@dimen/standard_spacer">
</Button>
android:layout_marginEnd="@dimen/standard_spacer"/>

<LinearLayout
android:layout_width="match_parent"
Expand Down
6 changes: 3 additions & 3 deletions app/res/layout/component_entity_detail_item.xml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
android:visibility="visible"
android:layout_marginEnd="8dp" />

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/detail_value_phone"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -105,7 +105,7 @@
android:drawablePadding="@dimen/content_min_margin"
android:text="Callout"/>

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/callout_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -146,7 +146,7 @@
android:paddingStart="11dp"
android:paddingEnd="4dp">

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/detail_address_button"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
Expand Down
10 changes: 4 additions & 6 deletions app/res/layout/connection_diagnostic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,10 @@
android:paddingStart="5dp"
android:paddingEnd="5dp">

<Button
shubham1g5 marked this conversation as resolved.
Show resolved Hide resolved
<com.google.android.material.button.MaterialButton
android:id="@+id/run_connection_test"
style="@style/ButtonBottom"
android:layout_width="match_parent"
android:layout_margin="10dp"
android:layout_height="wrap_content"
android:text="Run Connection Test"/>

Expand All @@ -58,17 +58,15 @@
android:text="Output message."
android:visibility="invisible"/>

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/settings_button"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Go to Settings"
android:visibility="invisible"/>

<Button
<com.google.android.material.button.MaterialButton
android:id="@+id/report_button"
style="?android:attr/buttonStyleSmall"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Report to CommCare"
Expand Down
66 changes: 32 additions & 34 deletions app/res/layout/custom_alert_dialog.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -71,50 +71,48 @@
android:layout_weight="2"
android:layout_marginBottom="@dimen/standard_spacer">

<Button xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/positive_button"
<com.google.android.material.button.MaterialButton
style="@style/CustomButtonStyleOutline"
app:strokeColor="@color/primary_button_background"
android:id="@+id/positive_button"
android:layout_width="wrap_content"
android:layout_height="@dimen/min_button_height"
android:padding="@dimen/standard_spacer"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/standard_spacer"
android:background="@android:color/transparent"
android:textSize="@dimen/font_size_dp_medium"
android:textColor="@color/dialog_button_color"
android:visibility="gone"
android:layout_alignParentEnd="true"
android:layout_marginEnd="@dimen/standard_spacer">
</Button>
android:layout_marginEnd="@dimen/standard_spacer"/>

<Button xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/neutral_button"
android:layout_width="wrap_content"
android:layout_height="@dimen/min_button_height"
android:padding="@dimen/standard_spacer"
android:layout_toLeftOf="@id/positive_button"
android:background="@android:color/transparent"
android:textSize="@dimen/font_size_dp_medium"
android:textColor="@color/dialog_button_color"
android:visibility="gone"
android:layout_toStartOf="@id/positive_button">
</Button>
<com.google.android.material.button.MaterialButton
style="@style/CustomButtonStyleOutline"
app:strokeColor="@color/primary_button_background"
android:id="@+id/neutral_button"
android:layout_width="wrap_content"
android:layout_height="@dimen/min_button_height"
android:padding="@dimen/standard_spacer"
android:layout_toLeftOf="@id/positive_button"
android:textSize="@dimen/font_size_dp_medium"
android:text="@string/access_error"
android:visibility="gone"
android:layout_toStartOf="@id/positive_button"/>

<Button xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/negative_button"
android:layout_width="wrap_content"
android:layout_height="@dimen/min_button_height"
android:padding="@dimen/standard_spacer"
android:layout_toLeftOf="@id/neutral_button"
android:layout_marginRight="@dimen/standard_spacer"
android:layout_marginLeft="@dimen/standard_spacer"
android:background="@android:color/transparent"
android:textSize="@dimen/font_size_dp_medium"
android:textColor="@color/dialog_button_color"
android:visibility="gone"
<com.google.android.material.button.MaterialButton
style="@style/CustomButtonStyleOutline"
android:id="@+id/negative_button"
android:layout_width="wrap_content"
android:layout_height="@dimen/min_button_height"
android:padding="@dimen/standard_spacer"
app:strokeColor="@color/primary_button_background"
android:layout_toLeftOf="@id/neutral_button"
android:layout_marginRight="@dimen/standard_spacer"
android:layout_marginLeft="@dimen/standard_spacer"
android:textSize="@dimen/font_size_dp_medium"
android:visibility="gone"
android:layout_marginStart="@dimen/standard_spacer"
android:layout_marginEnd="@dimen/standard_spacer"
android:layout_toStartOf="@id/neutral_button">
</Button>
android:layout_toStartOf="@id/neutral_button"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
Loading
Loading