diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
index 554213e..2467c20 100644
--- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java
+++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java
@@ -27,6 +27,7 @@ import androidx.fragment.app.FragmentTransaction;
import de.sebse.fuplanner.fragments.CanteensFragment;
import de.sebse.fuplanner.fragments.LoginFragment;
import de.sebse.fuplanner.fragments.ModulesFragment;
+import de.sebse.fuplanner.fragments.NewsFragment;
import de.sebse.fuplanner.fragments.PrefsFragment;
import de.sebse.fuplanner.fragments.ScheduleFragment;
import de.sebse.fuplanner.fragments.StartupFragment;
@@ -63,6 +64,7 @@ public class MainActivity extends AppCompatActivity
private static final int FRAGMENT_CANTEENS = 5;
private static final int FRAGMENT_CANTEENS_DETAILS = 6;
private static final int FRAGMENT_PREFERENCES = 7;
+ private static final int FRAGMENT_NEWS = 8;
private static final String ARG_FRAGMENT_PAGE = "fragment_page";
private static final String ARG_FRAGMENT_STATUS = "fragment_status";
@@ -171,6 +173,9 @@ public class MainActivity extends AppCompatActivity
case R.id.nav_canteens:
changeFragment(FRAGMENT_CANTEENS);
break;
+ case R.id.nav_news:
+ changeFragment(FRAGMENT_NEWS);
+ break;
case R.id.nav_settings:
changeFragment(FRAGMENT_PREFERENCES);
break;
@@ -319,6 +324,9 @@ public class MainActivity extends AppCompatActivity
case FRAGMENT_CANTEENS:
fragment = CanteensFragment.newInstance();
break;
+ case FRAGMENT_NEWS:
+ fragment = NewsFragment.newInstance();
+ break;
case FRAGMENT_PREFERENCES:
fragment = PrefsFragment.newInstance();
break;
@@ -394,6 +402,9 @@ public class MainActivity extends AppCompatActivity
case FRAGMENT_CANTEENS:
mNavigationView.getMenu().findItem(R.id.nav_canteens).setChecked(true);
break;
+ case FRAGMENT_NEWS:
+ mNavigationView.getMenu().findItem(R.id.nav_news).setChecked(true);
+ break;
case FRAGMENT_PREFERENCES:
mNavigationView.getMenu().findItem(R.id.nav_settings).setChecked(true);
break;
@@ -486,11 +497,13 @@ public class MainActivity extends AppCompatActivity
@Override
public void onModulesFragmentInteraction(final String itemID) {
changeFragment(FRAGMENT_MODULES_DETAILS, itemID);
+ setNavigationSelection();
}
@Override
public void onCanteensFragmentInteraction(final int itemID) {
changeFragment(FRAGMENT_CANTEENS_DETAILS, String.valueOf(itemID));
+ setNavigationSelection();
}
@Override
diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/NewsFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/NewsFragment.java
new file mode 100644
index 0000000..8608b1c
--- /dev/null
+++ b/app/src/main/java/de/sebse/fuplanner/fragments/NewsFragment.java
@@ -0,0 +1,52 @@
+package de.sebse.fuplanner.fragments;
+
+
+import android.os.Bundle;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.Fragment;
+
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import de.sebse.fuplanner.R;
+
+/**
+ * A simple {@link Fragment} subclass.
+ * Use the {@link NewsFragment#newInstance} factory method to
+ * create an instance of this fragment.
+ */
+public class NewsFragment extends Fragment {
+ // TODO: Rename parameter arguments, choose names that match
+ // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER
+
+ // TODO: Rename and change types of parameters
+
+
+ public NewsFragment() {
+ // Required empty public constructor
+ }
+
+ /**
+ * Use this factory method to create a new instance of
+ * this fragment using the provided parameters.
+ *
+ * @return A new instance of fragment NewsFragment.
+ */
+ // TODO: Rename and change types and number of parameters
+ public static NewsFragment newInstance() {
+ NewsFragment fragment = new NewsFragment();
+ Bundle args = new Bundle();
+ fragment.setArguments(args);
+ return fragment;
+ }
+
+ @Override
+ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
+ Bundle savedInstanceState) {
+ // Inflate the layout for this fragment
+ return inflater.inflate(R.layout.fragment_news, container, false);
+ }
+
+}
diff --git a/app/src/main/res/drawable/ic_chat_bubble.xml b/app/src/main/res/drawable/ic_chat_bubble.xml
new file mode 100644
index 0000000..3eeab82
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chat_bubble.xml
@@ -0,0 +1,9 @@
+
+
+
diff --git a/app/src/main/res/layout/fragment_news.xml b/app/src/main/res/layout/fragment_news.xml
new file mode 100644
index 0000000..d15d0f0
--- /dev/null
+++ b/app/src/main/res/layout/fragment_news.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_drawer.xml b/app/src/main/res/menu/activity_main_drawer.xml
index 70a4a2d..6573329 100644
--- a/app/src/main/res/menu/activity_main_drawer.xml
+++ b/app/src/main/res/menu/activity_main_drawer.xml
@@ -7,15 +7,21 @@
android:icon="@drawable/ic_local_dining"
android:title="@string/canteen_plan"
android:orderInCategory="200" />
+
- -
+
-
diff --git a/app/src/main/res/menu/activity_main_drawer_login.xml b/app/src/main/res/menu/activity_main_drawer_login.xml
index 8d10d2a..55f4cee 100644
--- a/app/src/main/res/menu/activity_main_drawer_login.xml
+++ b/app/src/main/res/menu/activity_main_drawer_login.xml
@@ -22,21 +22,26 @@
android:icon="@drawable/ic_settings"
android:title="@string/settings"
android:orderInCategory="300"/>
+
-
+ android:orderInCategory="599">
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 391fdab..2e986bb 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -78,4 +78,5 @@
Dozenten
Mail Icon
Hallo %1$s, \n\n\n\nMit freundlichen Grüßen\n\n\n\nGesendet von der FUPlanner Android App
+ Neuigkeiten
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5406d03..815c903 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -86,4 +86,5 @@
Lecturers
Mail Icon
Dear %1$s, \n\n\n\nYours sincerely\n\n\n\nSend by FUPlanner Android App
+ News