diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..cd7d31c
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+MomentUp
\ No newline at end of file
diff --git a/.idea/2024-02-CSC4004-2-1-PeopleOfDev.iml b/.idea/2024-02-CSC4004-2-1-PeopleOfDev.iml
new file mode 100644
index 0000000..d6ebd48
--- /dev/null
+++ b/.idea/2024-02-CSC4004-2-1-PeopleOfDev.iml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
new file mode 100644
index 0000000..7c7cfef
--- /dev/null
+++ b/.idea/assetWizardSettings.xml
@@ -0,0 +1,337 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/caches/deviceStreaming.xml b/.idea/caches/deviceStreaming.xml
new file mode 100644
index 0000000..b81700b
--- /dev/null
+++ b/.idea/caches/deviceStreaming.xml
@@ -0,0 +1,329 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..b589d56
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
new file mode 100644
index 0000000..4ab34bd
--- /dev/null
+++ b/.idea/deploymentTargetSelector.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
new file mode 100644
index 0000000..83779e9
--- /dev/null
+++ b/.idea/gradle.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
new file mode 100644
index 0000000..fdf8d99
--- /dev/null
+++ b/.idea/kotlinc.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/migrations.xml b/.idea/migrations.xml
new file mode 100644
index 0000000..ecd4973
--- /dev/null
+++ b/.idea/migrations.xml
@@ -0,0 +1,10 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..b0137f1
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MomentUp/app/src/main/AndroidManifest.xml b/MomentUp/app/src/main/AndroidManifest.xml
index e61eddf..36abc07 100644
--- a/MomentUp/app/src/main/AndroidManifest.xml
+++ b/MomentUp/app/src/main/AndroidManifest.xml
@@ -59,14 +59,6 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/MomentUp/app/src/main/ic_launcher-playstore.png b/MomentUp/app/src/main/ic_launcher-playstore.png
index 33a7a92..5571c44 100644
Binary files a/MomentUp/app/src/main/ic_launcher-playstore.png and b/MomentUp/app/src/main/ic_launcher-playstore.png differ
diff --git a/MomentUp/app/src/main/java/com/example/momentup/HomeScreenActivity.kt b/MomentUp/app/src/main/java/com/example/momentup/HomeScreenActivity.kt
index 9fd196f..7351138 100644
--- a/MomentUp/app/src/main/java/com/example/momentup/HomeScreenActivity.kt
+++ b/MomentUp/app/src/main/java/com/example/momentup/HomeScreenActivity.kt
@@ -6,7 +6,7 @@ import androidx.fragment.app.Fragment
import com.example.momentup.databinding.ActivityHomeScreenBinding
import com.google.android.material.bottomnavigation.BottomNavigationView
-class HomeScreenActivity : AppCompatActivity() {
+/*class HomeScreenActivity : AppCompatActivity() {
private lateinit var binding: ActivityHomeScreenBinding
@@ -64,4 +64,4 @@ class HomeScreenActivity : AppCompatActivity() {
is ProfileFragment -> binding.bottomNavigation.selectedItemId = R.id.nav_profile
}
}
-}
+}*/
diff --git a/MomentUp/app/src/main/java/com/example/momentup/NotificationActivity.java b/MomentUp/app/src/main/java/com/example/momentup/NotificationActivity.java
index c4d8a3e..91100c7 100644
--- a/MomentUp/app/src/main/java/com/example/momentup/NotificationActivity.java
+++ b/MomentUp/app/src/main/java/com/example/momentup/NotificationActivity.java
@@ -113,7 +113,7 @@ public void onClick(View v) {
}
});
} else {
- headImg.setImageDrawable(ContextCompat.getDrawable(itemView.getContext(), R.drawable.camera));
+ headImg.setImageDrawable(ContextCompat.getDrawable(itemView.getContext(), R.drawable.ic_camera_mono));
optBtnLl.setVisibility(View.GONE);
}
}
diff --git a/MomentUp/app/src/main/res/drawable/ic_delete.xml b/MomentUp/app/src/main/res/drawable/ic_delete.xml
new file mode 100644
index 0000000..0feaf6d
--- /dev/null
+++ b/MomentUp/app/src/main/res/drawable/ic_delete.xml
@@ -0,0 +1,10 @@
+
+
+
diff --git a/MomentUp/app/src/main/res/drawable/notification_gray_bg.xml b/MomentUp/app/src/main/res/drawable/notification_gray_bg.xml
new file mode 100644
index 0000000..dfc1b04
--- /dev/null
+++ b/MomentUp/app/src/main/res/drawable/notification_gray_bg.xml
@@ -0,0 +1,7 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/MomentUp/app/src/main/res/layout/alarm_recycler_item.xml b/MomentUp/app/src/main/res/layout/alarm_recycler_item.xml
index 05dc33c..e51866c 100644
--- a/MomentUp/app/src/main/res/layout/alarm_recycler_item.xml
+++ b/MomentUp/app/src/main/res/layout/alarm_recycler_item.xml
@@ -7,14 +7,14 @@
android:layout_marginHorizontal="5dp"
android:layout_marginTop="10dp"
android:orientation="vertical"
- app:cardCornerRadius="8dp">
+ app:cardCornerRadius="10dp">
@@ -70,7 +70,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginLeft="5dp"
- android:src="@drawable/delete" />
+ android:src="@drawable/ic_delete" />
-
+
\ No newline at end of file
diff --git a/MomentUp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/MomentUp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index 92fe3b6..036d09b 100644
--- a/MomentUp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/MomentUp/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
-
+
\ No newline at end of file
diff --git a/MomentUp/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/MomentUp/app/src/main/res/mipmap-hdpi/ic_launcher.webp
index ad1dd16..82c105a 100644
Binary files a/MomentUp/app/src/main/res/mipmap-hdpi/ic_launcher.webp and b/MomentUp/app/src/main/res/mipmap-hdpi/ic_launcher.webp differ
diff --git a/MomentUp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/MomentUp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp
index 0f31925..7bd23de 100644
Binary files a/MomentUp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp and b/MomentUp/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp differ
diff --git a/MomentUp/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/MomentUp/app/src/main/res/mipmap-mdpi/ic_launcher.webp
index f6b9fb6..86e83f7 100644
Binary files a/MomentUp/app/src/main/res/mipmap-mdpi/ic_launcher.webp and b/MomentUp/app/src/main/res/mipmap-mdpi/ic_launcher.webp differ
diff --git a/MomentUp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp b/MomentUp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp
index 40593e2..b5fc44a 100644
Binary files a/MomentUp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp and b/MomentUp/app/src/main/res/mipmap-mdpi/ic_launcher_round.webp differ
diff --git a/MomentUp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/MomentUp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp
index 2c46b7d..8862a25 100644
Binary files a/MomentUp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp and b/MomentUp/app/src/main/res/mipmap-xhdpi/ic_launcher.webp differ
diff --git a/MomentUp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/MomentUp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp
index 1287701..7499aec 100644
Binary files a/MomentUp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp and b/MomentUp/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp differ
diff --git a/MomentUp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp b/MomentUp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp
index a352815..a5c6f30 100644
Binary files a/MomentUp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp and b/MomentUp/app/src/main/res/mipmap-xxhdpi/ic_launcher.webp differ
diff --git a/MomentUp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp b/MomentUp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp
index b60e3bd..770a616 100644
Binary files a/MomentUp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp and b/MomentUp/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.webp differ
diff --git a/MomentUp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp b/MomentUp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp
index 0ae27ff..63e35d6 100644
Binary files a/MomentUp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp and b/MomentUp/app/src/main/res/mipmap-xxxhdpi/ic_launcher.webp differ
diff --git a/MomentUp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp b/MomentUp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp
index f7af149..5f6f29a 100644
Binary files a/MomentUp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp and b/MomentUp/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.webp differ
diff --git a/MomentUp/app/src/main/res/values/style.xml b/MomentUp/app/src/main/res/values/style.xml
index 27cbb1f..944ff12 100644
--- a/MomentUp/app/src/main/res/values/style.xml
+++ b/MomentUp/app/src/main/res/values/style.xml
@@ -15,7 +15,7 @@
diff --git a/MomentUp/gradle/libs.versions.toml b/MomentUp/gradle/libs.versions.toml
index f251831..b419ab7 100644
--- a/MomentUp/gradle/libs.versions.toml
+++ b/MomentUp/gradle/libs.versions.toml
@@ -1,6 +1,6 @@
[versions]
agp = "8.6.0"
-kotlin = "1.9.10"
+kotlin = "1.9.0"
junit = "4.13.2"
junitVersion = "1.2.1"
espressoCore = "3.6.1"