Skip to content

Commit

Permalink
fix (ui) : color for dark mode
Browse files Browse the repository at this point in the history
  • Loading branch information
@parvez-ahammed
parvez-ahammed committed Dec 11, 2022
1 parent f874c79 commit 732b076
Show file tree
Hide file tree
Showing 4 changed files with 123 additions and 129 deletions.
75 changes: 27 additions & 48 deletions app/src/main/res/layout/activity_on_boarding3.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,55 +5,34 @@
android:layout_width="match_parent"
android:layout_height="match_parent">

<ImageView
android:id="@+id/onboarding_3_image"
android:layout_width="409dp"
android:layout_height="347dp"
android:layout_marginTop="32dp"
android:contentDescription="@string/hodo"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.491"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/onboarding_3" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center"
android:orientation="vertical">

<TextView
android:id="@+id/onboarding_3_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="44dp"
android:text="@string/nothing_is_perfect"
android:textColor="@color/black"
android:textSize="34sp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/onboarding_3_image"
tools:fontFamily="sans-serif" />
<ImageView
android:id="@+id/onboarding_3_image"
android:layout_width="409dp"
android:layout_height="347dp"
android:layout_marginTop="32dp"
android:contentDescription="@string/hodo"
app:srcCompat="@drawable/onboarding_3" />

<TextView
android:id="@+id/onboarding_3_para"
android:layout_width="374dp"
android:layout_height="74dp"
android:text="@string/onboarding_para_3"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/onboarding_3_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/onboarding_3_title"
app:layout_constraintVertical_bias="0.391" />
<TextView
android:id="@+id/onboarding_3_para"
android:layout_width="374dp"
android:layout_height="wrap_content"
android:text="Other exciting things you can find \n1. Important link \n2. Bus Schedule \n3.Teachers details and create favourite list \n4. Save bookmark of favourite websites\n5. Create or join groups \n6. Post quiz schedule in group"
android:textSize="16sp"
android:paddingBottom="20dp"/>

<Button
android:id="@+id/onboarding_3_button"
android:layout_width="374dp"
android:layout_height="wrap_content"
android:backgroundTint="@color/primary_green"
android:text="@string/finish" />
</LinearLayout>

<Button
android:id="@+id/onboarding_3_button"
android:layout_width="334dp"
android:layout_height="48dp"
android:layout_marginBottom="44dp"
android:backgroundTint="@color/primary_green"
android:text="@string/finish"
android:textColor="@color/white"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.493"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
32 changes: 18 additions & 14 deletions app/src/main/res/layout/activity_sign_in.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@


<LinearLayout
android:id="@+id/activity_sign_in"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="20sp"
android:gravity="center"
android:id="@+id/activity_sign_in"
android:orientation="vertical">

<ImageView
Expand Down Expand Up @@ -53,16 +53,28 @@

</com.google.android.material.textfield.TextInputLayout>

<TextView
android:id="@+id/goToForgotPasswrdFragment"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20sp"
android:text="Forgot Password ?"
android:textAlignment="textEnd"
android:textSize="20dp" />

<Button

android:id="@+id/signinBtn"
android:layout_width="369dp"
android:layout_height="62dp"
android:layout_marginTop="58dp"
android:background="@drawable/rounded_list_item_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="20sp"
android:background="@color/background_color_50"
android:focusable="true"
android:fontFamily="@font/poppins_light"
android:foreground="?android:attr/selectableItemBackground"
android:text="Sign in"
android:textSize="20sp"
tools:ignore="InvalidId" />
android:textColor="@color/black" />

<TextView

Expand All @@ -74,16 +86,8 @@
android:padding="5dp"
android:text=" Don't have an account? Sign up"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold" />
<TextView
android:id="@+id/goToForgotPasswrdFragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:padding="2dp"
android:textSize="20dp"
android:text="Forgot Password ?" />


</LinearLayout>
Expand Down
143 changes: 77 additions & 66 deletions app/src/main/res/layout/activity_sign_up.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,88 +8,99 @@

tools:context=".loginSignup.SignUpActivity">

<ImageView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="200sp"
android:layout_marginTop="20sp"
android:src="@drawable/registration" />
android:layout_height="match_parent"
android:orientation="vertical">

