AndrewTrieu/sustainableuse
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added Log Out function and Settings activity

Browse Source
This commit is contained in:
AndrewTrieu
2022-12-01 12:07:32 +02:00
parent 8912ddad87
commit 3911795007
9 changed files with 129 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.idea/deploymentTargetDropDown.xml generated
View File

@@ -1,17 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<runningDeviceTargetSelectedWithDropDown>
<Target>
<type value="RUNNING_DEVICE_TARGET" />
<deviceKey>
<Key>
<type value="SERIAL_NUMBER" />
<value value="R58M20FFKHW" />
</Key>
</deviceKey>
</Target>
</runningDeviceTargetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-11-26T19:31:17.995259Z" />
</component>
</project>

14
app/src/main/AndroidManifest.xml
View File

@@ -12,6 +12,20 @@
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/Theme.Electricity" android:theme="@style/Theme.Electricity"
tools:targetApi="31"> tools:targetApi="31">
<activity
android:name=".Settings"
android:exported="false">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity
android:name=".Usage"
android:exported="false">
<meta-data
android:name="android.app.lib_name"
android:value="" />
</activity>
<activity <activity
android:name=".Home" android:name=".Home"
android:exported="false"> android:exported="false">

25
app/src/main/java/com/example/electricity/Home.java
View File

@@ -2,12 +2,17 @@ package com.example.electricity;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.view.View;
import android.widget.ImageView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast;
public class Home extends AppCompatActivity { public class Home extends AppCompatActivity {
String username; String username;
TextView name, usage; TextView name, usage;
ImageView back, setting;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@@ -16,5 +21,25 @@ public class Home extends AppCompatActivity {
name = findViewById(R.id.textView12); name = findViewById(R.id.textView12);
name.setText(username); name.setText(username);
usage = findViewById(R.id.textView11); 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);
});
} }
} }

5
app/src/main/java/com/example/electricity/MainActivity.java
View File

