Merge pull request #17 from itsyourap/itsyourap-patch-2

[fix]: UI Fixes

app/src/main/java/sayan/apps/numplex/MainActivity.kt

@@ -1,24 +1,26 @@
 package sayan.apps.numplex
 
+import android.content.Intent
 import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.view.MenuItem
+import android.view.inputmethod.InputMethodManager
+import android.widget.TextView
 import android.widget.Toast
 import androidx.activity.enableEdgeToEdge
 import androidx.appcompat.app.ActionBarDrawerToggle
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
 import androidx.core.view.ViewCompat
 import androidx.core.view.WindowInsetsCompat
+import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
-import com.google.android.material.navigation.NavigationView
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInClient
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import com.google.android.material.navigation.NavigationView
 import com.google.firebase.auth.FirebaseAuth
-import android.content.Intent
-import android.widget.TextView
 import com.squareup.picasso.Picasso
 
 class MainActivity : AppCompatActivity() {
@@ -62,6 +64,10 @@ class MainActivity : AppCompatActivity() {
         mGoogleSignInClient = GoogleSignIn.getClient(this, gso)
 
         drawerLayout = findViewById(R.id.drawerLayout)
+        drawerLayout.addDrawerListener(object : DrawerLayout.SimpleDrawerListener() {
+            // Close the keyboard when the drawer starts moving
+            override fun onDrawerStateChanged(newState: Int) = closeKeyboard()
+        })
         val navView: NavigationView = findViewById(R.id.navView)
         toggle = ActionBarDrawerToggle(this, drawerLayout, R.string.open, R.string.close)
         drawerLayout.addDrawerListener(toggle)
@@ -113,7 +119,11 @@ class MainActivity : AppCompatActivity() {
                 }
 
                 R.id.nav_update -> {
-                    Toast.makeText(applicationContext, "Latest Version is already Installed !!", Toast.LENGTH_SHORT).show()
+                    Toast.makeText(
+                        applicationContext,
+                        "Latest Version is already Installed !!",
+                        Toast.LENGTH_SHORT
+                    ).show()
                 }
 
                 R.id.nav_feedback -> {
@@ -128,6 +138,14 @@ class MainActivity : AppCompatActivity() {
         }
     }
 
+    private fun closeKeyboard() {
+        val view = this.currentFocus
+        if (view != null) {
+            val imm = getSystemService(INPUT_METHOD_SERVICE) as InputMethodManager
+            imm.hideSoftInputFromWindow(view.windowToken, 0)
+        }
+    }
+
     private fun goToSignInActivity() {
         val intent = Intent(this, SignInActivity::class.java)
         startActivity(intent)

app/src/main/java/sayan/apps/numplex/SignInActivity.kt

@@ -1,14 +1,13 @@
 package sayan.apps.numplex
 
 import android.content.Intent
-import androidx.appcompat.app.AppCompatActivity
 import android.os.Bundle
-import android.widget.Button
-import android.widget.ImageButton
-import android.widget.LinearLayout
 import android.widget.Toast
+import androidx.activity.enableEdgeToEdge
+import androidx.appcompat.app.AppCompatActivity
 import com.google.android.gms.auth.api.signin.GoogleSignIn
 import com.google.android.gms.auth.api.signin.GoogleSignInOptions
+import com.google.android.gms.common.SignInButton
 import com.google.android.gms.common.api.ApiException
 import com.google.firebase.auth.FirebaseAuth
 import com.google.firebase.auth.GoogleAuthProvider
@@ -25,6 +24,7 @@ class SignInActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
 
         setContentView(R.layout.activity_signin)
+        enableEdgeToEdge()
 
         auth = FirebaseAuth.getInstance()
 
@@ -37,7 +37,7 @@ class SignInActivity : AppCompatActivity() {
             finish() // finish the current activity to prevent the user from coming back to the SignInActivity using the back button
         }
 
-        val signInButton = findViewById<ImageButton>(R.id.google_sign_in_button)
+        val signInButton = findViewById<SignInButton>(R.id.google_sign_in_button)
         signInButton.setOnClickListener {
             signIn()
         }

app/src/main/res/layout/activity_signin.xml

@@ -10,22 +10,16 @@
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/app_icon"
         android:layout_gravity="center"
-        android:layout_marginTop="100dp"/>
+        android:layout_marginTop="100dp"
+        android:src="@drawable/app_icon" />
 
-    <ImageButton
+    <com.google.android.gms.common.SignInButton
         android:id="@+id/google_sign_in_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:src="@drawable/sign_in_image_google"
-        android:contentDescription="@string/google_sign_in"
-        android:background="?attr/selectableItemBackgroundBorderless"
         android:layout_gravity="center"
-        android:scaleType="fitCenter"
-        android:adjustViewBounds="true"
-        android:maxWidth="200dp"
-        android:maxHeight="100dp"/>
+        android:contentDescription="@string/google_sign_in" />
 
 
 </LinearLayout>