diff --git a/app/src/main/java/id/ac/ui/cs/myui/activity/schedule/ScheduleActivity.java b/app/src/main/java/id/ac/ui/cs/myui/activity/schedule/ScheduleActivity.java
index 01ae343a9b13e0fe2bc04bc9bc2d7b7b04c91771..7768b765c6c8ebb7d34e1c0badb23f44a0c0e1ee 100644
--- a/app/src/main/java/id/ac/ui/cs/myui/activity/schedule/ScheduleActivity.java
+++ b/app/src/main/java/id/ac/ui/cs/myui/activity/schedule/ScheduleActivity.java
@@ -97,7 +97,7 @@ public class ScheduleActivity extends DrawerActivity {
if (day != null) {
- ArrayList<Schedule> schedules = getScheduleOfDay((ArrayList<Schedule>) dbhandler.getAllScheduleCourse(), day);
+ final ArrayList<Schedule> schedules = getScheduleOfDay((ArrayList<Schedule>) dbhandler.getAllScheduleCourse(), day);
if (!schedules.isEmpty()) {
tvInformation.setVisibility(View.INVISIBLE);
diff --git a/app/src/main/java/id/ac/ui/cs/myui/fragment/PresenceStatusFragment.java b/app/src/main/java/id/ac/ui/cs/myui/fragment/PresenceStatusFragment.java
index a225beb94e6b34103fa51768ebdd4bbd90fa84df..a81bf013c94f711a03dad7cd13e00cf934bebd68 100644
--- a/app/src/main/java/id/ac/ui/cs/myui/fragment/PresenceStatusFragment.java
+++ b/app/src/main/java/id/ac/ui/cs/myui/fragment/PresenceStatusFragment.java
@@ -40,7 +40,7 @@ public class PresenceStatusFragment extends Fragment {
final String curcode = getActivity().getIntent().getStringExtra("curcode");
final String dosen = getActivity().getIntent().getStringExtra("lecturers");
- new PresenceTask(getActivity()).execute(classCode);
+ new PresenceTask(getActivity(), className).execute(classCode);
Button btn = (Button) getActivity().findViewById(R.id.history_presence_button);
btn.setVisibility(View.VISIBLE);
diff --git a/app/src/main/java/id/ac/ui/cs/myui/task/PresenceTask.java b/app/src/main/java/id/ac/ui/cs/myui/task/PresenceTask.java
index add0b484e43b78e43b78045a94b70abf26f47449..d62e5dd6a3fd294189f2458cd119268a0d0e2dbf 100644
--- a/app/src/main/java/id/ac/ui/cs/myui/task/PresenceTask.java
+++ b/app/src/main/java/id/ac/ui/cs/myui/task/PresenceTask.java
@@ -35,6 +35,7 @@ import id.ac.ui.cs.myui.model.attendance.Attendance;
import id.ac.ui.cs.myui.model.attendance.CourseAttendance;
import id.ac.ui.cs.myui.model.schedule.Course;
import id.ac.ui.cs.myui.model.schedule.Lecturer;
+import id.ac.ui.cs.myui.model.schedule.Room;
import id.ac.ui.cs.myui.model.schedule.Schedule;
import id.ac.ui.cs.myui.service.PresenceService;
import retrofit2.Call;
@@ -49,6 +50,7 @@ import retrofit2.converter.gson.GsonConverterFactory;
* modified by ayu dan sarah on 3/8/17
* modified by emon & ghozi 16/8/17
* modified by rifki dan sarah on 10/8/17
+ * modeified by wisnu on 24/8/17
*/
public class PresenceTask extends AsyncTask<Object, Object, ArrayList<Attendance>> {
@@ -63,9 +65,10 @@ public class PresenceTask extends AsyncTask<Object, Object, ArrayList<Attendance
private CourseAttendance course;
private String errorMsg;
private String npm;
+ private String courseName;
- public PresenceTask(Context context) {
+ public PresenceTask(Context context, String courseName) {
this.context = context;
schedules = new ArrayList<>();
this.dbhandler = new ScheduleHandler(context);
@@ -73,6 +76,8 @@ public class PresenceTask extends AsyncTask<Object, Object, ArrayList<Attendance
sharedPreferences = context.getSharedPreferences("user", 0);
access_token = sharedPreferences.getString("access_token", "");
npm = sharedPreferences.getString("npm", "");
+ this.courseName = courseName;
+
}
@Override
@@ -181,12 +186,12 @@ public class PresenceTask extends AsyncTask<Object, Object, ArrayList<Attendance
TextView presence = (TextView) act.findViewById(R.id.total_attedance);
if (presence != null) {
- presence.setText("" + course.getTotalPresence() +" "+ act.getResources().getString(R.string.task_presence_attr1));
+ presence.setText("" + course.getTotalPresence() + " " + act.getResources().getString(R.string.task_presence_attr1));
}
TextView absence = (TextView) act.findViewById(R.id.total_absence);
if (absence != null) {
- absence.setText("" + course.getTotalAbsence() +" "+ act.getResources().getString(R.string.task_presence_attr3));
+ absence.setText("" + course.getTotalAbsence() + " " + act.getResources().getString(R.string.task_presence_attr3));
}
TextView permission = (TextView) act.findViewById(R.id.permission);
@@ -213,6 +218,27 @@ public class PresenceTask extends AsyncTask<Object, Object, ArrayList<Attendance
} else {
Toast.makeText(context, context.getResources().getString(R.string.task_presence_error_empty),
Toast.LENGTH_SHORT).show();
+ recyclerView = (RecyclerView) act.findViewById(R.id.recycle_view);
+
+ LinearLayoutManager layout = new LinearLayoutManager(act) {
+ @Override
+ public boolean canScrollVertically() {
+ return false;
+ }
+ };
+
+ ArrayList<Schedule> schedules = new ArrayList<>();
+ for (Schedule s : dbhandler.getCourseByTitle(courseName)) {
+ schedules.add(s);
+ }
+
+
+ courseDetailAdapter = new CourseDetailAdapter(schedules);
+
+ if (recyclerView != null) {
+ recyclerView.setLayoutManager(layout);
+ recyclerView.setAdapter(courseDetailAdapter);
+ }
}
}
}
diff --git a/app/src/main/res/drawable-mdpi/bookmark_button.png b/app/src/main/res/drawable-mdpi/bookmark_button.png
deleted file mode 100644
index b7da85d5263b61db8f18e0ee5ef19e958154c49a..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable-mdpi/bookmark_button.png and /dev/null differ
diff --git a/app/src/main/res/drawable-v21/ic_menu_camera.xml b/app/src/main/res/drawable-v21/ic_menu_camera.xml
deleted file mode 100644
index 0d9ea104b2f34dbd9d7a0ea545589660fe6c0ef6..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable-v21/ic_menu_camera.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
- <path
- android:fillColor="#FF000000"
- android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
-</vector>
diff --git a/app/src/main/res/drawable-v21/ic_menu_gallery.xml b/app/src/main/res/drawable-v21/ic_menu_gallery.xml
deleted file mode 100644
index f6872c409eb82cabaa9297998d49005b057d8043..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable-v21/ic_menu_gallery.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z" />
-</vector>
diff --git a/app/src/main/res/drawable-v21/ic_menu_manage.xml b/app/src/main/res/drawable-v21/ic_menu_manage.xml
deleted file mode 100644
index c1be60b368cee69ed9c866009439b50e4e920230..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable-v21/ic_menu_manage.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable-v21/ic_menu_send.xml b/app/src/main/res/drawable-v21/ic_menu_send.xml
deleted file mode 100644
index 00c668c60b05fd2e0b5c4f8bc43c8114c7dbd7a1..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable-v21/ic_menu_send.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
-</vector>
diff --git a/app/src/main/res/drawable-v21/ic_menu_share.xml b/app/src/main/res/drawable-v21/ic_menu_share.xml
deleted file mode 100644
index a28fb9e2897130c7b627049d91c2294679563b05..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable-v21/ic_menu_share.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z" />
-</vector>
diff --git a/app/src/main/res/drawable-v21/ic_menu_slideshow.xml b/app/src/main/res/drawable-v21/ic_menu_slideshow.xml
deleted file mode 100644
index 209aa6430e754b466c4256446446cfce615f3394..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable-v21/ic_menu_slideshow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0">
- <path
- android:fillColor="#FF000000"
- android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6zm16,-4H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zm-8,12.5v-9l6,4.5 -6,4.5z" />
-</vector>
diff --git a/app/src/main/res/drawable-xhdpi/background_splash.xml b/app/src/main/res/drawable-xhdpi/background_splash.xml
index 32402ba880a8a3ffb1ebeecd70a0caca5ee7cdb6..0a3a318200cef678e29b99d8cd468c678581e7f3 100644
--- a/app/src/main/res/drawable-xhdpi/background_splash.xml
+++ b/app/src/main/res/drawable-xhdpi/background_splash.xml
@@ -2,12 +2,12 @@
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item
- android:drawable="@color/colorAccent"/>
-
+ android:drawable="@color/colorPrimary"/>
<item>
<bitmap
android:gravity="center"
- android:src="@mipmap/ic_launcher"/>
+ android:src="@drawable/ic_splash"
+ />
</item>
</layer-list>
diff --git a/app/src/main/res/drawable/calendar_academic.png b/app/src/main/res/drawable/calendar_academic.png
deleted file mode 100644
index efd32d0360d85a45cfb04a36cf38e5ca8763ac05..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable/calendar_academic.png and /dev/null differ
diff --git a/app/src/main/res/drawable/line_button.png b/app/src/main/res/drawable/line_button.png
deleted file mode 100644
index 505f26c23a38a94458d7edb8b0569348d861d7bb..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable/line_button.png and /dev/null differ
diff --git a/app/src/main/res/drawable/makara.png b/app/src/main/res/drawable/makara.png
deleted file mode 100644
index bbad65967e8e5289ca8dc319a2c447085c21bbaa..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable/makara.png and /dev/null differ
diff --git a/app/src/main/res/drawable/multiple_users.png b/app/src/main/res/drawable/multiple_users.png
deleted file mode 100644
index 02fc4384d7c603fba73dd34616f8917cd4b16c85..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable/multiple_users.png and /dev/null differ
diff --git a/app/src/main/res/drawable/notification.png b/app/src/main/res/drawable/notification.png
index 1597e3e3873f689fe1bb7b2ed5264f38d4ed595b..3871f5a584c791824d2ad98f697c79bd00fb06e3 100644
Binary files a/app/src/main/res/drawable/notification.png and b/app/src/main/res/drawable/notification.png differ
diff --git a/app/src/main/res/drawable/panic_button_toggle.xml b/app/src/main/res/drawable/panic_button_toggle.xml
index ad83fc29e2991d5c351a79610fbf5dd0c28062e3..2960c02466154497575ab681750af41bb521c595 100644
--- a/app/src/main/res/drawable/panic_button_toggle.xml
+++ b/app/src/main/res/drawable/panic_button_toggle.xml
@@ -1,4 +1,4 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:drawable="@drawable/panic_button_pressed" android:state_pressed="true" />
- <item android:drawable="@drawable/panic_button" />
+ <item android:drawable="@drawable/background_panic_press" android:state_pressed="true" />
+ <item android:drawable="@drawable/background_panic_red" />
</selector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/shape_oval.xml b/app/src/main/res/drawable/shape_oval.xml
index ae823ed11cb8166bb6c60e8b63f92b3778f7d487..c87533f9b93f2640aa47f4327a8e90b5cb65ad84 100644
--- a/app/src/main/res/drawable/shape_oval.xml
+++ b/app/src/main/res/drawable/shape_oval.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
- <solid android:color="?attr/colorAccent"/>
+ <solid android:color="@color/colorAccent"/>
</shape>
diff --git a/app/src/main/res/drawable/side_nav_bar.xml b/app/src/main/res/drawable/side_nav_bar.xml
deleted file mode 100644
index 458b4b07d185c3fc50ebca176e640d9518c69b61..0000000000000000000000000000000000000000
--- a/app/src/main/res/drawable/side_nav_bar.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
- android:shape="rectangle">
- <gradient
- android:angle="135"
- android:centerColor="#4CAF50"
- android:endColor="#2E7D32"
- android:startColor="#81C784"
- android:type="linear" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/splash_white.jpeg b/app/src/main/res/drawable/splash_white.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..d03ad77b5717b6a317b3f3ce7f64d6c5e703202e
Binary files /dev/null and b/app/src/main/res/drawable/splash_white.jpeg differ
diff --git a/app/src/main/res/drawable/study.jpeg b/app/src/main/res/drawable/study.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..c7761240556d34da3042dfdd01c6f24c8b18379f
Binary files /dev/null and b/app/src/main/res/drawable/study.jpeg differ
diff --git a/app/src/main/res/drawable/sync.png b/app/src/main/res/drawable/sync.png
index 08f2794dae5ecc6d21c35925b957537bc0b3a14c..39be19e4733f60baea680a3bc80e8e397e0c2fc3 100644
Binary files a/app/src/main/res/drawable/sync.png and b/app/src/main/res/drawable/sync.png differ
diff --git a/app/src/main/res/drawable/user.png b/app/src/main/res/drawable/user.png
deleted file mode 100644
index 36e223ea7183729ae29cfbe724c6529b449d0afa..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable/user.png and /dev/null differ
diff --git a/app/src/main/res/drawable/user1.png b/app/src/main/res/drawable/user1.png
deleted file mode 100644
index 89e014c00c3b82394645a4229239fe659f8eb0b1..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable/user1.png and /dev/null differ
diff --git a/app/src/main/res/drawable/warning.png b/app/src/main/res/drawable/warning.png
new file mode 100644
index 0000000000000000000000000000000000000000..d935d854dbe719d6fedd4c637ae436f59203a466
Binary files /dev/null and b/app/src/main/res/drawable/warning.png differ
diff --git a/app/src/main/res/drawable/whatsapp.png b/app/src/main/res/drawable/whatsapp.png
deleted file mode 100644
index f60b53ab43f31f4b6889c1e7641965260a86841d..0000000000000000000000000000000000000000
Binary files a/app/src/main/res/drawable/whatsapp.png and /dev/null differ
diff --git a/app/src/test/java/id/ac/ui/cs/myui/task/AttendanceTaskTest.java b/app/src/test/java/id/ac/ui/cs/myui/task/AttendanceTaskTest.java
index c2e6cef9969672c84687fa0eb30966810b21c8d9..a969c96bfb55f854a22f8a14637fcaff92685f18 100644
--- a/app/src/test/java/id/ac/ui/cs/myui/task/AttendanceTaskTest.java
+++ b/app/src/test/java/id/ac/ui/cs/myui/task/AttendanceTaskTest.java
@@ -26,7 +26,7 @@ public class AttendanceTaskTest {
@Before
public void setUp() {
context = RuntimeEnvironment.application.getBaseContext();
- presenceTask = new PresenceTask(context);
+ presenceTask = new PresenceTask(context, "");
}
@Test