diff --git a/app/src/main/java/com/example/electricity/Home.java b/app/src/main/java/com/example/electricity/Home.java index 9acda71..bbea767 100644 --- a/app/src/main/java/com/example/electricity/Home.java +++ b/app/src/main/java/com/example/electricity/Home.java @@ -5,6 +5,7 @@ import androidx.appcompat.app.AppCompatActivity; import android.content.Intent; import android.os.Bundle; import android.view.View; +import android.widget.Button; import android.widget.ImageView; import android.widget.TextView; import android.widget.Toast; @@ -13,6 +14,7 @@ public class Home extends AppCompatActivity { String username; TextView name, usage; ImageView back, setting; + Button usageBtn, oasisBtn; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -23,8 +25,11 @@ public class Home extends AppCompatActivity { usage = findViewById(R.id.textView11); back = findViewById(R.id.imageView17); setting = findViewById(R.id.imageView18); + usageBtn = findViewById(R.id.button4); + oasisBtn = findViewById(R.id.button5); logOut(); startSetting(); + startUsage(); } public void logOut() { @@ -42,4 +47,11 @@ public class Home extends AppCompatActivity { startActivity(intent); }); } + + public void startUsage() { + usageBtn.setOnClickListener(view -> { + Intent intent = new Intent(this, Usage.class); + startActivity(intent); + }); + } } \ No newline at end of file diff --git a/app/src/main/java/com/example/electricity/Settings.java b/app/src/main/java/com/example/electricity/Settings.java index 2cfbdf1..3fcce37 100644 --- a/app/src/main/java/com/example/electricity/Settings.java +++ b/app/src/main/java/com/example/electricity/Settings.java @@ -2,13 +2,24 @@ package com.example.electricity; import androidx.appcompat.app.AppCompatActivity; +import android.content.Intent; import android.os.Bundle; +import android.widget.ImageView; public class Settings extends AppCompatActivity { - + ImageView back; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_settings); + back = findViewById(R.id.imageView24); + back(); + } + + public void back() { + back.setOnClickListener(view -> { + Intent intent = new Intent(this, Home.class); + startActivity(intent); + }); } } \ 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 index 4b0d4a8..d61cfda 100644 --- a/app/src/main/java/com/example/electricity/Usage.java +++ b/app/src/main/java/com/example/electricity/Usage.java @@ -1,13 +1,25 @@ package com.example.electricity; import androidx.appcompat.app.AppCompatActivity; + +import android.content.Intent; import android.os.Bundle; +import android.widget.ImageView; public class Usage extends AppCompatActivity { - + ImageView back; @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_usage); + back = findViewById(R.id.imageView25); + back(); + } + + public void back() { + back.setOnClickListener(view -> { + Intent intent = new Intent(this, Home.class); + startActivity(intent); + }); } } \ No newline at end of file diff --git a/app/src/main/res/drawable/background.png b/app/src/main/res/drawable/background.png new file mode 100644 index 0000000..acef30e Binary files /dev/null and b/app/src/main/res/drawable/background.png differ diff --git a/app/src/main/res/drawable/group_2584.png b/app/src/main/res/drawable/group_2584.png new file mode 100644 index 0000000..d94ed27 Binary files /dev/null and b/app/src/main/res/drawable/group_2584.png differ diff --git a/app/src/main/res/drawable/group_2584__1_.png b/app/src/main/res/drawable/group_2584__1_.png new file mode 100644 index 0000000..03659a6 Binary files /dev/null and b/app/src/main/res/drawable/group_2584__1_.png differ diff --git a/app/src/main/res/drawable/group_2660.png b/app/src/main/res/drawable/group_2660.png new file mode 100644 index 0000000..0044886 Binary files /dev/null and b/app/src/main/res/drawable/group_2660.png differ diff --git a/app/src/main/res/drawable/group_2660__1_.png b/app/src/main/res/drawable/group_2660__1_.png new file mode 100644 index 0000000..0e47fd6 Binary files /dev/null and b/app/src/main/res/drawable/group_2660__1_.png differ diff --git a/app/src/main/res/drawable/group_2666.png b/app/src/main/res/drawable/group_2666.png new file mode 100644 index 0000000..cb2b1dc Binary files /dev/null and b/app/src/main/res/drawable/group_2666.png differ diff --git a/app/src/main/res/drawable/group_2667.png b/app/src/main/res/drawable/group_2667.png new file mode 100644 index 0000000..4e3a046 Binary files /dev/null and b/app/src/main/res/drawable/group_2667.png differ diff --git a/app/src/main/res/drawable/group_2677.png b/app/src/main/res/drawable/group_2677.png new file mode 100644 index 0000000..ca0a127 Binary files /dev/null and b/app/src/main/res/drawable/group_2677.png differ diff --git a/app/src/main/res/drawable/pngwing_com.png b/app/src/main/res/drawable/pngwing_com.png new file mode 100644 index 0000000..28d5dc1 Binary files /dev/null and b/app/src/main/res/drawable/pngwing_com.png differ diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml index 9a87120..b45929f 100644 --- a/app/src/main/res/layout/activity_home.xml +++ b/app/src/main/res/layout/activity_home.xml @@ -6,6 +6,16 @@ android:layout_height="match_parent" tools:context=".Home"> + + + + + + +