From: pk910 Date: Sat, 5 Mar 2016 18:15:41 +0000 (+0100) Subject: beta 0.1.1 X-Git-Url: http://git.pk910.de/?p=DHBWCampusApp.git;a=commitdiff_plain;h=783024077bd38c4bede07ca8310fb2daf67751b5 beta 0.1.1 --- diff --git a/app/src/main/java/de/dhbwloe/campusapp/database/DatabaseManager.java b/app/src/main/java/de/dhbwloe/campusapp/database/DatabaseManager.java index 06cf972..32d7c61 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/database/DatabaseManager.java +++ b/app/src/main/java/de/dhbwloe/campusapp/database/DatabaseManager.java @@ -376,6 +376,13 @@ public class DatabaseManager { return vorlesungsplanDBHelper.getCourseCalendarEvents(coursename, timeFrom, timeTo); } + public CourseEvent[] getCourseEventsByGroup(CourseGroup group) { + openDatabase(); + if(vorlesungsplanDBHelper == null) + vorlesungsplanDBHelper = new VorlesungsplanDatabaseHelper(AppContext, database); + return vorlesungsplanDBHelper.getCourseEventsByGroup(group); + } + public CourseEvent[] getCourseCalendarTimetable(String coursename, long timeFrom, int days) { openDatabase(); if(vorlesungsplanDBHelper == null) diff --git a/app/src/main/java/de/dhbwloe/campusapp/database/VorlesungsplanDatabaseHelper.java b/app/src/main/java/de/dhbwloe/campusapp/database/VorlesungsplanDatabaseHelper.java index 8fc5f95..2894cc8 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/database/VorlesungsplanDatabaseHelper.java +++ b/app/src/main/java/de/dhbwloe/campusapp/database/VorlesungsplanDatabaseHelper.java @@ -282,7 +282,54 @@ public class VorlesungsplanDatabaseHelper { return eventsArr; } + public CourseEvent[] getCourseEventsByGroup(CourseGroup group) { + String[] whereArgs; + whereArgs = new String[] { + Integer.toString(group.getGroupId()) + }; + Cursor resultSet = database.rawQuery( + "SELECT " + + "Id, CourseName, UniqueId, SequenceId, CourseCalendarEvent.EventFrom, CourseCalendarEvent.EventTo, EventTitle, EventLocation, EventStatus, RecurRule, ExcludeDates, CourseGroupId, EventType " + + "FROM " + + "CourseCalendarEvent " + + "LEFT JOIN " + + "CourseCalendar ON CourseCalendar.Id = CourseCalendarEvent.EventId "+ + "WHERE " + + "CourseGroupId = ? ORDER BY CourseCalendarEvent.EventFrom ASC ", + whereArgs); + ArrayList events = new ArrayList(); + if(resultSet.moveToFirst()) { + int[] columnIndexes = { + resultSet.getColumnIndex("Id"), + resultSet.getColumnIndex("CourseName"), + resultSet.getColumnIndex("UniqueId"), + resultSet.getColumnIndex("SequenceId"), + resultSet.getColumnIndex("EventFrom"), + resultSet.getColumnIndex("EventTo"), + resultSet.getColumnIndex("EventTitle"), + resultSet.getColumnIndex("EventLocation"), + resultSet.getColumnIndex("EventStatus"), + resultSet.getColumnIndex("RecurRule"), + resultSet.getColumnIndex("ExcludeDates"), + resultSet.getColumnIndex("CourseGroupId"), + resultSet.getColumnIndex("EventType") + }; + do { + int eventType = resultSet.getInt(columnIndexes[12]); + + CourseEvent event = new CourseEvent(resultSet.getInt(columnIndexes[0]), resultSet.getString(columnIndexes[1]), resultSet.getString(columnIndexes[2]), resultSet.getInt(columnIndexes[3]), + resultSet.getLong(columnIndexes[4]), resultSet.getLong(columnIndexes[5]), resultSet.getString(columnIndexes[6]), resultSet.getString(columnIndexes[7]), + resultSet.getString(columnIndexes[8]), resultSet.getString(columnIndexes[9]), resultSet.getString(columnIndexes[10]), group, eventType); + events.add(event); + } while (resultSet.moveToNext()); + } + resultSet.close(); + + CourseEvent[] eventsArr = new CourseEvent[events.size()]; + eventsArr = events.toArray(eventsArr); + return eventsArr; + } public CourseGroup getCourseGroup(int courseGroupId) { CourseGroup coursegroup = null; diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java index fa75c5c..5a9c41b 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardMensa.java @@ -76,7 +76,7 @@ public class DashboardMensa extends CampusAppFragment { if(menuTitle == null || menuTitle.matches("^Buffet")) continue; - RelativeLayout menu = (RelativeLayout) li.inflate(R.layout.fragment_dashboard_mensa_menu, null, false); + LinearLayout menu = (LinearLayout) li.inflate(R.layout.fragment_dashboard_mensa_menu, null, false); menueContainer.addView(menu); TextView menuName = (TextView) menu.findViewById(R.id.menuName); diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsDhbw.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsDhbw.java index 48342fa..20f1ad8 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsDhbw.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsDhbw.java @@ -6,19 +6,21 @@ import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.RelativeLayout; +import android.widget.TextView; import java.util.Collections; import java.util.Comparator; import java.util.Date; -import de.dhbwloe.campusapp.CampusAppFragment; import de.dhbwloe.campusapp.R; /** * A simple {@link Fragment} subclass. */ public class DashboardNewsDhbw extends News { - + private View newsEntryPanel; + private View newsNonePanel; public DashboardNewsDhbw() { // Required empty public constructor @@ -28,7 +30,10 @@ public class DashboardNewsDhbw extends News { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - oFragmentView = inflater.inflate(R.layout.fragment_dashboard_news_stuv, container, false); + + oFragmentView = new RelativeLayout(inflater.getContext()); + newsEntryPanel = inflater.inflate(R.layout.fragment_dashboard_news_entry, container, false); + newsNonePanel = inflater.inflate(R.layout.fragment_dashboard_news_none, container, false); return oFragmentView; } @@ -51,8 +56,20 @@ public class DashboardNewsDhbw extends News { } }); + RelativeLayout container = (RelativeLayout) oFragmentView; + container.removeAllViews(); + + if(newsListItems.size() > 0) { + container.addView(newsEntryPanel); + + TextView dateView = (TextView) newsEntryPanel.findViewById(R.id.newsDate); + TextView titleView = (TextView) newsEntryPanel.findViewById(R.id.newsTitle); + NewsListItem newsItem = newsListItems.get(0); - // show newsListItems + dateView.setText(newsItem.getFormatedDate()); + titleView.setText(newsItem.getTitle()); + } else + container.addView(newsNonePanel); } } diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsStuv.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsStuv.java index ba692a6..57bf356 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsStuv.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardNewsStuv.java @@ -6,19 +6,21 @@ import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.RelativeLayout; +import android.widget.TextView; import java.util.Collections; import java.util.Comparator; import java.util.Date; -import de.dhbwloe.campusapp.CampusAppFragment; import de.dhbwloe.campusapp.R; /** * A simple {@link Fragment} subclass. */ public class DashboardNewsStuv extends News { - + private View newsEntryPanel; + private View newsNonePanel; public DashboardNewsStuv() { // Required empty public constructor @@ -28,7 +30,10 @@ public class DashboardNewsStuv extends News { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - oFragmentView = inflater.inflate(R.layout.fragment_dashboard_news_stuv, container, false); + + oFragmentView = new RelativeLayout(inflater.getContext()); + newsEntryPanel = inflater.inflate(R.layout.fragment_dashboard_news_entry, container, false); + newsNonePanel = inflater.inflate(R.layout.fragment_dashboard_news_none, container, false); return oFragmentView; } @@ -52,7 +57,20 @@ public class DashboardNewsStuv extends News { } }); - // show newsListItems + RelativeLayout container = (RelativeLayout) oFragmentView; + container.removeAllViews(); + + if(newsListItems.size() > 0) { + container.addView(newsEntryPanel); + + TextView dateView = (TextView) newsEntryPanel.findViewById(R.id.newsDate); + TextView titleView = (TextView) newsEntryPanel.findViewById(R.id.newsTitle); + NewsListItem newsItem = newsListItems.get(0); + + dateView.setText(newsItem.getFormatedDate()); + titleView.setText(newsItem.getTitle()); + } else + container.addView(newsNonePanel); } } diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardVorlesungsplan.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardVorlesungsplan.java index bb0105d..91e56c4 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardVorlesungsplan.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/DashboardVorlesungsplan.java @@ -44,7 +44,7 @@ public class DashboardVorlesungsplan extends CampusAppFragment { view = inflater.inflate(R.layout.fragment_dashboard_timetable, container, false); String kursTag = AppContext.getDatabaseManager().getRuntimeCache("CourseName"); if(kursTag == null || kursTag.isEmpty()) { - return null; + return view; } courseName = kursTag; return view; diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/SplashScreen.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/SplashScreen.java index 83d773f..961a32b 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/SplashScreen.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/SplashScreen.java @@ -142,7 +142,7 @@ public class SplashScreen extends CampusAppFragment { indices.setDescription("Vorlesung " + event.getEventTitle()); indices.addKeyWord(event.getGroupTitle()); indices.addKeyWord(event.getEventLocation()); - return null; + return indices; } }); } @@ -164,11 +164,11 @@ public class SplashScreen extends CampusAppFragment { SearchIndices indices = new SearchIndices("Vorlesungsplan#Group"+group.getGroupId(), false); indices.setUpdateTime(event.getEventFrom()); indices.setTarget("#Vorlesungsplan#groupid=" + group.getGroupId()); - indices.setTitle("Vorlesungsplan " + event.getCourseName()); - indices.setDescription("Vorlesung " + event.getEventTitle()); + indices.setTitle(AppContext.getResString(R.string.search_vorlesungsplan_group_title, event.getCourseName())); + indices.setDescription(event.getEventTitle()); indices.addKeyWord(event.getGroupTitle()); indices.addKeyWord(event.getEventLocation()); - return null; + return indices; } }); } diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/Vorlesungsplan.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/Vorlesungsplan.java index d4b8bb6..a0bde34 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/Vorlesungsplan.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/Vorlesungsplan.java @@ -10,6 +10,9 @@ import android.support.v4.view.ViewPager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import android.widget.LinearLayout; +import android.widget.RelativeLayout; +import android.widget.TextView; import java.text.SimpleDateFormat; import java.util.ArrayList; @@ -17,9 +20,12 @@ import java.util.Calendar; import java.util.Date; import java.util.List; +import de.dhbwloe.campusapp.CampusAppContext; import de.dhbwloe.campusapp.CampusAppFragment; import de.dhbwloe.campusapp.R; import de.dhbwloe.campusapp.search.SearchIndices; +import de.dhbwloe.campusapp.vorlesungen.CourseEvent; +import de.dhbwloe.campusapp.vorlesungen.CourseGroup; /** * A simple {@link Fragment} subclass. @@ -39,7 +45,7 @@ public class Vorlesungsplan extends CampusAppFragment { setDescription(R.string.search_vorlesungsplan_description); addKeyWord(R.string.search_vorlesungsplan_keywords); }}, - new SearchIndices("Vorlesungsplan", true) {{ + new SearchIndices("VorlesungsplanExams", true) {{ setUpdateTime(1); setTarget("#Vorlesungsplan#view=exams"); setTitle(R.string.search_vorlesungsplan_klausur_title); @@ -50,16 +56,44 @@ public class Vorlesungsplan extends CampusAppFragment { } @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, - Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_vorlesungsplan, container, false); - AppContext.setTitle(AppContext.getResString(R.string.vorlesungsplan_title)); + public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { + Bundle arguments = getArguments(); + int showGroupId = 0; + boolean showExamsPage = false; + if(arguments != null) { + String groupid = arguments.getString("groupid"); + if(groupid != null) + showGroupId = Integer.parseInt(groupid); + String view = arguments.getString("view"); + if(view != null && view.equalsIgnoreCase("exams")) + showExamsPage = true; + } + + View view = null; + if(showGroupId > 0) { + view = inflater.inflate(R.layout.fragment_vorlesungsplan_group, container, false); + + CourseGroup group = AppContext.getDatabaseManager().getCourseGroup(showGroupId); + if(group != null) { + AppContext.setTitle(AppContext.getResString(R.string.vorlesungsplan_group_title, group.getGroupName())); + + showGroupEvents(view, group); + } else + view = null; + } + if(view == null) { + view = inflater.inflate(R.layout.fragment_vorlesungsplan, container, false); + AppContext.setTitle(AppContext.getResString(R.string.vorlesungsplan_title)); + + ViewPager pager = (ViewPager) view.findViewById(R.id.viewpager); + setupViewPager(pager); - ViewPager pager = (ViewPager) view.findViewById(R.id.viewpager); - setupViewPager(pager); + if(showExamsPage) + pager.setCurrentItem(2); - TabLayout tabLayout = (TabLayout) view.findViewById(R.id.tabs); - tabLayout.setupWithViewPager(pager); + TabLayout tabLayout = (TabLayout) view.findViewById(R.id.tabs); + tabLayout.setupWithViewPager(pager); + } return view; } @@ -97,6 +131,81 @@ public class Vorlesungsplan extends CampusAppFragment { }); } + private void showGroupEvents(View view, CourseGroup group) { + CourseEvent events[] = AppContext.getDatabaseManager().getCourseEventsByGroup(group); + + CourseEvent nextEvent = null; + CourseEvent lastEvent = null; + CourseEvent examEvent = null; + long now = (new Date()).getTime()/1000; + SimpleDateFormat dateFormat = new SimpleDateFormat(AppContext.getResString(R.string.timeformat_vorlesungsplan_fulldate)); + + LinearLayout container = (LinearLayout) view.findViewById(R.id.allEventsList); + TextView groupName = (TextView) view.findViewById(R.id.courseTitle); + TextView nextEventView = (TextView) view.findViewById(R.id.nextEvent); + TextView lastEventView = (TextView) view.findViewById(R.id.lastEvent); + TextView examEventView = (TextView) view.findViewById(R.id.klausurEvent); + + groupName.setText(group.getGroupName()); + container.removeAllViews(); + + for(CourseEvent event : events) { + if(event.getEventFrom() >= now && nextEvent == null) + nextEvent = event; + if(event.getCourseType() == CourseEvent.CourseType.COURSETYPE_KLAUSUR) + examEvent = event; + else + lastEvent = event; + + LinearLayout eventEntry = new LinearLayout(view.getContext()); + eventEntry.setLayoutParams(new LinearLayout.LayoutParams(RelativeLayout.LayoutParams.WRAP_CONTENT, + RelativeLayout.LayoutParams.WRAP_CONTENT)); + eventEntry.setOrientation(LinearLayout.HORIZONTAL); + + TextView dotView = new TextView(view.getContext()); + dotView.setText(AppContext.getResString(R.string.listDot)); + eventEntry.addView(dotView); + + if(event.getEventFrom() < now) + dotView.setTextColor(AppContext.getMainActivity().getResources().getColor(R.color.color_dhbw_lightgray)); + else + dotView.setTextColor(AppContext.getMainActivity().getResources().getColor(R.color.color_dhbw_darkred)); + + TextView nameView = new TextView(view.getContext()); + LinearLayout.LayoutParams nameViewLayoutParams = new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); + nameViewLayoutParams.setMargins(16,0,0,0); + nameView.setLayoutParams(nameViewLayoutParams); + nameView.setText(dateFormat.format(new Date(event.getEventFrom() * 1000))); + eventEntry.addView(nameView); + + TextView locationView = new TextView(view.getContext()); + LinearLayout.LayoutParams locationViewLayoutParams = new LinearLayout.LayoutParams( + LinearLayout.LayoutParams.WRAP_CONTENT, LinearLayout.LayoutParams.WRAP_CONTENT); + locationViewLayoutParams.setMargins(32,0,0,0); + locationView.setLayoutParams(locationViewLayoutParams); + locationView.setText(event.getEventLocation()); + eventEntry.addView(locationView); + + container.addView(eventEntry); + } + + if(nextEvent != null) + nextEventView.setText(dateFormat.format(new Date(nextEvent.getEventFrom() * 1000))); + else + nextEventView.setText(CampusAppContext.getInstance().getResString(R.string.vorlesungsplan_groups_nonext)); + + if(lastEvent != null) + lastEventView.setText(dateFormat.format(new Date(lastEvent.getEventFrom() * 1000))); + else + lastEventView.setText(CampusAppContext.getInstance().getResString(R.string.vorlesungsplan_groups_nonext)); + + if(examEvent != null) + examEventView.setText(dateFormat.format(new Date(examEvent.getEventFrom() * 1000))); + else + examEventView.setText(CampusAppContext.getInstance().getResString(R.string.vorlesungsplan_groups_noklausur)); + } + class ViewPagerAdapter extends FragmentPagerAdapter { private final List mFragmentList = new ArrayList<>(); private final List mFragmentTitleList = new ArrayList<>(); diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanExams.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanExams.java index 1d089c0..a8aa4a4 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanExams.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanExams.java @@ -70,6 +70,7 @@ public class VorlesungsplanExams extends CampusAppFragment implements Vorlesungs event.getEventId(), coursename, event.getEventTitle(), + event.getEventLocation(), event.getEventFrom(), event.getEventTo(), 1 diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanExamsListAdapter.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanExamsListAdapter.java index a880be8..4fb489c 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanExamsListAdapter.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanExamsListAdapter.java @@ -49,6 +49,7 @@ public class VorlesungsplanExamsListAdapter extends ArrayAdapter parent, View view, int position, long id) { + VorlesungsplanGroupsListItem item = listItems.get(position); + + Bundle args = new Bundle(); + args.putString("groupid", Integer.toString(item.getGroupId())); + AppContext.getNavigationManager().navigatePage("Vorlesungsplan", args); + } + }); + return view; } diff --git a/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanUpcomingCourseListItem.java b/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanUpcomingCourseListItem.java index 6fc45f4..7235795 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanUpcomingCourseListItem.java +++ b/app/src/main/java/de/dhbwloe/campusapp/fragments/VorlesungsplanUpcomingCourseListItem.java @@ -1,6 +1,7 @@ package de.dhbwloe.campusapp.fragments; import android.content.Context; +import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; import android.widget.TextView; @@ -11,6 +12,7 @@ import java.util.Date; import de.dhbwloe.campusapp.CampusAppContext; import de.dhbwloe.campusapp.R; import de.dhbwloe.campusapp.vorlesungen.CourseEvent; +import de.dhbwloe.campusapp.vorlesungen.CourseGroup; /** * Created by pk910 on 20.02.2016. @@ -24,6 +26,14 @@ public class VorlesungsplanUpcomingCourseListItem { public void updateContainerView(View view) { + android.support.v7.widget.CardView cardView = (android.support.v7.widget.CardView) view.findViewById(R.id.card_upcomingday); + cardView.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + onEventClicked(); + } + }); + SimpleDateFormat dateFormat = new SimpleDateFormat(CampusAppContext.getInstance().getResString(R.string.timeformat_vorlesungsplan_time)); TextView timeFrom = (TextView) view.findViewById(R.id.timeFrom); TextView timeTo = (TextView) view.findViewById(R.id.timeTo); @@ -39,4 +49,13 @@ public class VorlesungsplanUpcomingCourseListItem { location.setText(event.getEventLocation()); courseTitle.setText(event.getEventTitle()); } + + private void onEventClicked() { + Bundle args = new Bundle(); + CourseGroup group = event.getCourseGroup(); + if(group == null) + return; + args.putString("groupid", Integer.toString(group.getGroupId())); + CampusAppContext.getInstance().getNavigationManager().navigatePage("Vorlesungsplan", args); + } } diff --git a/app/src/main/java/de/dhbwloe/campusapp/network/IscRequestHelper.java b/app/src/main/java/de/dhbwloe/campusapp/network/IscRequestHelper.java index f840366..613b511 100644 --- a/app/src/main/java/de/dhbwloe/campusapp/network/IscRequestHelper.java +++ b/app/src/main/java/de/dhbwloe/campusapp/network/IscRequestHelper.java @@ -43,7 +43,7 @@ public abstract class IscRequestHelper { String error = null; try { error = new String(errorResponse, "US-ASCII"); - } catch (UnsupportedEncodingException e1) { + } catch (Exception e1) { } Log.i("HTTPClient", " Error: " + statusCode + " - " + error); onCalendarRequestFail(statusCode, error); diff --git a/app/src/main/res/layout/fragment_dashboard.xml b/app/src/main/res/layout/fragment_dashboard.xml index 8c8ac46..8b71f0a 100644 --- a/app/src/main/res/layout/fragment_dashboard.xml +++ b/app/src/main/res/layout/fragment_dashboard.xml @@ -56,7 +56,7 @@ @@ -133,7 +133,7 @@ android:layout_below="@+id/imageView6" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - tools:layout="@layout/fragment_dashboard_news_dhbw" /> + tools:layout="@layout/fragment_dashboard_news_entry" /> @@ -168,7 +168,7 @@ android:layout_below="@+id/imageView7" android:layout_alignParentLeft="true" android:layout_alignParentStart="true" - tools:layout="@layout/fragment_dashboard_news_stuv" /> + tools:layout="@layout/fragment_dashboard_news_none" /> diff --git a/app/src/main/res/layout/fragment_dashboard_mensa_menu.xml b/app/src/main/res/layout/fragment_dashboard_mensa_menu.xml index d1e388a..70751f0 100644 --- a/app/src/main/res/layout/fragment_dashboard_mensa_menu.xml +++ b/app/src/main/res/layout/fragment_dashboard_mensa_menu.xml @@ -1,14 +1,14 @@ - - + android:layout_marginLeft="8dp" + android:layout_weight="1" /> - + + diff --git a/app/src/main/res/layout/fragment_dashboard_news_dhbw.xml b/app/src/main/res/layout/fragment_dashboard_news_dhbw.xml deleted file mode 100644 index 38df6d2..0000000 --- a/app/src/main/res/layout/fragment_dashboard_news_dhbw.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/fragment_dashboard_news_entry.xml b/app/src/main/res/layout/fragment_dashboard_news_entry.xml new file mode 100644 index 0000000..e44b17a --- /dev/null +++ b/app/src/main/res/layout/fragment_dashboard_news_entry.xml @@ -0,0 +1,27 @@ + + + + + + + + diff --git a/app/src/main/res/layout/fragment_dashboard_news_none.xml b/app/src/main/res/layout/fragment_dashboard_news_none.xml new file mode 100644 index 0000000..197cd4b --- /dev/null +++ b/app/src/main/res/layout/fragment_dashboard_news_none.xml @@ -0,0 +1,17 @@ + + + + + + diff --git a/app/src/main/res/layout/fragment_dashboard_news_stuv.xml b/app/src/main/res/layout/fragment_dashboard_news_stuv.xml deleted file mode 100644 index a7900dc..0000000 --- a/app/src/main/res/layout/fragment_dashboard_news_stuv.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/app/src/main/res/layout/fragment_vorlesungsplan_exams_exam.xml b/app/src/main/res/layout/fragment_vorlesungsplan_exams_exam.xml index 15cb59b..3ec019a 100644 --- a/app/src/main/res/layout/fragment_vorlesungsplan_exams_exam.xml +++ b/app/src/main/res/layout/fragment_vorlesungsplan_exams_exam.xml @@ -38,17 +38,25 @@ + + + + + android:layout_alignStart="@+id/eventDate" + android:layout_alignBottom="@+id/textView18" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/values-en/strings.xml b/app/src/main/res/values-en/strings.xml new file mode 100644 index 0000000..e86f5a1 --- /dev/null +++ b/app/src/main/res/values-en/strings.xml @@ -0,0 +1,170 @@ + + DHBW Campus App + Campus App + + Open navigation drawer + Close navigation drawer + + Settings + + Monday + Thuesday + Wednesday + Thuesday + Friday + Saturday + Sunday + + Mon + Tue + Wed + Thu + Fri + Sat + Sun + + MM/dd + HH:mm + MM/dd + MM/dd/yyyy + MM/dd/yyyy HH:mm + HH:mm + MM/dd + MM/dd/yyyy HH:mm + MM/dd/yyyy + #,##0.00 € + + Search: %s + Campus App + DHBW Search + Stuv Search + + Dashboard + App Dashboard :) + home, dashboard, start, overview + Imprint + App Imprint + autor, author, contact, imprint + Dining Hall + current dining hall plans + mensa, diner, dining hall, eat, lunch, food, plan, hunger + News + DHBW & Stuv News + news, dhbw, stuv, dates, appointment, events + Lecture Plan + Your lecture plan + vorlesung, vorlesungen, plan, vorlesungsplan, stundenplan, termin, termine, kursplan, blockplan, block, zeit, zeiten, lecture, course, time, dates, deadlines + Lecture Plan + Your exams + klausuren, prüfungen, exams, termine, zeitpunkt, plan, ergebnisse, results + Wifi Settings + Wifi configuration for your device + wlan, secure, dhbw-secure, wifi, w-lan, wireless, internet, netzwerk, network + + Dashboard + Dining Hall + Lecture Plan + Today + Tomorrow + + Exam: + + Menu + Menu: %s + TGIF! + Card Balance + Your balance: + + Lecture Plan + Next lecture + Lecture Overview + Exam Overview + Show past lectures + Next lecture: + Last lecture: + - none - + - none - + Exam: + Presentation: + + Date: + Start: + End: + + Imprint + Campus App + This App was developed as part of the lecture \n\'Entwicklung mobiler Apps\'. + Developed by: + Sourcecode: + + News + DHBW News + STUV News + STUV Events + more... + + Settings + Lecture Plan + Your course description: + Example: tif13a, win14a, wwi15b + Dining Hall Menu + Your profession: + + Student + Employee + Pupil + Guest + + + Please enter your course description: + (eg. tif13a, win14a, wwi15b) + Ok + You can sign in as guest. You will then, however, not have the full functionality. + Run as Guest + You can change your course description in the app settings anytime. + Due to the incredibly high speed of the DHBW infrastructure, the initial bootup may take a few moments. + + PSK: + Warning: This network is potentially insecure! + + DHBW offers various ways to connect your device to WiFi networks. + SSID: + Security: + EAP-Method: + Phase 2-Authentification: + CA-Certificate: + Username: + Password: + + Public + WEP + WPA/WPA2 PSK + WPA/WPA2 Enterprise + + PEAP + TLS + TTLS + PWD + + MSCHAPv2 + GTC + + Connect now! + Network not available + Scanning... + WiFi module deactivated! + Connected! + Connecting... + Authenticating... + Login failed! + + WLAN Status: + Connected to %1$s + Connecting to %1$s... + Not Connected! + + + + Hello blank fragment + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index cb90f70..f2fe27d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,6 +6,7 @@ Close navigation drawer Settings + • Montag Dienstag @@ -52,6 +53,7 @@ News der DHBW & Stuv news, dhbw, stuv, termin, termine Vorlesungsplan + Vorlesungsplan: %s Vorlesungsplan dienes Kurses vorlesung, vorlesungen, plan, vorlesungsplan, stundenplan, termin, termine, kursplan, blockplan, block, zeit, zeiten Vorlesungsplan @@ -66,6 +68,7 @@ Vorlesungsplan Heute Morgen + - keine - Klausur: @@ -76,6 +79,7 @@ Dein Guthaben: Vorlesungsplan + Vorlesung: %s Nächste Kurse Kursübersicht Klausurübersicht @@ -88,9 +92,12 @@ Präsentation: Datum: + Raum: Beginn: Ende: + Alle Vorlesungen: + Impressum Campus App Diese App wurde im Rahmen der Vorlesung \n\'Entwicklung mobiler Apps\' erstellt. @@ -117,7 +124,7 @@ Bitte tippe deine Kursbezeichnung ein: - () + (Beispiel: tif13a, win14a, wwi15b) Ok Alternativ kannst du die App auch als Gast starten. Jedoch stehen im Gastmodus nicht alle Funktionen zur verfügung. Als Gast starten