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 round button #2941

Merged
merged 3 commits into from
Jan 16, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Next Next commit
-rounded button issue resolved
  • Loading branch information
pm-dimagi committed Jan 16, 2025
commit c0896f3715fd3f323c0d524b647ab58c0d2fae06
2 changes: 1 addition & 1 deletion app/res/drawable/ic_connect_arrow_forward_24px.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@
android:viewportHeight="20">
<path
android:pathData="M10,3.333L8.825,4.508L13.475,9.166H3.333V10.833H13.475L8.825,15.491L10,16.666L16.667,10L10,3.333Z"
android:fillColor="@color/connect_dark_blue_color"/>
android:fillColor="@color/cc_brand_color"/>
</vector>
9 changes: 0 additions & 9 deletions app/res/layout-land/home_screen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -112,15 +112,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<!-- <org.commcare.views.connect.RoundedButton-->
<!-- android:id="@+id/btnOverLimit"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="30dp"-->
<!-- android:text="@string/connect_job_tile_daily_limit"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:roundButtonTextSize="4sp" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>

Expand Down
18 changes: 6 additions & 12 deletions app/res/layout/dialog_payment_confirmation.xml
Original file line number Diff line number Diff line change
Expand Up @@ -62,28 +62,22 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_payment_date">

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
style="@style/NegativeButtonStyle"
android:id="@+id/ri_no"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_marginEnd="16dp"
android:text="@string/connect_payment_dialog_no"
app:roundButtonBackgroundColor="@color/white"
app:roundButtonBorderVisible="true"
app:roundButtonBorderWidth="0.5dp"
app:roundButtonTextColor="@color/black"
app:roundButtonTextSize="5dp" />
android:textSize="5dp" />

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/ri_yes"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:text="@string/connect_payment_dialog_yes"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonBorderVisible="false"
app:roundButtonBorderWidth="0.5dp"
app:roundButtonTextColor="@color/white"
app:roundButtonTextSize="5dp" />
android:textColor="@color/white"
android:textSize="5sp" />

</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
Expand Down
17 changes: 8 additions & 9 deletions app/res/layout/fragment_connect_delivery_details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -185,21 +185,20 @@

</LinearLayout>

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/connect_delivery_button"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_height="wrap_content"
android:text="@string/connect_job_info_download"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundButtonBackgroundColor="@color/white"
app:roundButtonFontFamily="@font/roboto_medium"
app:roundButtonIcon="@drawable/ic_connect_arrow_forward_24px"
app:roundButtonIconLeftAlign="false"
app:roundButtonIconTintColor="@color/connect_dark_blue_color"
app:roundButtonTextColor="@color/connect_blue_color"
app:roundButtonTextSize="5sp" />
android:backgroundTint= "@color/white"
android:fontFamily= "@font/roboto_medium"
android:drawableRight= "@drawable/ic_connect_arrow_forward_24px"
android:textColor= "@color/cc_brand_color"
app:iconTint="@color/cc_brand_color"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
</androidx.constraintlayout.widget.ConstraintLayout>
Expand Down
10 changes: 0 additions & 10 deletions app/res/layout/fragment_connect_delivery_progress.xml
Original file line number Diff line number Diff line change
Expand Up @@ -135,16 +135,6 @@
android:textSize="14sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<!-- <org.commcare.views.connect.RoundedButton-->
<!-- android:id="@+id/btnOverLimit"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="30dp"-->
<!-- android:text="@string/connect_job_tile_daily_limit"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- app:layout_constraintTop_toTopOf="parent"-->
<!-- app:roundButtonTextSize="4sp" />-->
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>

Expand Down
11 changes: 5 additions & 6 deletions app/res/layout/fragment_connect_job_intro.xml
Original file line number Diff line number Diff line change
Expand Up @@ -99,18 +99,17 @@
android:textSize="12sp" />
</LinearLayout>

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/connect_job_intro_start_button"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
app:roundButtonTextSize="5sp"
android:layout_marginStart="20dp"
android:gravity="center"
android:text="Continue"
app:roundButtonIcon="@drawable/connect_right_arrow"
app:roundButtonIconTintColor="@color/connect_blue_color"
app:roundButtonTextColor="@color/connect_blue_color" />
android:drawableRight= "@drawable/ic_connect_arrow_forward_24px"
android:backgroundTint= "@color/white"
android:textColor= "@color/cc_brand_color" />
</LinearLayout>
</androidx.cardview.widget.CardView>