@@ -34,14 +34,15 @@ public class MainActivity extends AppCompatActivity {
public void checkUser() { public void checkUser() {
btnLogin.setOnClickListener(view -> { btnLogin.setOnClickListener(view -> {
String sUsername = username.getText().toString(); String sUsername = username.getText().toString().trim();
String sPassword = password.getText().toString(); String sPassword = password.getText().toString().trim();
int checkUser = database.checkData(sUsername, sPassword); int checkUser = database.checkData(sUsername, sPassword);
if (checkUser == 1) { if (checkUser == 1) {
Toast.makeText(MainActivity.this, "Logged in successfully", Toast.LENGTH_LONG).show(); Toast.makeText(MainActivity.this, "Logged in successfully", Toast.LENGTH_LONG).show();
Intent intent = new Intent(MainActivity.this, Home.class); Intent intent = new Intent(MainActivity.this, Home.class);
intent.putExtra("username", sUsername); intent.putExtra("username", sUsername);
startActivity(intent); startActivity(intent);
finish();
} else if (checkUser == 2){ } else if (checkUser == 2){
Toast.makeText(MainActivity.this, "Username and password cannot be empty", Toast.LENGTH_LONG).show(); Toast.makeText(MainActivity.this, "Username and password cannot be empty", Toast.LENGTH_LONG).show();
} else { } else {

14
app/src/main/java/com/example/electricity/Settings.java Normal file
View File

@@ -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);
}
}

13
app/src/main/java/com/example/electricity/Usage.java Normal file
View File

@@ -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);
}
}

76
app/src/main/res/layout/activity_home.xml
View File

@@ -143,65 +143,54 @@
<ImageView <ImageView
android:id="@+id/imageView13" android:id="@+id/imageView13"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="200dp" android:layout_height="150dp"
android:layout_marginTop="10dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.505" app:layout_constraintHorizontal_bias="0.505"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView4" app:layout_constraintTop_toBottomOf="@+id/imageView4"
app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_bias="0.060000002"
app:srcCompat="@drawable/rectangle_232" /> app:srcCompat="@drawable/rectangle_232" />
<ImageView <ImageView
android:id="@+id/imageView14" android:id="@+id/imageView14"
android:layout_width="320dp" android:layout_width="320dp"
android:layout_height="200dp" android:layout_height="150dp"
android:layout_marginTop="10dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.505" app:layout_constraintHorizontal_bias="0.494"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/imageView13" app:layout_constraintTop_toBottomOf="@+id/imageView13"
app:layout_constraintVertical_bias="0.0" app:layout_constraintVertical_bias="0.373"
app:srcCompat="@drawable/rectangle_232" /> app:srcCompat="@drawable/rectangle_232" />
<ImageView <ImageView
android:id="@+id/imageView15" android:id="@+id/imageView15"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
app:layout_constraintBottom_toTopOf="@+id/imageView14" app:layout_constraintBottom_toBottomOf="@+id/imageView13"
app:layout_constraintEnd_toEndOf="@+id/imageView13" app:layout_constraintEnd_toEndOf="@+id/imageView13"
app:layout_constraintHorizontal_bias="0.065" app:layout_constraintEnd_toStartOf="@+id/textView13"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toEndOf="@+id/imageView13"
app:layout_constraintStart_toStartOf="@+id/imageView13" app:layout_constraintStart_toStartOf="@+id/imageView13"
app:layout_constraintTop_toBottomOf="@+id/imageView4" app:layout_constraintTop_toTopOf="@+id/imageView13"
app:layout_constraintVertical_bias="0.49" app:layout_constraintVertical_bias="0.6"
app:srcCompat="@drawable/union" /> app:srcCompat="@drawable/union" />
<ImageView <ImageView
android:id="@+id/imageView16" android:id="@+id/imageView16"
android:layout_width="100dp" android:layout_width="100dp"
android:layout_height="100dp" android:layout_height="100dp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="@+id/imageView14"
app:layout_constraintEnd_toEndOf="@+id/imageView14" app:layout_constraintEnd_toEndOf="@+id/imageView14"
app:layout_constraintHorizontal_bias="0.065" app:layout_constraintHorizontal_bias="0.09"
app:layout_constraintStart_toStartOf="@+id/imageView14" app:layout_constraintStart_toStartOf="@+id/imageView14"
app:layout_constraintTop_toBottomOf="@+id/imageView13" app:layout_constraintTop_toTopOf="@+id/imageView14"
app:layout_constraintVertical_bias="0.404"
app:srcCompat="@drawable/union__2_" /> app:srcCompat="@drawable/union__2_" />
<Button
android:id="@+id/button4"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:backgroundTint="#4CAF50"
android:text="Electricty Usage"
android:textAllCaps="false"
app:layout_constraintBottom_toTopOf="@+id/imageView14"
app:layout_constraintEnd_toEndOf="@+id/imageView13"
app:layout_constraintHorizontal_bias="0.882"
app:layout_constraintStart_toStartOf="@+id/imageView13"
app:layout_constraintTop_toBottomOf="@+id/imageView4"
app:layout_constraintVertical_bias="0.324" />
<Button <Button
android:id="@+id/button5" android:id="@+id/button5"
android:layout_width="180dp" android:layout_width="180dp"
@@ -209,31 +198,48 @@
android:backgroundTint="#4CAF50" android:backgroundTint="#4CAF50"
android:text="Building Oasis" android:text="Building Oasis"
android:textAllCaps="false" android:textAllCaps="false"
android:textColor="#FFFFFF"
app:layout_constraintBottom_toBottomOf="@+id/imageView14" app:layout_constraintBottom_toBottomOf="@+id/imageView14"
app:layout_constraintEnd_toEndOf="@+id/imageView14" app:layout_constraintEnd_toEndOf="@+id/imageView14"
app:layout_constraintHorizontal_bias="0.885" app:layout_constraintHorizontal_bias="0.892"
app:layout_constraintStart_toStartOf="@+id/imageView14" app:layout_constraintStart_toStartOf="@+id/imageView14"
app:layout_constraintTop_toBottomOf="@+id/imageView13" app:layout_constraintTop_toTopOf="@+id/imageView14"
app:layout_constraintVertical_bias="0.322" /> app:layout_constraintVertical_bias="0.245" />
<TextView <TextView
android:id="@+id/textView13" android:id="@+id/textView13"
android:layout_width="170dp" android:layout_width="181dp"
android:layout_height="57dp" android:layout_height="49dp"
android:text="Your little helper for home electricity monitoring!" android:text="Your little helper for home electricity monitoring!"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="#000000"
app:layout_constraintBottom_toBottomOf="@+id/imageView13" app:layout_constraintBottom_toBottomOf="@+id/imageView13"
app:layout_constraintEnd_toEndOf="@+id/button4" app:layout_constraintEnd_toEndOf="@+id/button4"
app:layout_constraintHorizontal_bias="1.0"
app:layout_constraintStart_toStartOf="@+id/button4" app:layout_constraintStart_toStartOf="@+id/button4"
app:layout_constraintTop_toBottomOf="@+id/button4" app:layout_constraintTop_toBottomOf="@+id/button4"
app:layout_constraintVertical_bias="0.0" /> app:layout_constraintVertical_bias="0.0" />
<Button
android:id="@+id/button4"
android:layout_width="180dp"
android:layout_height="wrap_content"
android:backgroundTint="#4CAF50"
android:text="Electricty Usage"
android:textAllCaps="false"
android:textColor="#FFFFFF"
app:layout_constraintBottom_toBottomOf="@+id/imageView13"
app:layout_constraintEnd_toEndOf="@+id/imageView13"
app:layout_constraintHorizontal_bias="0.892"
app:layout_constraintStart_toStartOf="@+id/imageView13"
app:layout_constraintTop_toTopOf="@+id/imageView13"
app:layout_constraintVertical_bias="0.323" />
<TextView <TextView
android:id="@+id/textView14" android:id="@+id/textView14"
android:layout_width="170dp" android:layout_width="180dp"
android:layout_height="57dp" android:layout_height="56dp"
android:text="Take practical action to save carbon emissions and build your own oasis!" android:text="Take practical actions to reduce emissions and build your own oasis!"
android:textAlignment="center" android:textAlignment="center"
android:textColor="#000000" android:textColor="#000000"
app:layout_constraintBottom_toBottomOf="@+id/imageView14" app:layout_constraintBottom_toBottomOf="@+id/imageView14"

9
app/src/main/res/layout/activity_settings.xml Normal file
View File

@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Settings">
</androidx.constraintlayout.widget.ConstraintLayout>

10
app/src/main/res/layout/activity_usage.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".Usage">
</androidx.constraintlayout.widget.ConstraintLayout>