<com.google.android.material.textfield.TextInputLayout
android:id="@+id/email_signup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@id/password_signup">
<ImageView
android:layout_width="match_parent"
android:layout_height="200sp"
android:layout_marginTop="20sp"
android:src="@drawable/registration" />

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/users_email"
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/email_signup"
android:layout_width="match_parent"
android:layout_height="53dp"
android:hint="Type your Email"
android:inputType="textEmailAddress" />
android:layout_height="wrap_content">

</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/users_email"
android:layout_width="match_parent"
android:layout_height="51dp"
android:layout_margin="20sp"
android:hint="Type your Email"
android:inputType="textEmailAddress" />

<com.google.android.material.textfield.TextInputLayout
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textfield.TextInputLayout

android:id="@+id/password_signup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
app:passwordToggleEnabled="true">

android:id="@+id/password_signup"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
app:passwordToggleEnabled="true">

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/usersPasswordType"
android:layout_width="match_parent"
android:layout_height="51dp"
android:layout_margin="20sp"
android:hint="Type your Password"
android:inputType="textPassword" />

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/usersPasswordType"
</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout

android:id="@+id/password_signup_retype"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="Type your Password"
android:inputType="textPassword" />
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_below="@id/password_signup"
app:passwordToggleEnabled="true">

</com.google.android.material.textfield.TextInputLayout>

<com.google.android.material.textfield.TextInputLayout
<com.google.android.material.textfield.TextInputEditText
android:id="@+id/usersPasswordRetype"
android:layout_width="match_parent"
android:layout_height="51dp"
android:layout_margin="20sp"
android:hint="Re Type your Password"
android:inputType="textPassword" />

android:id="@+id/password_signup_retype"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_below="@id/password_signup"
app:passwordToggleEnabled="true">
</com.google.android.material.textfield.TextInputLayout>

<Button

<com.google.android.material.textfield.TextInputEditText
android:id="@+id/usersPasswordRetype"
android:id="@+id/signupBtn"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:hint="Re Type your Password"
android:inputType="textPassword" />

</com.google.android.material.textfield.TextInputLayout>

<Button

android:id="@+id/signupBtn"
android:layout_width="369dp"
android:layout_height="62dp"
android:layout_below="@id/password_signup_retype"
android:layout_marginTop="58dp"
android:background="@drawable/rounded_list_item_view"
android:text="Sign up"
tools:ignore="InvalidId" />

<TextView

android:id="@+id/go_to_sign_in_page"
android:layout_width="362dp"
android:layout_height="70dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="49dp"
android:padding="5dp"
android:text=" Already have an account? Sign in"
android:textAlignment="center"
android:textColor="@color/black"
android:textSize="16sp"
android:textStyle="bold" />
android:layout_height="wrap_content"
android:layout_margin="20sp"
android:background="@color/background_color_50"
android:focusable="true"
android:fontFamily="@font/poppins_light"
android:foreground="?android:attr/selectableItemBackground"
android:text="Sign up"
android:textSize="20sp"
android:textColor="@color/black" />

<TextView

android:id="@+id/go_to_sign_in_page"
android:layout_width="362dp"
android:layout_height="70dp"
android:layout_alignParentBottom="true"
android:layout_marginBottom="49dp"
android:padding="5dp"
android:text=" Already have an account? Sign in"
android:textAlignment="center"
android:textSize="16sp"
android:textStyle="bold" />

</LinearLayout>



</RelativeLayout>
2 changes: 1 addition & 1 deletion app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

<string name="hodo">hodo</string>
<string name="nothing_is_perfect">NOTHING IS PERFECT</string>
<string name="onboarding_para_3">We know that nothing is perfect and we value that . Know how to take the perfect preparation ? Just request for anything to take the perfect preparation.</string>
<string name="onboarding_para_3">Other exciting things you can find <br> HElo hi</br> Know how to take the perfect preparation ? Just request for anything to take the perfect preparation.</string>
<string name="get_started">Get Started</string>
<string name="finish">Finish</string>
<string name="get_started_welcome">GET STARTED</string>
Expand Down

0 comments on commit 732b076

Please sign in to comment.