Expand Down
23 changes: 8 additions & 15 deletions app/res/layout/fragment_connect_learning_progress.xml
Original file line number Diff line number Diff line change
Expand Up @@ -166,21 +166,18 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/btnSync"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_height="wrap_content"
android:text="@string/sync"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundButtonBackgroundColor="@color/connect_dark_blue_color"
app:roundButtonFontFamily="@font/roboto_medium"
app:roundButtonIcon="@drawable/ic_connect_directory_sync"
app:roundButtonIconLeftAlign="false"
app:roundButtonIconPadding="5dp"
app:roundButtonTextColor="@color/white"
app:roundButtonTextSize="5sp" />
android:fontFamily= "@font/roboto_medium"
app:iconSize="24dp"
android:drawableRight="@drawable/ic_connect_directory_sync"
/>

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
Expand Down Expand Up @@ -317,25 +314,21 @@
android:textColor="@color/red"
android:visibility="visible" />

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/connect_learning_review_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="8dp"
android:visibility="visible"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonTextColor="@color/white"
tools:text="@string/connect_learn_review" />

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/connect_learning_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginVertical="8dp"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonTextColor="@color/white"
tools:text="Button" />

</LinearLayout>
Expand Down
34 changes: 13 additions & 21 deletions app/res/layout/fragment_connect_progress_delivery.xml
Original file line number Diff line number Diff line change
Expand Up @@ -153,56 +153,48 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/btnSync"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_height="wrap_content"
android:text="@string/sync"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:roundButtonBackgroundColor="@color/connect_dark_blue_color"
app:roundButtonFontFamily="@font/roboto_medium"
app:roundButtonIcon="@drawable/ic_connect_directory_sync"
app:roundButtonIconLeftAlign="false"
app:roundButtonIconPadding="5dp"
app:roundButtonTextColor="@color/white"
app:roundButtonTextSize="5sp" />
android:fontFamily= "@font/roboto_medium"
android:drawableRight= "@drawable/ic_connect_directory_sync"
android:drawablePadding="5dp" />

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/connect_progress_review_button"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/connect_progress_review"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/clRefreshView"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonFontFamily="@font/roboto_medium"
app:roundButtonTextColor="@color/white"
app:roundButtonTextSize="6sp" />
android:fontFamily= "@font/roboto_medium"
/>

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/connect_progress_button"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="16dp"
android:text="@string/connect_progress_launch"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/connect_progress_review_button"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonFontFamily="@font/roboto_medium"
app:roundButtonTextColor="@color/white"
app:roundButtonTextSize="6sp" />
android:fontFamily= "@font/roboto_medium"
/>
</androidx.constraintlayout.widget.ConstraintLayout>

</RelativeLayout>
Expand Down
22 changes: 7 additions & 15 deletions app/res/layout/fragment_phone_available_bottom_sheet.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,37 +69,29 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView">

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/back_button"
style="@style/NegativeButtonStyle"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_alignParentLeft="true"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:gravity="start|center"
android:text="Back"
app:roundButtonBorderColor="@color/border_grey"
app:roundButtonBorderVisible="true"
app:roundButtonTextColor="@color/connect_blue_color" />
android:text="Back" />

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/recover_button"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:gravity="start|center"
android:text="Recover"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonBorderRadius="@dimen/dp48"
app:roundButtonIcon="@drawable/connect_right_arrow"
app:roundButtonIconLeftAlign="false"
app:roundButtonTextColor="@color/white" />
android:drawableRight="@drawable/connect_right_arrow" />
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

Expand Down
22 changes: 8 additions & 14 deletions app/res/layout/fragment_recovery_code.xml
Original file line number Diff line number Diff line change
Expand Up @@ -168,40 +168,34 @@
android:textColor="@color/red"
android:textSize="16sp" />

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/forgot_button"
style="@style/NegativeButtonStyle"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_height="wrap_content"
android:layout_below="@id/connect_pin_error_message"
android:layout_alignParentLeft="true"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:gravity="start|center"
android:text="@string/connect_pin_verify_forgot"
app:roundButtonBorderColor="@color/border_grey"
app:roundButtonBorderVisible="true"
app:roundButtonTextColor="@color/connect_blue_color" />
android:text="@string/connect_pin_verify_forgot" />

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/connect_pin_button"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_height="wrap_content"
android:layout_below="@id/connect_pin_error_message"
android:layout_alignParentEnd="true"
android:layout_marginStart="16dp"
app:roundButtonTextSize="6.5sp"
android:layout_marginTop="16dp"
android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:gravity="start|center"
android:text="@string/review"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonBorderRadius="@dimen/dp48"
app:roundButtonIcon="@drawable/connect_right_arrow"
app:roundButtonIconLeftAlign="false"
app:roundButtonTextColor="@color/white" />
android:drawableRight="@drawable/connect_right_arrow"
/>


</RelativeLayout>
Expand Down
Loading