Skip to content

Commit

Permalink
login page updated (#23)
Browse files Browse the repository at this point in the history
  • Loading branch information
debarghya472 authored and atm1504 committed Jan 3, 2020
1 parent 0c9088a commit c069198
Show file tree
Hide file tree
Showing 7 changed files with 9 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
loginButton = view.findViewById(R.id.login_button);

ImageView imageView = view.findViewById(R.id.login_image);
Glide.with(requireContext()).load(R.drawable.celesta_logo_long_2).into(imageView);
Glide.with(requireContext()).load(R.drawable.logo).into(imageView);

loginButton.setOnClickListener(view13 -> {
if (!CheckNetwork.isNetworkConnected(context))
Expand Down
Binary file added app/src/main/res/drawable/login_back.jpg
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/login_background.jpeg
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/logo.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 6 additions & 5 deletions app/src/main/res/layout/fragment_login.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:background="@drawable/login_background"
android:layout_width="match_parent"
android:layout_height="match_parent">

Expand All @@ -18,7 +19,7 @@
android:layout_marginTop="32dp"
android:layout_marginEnd="32dp"
android:padding="8dp"
android:id="@+id/login_image" />
android:id="@+id/login_image"/>

<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
Expand Down Expand Up @@ -72,9 +73,9 @@
android:id="@+id/login_button"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="32dp"
android:layout_marginStart="40dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="32dp"
android:layout_marginEnd="40dp"
android:layout_marginBottom="32dp"
android:padding="8dp"
android:enabled="false"
Expand Down Expand Up @@ -105,7 +106,7 @@
android:layout_weight="1"
android:gravity="start"
android:text="Register Now"
android:textColor="@color/colorAccent"
android:textColor="@color/green"
android:textSize="16sp" />

</LinearLayout>
Expand Down Expand Up @@ -135,7 +136,7 @@
android:layout_weight="1"
android:gravity="start"
android:text="Resend Activation Link"
android:textColor="@color/colorAccent"
android:textColor="@color/green"
android:textSize="16sp" />

</LinearLayout>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@

<color name="white">#ffffff</color>
<color name="black">#000000</color>
<color name ="green">#a4c639</color>
<color name="transparent">#00000000</color>

<color name="navigation_background">#aa646B6D</color>
Expand Down
1 change: 1 addition & 0 deletions app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -44,4 +44,5 @@
<item name="android:navigationBarColor">@color/transparent</item>
</style>


</resources>

0 comments on commit c069198

Please sign in to comment.