diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
deleted file mode 100644
index 56e25c5..0000000
Binary files a/.idea/caches/build_file_checksums.ser and /dev/null differ
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 8306744..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -2,6 +2,5 @@
-
\ No newline at end of file
diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index 707d3ac..b2f7423 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -72,7 +72,6 @@ public class MainActivity extends AppCompatActivity
this.getGoogleAuth().connect(() -> {
- // getGoogleAuth().setLoginState("***REMOVED***", "***REMOVED***");
getGoogleAuth().getLoginState(credentials -> {
if (credentials == null || credentials.getUsername() == null || credentials.getPassword() == null) {
MainActivity.this.getKVV().endUpdate();
@@ -257,9 +256,7 @@ public class MainActivity extends AppCompatActivity
@Override
public void onModulesFragmentInteraction(final int itemPosition) {
log.d("Item clicked", itemPosition);
- getKVV().getModuleList(success -> log.d(success.get(itemPosition).title), error -> {
- // TODO
- });
+ getKVV().getModuleList(success -> log.d(success.get(itemPosition).title), error -> log.e(error));
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
fragmentTransaction.replace(R.id.fragcontainer, ModDetailFragment.newInstance(itemPosition));
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewFragment.java
index b89db62..50714f0 100644
--- a/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewFragment.java
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewFragment.java
@@ -5,6 +5,7 @@ import android.content.Context;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.Fragment;
+import android.support.v4.widget.SwipeRefreshLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
@@ -31,6 +32,8 @@ public class ModDetailOverviewFragment extends Fragment {
// TODO: Rename and change types of parameters
private int mItemPos;
private Logger log = new Logger(this);
+ private ModDetailOverviewAdapter adapter;
+ private SwipeRefreshLayout swipeLayout;
public ModDetailOverviewFragment() {
@@ -70,40 +73,48 @@ public class ModDetailOverviewFragment extends Fragment {
log.d("on create");
View view = inflater.inflate(R.layout.fragment_mod_detail_overview, container, false);
// Set the adapter
- if (view instanceof RecyclerView) {
- Context context = view.getContext();
- RecyclerView recyclerView = (RecyclerView) view;
- recyclerView.setLayoutManager(new LinearLayoutManager(context));
- final ModDetailOverviewAdapter adapter = new ModDetailOverviewAdapter();
- recyclerView.setAdapter(adapter);
-
-
- if (getActivity() != null) {
- KVV kvv = ((MainActivity) getActivity()).getKVV();
- kvv.getModuleList((Modules success) -> {
- log.d(success);
- Modules.Module module = success.get(mItemPos);
- adapter.setModule(module);
- kvv.getModuleAnnouncements(module, module1 -> {
- log.d("announcements", module.announcements);
- adapter.setModule();
- }, error -> log.e(error));
- kvv.getModuleAssignments(module, module1 -> {
- log.d("assignments", module.assignments);
- adapter.setModule();
- }, error -> log.e(error));
- kvv.getModuleEvents(module, module1 -> {
- log.d("events", module.events);
- adapter.setModule();
- }, error -> log.e(error));
- }, error -> log.e(error));
- }
- }
-
-
+ Context context = view.getContext();
+ RecyclerView recyclerView = view.findViewById(R.id.list);
+ recyclerView.setLayoutManager(new LinearLayoutManager(context));
+ adapter = new ModDetailOverviewAdapter();
+ recyclerView.setAdapter(adapter);
+ // Getting SwipeContainerLayout
+ swipeLayout = view.findViewById(R.id.swipe_container);
+ // Adding Listener
+ swipeLayout.setOnRefreshListener(this::refresh);
+ refresh();
return view;
}
+ private void refresh() {
+ if (getActivity() != null) {
+ KVV kvv = ((MainActivity) getActivity()).getKVV();
+ kvv.getModuleList((Modules success) -> {
+ log.d(success);
+ Modules.Module module = success.get(mItemPos);
+ log.d("Print c");
+ adapter.setModule(module);
+ kvv.getModuleAnnouncements(module, module1 -> {
+ //log.d("announcements", module.announcements);
+ adapter.setModule();
+ }, error -> log.e(error));
+ kvv.getModuleAssignments(module, module1 -> {
+ //log.d("assignments", module.assignments);
+ adapter.setModule();
+ }, error -> log.e(error));
+ kvv.getModuleEvents(module, module1 -> {
+ //log.d("events", module.events);
+ adapter.setModule();
+ }, error -> log.e(error));
+ kvv.getModuleGradebook(module, module1 -> {
+ log.d("gradebook", module.gradebook);
+ adapter.setModule();
+ }, error -> log.e(error));
+ }, error -> log.e(error));
+ }
+ swipeLayout.setRefreshing(false);
+ }
+
}
diff --git a/app/src/main/java/de/sebse/fuplanner/services/KVV/Gradebook.java b/app/src/main/java/de/sebse/fuplanner/services/KVV/Gradebook.java
index 76e2ab2..e23fbe5 100644
--- a/app/src/main/java/de/sebse/fuplanner/services/KVV/Gradebook.java
+++ b/app/src/main/java/de/sebse/fuplanner/services/KVV/Gradebook.java
@@ -22,4 +22,10 @@ public class Gradebook {
public String getItemName() {
return itemName;
}
+
+ @Override
+ public String toString() {
+ // TODO
+ return super.toString();
+ }
}
diff --git a/app/src/main/res/layout/fragment_mod_detail_overview.xml b/app/src/main/res/layout/fragment_mod_detail_overview.xml
index 8382706..23c5ea4 100644
--- a/app/src/main/res/layout/fragment_mod_detail_overview.xml
+++ b/app/src/main/res/layout/fragment_mod_detail_overview.xml
@@ -1,13 +1,19 @@
-
\ No newline at end of file
+ android:layout_height="match_parent">
+
+
\ No newline at end of file