From 76e9b2ea4697e9f4e41a3d665c7c15384f04554f Mon Sep 17 00:00:00 2001
From: linlyboi <linlysmolworthy@gmail.com>
Date: Wed, 20 Dec 2023 11:36:51 +0200
Subject: [PATCH] defeated again by capitalisation

---
 .../com/example/myapp_1/HomeActivity.java     |  6 +-
 .../com/example/myapp_1/LoginActivity.java    | 62 ++++++++-----------
 2 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/app/src/main/java/com/example/myapp_1/HomeActivity.java b/app/src/main/java/com/example/myapp_1/HomeActivity.java
index db35ce2..50edebf 100644
--- a/app/src/main/java/com/example/myapp_1/HomeActivity.java
+++ b/app/src/main/java/com/example/myapp_1/HomeActivity.java
@@ -45,9 +45,11 @@ public class HomeActivity extends AppCompatActivity {
                     }
                 });
         TextView userGreeting = findViewById(R.id.userGreeting);
-        SharedPreferences currentUserThings = getSharedPreferences("userData", MODE_PRIVATE);
+        SharedPreferences currentUserThings = getApplicationContext().getSharedPreferences("UserData", MODE_PRIVATE);
         String user = currentUserThings.getString("username", "");
-        userGreeting.setText("Welcome " + user + "!");
+        if (user != null)
+            userGreeting.setText("Welcome " + user + "!");
+
 
     }
 }
diff --git a/app/src/main/java/com/example/myapp_1/LoginActivity.java b/app/src/main/java/com/example/myapp_1/LoginActivity.java
index 08e72e1..88542c7 100644
--- a/app/src/main/java/com/example/myapp_1/LoginActivity.java
+++ b/app/src/main/java/com/example/myapp_1/LoginActivity.java
@@ -3,7 +3,6 @@ package com.example.myapp_1;
 import android.content.Intent;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.Toast;
@@ -36,52 +35,43 @@ public class LoginActivity extends AppCompatActivity {
         guestLogin= findViewById(R.id.guestButton);
 
         SharedPreferences.Editor editor = currentUserThings.edit();
-        signup.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                Intent newScreen = new Intent(getApplicationContext(), SigninActivity.class);
-                startActivity(newScreen);
-            }
+        signup.setOnClickListener(v -> {
+            Intent newScreen = new Intent(getApplicationContext(), SigninActivity.class);
+            startActivity(newScreen);
         });
 
-        guestLogin.setOnClickListener(new View.OnClickListener(){
-
-
-            @Override
-            public void onClick(View v) {
-                editor.putString("username", "Guest");
-                Intent newScreen = new Intent(getApplicationContext(), HomeActivity.class);
-                startActivity(newScreen);
-            }
+        guestLogin.setOnClickListener(v -> {
+            editor.putString("username", "Guest");
+            editor.apply();
+            Intent newScreen = new Intent(getApplicationContext(), HomeActivity.class);
+            startActivity(newScreen);
         });
-        login.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
+        login.setOnClickListener(v -> {
 
-                String username_data = username.getText().toString();
-                String password_data = password.getText().toString();
+            String username_data = username.getText().toString();
+            String password_data = password.getText().toString();
 
-                if(username_data.isEmpty() || password_data.isEmpty()){
-                    Toast.makeText(LoginActivity.this,"Please fill your data!", Toast.LENGTH_LONG).show();
-                }else{
-                    if (dbOperations.checkLoginCredentials(username_data, password_data)) {
-                        // Login successful
-                        // Proceed to the next screen or perform other actions
-                        Toast.makeText(LoginActivity.this,"Welcome", Toast.LENGTH_LONG).show();
-                        editor.putString("username", "Guest");
-                        Intent newScreen = new Intent(getApplicationContext(), HomeActivity.class);
-                        startActivity(newScreen);
+            if(username_data.isEmpty() || password_data.isEmpty()){
+                Toast.makeText(LoginActivity.this,"Please fill your data!", Toast.LENGTH_LONG).show();
+            }else{
+                if (dbOperations.checkLoginCredentials(username_data, password_data)) {
+                    // Login successful
+                    // Proceed to the next screen or perform other actions
+                    Toast.makeText(LoginActivity.this,"Welcome", Toast.LENGTH_LONG).show();
+                    editor.putString("username", username_data);
+                    editor.apply();
+                    Intent newScreen = new Intent(getApplicationContext(), HomeActivity.class);
+                    startActivity(newScreen);
 
-                    } else {
-                        // Login failed
+                } else {
+                    // Login failed
 
-                        Toast.makeText(LoginActivity.this,"Invalid Iformation", Toast.LENGTH_LONG).show();
-
-                    }
+                    Toast.makeText(LoginActivity.this,"Invalid Iformation", Toast.LENGTH_LONG).show();
 
                 }
 
             }
+
         });
     }
 }