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

CCCT-438 || Login Screen revamp and Bottomsheet job list UI #2854

Open
wants to merge 12 commits into
base: connect_qa
Choose a base branch
from
Binary file added app/res/drawable-hdpi/ic_connect_delivery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-hdpi/ic_connect_learning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-hdpi/ic_connect_new_opportunity.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-ldpi/ic_connect_delivery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-ldpi/ic_connect_learning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-ldpi/ic_connect_new_opportunity.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-mdpi/ic_connect_delivery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-mdpi/ic_connect_learning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-mdpi/ic_connect_new_opportunity.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-xhdpi/ic_connect_delivery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-xhdpi/ic_connect_learning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-xxhdpi/ic_connect_delivery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-xxhdpi/ic_connect_learning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-xxxhdpi/ic_connect_delivery.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/res/drawable-xxxhdpi/ic_connect_learning.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
67 changes: 67 additions & 0 deletions app/res/drawable/connect_bottom_sheet_rounded_corners.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
tools:ignore="MissingDefaultResource">

<!-- Drop Shadow Stack -->
<item>
<shape>
<padding
android:top="2.5dp" />

<solid android:color="@color/connect_light_grey_transparent" />
<corners android:topRightRadius="16dp" android:topLeftRadius="16dp"/>
</shape>
</item>
<item>
<shape>
<padding
android:top="2.5dp" />

<solid android:color="@color/connect_light_grey_transparent" />
<corners android:topRightRadius="16dp" android:topLeftRadius="16dp"/>
</shape>
</item>
<!-- <item>
<shape>
<padding
android:top="2.5dp" />

<solid android:color="@color/connect_light_grey_transparent" />

<corners android:radius="40dp" />
</shape>
</item>-->
<!-- <item>
<shape>
<padding
android:top="2.5dp" />

<solid android:color="@color/connect_light_grey_transparent" />

<corners android:radius="40dp" />
</shape>
</item>-->
<!--<item>
<shape>
<padding
android:top="2.5dp" />

<solid android:color="@color/connect_light_grey_transparent" />

<corners android:radius="40dp" />
</shape>
</item>-->

<!-- Background -->
<item android:id="@+id/itemShape">
<shape>
<gradient
android:angle="0"
android:endColor="@color/white"
android:startColor="@color/white" />
<corners android:topRightRadius="16dp" android:topLeftRadius="16dp"/>
</shape>
</item>

</layer-list>
5 changes: 5 additions & 0 deletions app/res/drawable/connect_login_bottomsheet_tab_textcolor.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/connect_blue_color" android:state_selected="true"/>
<item android:color="@color/connect_light_grey" />
</selector>
Binary file added app/res/drawable/connect_login_new_job_pup_icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 5 additions & 0 deletions app/res/drawable/connect_rounded_corner_light_green.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/connect_light_green" />
<corners android:radius="16dp" />
</shape>
5 changes: 5 additions & 0 deletions app/res/drawable/connect_rounded_corner_orange_yellow.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/connect_orange_yellow" />
<corners android:radius="16dp" />
</shape>
5 changes: 5 additions & 0 deletions app/res/drawable/connect_rounded_corner_teslish_blue.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/connect_tealish_blue_color" />
<corners android:radius="16dp" />
</shape>
17 changes: 17 additions & 0 deletions app/res/drawable/ic_connect_pager_indicator.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<item android:gravity="center">
<shape>
<size
android:width="40dp"
android:height="4dp" />

<corners
android:topLeftRadius="5dp"
android:topRightRadius="5dp" />

<solid android:color="#FF0000" />
</shape>
</item>
</layer-list>
Binary file added app/res/drawable/ic_snackbar_done.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 69 additions & 0 deletions app/res/layout/bottomsheet_login_joblist.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/rootView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:clipToPadding="true"
android:orientation="vertical"
android:padding="16dp">

<androidx.cardview.widget.CardView
android:id="@+id/view"
android:layout_width="40dp"
android:layout_height="5dp"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:background="@color/cardview_dark_background"
android:backgroundTint="@color/connect_light_grey"
android:elevation="0dp"
app:cardCornerRadius="10dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<LinearLayout
android:id="@+id/llJobListTabSeparated"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="15dp"
android:orientation="vertical"
android:visibility="visible"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view">

