sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Moved KVV types to sub package

Browse Source
This commit is contained in:
Caesar2011
2018-07-03 14:38:34 +02:00
parent 215a853c3d
commit 6eed71d19c
16 changed files with 34 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/de/sebse/fuplanner/MainActivity.java
View File

@@ -26,7 +26,7 @@ import de.sebse.fuplanner.fragments.StartupFragment;
import de.sebse.fuplanner.services.GoogleAuth.Credentials; import de.sebse.fuplanner.services.GoogleAuth.Credentials;
import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth; import de.sebse.fuplanner.services.GoogleAuth.GoogleAuth;
import de.sebse.fuplanner.services.KVV.KVV; import de.sebse.fuplanner.services.KVV.KVV;
import de.sebse.fuplanner.services.KVV.Modules; import de.sebse.fuplanner.services.KVV.types.Modules;
import de.sebse.fuplanner.tools.logging.Logger; import de.sebse.fuplanner.tools.logging.Logger;
public class MainActivity extends AppCompatActivity public class MainActivity extends AppCompatActivity

2
app/src/main/java/de/sebse/fuplanner/fragments/ModulesRecyclerViewAdapter.java
View File

@@ -8,7 +8,7 @@ import android.view.ViewGroup;
import de.sebse.fuplanner.R; import de.sebse.fuplanner.R;
import de.sebse.fuplanner.fragments.ModulesFragment.OnModulesFragmentInteractionListener; import de.sebse.fuplanner.fragments.ModulesFragment.OnModulesFragmentInteractionListener;
import de.sebse.fuplanner.services.KVV.Modules; import de.sebse.fuplanner.services.KVV.types.Modules;
import de.sebse.fuplanner.tools.ui.ItemViewHolder; import de.sebse.fuplanner.tools.ui.ItemViewHolder;
/** /**

8
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewAdapter.java
View File

@@ -13,10 +13,10 @@ import com.ms.square.android.expandabletextview.ExpandableTextView;
import java.util.ArrayList; import java.util.ArrayList;
import de.sebse.fuplanner.R; import de.sebse.fuplanner.R;
import de.sebse.fuplanner.services.KVV.Announcement; import de.sebse.fuplanner.services.KVV.types.Announcement;
import de.sebse.fuplanner.services.KVV.Assignment; import de.sebse.fuplanner.services.KVV.types.Assignment;
import de.sebse.fuplanner.services.KVV.Event; import de.sebse.fuplanner.services.KVV.types.Event;
import de.sebse.fuplanner.services.KVV.Modules; import de.sebse.fuplanner.services.KVV.types.Modules;
import de.sebse.fuplanner.tools.Conversion; import de.sebse.fuplanner.tools.Conversion;
import de.sebse.fuplanner.tools.logging.Logger; import de.sebse.fuplanner.tools.logging.Logger;
import de.sebse.fuplanner.tools.ui.CustomViewHolder; import de.sebse.fuplanner.tools.ui.CustomViewHolder;

2
app/src/main/java/de/sebse/fuplanner/fragments/moddetails/ModDetailOverviewFragment.java
View File

@@ -15,7 +15,7 @@ import android.view.ViewGroup;
import de.sebse.fuplanner.MainActivity; import de.sebse.fuplanner.MainActivity;
import de.sebse.fuplanner.R; import de.sebse.fuplanner.R;
import de.sebse.fuplanner.services.KVV.KVV; import de.sebse.fuplanner.services.KVV.KVV;
import de.sebse.fuplanner.services.KVV.Modules; import de.sebse.fuplanner.services.KVV.types.Modules;
import de.sebse.fuplanner.tools.logging.Logger; import de.sebse.fuplanner.tools.logging.Logger;
/** /**

2
app/src/main/java/de/sebse/fuplanner/services/KVV/KVV.java
View File

@@ -6,6 +6,8 @@ import android.support.annotation.NonNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import de.sebse.fuplanner.services.KVV.types.LoginToken;
import de.sebse.fuplanner.services.KVV.types.Modules;
import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkCallback;
import de.sebse.fuplanner.tools.network.NetworkErrorCallback; import de.sebse.fuplanner.tools.network.NetworkErrorCallback;

1
app/src/main/java/de/sebse/fuplanner/services/KVV/KVVLogin.java
View File

@@ -7,6 +7,7 @@ import java.util.HashMap;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import de.sebse.fuplanner.services.KVV.types.LoginToken;
import de.sebse.fuplanner.tools.network.HTTPService; import de.sebse.fuplanner.tools.network.HTTPService;
import de.sebse.fuplanner.tools.network.NetworkCallback; import de.sebse.fuplanner.tools.network.NetworkCallback;
import de.sebse.fuplanner.tools.network.NetworkError; import de.sebse.fuplanner.tools.network.NetworkError;

10
app/src/main/java/de/sebse/fuplanner/services/KVV/KVVModuleList.java
View File

@@ -9,12 +9,16 @@ import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
import java.util.HashSet; import java.util.HashSet;
import java.util.concurrent.atomic.AtomicReference;
import java.util.regex.MatchResult; import java.util.regex.MatchResult;
import de.sebse.fuplanner.services.KVV.types.Announcement;
import de.sebse.fuplanner.services.KVV.types.Assignment;
import de.sebse.fuplanner.services.KVV.types.Event;
import de.sebse.fuplanner.services.KVV.types.Gradebook;
import de.sebse.fuplanner.services.KVV.types.Lecturer;
import de.sebse.fuplanner.services.KVV.types.LoginToken;
import de.sebse.fuplanner.services.KVV.types.Modules;
import de.sebse.fuplanner.tools.AsyncQueue; import de.sebse.fuplanner.tools.AsyncQueue;
import de.sebse.fuplanner.tools.EventList; import de.sebse.fuplanner.tools.EventList;
import de.sebse.fuplanner.tools.Regex; import de.sebse.fuplanner.tools.Regex;

2
app/src/main/java/de/sebse/fuplanner/services/KVV/LastTokenCallback.java
View File

@@ -1,5 +1,7 @@
package de.sebse.fuplanner.services.KVV; package de.sebse.fuplanner.services.KVV;
import de.sebse.fuplanner.services.KVV.types.LoginToken;
/** /**
* Created by sebastian on 31.01.18. * Created by sebastian on 31.01.18.
*/ */

