Pm rounded button #2897
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <item android:color="@color/button_disabled" android:state_enabled="false" /> | ||
| <item android:color="@color/button_primary_color" /> | ||
| </selector> |
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <shape xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <solid android:color="@color/white" /> <!-- Background color --> | ||
| <corners android:radius="22dp" /> <!-- Rounded corners --> | ||
|
There was a problem hiding this comment. 💡 Codebase verification Corner radius of 22dp is inconsistent with app's button styling Based on the search results, most rounded elements in the app use a 12dp radius (seen in multiple files like blue_tabbed_box.xml, grey_bordered_box.xml, info_bubble.xml, bubble.xml). The 22dp radius in button_background_white.xml is significantly larger and inconsistent with this pattern. Only border_dashed_edges.xml uses a similar larger radius of 18dp, but it's not a button element.
🔗 Analysis chainVerify corner radius consistency with Figma design The corner radius of 22dp should be verified against the Figma design specifications to ensure consistency across all rounded buttons in the app. 🏁 Scripts executedThe following scripts were executed for the analysis: Script: #!/bin/bash
# Search for other corner radius definitions in drawable files
rg -l "android:radius" --type xml
Length of output: 869 Script: #!/bin/bash
# Search for corner radius values in drawable files
rg "android:radius=\"\d+dp\"" --type xml -A 1
Length of output: 3306 Script: #!/bin/bash
# Search for button-specific drawables with corner radius
rg "android:radius=\"\d+dp\"" --type xml -A 2 -B 2 "*button*.xml"
Length of output: 118 Script: #!/bin/bash
# Search for button-specific drawables with corner radius, using full paths
rg "android:radius=\"\d+dp\"" --type xml -A 2 -B 2 "button_background_white.xml|rounded_button_shape.xml|map_button_base_background.xml"
Length of output: 260 |
||
| <stroke | ||
| android:width="2dp" | ||
| android:color="@color/cc_brand_color" /> <!-- Optional border --> | ||
| </shape> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,25 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <!-- Disabled state --> | ||
| <item android:state_enabled="false"> | ||
| <shape> | ||
| <solid android:color="@color/green_700" /> | ||
| <corners android:radius="22dp" /> | ||
| </shape> | ||
| </item> | ||
| <!-- Pressed state --> | ||
| <item android:state_pressed="true"> | ||
| <shape> | ||
| <solid android:color="@color/green_900" /> | ||
| <corners android:radius="22dp" /> | ||
| </shape> | ||
| </item> | ||
| <!-- Default state --> | ||
| <item> | ||
| <shape> | ||
| <solid android:color="@color/green_500" /> | ||
| <corners android:radius="22dp" /> | ||
| </shape> | ||
| </item> | ||
| </selector> | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,24 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <!-- Disabled state --> | ||
| <item android:state_enabled="false"> | ||
| <shape> | ||
| <solid android:color="@color/orange_700" /> | ||
| <corners android:radius="22dp" /> | ||
| </shape> | ||
| </item> | ||
| <!-- Pressed state --> | ||
| <item android:state_pressed="true"> | ||
| <shape> | ||
| <solid android:color="@color/orange_900" /> | ||
| <corners android:radius="22dp" /> | ||
| </shape> | ||
| </item> | ||
| <!-- Default state --> | ||
| <item> | ||
| <shape> | ||
| <solid android:color="@color/orange_500" /> | ||
| <corners android:radius="22dp" /> | ||
| </shape> | ||
| </item> | ||
|
There was a problem hiding this comment. 🛠️ Refactor suggestion Consider creating a base button style The button background implementation is identical to Create a new file <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_enabled="false">
<shape>
<solid android:color="?attr/buttonDisabledColor" />
<corners android:radius="@dimen/button_corner_radius" />
</shape>
</item>
<item android:state_pressed="true">
<shape>
<solid android:color="?attr/buttonPressedColor" />
<corners android:radius="@dimen/button_corner_radius" />
</shape>
</item>
<item>
<shape>
<solid android:color="?attr/buttonDefaultColor" />
<corners android:radius="@dimen/button_corner_radius" />
</shape>
</item>
</selector>Then create styles for different button colors: <style name="RedButtonBackground">
<item name="buttonDisabledColor">@color/red_700</item>
<item name="buttonPressedColor">@color/red_900</item>
<item name="buttonDefaultColor">@color/red_500</item>
</style>
<style name="OrangeButtonBackground">
<item name="buttonDisabledColor">@color/orange_700</item>
<item name="buttonPressedColor">@color/orange_900</item>
<item name="buttonDefaultColor">@color/orange_500</item>
</style>There was a problem hiding this comment. @avazirna also want to bump this. There was a problem hiding this comment.
There was a problem hiding this comment. @shubham1g5 I have reverted this as it didn't work as expected, some posts suggest that direct reference to a theme attribute from a state selector doesn't work, maybe in older versions of Android. Also the selectors where defined for |
||
| </selector> | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,24 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <!-- Disabled state --> | ||
| <item android:state_enabled="false"> | ||
| <shape> | ||
| <solid android:color="@color/red_700" /> | ||
| <corners android:radius="22dp" /> | ||
| </shape> | ||
| </item> | ||
| <!-- Pressed state --> | ||
| <item android:state_pressed="true"> | ||
| <shape> | ||
| <solid android:color="@color/red_900" /> | ||
| <corners android:radius="22dp" /> | ||
| </shape> | ||
| </item> | ||
| <!-- Default state --> | ||
| <item> | ||
| <shape> | ||
| <solid android:color="@color/red_500" /> | ||
| <corners android:radius="22dp" /> | ||
| </shape> | ||
| </item> | ||
| </selector> |
Binary file not shown.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,9 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="24dp" | ||
| android:height="24dp" | ||
| android:viewportWidth="66" | ||
| android:viewportHeight="66"> | ||
| <path | ||
| android:pathData="M65.243,28.031C63.982,23.591 61.071,19.904 57.042,17.654C54.971,16.5 52.728,15.802 50.439,15.559C50.332,14.594 50.16,13.629 49.894,12.677C48.634,8.237 45.723,4.55 41.694,2.3C37.664,0.051 33.002,-0.494 28.564,0.767C24.126,2.028 20.44,4.94 18.192,8.971C17.038,11.043 16.34,13.286 16.097,15.577C15.133,15.683 14.168,15.855 13.216,16.121C8.778,17.382 5.092,20.294 2.844,24.325C0.595,28.356 0.051,33.02 1.311,37.46C2.571,41.899 5.482,45.587 9.512,47.836C11.583,48.99 13.825,49.689 16.115,49.931C16.222,50.896 16.393,51.861 16.659,52.814C17.92,57.253 20.831,60.941 24.86,63.19C28.889,65.439 33.552,65.984 37.989,64.723C42.427,63.462 46.113,60.55 48.362,56.519C49.515,54.448 50.214,52.204 50.456,49.914C51.421,49.807 52.385,49.635 53.338,49.369C57.775,48.108 61.462,45.196 63.71,41.165C65.952,37.134 66.497,32.47 65.243,28.031ZM23.428,11.895C24.896,9.267 27.298,7.361 30.197,6.538C33.096,5.716 36.138,6.071 38.771,7.539C41.403,9.007 43.303,11.41 44.125,14.31C44.285,14.866 44.386,15.429 44.457,15.997C44.705,17.974 44.439,19.969 43.646,21.816C43.492,22.177 43.321,22.538 43.125,22.887C42.682,23.686 41.865,25.042 40.883,26.64C36.919,24.13 28.966,19.116 26.345,17.654C24.99,16.897 23.558,16.352 22.091,15.985C22.263,14.565 22.712,13.18 23.428,11.895ZM37.711,32.748C37.711,35.199 35.723,37.188 33.274,37.188C30.824,37.188 28.836,35.199 28.836,32.748C28.836,30.298 30.824,28.309 33.274,28.309C35.723,28.309 37.711,30.298 37.711,32.748ZM18.186,39.679C17.428,41.035 16.884,42.467 16.517,43.935C15.097,43.758 13.713,43.308 12.429,42.592C9.802,41.124 7.896,38.721 7.074,35.82C6.252,32.92 6.607,29.877 8.074,27.243C9.541,24.609 11.944,22.709 14.843,21.887C15.399,21.727 15.961,21.626 16.529,21.555C18.505,21.306 20.499,21.573 22.345,22.366C22.706,22.52 23.067,22.698 23.416,22.893C24.215,23.337 25.57,24.154 27.168,25.136C24.659,29.102 19.653,37.063 18.186,39.679ZM43.119,53.595C41.652,56.223 39.25,58.129 36.351,58.952C33.451,59.775 30.41,59.42 27.777,57.952C25.144,56.484 23.245,54.081 22.422,51.18C22.263,50.624 22.162,50.062 22.091,49.493C21.843,47.516 22.109,45.521 22.896,43.675C23.049,43.314 23.221,42.953 23.422,42.603C23.866,41.804 24.683,40.449 25.665,38.851C29.629,41.36 37.581,46.374 40.202,47.836C41.557,48.594 42.989,49.138 44.457,49.505C44.285,50.926 43.835,52.311 43.119,53.595ZM58.468,38.241C57,40.875 54.598,42.775 51.699,43.598C51.143,43.758 50.581,43.858 50.013,43.929C48.036,44.178 46.042,43.912 44.196,43.118C43.835,42.965 43.474,42.793 43.125,42.592C42.327,42.148 40.972,41.331 39.374,40.348C41.883,36.382 46.894,28.427 48.356,25.805C49.113,24.45 49.658,23.017 50.024,21.549C51.444,21.727 52.829,22.177 54.113,22.893C56.74,24.361 58.645,26.764 59.468,29.664C60.29,32.565 59.935,35.613 58.468,38.241Z" | ||
| android:fillColor="#ffffff"/> | ||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <layer-list | ||
| xmlns:android="http://schemas.android.com/apk/res/android"> | ||
| <item | ||
| android:drawable="@drawable/commcare_actionbar_logo" | ||
| android:right="16dp"/> | ||
| </layer-list> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="300dp" | ||
| android:height="233dp" | ||
| android:viewportWidth="300" | ||
| android:viewportHeight="233"> | ||
| <path | ||
| android:pathData="M122.98,58.67C126.89,47.53 137.52,39.56 150,39.56C162.48,39.56 173.11,47.53 177.02,58.67H188.22C198.76,58.67 207.33,67.24 207.33,77.78V173.33C207.33,183.87 198.76,192.44 188.22,192.44H111.78C101.24,192.44 92.67,183.87 92.67,173.33V77.78C92.67,67.24 101.24,58.67 111.78,58.67H122.98ZM156.76,61.47C154.96,59.68 152.53,58.67 150,58.67C147.47,58.67 145.04,59.68 143.24,61.47C141.45,63.26 140.45,65.69 140.45,68.22C140.45,70.76 141.45,73.19 143.24,74.98C145.04,76.77 147.47,77.78 150,77.78C152.53,77.78 154.96,76.77 156.76,74.98C158.55,73.19 159.55,70.76 159.55,68.22C159.55,65.69 158.55,63.26 156.76,61.47ZM116.27,104.74C114.92,106.08 114.17,107.91 114.17,109.81C114.17,111.71 114.92,113.53 116.27,114.88C117.61,116.22 119.43,116.97 121.33,116.97C123.24,116.97 125.06,116.22 126.4,114.88C127.75,113.53 128.5,111.71 128.5,109.81C128.5,107.91 127.75,106.08 126.4,104.74C125.06,103.4 123.24,102.64 121.33,102.64C119.43,102.64 117.61,103.4 116.27,104.74ZM183.44,105.03H145.22C142.6,105.03 140.45,107.18 140.45,109.81C140.45,112.44 142.6,114.59 145.22,114.59H183.44C186.07,114.59 188.22,112.44 188.22,109.81C188.22,107.18 186.07,105.03 183.44,105.03ZM192.51,153.83C192.51,164.38 183.96,172.94 173.4,172.94C162.85,172.94 154.29,164.38 154.29,153.83C154.29,143.27 162.85,134.72 173.4,134.72C183.96,134.72 192.51,143.27 192.51,153.83ZM175.19,146.07C175.19,145.07 174.39,144.27 173.4,144.27C172.41,144.27 171.61,145.07 171.61,146.07V154.43C171.61,155.42 172.41,156.22 173.4,156.22C174.39,156.22 175.19,155.42 175.19,154.43V146.07ZM173.4,163.38C174.72,163.38 175.79,162.32 175.79,161C175.79,159.68 174.72,158.61 173.4,158.61C172.08,158.61 171.01,159.68 171.01,161C171.01,162.32 172.08,163.38 173.4,163.38Z" | ||
| android:fillColor="#ffffff" | ||
| android:fillType="evenOdd"/> | ||
| </vector> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,12 +1,9 @@ | ||
| <vector xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:width="300dp" | ||
| android:height="233dp" | ||
| android:viewportWidth="300" | ||
| android:viewportHeight="233"> | ||
| <path | ||
| android:pathData="M120.75,67.5C126.14,67.5 130.5,63.14 130.5,57.75C130.5,52.36 126.14,48 120.75,48H101.25C85.1,48 72,61.1 72,77.25V155.25C72,171.4 85.1,184.5 101.25,184.5H120.75C126.14,184.5 130.5,180.14 130.5,174.75C130.5,169.36 126.14,165 120.75,165H101.25C95.86,165 91.5,160.64 91.5,155.25V77.25C91.5,71.86 95.86,67.5 101.25,67.5H120.75ZM225.71,121.55C227.18,120.18 228,118.26 228,116.25C228,114.24 227.18,112.32 225.71,110.95L181.84,69.51C179.71,67.5 176.6,66.95 173.92,68.11C171.24,69.27 169.5,71.92 169.5,74.81V96.75H130.5C125.11,96.75 120.75,101.11 120.75,106.5V126C120.75,131.39 125.11,135.75 130.5,135.75H169.5V157.69C169.5,160.61 171.24,163.23 173.92,164.39C176.6,165.55 179.71,165 181.84,162.99L225.71,121.55Z" | ||
| android:fillColor="#ffffff"/> | ||
| </vector> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
💡 Codebase verification
Color inconsistency detected with design system
The current implementation uses
@color/start_home_button(#6AB849), but this doesn't align with the design system's rounded button specifications. The design system (CustomButtonStyle) uses@color/cc_brand_coloras the standard background color for primary rounded buttons.btn_finish_background.xmlshould use@color/cc_brand_colorinstead of@color/start_home_buttonto maintain consistency with the design systemCustomButtonStyledirectly instead of managing colors separately🔗 Analysis chain
Ensure color consistency with design system
The button's default state now uses
@color/start_home_button. Please verify this aligns with the Figma design specifications for rounded buttons.🏁 Scripts executed
The following scripts were executed for the analysis:
Script:
Length of output: 473
Script:
Length of output: 2704
Script:
Length of output: 1636