<com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
android:layout_marginTop="20dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/view"
app:tabGravity="center"
app:tabIndicator="@drawable/ic_connect_pager_indicator"
app:tabIndicatorColor="@color/connect_blue_color"
app:tabInlineLabel="true"
app:tabMode="scrollable"
app:tabSelectedTextColor="@color/connect_blue_color"
app:tabTextColor="@color/connect_light_grey" />

<View
android:id="@+id/divider"
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/connect_divider_color"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tabLayout" />

<androidx.viewpager2.widget.ViewPager2
android:id="@+id/viewPager"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintTop_toBottomOf="@+id/divider" />
</LinearLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
43 changes: 43 additions & 0 deletions app/res/layout/custom_snack_bar.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_marginHorizontal="10dp"
android:layout_marginTop="10dp"
android:paddingHorizontal="15dp"
android:paddingVertical="10dp">

<ImageView
android:id="@+id/imgLeftIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_add"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
android:id="@+id/tvMessage"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:textSize="14sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/imgRightIcon"
app:layout_constraintStart_toEndOf="@+id/imgLeftIcon"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/imgRightIcon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@null"
android:src="@drawable/ic_add"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

</androidx.constraintlayout.widget.ConstraintLayout>
18 changes: 18 additions & 0 deletions app/res/layout/custom_tab.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:orientation="horizontal">

<TextView
android:id="@+id/tabTextView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAllCaps="false"
android:fontFamily="@font/roboto_medium"
android:gravity="center"
android:textColor="@color/connect_blue_color"
android:textSize="14sp" />

</LinearLayout>
15 changes: 15 additions & 0 deletions app/res/layout/fragment_connect_login_combine_apps.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rcCombineApps"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:paddingTop="16dp" />

</RelativeLayout>
23 changes: 23 additions & 0 deletions app/res/layout/fragment_connect_login_commcare_apps.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">

<include
android:id="@+id/lytInstallApps"
layout="@layout/item_install_commcare_apps"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="16dp"/>

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rcCommCareApps"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/lytInstallApps"
android:layout_alignParentStart="true"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:paddingTop="16dp" />

</RelativeLayout>
15 changes: 15 additions & 0 deletions app/res/layout/fragment_connect_login_commcare_home.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rcConnectHomeApps"
android:layout_width="match_parent"
android:layout_alignParentTop="true"
android:paddingTop="16dp"
android:layout_alignParentEnd="true"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:layout_height="match_parent" />

</RelativeLayout>
60 changes: 60 additions & 0 deletions app/res/layout/item_install_commcare_apps.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:shadowColor="@color/connect_light_grey_transparent"
android:shadowDx="30"
android:shadowDy="30"
android:shadowRadius="50"
app:cardBackgroundColor="@color/connect_blue_color"
app:cardCornerRadius="12dp"
app:cardElevation="5dp">

<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingLeft="18dp"
android:paddingTop="18dp"
android:paddingBottom="18dp">

<org.commcare.views.connect.connecttextview.ConnectMediumTextView
android:id="@+id/tvTitle"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:lineSpacingExtra="5dp"
android:text=""
android:textColor="@color/white"
android:textSize="15sp"
app:layout_constraintEnd_toStartOf="@+id/guideline2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<org.commcare.views.connect.RoundedButton
android:id="@+id/btnInstallNow"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:text=""
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="@+id/guideline2"
app:layout_constraintTop_toTopOf="parent"
app:roundButtonTextSize="6sp"
app:roundButtonBackgroundColor="@color/connect_blue_color"
app:roundButtonBorderColor="@color/white"
app:roundButtonBorderVisible="true"
app:roundButtonBorderWidth="0.5dp"
app:roundButtonTextColor="@color/white" />

<androidx.constraintlayout.widget.Guideline
android:id="@+id/guideline2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
app:layout_constraintGuide_percent="0.65" />

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