Skip to content

First fragment #10

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

Open
AbhinavJha12 wants to merge 5 commits into
base: master
Choose a base branch
from
Open

First fragment #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0266379
Merge pull request #5 from NitinAB1108/master
UvrajSB Jan 8, 2022
ece2740
Merge remote-tracking branch 'origin/master'
AbhinavJha12 Jan 9, 2022
15e614a
Merge remote-tracking branch 'origin/master'
AbhinavJha12 Jan 9, 2022
09b6b09
Merge branch 'master' of https://github.com/AbhinavJha12/LaundroPool
AbhinavJha12 Jan 9, 2022
6f07797
Merge branch 'gdsc-bpgc:master' into master
AbhinavJha12 Jan 9, 2022
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
3 changes: 3 additions & 0 deletions .idea/misc.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

24 changes: 24 additions & 0 deletions app/src/main/res/drawable/capsule_opaque.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >

<corners
android:bottomLeftRadius="30dp"
android:bottomRightRadius="30dp"
android:radius="60dp"
android:topLeftRadius="30dp"
android:topRightRadius="30dp" />

<solid android:color="#6342E8" />

<padding
android:bottom="0dp"
android:left="0dp"
android:right="0dp"
android:top="0dp" />

<size
android:height="60dp"
android:width="270dp" />

</shape>
Binary file added app/src/main/res/drawable/vector_3.png
View file
Open in desktop
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/src/main/res/drawable/vector_5.png
View file
Open in desktop
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/src/main/res/drawable/vector_6.png
View file
Open in desktop
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/src/main/res/drawable/vector_7.png
View file
Open in desktop
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/src/main/res/drawable/vector_8.png
View file
Open in desktop
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/src/main/res/drawable/vector_9.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions app/src/main/res/font/baloo_bhai.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="Baloo Bhai"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>
7 changes: 7 additions & 0 deletions app/src/main/res/font/cabin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
app:fontProviderAuthority="com.google.android.gms.fonts"
app:fontProviderPackage="com.google.android.gms"
app:fontProviderQuery="Cabin"
app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
</font-family>
206 changes: 164 additions & 42 deletions app/src/main/res/layout/fragment_first.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,52 +7,174 @@
tools:context=".ui.onBoarding.FirstFragment">


<TextView
android:layout_marginTop="80dp"
android:id="@+id/textview_second"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toTopOf="@id/login_button_ff"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:text="first screen of the app the app that gives two options \either to register or login"
android:layout_marginHorizontal="20dp"
android:paddingHorizontal="20dp"
android:textSize="24sp"/>

<androidx.cardview.widget.CardView
android:id="@+id/login_button_ff"
android:layout_width="160dp"
android:layout_height="60dp"
android:layout_marginTop="224dp"
<LinearLayout
android:layout_width="292dp"
android:layout_height="584dp"
android:layout_marginBottom="4dp"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/textview_second">
app:layout_constraintHorizontal_bias="0.563"
app:layout_constraintStart_toStartOf="parent">

<TextView
android:id="@+id/textView12"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:text="Login"
android:textSize="18sp"
android:gravity="center"/>
</androidx.cardview.widget.CardView>

<androidx.cardview.widget.CardView
android:id="@+id/register_button_ff"
android:layout_width="160dp"
android:layout_height="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/login_button_ff"
app:layout_constraintVertical_bias="0.237" >
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:fontFamily="@font/baloo_bhai"
android:text="@string/LaundroPool"

android:textAlignment="center"
android:textAllCaps="true"
android:textColor="#000000"
android:textSize="41sp"
android:textStyle="bold" />

<TextView
android:id="@+id/textView13"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:layout_marginBottom="5dp"
android:fontFamily="@font/cabin"
android:text="Want to give clothes for washing
but don’t have enough kgs of them?
Pool your laundry today!"
android:textAlignment="center"
android:textColor="#000000"
android:textSize="19sp" />

<TextView
android:id="@+id/textView14"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:fontFamily="@font/lato_bold"

android:text="Find your friends on laundropool,
pool your laundry with them,
and save money!"
android:textAlignment="center" />


<!-- <Button-->
<!-- android:id="@+id/login_button_ff"-->
<!-- android:layout_width="250dp"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:layout_gravity="center_horizontal"-->
<!-- android:layout_marginTop="20dp"-->
<!-- android:background="@drawable/capsule_button"-->
<!-- android:fontFamily="@font/lato_bold"-->
<!-- android:padding="16dp"-->
<!-- android:text="@string/Log_in"-->
<!-- android:textAlignment="gravity"-->
<!-- android:textColor="#000000"-->
<!-- android:textSize="11sp"-->
<!-- android:textStyle="normal"-->
<!-- />-->

<androidx.cardview.widget.CardView
android:layout_width="250dp"
android:layout_height="60dp"
app:cardCornerRadius="30dp"
android:id="@+id/login_button_ff"
android:layout_gravity="center"
android:contextClickable="true"
android:layout_marginTop="20dp"
android:elevation="10dp"


>

<TextView
android:id="@+id/textView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/Log_in"
android:textAlignment="center"
android:textSize="11sp"
android:textStyle="normal"
android:textColor="@color/black"
/>
</androidx.cardview.widget.CardView>

<TextView
android:id="@+id/editTextTextPersonName2"

android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:ems="10"
android:inputType="textPersonName"
android:text="-- OR --"
android:textAlignment="center" />

<Button
android:id="@+id/register_button_ff"
android:layout_width="250dp"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:background="@drawable/capsule_opaque"
android:fontFamily="@font/lato_bold"
android:padding="16dp"
android:text="Register"
android:textSize="18sp"
android:gravity="center"/>
</androidx.cardview.widget.CardView>
android:textAlignment="gravity"
android:textColor="#FFFFFF"
android:textSize="11sp"
android:textStyle="normal" />

</LinearLayout>

<ImageView
android:id="@+id/imageView6"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/vector_3" />

<ImageView
android:id="@+id/imageView7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/vector_8" />

<ImageView
android:id="@+id/imageView8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@drawable/vector_9" />

<ImageView
android:id="@+id/imageView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/vector_6" />

<ImageView
android:id="@+id/imageView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/vector_5" />

<ImageView
android:id="@+id/imageView9"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="@+id/imageView"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/vector_7" />


</androidx.constraintlayout.widget.ConstraintLayout>
4 changes: 3 additions & 1 deletion app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,15 @@
<string name="action_settings">Settings</string>

<string name="menu_home">Home</string>
<string name="Log_in">LOG IN</string>
<string name="menu_gallery">Gallery</string>
<string name="menu_slideshow">Slideshow</string>
<string name="menu_open_pools">My Open Pools</string>
<string name="menu_past_pools">Past Pools</string>
<string name="menu_notifications">Notifications</string>
<string name="menu_help">Help</string>
<string name="menu_about">About</string>

<string name="LaundroPool">LaundroPool</string>

<string name="title_activity_on_boarding">OnBoarding</string>
<!-- Strings used for fragments for navigation -->
Expand All @@ -28,4 +29,5 @@
<string name="hello_register_fragment">Hello Register fragment. Arg: %1$s</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>

</resources>