From 11c3f9157b8d1faf99b4cfddb4df42c757c41cb4 Mon Sep 17 00:00:00 2001 From: Caesar2011 Date: Tue, 3 Jul 2018 14:29:03 +0200 Subject: [PATCH] Added refesh to module overview --- .idea/caches/build_file_checksums.ser | Bin 535 -> 0 bytes .idea/vcs.xml | 1 - .../java/de/sebse/fuplanner/MainActivity.java | 5 +- .../moddetails/ModDetailOverviewFragment.java | 73 ++++++++++-------- .../fuplanner/services/KVV/Gradebook.java | 6 ++ .../layout/fragment_mod_detail_overview.xml | 24 +++--- 6 files changed, 64 insertions(+), 45 deletions(-) delete mode 100644 .idea/caches/build_file_checksums.ser diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser deleted file mode 100644 index 56e25c5f1b4f56611abe686ef750d55ad5b57868..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 535 zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2 zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}uGBYr_F>vMNC#JY1CYR(Fc`|U8WE7aKg;e{m(JSaB66`tR - \ 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 362f4cc..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("seedorf96", "m&gcwBaT@"); 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