Skip to content

Commit

Permalink
Merge pull request #2866 from dimagi/jp/user-deactivation-flow-new-re…
Browse files Browse the repository at this point in the history 
…vamp

CCCT-483 || User Deactivate Flow (New Revamp)
  • Loading branch information
@OrangeAndGreen
OrangeAndGreen authored Oct 4, 2024
2 parents 4211679 + 925183b commit 84a508f
Show file tree
Hide file tree
Showing 21 changed files with 320 additions and 182 deletions.
4 changes: 2 additions & 2 deletions app/res/layout/fragment_phone_available_bottom_sheet.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
android:textSize="16sp" />
</LinearLayout>

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
<TextView
android:id="@+id/phone_number"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand All @@ -46,7 +46,7 @@
android:textColor="@color/connect_subtext"
android:textSize="20sp" />

<org.commcare.views.connect.connecttextview.ConnectRegularTextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="24dp"
Expand Down
98 changes: 50 additions & 48 deletions app/res/layout/screen_connect_message.xml
View file
Original file line number Diff line number Diff line change
@@ -1,60 +1,62 @@
<?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<FrameLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/transparent">
<LinearLayout
android:background="@color/white"
android:layout_height="wrap_content"

<FrameLayout
android:layout_width="match_parent"
android:layout_gravity="bottom"
android:orientation="vertical"
android:padding="16dp">
android:layout_height="match_parent"
android:background="@color/transparent">

<TextView
android:id="@+id/connect_message_title"
android:layout_gravity="center"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/content_min_margin"
android:layout_width="wrap_content"
android:textColor="@color/connect_subtext"
android:textSize="@dimen/text_larger" />
android:layout_gravity="bottom"
android:background="@color/white"
android:orientation="vertical"
android:padding="16dp">

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
android:gravity="start"
android:id="@+id/connect_message_message"
android:layout_height="wrap_content"
android:layout_margin="@dimen/content_min_margin"
<org.commcare.views.connect.connecttextview.ConnectBoldTextView
android:id="@+id/connect_message_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="@dimen/content_min_margin"
android:textColor="@color/connect_subtext"
android:textSize="@dimen/text_larger" />

android:layout_width="fill_parent"
android:textSize="@dimen/text_medium" />
<org.commcare.views.connect.connecttextview.ConnectMediumTextView
android:id="@+id/connect_message_message"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/content_min_margin"
android:gravity="start"
android:textSize="16sp" />

<org.commcare.views.connect.RoundedButton
android:id="@+id/connect_message_button"
android:layout_height="45dp"
app:roundButtonTextSize="6.5sp"
android:layout_width="fill_parent"
android:paddingBottom="@dimen/content_start"
android:paddingTop="@dimen/content_start"
android:text="Back"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonTextColor="@color/white" />
<org.commcare.views.connect.RoundedButton
android:id="@+id/connect_message_button"
android:layout_width="fill_parent"
android:layout_height="45dp"
android:paddingTop="@dimen/content_start"
android:paddingBottom="@dimen/content_start"
android:text="Back"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonTextColor="@color/white"
app:roundButtonTextSize="6.5sp" />

<org.commcare.views.connect.RoundedButton
android:id="@+id/connect_message_button2"
android:layout_height="wrap_content"
android:layout_marginBottom="16dp"
android:layout_marginTop="16dp"
android:layout_width="fill_parent"
android:paddingBottom="@dimen/content_start"
android:visibility="gone"
android:paddingTop="@dimen/content_start"
android:text="Back"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonTextColor="@color/white" />
<org.commcare.views.connect.RoundedButton
android:id="@+id/connect_message_button2"
android:layout_width="fill_parent"
android:layout_height="45dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:paddingTop="@dimen/content_start"
android:paddingBottom="@dimen/content_start"
android:text="Back"
android:visibility="gone"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonTextColor="@color/white"
app:roundButtonTextSize="6.5sp" />

</LinearLayout>
</FrameLayout>
</LinearLayout>
</FrameLayout>
</layout>
56 changes: 42 additions & 14 deletions app/res/layout/screen_connect_phone_verify.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
android:id="@+id/connect_phone_verify_code"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:background="@drawable/connect_edit_text_bg"
android:hint="OTP"
android:imeOptions="actionNext"
Expand Down Expand Up @@ -120,23 +120,51 @@
android:textColor="@android:color/holo_blue_dark"
android:textSize="12sp" />

<org.commcare.views.connect.RoundedButton
android:id="@+id/connect_phone_verify_button"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_gravity="end"
<RelativeLayout
android:layout_width="match_parent"
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="@string/connect_verify_phone_verify"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonBorderRadius="@dimen/dp48"
app:roundButtonIconLeftAlign="false"
app:roundButtonIconTintColor="@color/white"
app:roundButtonTextColor="@color/white"
app:roundButtonTextSize="6.5sp" />
android:orientation="horizontal">

<org.commcare.views.connect.RoundedButton
android:id="@+id/connect_deactivate_button"
android:layout_width="150dp"
android:layout_height="45dp"
android:layout_gravity="end"
android:gravity="center"
android:text="@string/connect_deactivate_account"
app:roundButtonBackgroundColor="@color/white"
app:roundButtonBorderRadius="@dimen/dp48"
app:roundButtonIconLeftAlign="false"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
app:roundButtonIconTintColor="@color/white"
app:roundButtonTextColor="@color/connect_blue_color"
app:roundButtonBorderWidth="0.5dp"
app:roundButtonBorderVisible="true"
app:roundButtonBorderColor="@color/connect_blue_color"
app:roundButtonTextSize="6.5sp" />

<org.commcare.views.connect.RoundedButton
android:id="@+id/connect_phone_verify_button"
android:layout_width="wrap_content"
android:layout_height="45dp"
android:layout_gravity="end"
android:gravity="start|center"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:text="@string/connect_verify_phone_verify"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonBorderRadius="@dimen/dp48"
app:roundButtonIconLeftAlign="false"
app:roundButtonIconTintColor="@color/white"
app:roundButtonTextColor="@color/white"
app:roundButtonTextSize="6.5sp" />

</RelativeLayout>

</LinearLayout>
</layout>
2 changes: 1 addition & 1 deletion app/res/layout/select_install_mode_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ScrollView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@color/cc_core_bg"
android:background="@color/white"
android:scrollbars="none">

<LinearLayout
Expand Down
Loading

0 comments on commit 84a508f

Please sign in to comment.