Skip to content

Deleted extra files #3051

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.

Sign up for GitHub

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

Merged
pm-dimagi merged 1 commit into from
Apr 24, 2025
Merged

Deleted extra files #3051

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Binary file removed app/res/font/roboto_bold.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed app/res/font/roboto_italic.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed app/res/font/roboto_medium.ttf
View file
Open in desktop
Binary file not shown.
Binary file removed app/res/font/roboto_regular.ttf
View file
Open in desktop
Binary file not shown.
29 changes: 9 additions & 20 deletions app/res/layout-land/home_screen.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
app:layout_constraintTop_toTopOf="parent"
app:tint="@color/black" />

<org.commcare.views.connect.connecttextview.ConnectRegularTextView
<TextView
android:id="@+id/connect_phone_label"
android:layout_width="0dp"
android:layout_height="match_parent"
Expand All @@ -66,7 +66,7 @@
app:layout_constraintStart_toEndOf="@id/connect_secondary_phone_icon"
app:layout_constraintTop_toTopOf="parent" />

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
android:id="@+id/connect_phone_yes_button"
android:layout_width="wrap_content"
android:layout_height="35dp"
Expand All @@ -75,30 +75,18 @@
android:textColor="@color/blue"
android:textSize="18sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonBorderRadius="@dimen/dp48"
app:roundButtonIconLeftAlign="false"
app:roundButtonTextColor="@color/white"
app:roundButtonTextSize="5.0sp" />
app:layout_constraintTop_toBottomOf="@id/connect_phone_label" />

<org.commcare.views.connect.RoundedButton
<com.google.android.material.button.MaterialButton
style="@style/NegativeButtonStyle"
android:id="@+id/connect_phone_no_button"
android:layout_width="wrap_content"
android:layout_height="35dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="10dp"
android:text="@string/connect_payment_confirm_no"
android:textColor="@color/blue"
android:textSize="18sp"
app:layout_constraintEnd_toStartOf="@id/connect_phone_yes_button"
app:layout_constraintTop_toBottomOf="@id/connect_phone_label"
app:roundButtonBorderColor="@color/connect_blue_color"
app:roundButtonBorderVisible="true"
app:roundButtonBorderWidth="0.5dp"
app:roundButtonIconTintColor="@color/white"
app:roundButtonTextColor="@color/connect_blue_color"
app:roundButtonTextSize="5.0sp" />
app:layout_constraintTop_toBottomOf="@id/connect_phone_label" />
</androidx.constraintlayout.widget.ConstraintLayout>

</androidx.cardview.widget.CardView>
Expand Down Expand Up @@ -133,7 +121,7 @@
android:paddingTop="35dp"
android:paddingEnd="15dp">

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
<TextView
android:id="@+id/tvConnectMessage"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand All @@ -142,7 +130,8 @@
android:textColor="@color/connect_warning_color"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:textStyle="bold"/>

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>
Expand Down
14 changes: 8 additions & 6 deletions app/res/layout/connect_delivery_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

</LinearLayout>

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
<TextView
android:id="@+id/delivery_item_name"
android:layout_width="0dp"
android:layout_height="wrap_content"
Expand All @@ -33,10 +33,11 @@
app:layout_constraintBottom_toTopOf="@+id/delivery_item_reason"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/llDeliveryStatus"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:textStyle="bold"/>


<org.commcare.views.connect.connecttextview.ConnectBoldTextView
<TextView
android:id="@+id/delivery_item_reason"
android:layout_width="0dp"
android:layout_marginEnd="8dp"
Expand All @@ -47,18 +48,19 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/delivery_item_date"
app:layout_constraintStart_toStartOf="@+id/delivery_item_name"
app:layout_constraintTop_toBottomOf="@+id/delivery_item_name" />
app:layout_constraintTop_toBottomOf="@+id/delivery_item_name"
android:textStyle="bold"/>


<org.commcare.views.connect.connecttextview.ConnectRegularTextView
<TextView
android:id="@+id/delivery_item_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="@+id/delivery_item_reason"
app:layout_constraintEnd_toEndOf="parent" />

<org.commcare.views.connect.connecttextview.ConnectRegularTextView
<TextView
android:id="@+id/delivery_item_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
30 changes: 18 additions & 12 deletions app/res/layout/connect_delivery_progress_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,15 @@
android:layout_height="match_parent"
android:padding="16dp">

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
<TextView
android:id="@+id/tvDeliveryTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textSize="14sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintTop_toTopOf="parent"
android:textStyle="bold"/>

<LinearLayout
android:id="@+id/linearLayout5"
Expand Down Expand Up @@ -66,30 +67,33 @@
android:layout_marginStart="6dp"
android:orientation="vertical">

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/connect_results_summary_approved"
android:textColor="@color/connect_grey"
android:textSize="11sp" />
android:textSize="11sp"
android:textStyle="bold"/>

<org.commcare.views.connect.connecttextview.ConnectBoldTextView
<TextView
android:id="@+id/tvApproved"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="10"
android:textColor="@color/connect_green"
android:textSize="12sp" />
android:textSize="12sp"
android:textStyle="bold"/>

