Merge pull request #7 from batshalregmi/Shubh

Password Field modifications
batshalregmi · Mar 11, 2024 · d93f0dc · d93f0dc
2 parents 72469c4 + 4ea063a
commit d93f0dc
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 12 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -44,4 +44,5 @@ dependencies {
     testImplementation libs.junit
     androidTestImplementation libs.ext.junit
     androidTestImplementation libs.espresso.core
+
 }
diff --git a/app/src/main/java/com/group3/spotifywrapped/LoginActivity.java b/app/src/main/java/com/group3/spotifywrapped/LoginActivity.java
@@ -7,6 +7,8 @@
 import android.widget.EditText;
 import android.widget.Toast;
 
+import com.google.android.material.textfield.TextInputEditText;
+
 
 public class LoginActivity extends AppCompatActivity {
     EditText username;
@@ -17,7 +19,7 @@ protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
         username = findViewById(R.id.username);
-        password = findViewById(R.id.password);
+        password = (EditText) findViewById(R.id.password);
         loginButton = findViewById(R.id.loginButton);
         loginButton.setOnClickListener(new View.OnClickListener() {
             @Override

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
@@ -13,17 +13,17 @@
     <androidx.cardview.widget.CardView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="30dp"
+        android:layout_margin="35dp"
         app:cardCornerRadius="30dp"
-        app:cardElevation="20dp"
+        app:cardElevation="25dp"
         android:background="@drawable/custom_edittext">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:orientation="vertical"
-            android:padding="24dp">
+            android:padding="25dp">
 
             <TextView
                 android:id="@+id/loginText"
@@ -39,28 +39,45 @@
                 android:id="@+id/username"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
-                android:layout_marginTop="40dp"
+                android:layout_marginTop="26dp"
                 android:background="@drawable/custom_edittext"
                 android:drawablePadding="8dp"
                 android:hint="@string/username"
                 android:inputType="text"
                 android:padding="8dp"
                 android:textColor="@color/black"
                 android:textColorHighlight="@color/cardview_dark_background" />
-
-            <EditText
-                android:id="@+id/password"
+            <com.google.android.material.textfield.TextInputLayout
+                android:id="@+id/passwordParent"
                 android:layout_width="match_parent"
-                android:layout_height="50dp"
-                android:layout_marginTop="20dp"
+                android:layout_height="60dp"
+                android:layout_marginTop="15dp"
+                app:cursorColor="@color/purple"
                 android:background="@drawable/custom_edittext"
                 android:drawablePadding="8dp"
                 android:hint="@string/password"
                 android:inputType="textPassword"
                 android:padding="8dp"
                 android:textColor="@color/black"
-                android:textColorHighlight="@color/cardview_dark_background" />
+                app:passwordToggleEnabled="true"
+                android:paddingTop="6dp"
+                app:hintEnabled="false"
+                app:hintAnimationEnabled="false"
+                app:passwordToggleTint="@color/purple">
 
+                <com.google.android.material.textfield.TextInputEditText
+                    android:padding="8dp"
+                    android:id="@+id/password"
+                    android:layout_width="match_parent"
+                    android:layout_height="50dp"
+                    android:layout_marginTop="18dp"
+                    android:textSize="18sp"
+                    android:hint="Password"
+                    android:background="@drawable/custom_edittext"
+                    android:drawablePadding="8dp"
+                    android:inputType="textPassword"
+                     />
+            </com.google.android.material.textfield.TextInputLayout>
             <Button
                 android:id="@+id/loginButton"
                 android:layout_width="match_parent"
@@ -83,4 +100,4 @@
         android:textAlignment="center"
         android:textColor="@color/green"
         android:textSize="14sp" />
-</LinearLayout>
+</LinearLayout>