diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml deleted file mode 100644 index 606e9ab..0000000 --- a/.idea/deploymentTargetDropDown.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e27b3a1..226ca8a 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -12,6 +12,20 @@ android:supportsRtl="true" android:theme="@style/Theme.Electricity" tools:targetApi="31"> + + + + + + diff --git a/app/src/main/java/com/example/electricity/Home.java b/app/src/main/java/com/example/electricity/Home.java index 253f30c..9acda71 100644 --- a/app/src/main/java/com/example/electricity/Home.java +++ b/app/src/main/java/com/example/electricity/Home.java @@ -2,12 +2,17 @@ package com.example.electricity; import androidx.appcompat.app.AppCompatActivity; +import android.content.Intent; import android.os.Bundle; +import android.view.View; +import android.widget.ImageView; import android.widget.TextView; +import android.widget.Toast; public class Home extends AppCompatActivity { String username; TextView name, usage; + ImageView back, setting; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -16,5 +21,25 @@ public class Home extends AppCompatActivity { name = findViewById(R.id.textView12); name.setText(username); usage = findViewById(R.id.textView11); + back = findViewById(R.id.imageView17); + setting = findViewById(R.id.imageView18); + logOut(); + startSetting(); + } + + public void logOut() { + back.setOnClickListener(view -> { + Toast.makeText(Home.this, "Logged out successfully", Toast.LENGTH_LONG).show(); + Intent intent = new Intent(this, MainActivity.class); + startActivity(intent); + finish(); + }); + } + + public void startSetting() { + setting.setOnClickListener(view -> { + Intent intent = new Intent(this, Settings.class); + startActivity(intent); + }); } } \ No newline at end of file diff --git a/app/src/main/java/com/example/electricity/MainActivity.java b/app/src/main/java/com/example/electricity/MainActivity.java index 8ecc44b..0d58f1d 100644 --- a/app/src/main/java/com/example/electricity/MainActivity.java +++ b/app/src/main/java/com/example/electricity/MainActivity.java @@ -34,14 +34,15 @@ public class MainActivity extends AppCompatActivity { public void checkUser() { btnLogin.setOnClickListener(view -> { - String sUsername = username.getText().toString(); - String sPassword = password.getText().toString(); + String sUsername = username.getText().toString().trim(); + String sPassword = password.getText().toString().trim(); int checkUser = database.checkData(sUsername, sPassword); if (checkUser == 1) { Toast.makeText(MainActivity.this, "Logged in successfully", Toast.LENGTH_LONG).show(); Intent intent = new Intent(MainActivity.this, Home.class); intent.putExtra("username", sUsername); startActivity(intent); + finish(); } else if (checkUser == 2){ Toast.makeText(MainActivity.this, "Username and password cannot be empty", Toast.LENGTH_LONG).show(); } else { diff --git a/app/src/main/java/com/example/electricity/Settings.java b/app/src/main/java/com/example/electricity/Settings.java new file mode 100644 index 0000000..2cfbdf1 --- /dev/null +++ b/app/src/main/java/com/example/electricity/Settings.java @@ -0,0 +1,14 @@ +package com.example.electricity; + +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; + +public class Settings extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_settings); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/electricity/Usage.java b/app/src/main/java/com/example/electricity/Usage.java new file mode 100644 index 0000000..4b0d4a8 --- /dev/null +++ b/app/src/main/java/com/example/electricity/Usage.java @@ -0,0 +1,13 @@ +package com.example.electricity; + +import androidx.appcompat.app.AppCompatActivity; +import android.os.Bundle; + +public class Usage extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_usage); + } +} \ No newline at end of file diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index bbacc90..9a87120 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -143,65 +143,54 @@ -