4
app/src/main/java/de/sebse/fuplanner/services/KVV/Announcement.java → app/src/main/java/de/sebse/fuplanner/services/KVV/types/Announcement.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.KVV; package de.sebse.fuplanner.services.KVV.types;
public class Announcement { public class Announcement {
private final String id; private final String id;
@@ -7,7 +7,7 @@ public class Announcement {
private final String createdBy; private final String createdBy;
private final long createdOn; private final long createdOn;
Announcement(String id, String title, String body, String createdBy, long createdOn) { public Announcement(String id, String title, String body, String createdBy, long createdOn) {
this.id = id; this.id = id;
this.title = title; this.title = title;

4
app/src/main/java/de/sebse/fuplanner/services/KVV/Assignment.java → app/src/main/java/de/sebse/fuplanner/services/KVV/types/Assignment.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.KVV; package de.sebse.fuplanner.services.KVV.types;
import java.lang.reflect.Array; import java.lang.reflect.Array;
import java.util.ArrayList; import java.util.ArrayList;
@@ -12,7 +12,7 @@ public class Assignment {
private final String gradeScale; private final String gradeScale;
private final ArrayList<String> urls; private final ArrayList<String> urls;
Assignment(String id, String title, long dueTime, String gradebookItemName, String gradeScale, ArrayList<String> urls) {//, String grade public Assignment(String id, String title, long dueTime, String gradebookItemName, String gradeScale, ArrayList<String> urls) {//, String grade
this.id = id; this.id = id;
this.title = title; this.title = title;
this.dueTime = dueTime; this.dueTime = dueTime;

4
app/src/main/java/de/sebse/fuplanner/services/KVV/Event.java → app/src/main/java/de/sebse/fuplanner/services/KVV/types/Event.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.KVV; package de.sebse.fuplanner.services.KVV.types;
import java.util.Date; import java.util.Date;
@@ -9,7 +9,7 @@ public class Event {
private final long duration; private final long duration;
private final long firstTime; private final long firstTime;
Event(String id, String type, String title, long duration, long firstTime) { public Event(String id, String type, String title, long duration, long firstTime) {
this.id = id; this.id = id;
this.type = type; this.type = type;
this.title = title; this.title = title;

2
app/src/main/java/de/sebse/fuplanner/services/KVV/Gradebook.java → app/src/main/java/de/sebse/fuplanner/services/KVV/types/Gradebook.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.KVV; package de.sebse.fuplanner.services.KVV.types;
public class Gradebook { public class Gradebook {
private final String itemName; private final String itemName;

6
app/src/main/java/de/sebse/fuplanner/services/KVV/Lecturer.java → app/src/main/java/de/sebse/fuplanner/services/KVV/types/Lecturer.java
View File

@@ -1,14 +1,14 @@
package de.sebse.fuplanner.services.KVV; package de.sebse.fuplanner.services.KVV.types;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
class Lecturer { public class Lecturer {
private final String firstname; private final String firstname;
private final String surname; private final String surname;
private final String mail; private final String mail;
Lecturer(String parsableString) throws NoSuchFieldException { public Lecturer(String parsableString) throws NoSuchFieldException {
Pattern pattern = Pattern.compile("([^|]*)\\|([^|]*)\\|([^|]*)\\|\\|", Pattern.DOTALL); Pattern pattern = Pattern.compile("([^|]*)\\|([^|]*)\\|([^|]*)\\|\\|", Pattern.DOTALL);
Matcher matcher = pattern.matcher(parsableString); Matcher matcher = pattern.matcher(parsableString);
if (!matcher.find()) { if (!matcher.find()) {

2
app/src/main/java/de/sebse/fuplanner/services/KVV/LoginToken.java → app/src/main/java/de/sebse/fuplanner/services/KVV/types/LoginToken.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.KVV; package de.sebse.fuplanner.services.KVV.types;
import java.util.HashMap; import java.util.HashMap;

6
app/src/main/java/de/sebse/fuplanner/services/KVV/Modules.java → app/src/main/java/de/sebse/fuplanner/services/KVV/types/Modules.java
View File

@@ -1,4 +1,4 @@
package de.sebse.fuplanner.services.KVV; package de.sebse.fuplanner.services.KVV.types;
import android.support.annotation.NonNull; import android.support.annotation.NonNull;
import android.support.v7.util.SortedList; import android.support.v7.util.SortedList;
@@ -21,7 +21,7 @@ public class Modules /*extends EventEmitter<Triplet<Integer, Modules.UpgradeModu
private String latestSemester = null; private String latestSemester = null;
private Logger log = new Logger(this); private Logger log = new Logger(this);
Modules() { public Modules() {
this.list = new SortedList<>(Module.class, new SortedList.Callback<Module>() { this.list = new SortedList<>(Module.class, new SortedList.Callback<Module>() {
@Override @Override
public int compare(Module o1, Module o2) { public int compare(Module o1, Module o2) {
@@ -63,7 +63,7 @@ public class Modules /*extends EventEmitter<Triplet<Integer, Modules.UpgradeModu
}); });
} }
Module addModule(String semester, HashSet<String> lvNumber, String title, HashSet<Lecturer> lecturer, String type, String description, String ID) { public Module addModule(String semester, HashSet<String> lvNumber, String title, HashSet<Lecturer> lecturer, String type, String description, String ID) {
Module m = new Module(semester, lvNumber, title, lecturer, type, description, ID); Module m = new Module(semester, lvNumber, title, lecturer, type, description, ID);
this.list.add(m); this.list.add(m);
try { try {

2
app/src/main/java/de/sebse/fuplanner/tools/EventList.java
View File

@@ -3,7 +3,7 @@ package de.sebse.fuplanner.tools;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import de.sebse.fuplanner.services.KVV.Event; import de.sebse.fuplanner.services.KVV.types.Event;
public class EventList extends ArrayList<Event> { public class EventList extends ArrayList<Event> {
private int split = 0; private int split = 0;