Added News Fragment
This commit is contained in:
@@ -27,6 +27,7 @@ import androidx.fragment.app.FragmentTransaction;
|
|||||||
import de.sebse.fuplanner.fragments.CanteensFragment;
|
import de.sebse.fuplanner.fragments.CanteensFragment;
|
||||||
import de.sebse.fuplanner.fragments.LoginFragment;
|
import de.sebse.fuplanner.fragments.LoginFragment;
|
||||||
import de.sebse.fuplanner.fragments.ModulesFragment;
|
import de.sebse.fuplanner.fragments.ModulesFragment;
|
||||||
|
import de.sebse.fuplanner.fragments.NewsFragment;
|
||||||
import de.sebse.fuplanner.fragments.PrefsFragment;
|
import de.sebse.fuplanner.fragments.PrefsFragment;
|
||||||
import de.sebse.fuplanner.fragments.ScheduleFragment;
|
import de.sebse.fuplanner.fragments.ScheduleFragment;
|
||||||
import de.sebse.fuplanner.fragments.StartupFragment;
|
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 = 5;
|
||||||
private static final int FRAGMENT_CANTEENS_DETAILS = 6;
|
private static final int FRAGMENT_CANTEENS_DETAILS = 6;
|
||||||
private static final int FRAGMENT_PREFERENCES = 7;
|
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_PAGE = "fragment_page";
|
||||||
private static final String ARG_FRAGMENT_STATUS = "fragment_status";
|
private static final String ARG_FRAGMENT_STATUS = "fragment_status";
|
||||||
@@ -171,6 +173,9 @@ public class MainActivity extends AppCompatActivity
|
|||||||
case R.id.nav_canteens:
|
case R.id.nav_canteens:
|
||||||
changeFragment(FRAGMENT_CANTEENS);
|
changeFragment(FRAGMENT_CANTEENS);
|
||||||
break;
|
break;
|
||||||
|
case R.id.nav_news:
|
||||||
|
changeFragment(FRAGMENT_NEWS);
|
||||||
|
break;
|
||||||
case R.id.nav_settings:
|
case R.id.nav_settings:
|
||||||
changeFragment(FRAGMENT_PREFERENCES);
|
changeFragment(FRAGMENT_PREFERENCES);
|
||||||
break;
|
break;
|
||||||
@@ -319,6 +324,9 @@ public class MainActivity extends AppCompatActivity
|
|||||||
case FRAGMENT_CANTEENS:
|
case FRAGMENT_CANTEENS:
|
||||||
fragment = CanteensFragment.newInstance();
|
fragment = CanteensFragment.newInstance();
|
||||||
break;
|
break;
|
||||||
|
case FRAGMENT_NEWS:
|
||||||
|
fragment = NewsFragment.newInstance();
|
||||||
|
break;
|
||||||
case FRAGMENT_PREFERENCES:
|
case FRAGMENT_PREFERENCES:
|
||||||
fragment = PrefsFragment.newInstance();
|
fragment = PrefsFragment.newInstance();
|
||||||
break;
|
break;
|
||||||
@@ -394,6 +402,9 @@ public class MainActivity extends AppCompatActivity
|
|||||||
case FRAGMENT_CANTEENS:
|
case FRAGMENT_CANTEENS:
|
||||||
mNavigationView.getMenu().findItem(R.id.nav_canteens).setChecked(true);
|
mNavigationView.getMenu().findItem(R.id.nav_canteens).setChecked(true);
|
||||||
break;
|
break;
|
||||||
|
case FRAGMENT_NEWS:
|
||||||
|
mNavigationView.getMenu().findItem(R.id.nav_news).setChecked(true);
|
||||||
|
break;
|
||||||
case FRAGMENT_PREFERENCES:
|
case FRAGMENT_PREFERENCES:
|
||||||
mNavigationView.getMenu().findItem(R.id.nav_settings).setChecked(true);
|
mNavigationView.getMenu().findItem(R.id.nav_settings).setChecked(true);
|
||||||
break;
|
break;
|
||||||
@@ -486,11 +497,13 @@ public class MainActivity extends AppCompatActivity
|
|||||||
@Override
|
@Override
|
||||||
public void onModulesFragmentInteraction(final String itemID) {
|
public void onModulesFragmentInteraction(final String itemID) {
|
||||||
changeFragment(FRAGMENT_MODULES_DETAILS, itemID);
|
changeFragment(FRAGMENT_MODULES_DETAILS, itemID);
|
||||||
|
setNavigationSelection();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onCanteensFragmentInteraction(final int itemID) {
|
public void onCanteensFragmentInteraction(final int itemID) {
|
||||||
changeFragment(FRAGMENT_CANTEENS_DETAILS, String.valueOf(itemID));
|
changeFragment(FRAGMENT_CANTEENS_DETAILS, String.valueOf(itemID));
|
||||||
|
setNavigationSelection();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
@@ -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);
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
9
app/src/main/res/drawable/ic_chat_bubble.xml
Normal file
9
app/src/main/res/drawable/ic_chat_bubble.xml
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
android:width="24dp"
|
||||||
|
android:height="24dp"
|
||||||
|
android:viewportWidth="24.0"
|
||||||
|
android:viewportHeight="24.0">
|
||||||
|
<path
|
||||||
|
android:fillColor="#FF000000"
|
||||||
|
android:pathData="M20,2H4c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2z"/>
|
||||||
|
</vector>
|
||||||
14
app/src/main/res/layout/fragment_news.xml
Normal file
14
app/src/main/res/layout/fragment_news.xml
Normal file
@@ -0,0 +1,14 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
tools:context=".fragments.NewsFragment">
|
||||||
|
|
||||||
|
<!-- TODO: Update blank fragment layout -->
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent"
|
||||||
|
android:text="@string/hello_blank_fragment" />
|
||||||
|
|
||||||
|
</FrameLayout>
|
||||||
@@ -7,15 +7,21 @@
|
|||||||
android:icon="@drawable/ic_local_dining"
|
android:icon="@drawable/ic_local_dining"
|
||||||
android:title="@string/canteen_plan"
|
android:title="@string/canteen_plan"
|
||||||
android:orderInCategory="200" />
|
android:orderInCategory="200" />
|
||||||
|
<item
|
||||||
|
android:id="@+id/nav_news"
|
||||||
|
android:icon="@drawable/ic_chat_bubble"
|
||||||
|
android:title="@string/news"
|
||||||
|
android:orderInCategory="400"/>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<item android:title="@string/options">
|
<item android:title="@string/options"
|
||||||
|
android:orderInCategory="599">
|
||||||
<menu>
|
<menu>
|
||||||
<item
|
<item
|
||||||
android:id="@+id/nav_share"
|
android:id="@+id/nav_share"
|
||||||
android:icon="@drawable/ic_menu_share"
|
android:icon="@drawable/ic_menu_share"
|
||||||
android:title="@string/share"
|
android:title="@string/share"
|
||||||
android:orderInCategory="600"/>
|
android:orderInCategory="700"/>
|
||||||
</menu>
|
</menu>
|
||||||
</item>
|
</item>
|
||||||
|
|
||||||
|
|||||||
@@ -22,21 +22,26 @@
|
|||||||
android:icon="@drawable/ic_settings"
|
android:icon="@drawable/ic_settings"
|
||||||
android:title="@string/settings"
|
android:title="@string/settings"
|
||||||
android:orderInCategory="300"/>
|
android:orderInCategory="300"/>
|
||||||
|
<item
|
||||||
|
android:id="@+id/nav_news"
|
||||||
|
android:icon="@drawable/ic_chat_bubble"
|
||||||
|
android:title="@string/news"
|
||||||
|
android:orderInCategory="400"/>
|
||||||
</group>
|
</group>
|
||||||
|
|
||||||
<item android:title="@string/options"
|
<item android:title="@string/options"
|
||||||
android:orderInCategory="499">
|
android:orderInCategory="599">
|
||||||
<menu>
|
<menu>
|
||||||
<item
|
<item
|
||||||
android:id="@+id/nav_logout"
|
android:id="@+id/nav_logout"
|
||||||
android:icon="@drawable/ic_exit_to_app"
|
android:icon="@drawable/ic_exit_to_app"
|
||||||
android:title="@string/log_out"
|
android:title="@string/log_out"
|
||||||
android:orderInCategory="500"/>
|
android:orderInCategory="600"/>
|
||||||
<item
|
<item
|
||||||
android:id="@+id/nav_share"
|
android:id="@+id/nav_share"
|
||||||
android:icon="@drawable/ic_menu_share"
|
android:icon="@drawable/ic_menu_share"
|
||||||
android:title="@string/share"
|
android:title="@string/share"
|
||||||
android:orderInCategory="600"/>
|
android:orderInCategory="700"/>
|
||||||
</menu>
|
</menu>
|
||||||
</item>
|
</item>
|
||||||
|
|
||||||
|
|||||||
@@ -78,4 +78,5 @@
|
|||||||
<string name="lecturers">Dozenten</string>
|
<string name="lecturers">Dozenten</string>
|
||||||
<string name="mail_icon">Mail Icon</string>
|
<string name="mail_icon">Mail Icon</string>
|
||||||
<string name="mail_default_text">Hallo %1$s, \n\n\n\nMit freundlichen Grüßen\n\n\n\nGesendet von der FUPlanner Android App</string>
|
<string name="mail_default_text">Hallo %1$s, \n\n\n\nMit freundlichen Grüßen\n\n\n\nGesendet von der FUPlanner Android App</string>
|
||||||
|
<string name="news">Neuigkeiten</string>
|
||||||
</resources>
|
</resources>
|
||||||
@@ -86,4 +86,5 @@
|
|||||||
<string name="lecturers">Lecturers</string>
|
<string name="lecturers">Lecturers</string>
|
||||||
<string name="mail_icon">Mail Icon</string>
|
<string name="mail_icon">Mail Icon</string>
|
||||||
<string name="mail_default_text">Dear %1$s, \n\n\n\nYours sincerely\n\n\n\nSend by FUPlanner Android App</string>
|
<string name="mail_default_text">Dear %1$s, \n\n\n\nYours sincerely\n\n\n\nSend by FUPlanner Android App</string>
|
||||||
|
<string name="news">News</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|||||||
Reference in New Issue
Block a user