<org.commcare.views.connect.connecttextview.ConnectBoldTextView
<TextView
android:id="@+id/tvDeliveryTotalAmount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="3dp"
android:text="10,000 MWK"
android:textColor="@color/connect_green"
android:textSize="12sp" />
android:textSize="12sp"
android:textStyle="bold"/>
</LinearLayout>

</LinearLayout>
Expand Down Expand Up @@ -119,14 +123,15 @@
android:layout_marginStart="6dp"
android:orientation="vertical">

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/connect_results_summary_remaining"
android:textColor="@color/connect_grey"
android:textSize="11sp" />
android:textSize="11sp"
android:textStyle="bold"/>

<org.commcare.views.connect.connecttextview.ConnectBoldTextView
<TextView
android:id="@+id/tvRemaining"
android:layout_width="wrap_content"
android:layout_height="match_parent"
Expand All @@ -135,7 +140,8 @@
android:gravity="center_vertical"
android:text="6 in 3 days"
android:textColor="@color/connect_blue_color"
android:textSize="12sp" />
android:textSize="12sp"
android:textStyle="bold"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
Expand Down
17 changes: 10 additions & 7 deletions app/res/layout/connect_payment_item.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:paddingTop="10dp"
android:paddingBottom="10dp">

<org.commcare.views.connect.connecttextview.ConnectBoldTextView
<TextView
android:id="@+id/name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -17,6 +17,7 @@
android:textSize="18sp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:textStyle="bold"
/>

<ImageView
Expand Down Expand Up @@ -52,7 +53,7 @@
app:layout_constraintStart_toEndOf="@+id/name"
app:layout_constraintTop_toTopOf="@+id/name" />

<org.commcare.views.connect.connecttextview.ConnectRegularTextView
<TextView
android:id="@+id/tv_payment_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -72,7 +73,7 @@
app:layout_constraintStart_toEndOf="@+id/name"
app:layout_constraintTop_toTopOf="@+id/name" />

<org.commcare.views.connect.connecttextview.ConnectRegularTextView
<TextView
android:id="@+id/date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down Expand Up @@ -101,7 +102,7 @@
android:background="@color/connect_blue_color_10"
android:padding="6dp">

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
<TextView
android:id="@+id/payment_earned_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -114,7 +115,8 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="@string/connect_payment_received" />
tools:text="@string/connect_payment_received"
android:textStyle="bold"/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.cardview.widget.CardView>

Expand Down Expand Up @@ -142,7 +144,7 @@
app:layout_constraintStart_toEndOf="@+id/name"
app:layout_constraintTop_toTopOf="@+id/name" />

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/connect_payment_revert"
Expand All @@ -151,6 +153,7 @@
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/name"
tools:text="@string/connect_payment_revert" />
tools:text="@string/connect_payment_revert"
/>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
6 changes: 3 additions & 3 deletions app/res/layout/connectid_common_title_bar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,17 @@
android:tint="@color/white"
android:visibility="invisible" />

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
<TextView
android:id="@+id/title"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:layout_marginStart="10dp"
android:fontFamily="@font/roboto_medium"
android:text=""
android:textColor="#FFFFFF"
android:textSize="18sp" />
android:textSize="18sp"
android:textStyle="bold"/>

<LinearLayout
android:layout_width="wrap_content"
Expand Down
1 change: 0 additions & 1 deletion app/res/layout/connectid_title_bar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
android:layout_height="wrap_content"
android:textFontWeight='500'
android:text="Your Title"
android:fontFamily="@font/roboto_medium"
android:layout_gravity="center"
android:textSize="20sp"
android:textColor="#FFFFFF"
Expand Down
12 changes: 7 additions & 5 deletions app/res/layout/dialog_payment_confirmation.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<org.commcare.views.connect.connecttextview.ConnectBoldTextView
<TextView
android:id="@+id/tv_payment_confirmation_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -30,19 +30,21 @@
app:layout_constraintBottom_toBottomOf="@+id/img_payment_status"
app:layout_constraintStart_toEndOf="@+id/img_payment_status"
app:layout_constraintTop_toTopOf="@+id/img_payment_status"
tools:text="@string/connect_payment_confirm_transferred" />
tools:text="@string/connect_payment_confirm_transferred"
android:textStyle="bold"/>

<org.commcare.views.connect.connecttextview.ConnectBoldTextView
<TextView
android:id="@+id/tv_payment_amount"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="@color/black"
android:textSize="26sp"
app:layout_constraintStart_toStartOf="@+id/tv_payment_confirmation_title"
app:layout_constraintTop_toBottomOf="@+id/tv_payment_confirmation_title" />
app:layout_constraintTop_toBottomOf="@+id/tv_payment_confirmation_title"
android:textStyle="bold"/>

<org.commcare.views.connect.connecttextview.ConnectRegularTextView
<TextView
android:id="@+id/tv_payment_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
Loading