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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Caesar2011
2018-07-10 10:56:29 +02:00
parent 2cde3e83d5 31f4342726
commit f864065a65
5 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/build.gradle
View File

@@ -45,7 +45,7 @@ dependencies {
implementation 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2' implementation 'org.jbundle.util.osgi.wrapped:org.jbundle.util.osgi.wrapped.org.apache.http.client:4.1.2'
implementation 'com.android.support:support-v4:27.1.1' implementation 'com.android.support:support-v4:27.1.1'
implementation 'org.jetbrains:annotations-java5:15.0' implementation 'org.jetbrains:annotations-java5:15.0'
implementation 'com.github.alamkanak:android-week-view:1.2.6' implementation 'com.github.quivr:android-week-view:2.0.2'//com.github.alamkanak:android-week-view:1.2.6
implementation 'com.ms-square:expandableTextView:0.1.4' implementation 'com.ms-square:expandableTextView:0.1.4'
// https://github.com/bignerdranch/expandable-recycler-view // https://github.com/bignerdranch/expandable-recycler-view
implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' implementation 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1'

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

@@ -138,6 +138,7 @@ public class ScheduleFragment extends Fragment implements WeekView.EventClickLis
Iterator<Event> it_modEvents = mod.events.getEventsOfMonth(newYear, newMonth); Iterator<Event> it_modEvents = mod.events.getEventsOfMonth(newYear, newMonth);
while (it_modEvents.hasNext()) { while (it_modEvents.hasNext()) {
Event e = it_modEvents.next(); Event e = it_modEvents.next();
//log.d("Event in while", e.toString());
Calendar ende = Calendar.getInstance(); Calendar ende = Calendar.getInstance();
ende.setTimeInMillis(e.getEndDate()); ende.setTimeInMillis(e.getEndDate());
@@ -148,6 +149,7 @@ public class ScheduleFragment extends Fragment implements WeekView.EventClickLis
} }
} }
} }
} }
return events; return events;

4
app/src/main/res/layout/fragment_schedule.xml
View File

@@ -24,7 +24,9 @@
app:headerRowBackgroundColor="#ffefefef" app:headerRowBackgroundColor="#ffefefef"
app:dayBackgroundColor="#05000000" app:dayBackgroundColor="#05000000"
app:todayBackgroundColor="#1848adff" app:todayBackgroundColor="#1848adff"
app:headerColumnBackground="#ffffffff"/> app:headerColumnBackground="#ffffffff"
app:firstDayOfWeek="monday"
app:futureWeekendBackgroundColor="@color/colorFUPrimary"/>
</FrameLayout> </FrameLayout>

25
app/src/main/res/values-de/strings.xml
View File

@@ -2,4 +2,29 @@
<resources> <resources>
<string name="navigation_drawer_open">Navigationsmenü öffnen</string> <string name="navigation_drawer_open">Navigationsmenü öffnen</string>
<string name="action_settings">Einstellungen</string> <string name="action_settings">Einstellungen</string>
<string name="navigation_drawer_close">Navigationsmenü schließen</string>
<string name="overview">Übersicht</string>
<string name="announcements">Ankündigungen</string>
<string name="description">Beschreibung</string>
<string name="announcements_count">Ankündigungen (%1$d)</string>
<string name="cd_ic_launcher">App-Symbol</string>
<string name="schedule">Stundenplan</string>
<string name="events">Kurse</string>
<string name="canteen_plan">Mensaplan</string>
<string name="settings">Einstellungen</string>
<string name="options">Optionen</string>
<string name="log_out">Logout</string>
<string name="share">Teilen</string>
<string name="log_in">Login</string>
<string name="username">Nutzername</string>
<string name="password">Passwort</string>
<string name="show_all">Zeige alle</string>
<string name="assignments_count">Aufgaben (%1$d)</string>
<string name="assignments">Aufgaben</string>
<string name="upcoming_events_count">Nächste Veranstaltungen (%1$d)</string>
<string name="upcoming_events">Nächste Veranstaltungen</string>
<string name="date_scale">%1$s - %2$s</string>
<string name="open">Offen</string>
<string name="close">Geschlossen</string>
<string name="enter_offline_mode">Starte Offline-Modus</string>
</resources> </resources>

4
app/src/main/res/values/strings.xml
View File

@@ -14,7 +14,7 @@
<string name="announcements_count">Announcements (%1$d)</string> <string name="announcements_count">Announcements (%1$d)</string>
<string name="cd_ic_launcher">App Icon</string> <string name="cd_ic_launcher">App Icon</string>
<string name="schedule">Schedule</string> <string name="schedule">Schedule</string>
<string name="events">Events</string> <string name="events">Courses</string>
<string name="canteen_plan">Canteen Plan</string> <string name="canteen_plan">Canteen Plan</string>
<string name="settings">Settings</string> <string name="settings">Settings</string>
<string name="options">Options</string> <string name="options">Options</string>
@@ -33,6 +33,6 @@
<string name="close">Close</string> <string name="close">Close</string>
<!-- TODO: Remove or change this placeholder text --> <!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string> <string name="hello_blank_fragment" translatable="false">Hello blank fragment</string>
<string name="enter_offline_mode">Enter Offline Mode (%1$s)</string> <string name="enter_offline_mode">Enter Offline Mode (%1$s)</string>
</resources> </resources>