From 73d0b155e1bf5d30557d5587ea1a880ad411b39a Mon Sep 17 00:00:00 2001 From: Joshua <8Joshua@web.de> Date: Tue, 3 Jul 2018 14:26:08 +0200 Subject: [PATCH] =?UTF-8?q?Fragment=20f=C3=BCr=20Stundenplan=20hinzugef?= =?UTF-8?q?=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + .../java/de/sebse/fuplanner/MainActivity.java | 17 ++- .../fuplanner/fragments/ScheduleFragment.java | 109 ++++++++++++++++++ app/src/main/res/layout/fragment_schedule.xml | 14 +++ app/src/main/res/values/strings.xml | 3 + 5 files changed, 141 insertions(+), 3 deletions(-) create mode 100644 app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java create mode 100644 app/src/main/res/layout/fragment_schedule.xml diff --git a/app/build.gradle b/app/build.gradle index f23641c..c2b5fe0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -45,6 +45,7 @@ dependencies { 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 'org.jetbrains:annotations-java5:15.0' + implementation 'com.github.alamkanak:android-week-view:1.2.6' implementation 'com.ms-square:expandableTextView:0.1.4' implementation files('libs/jericho-html-3.4.jar') } diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index d82b2e1..707d3ac 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -19,6 +19,7 @@ import android.view.MenuItem; import java.util.Iterator; import de.sebse.fuplanner.fragments.LoginFragment; +import de.sebse.fuplanner.fragments.ScheduleFragment; import de.sebse.fuplanner.fragments.moddetails.ModDetailFragment; import de.sebse.fuplanner.fragments.ModulesFragment; import de.sebse.fuplanner.fragments.StartupFragment; @@ -32,7 +33,8 @@ public class MainActivity extends AppCompatActivity implements NavigationView.OnNavigationItemSelectedListener, LoginFragment.OnLoginFragmentInteractionListener, ModulesFragment.OnModulesFragmentInteractionListener, - ModDetailFragment.OnModuleDetailFragmentInteractionListener { + ModDetailFragment.OnModuleDetailFragmentInteractionListener, + ScheduleFragment.OnFragmentInteractionListener { FragmentManager fragmentManager; private GoogleAuth mGoogleAuth; @@ -127,14 +129,18 @@ public class MainActivity extends AppCompatActivity // Handle navigation view item clicks here. int id = item.getItemId(); + FragmentTransaction fragmentTransaction; switch (id) { case R.id.nav_modules: - FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction = fragmentManager.beginTransaction(); fragmentTransaction.replace(R.id.fragcontainer, ModulesFragment.newInstance()); fragmentTransaction.commit(); break; case R.id.nav_schedule: - + log.d("Stundenplan"); + fragmentTransaction = fragmentManager.beginTransaction(); + fragmentTransaction.replace(R.id.fragcontainer, ScheduleFragment.newInstance("bla","bla")); + fragmentTransaction.commit(); break; case R.id.nav_share: @@ -264,4 +270,9 @@ public class MainActivity extends AppCompatActivity public void onModuleDetailFragmentInteraction(Uri uri) { log.d("Cooles ding"); } + + @Override + public void onFragmentInteraction(Uri uri) { + + } } diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java new file mode 100644 index 0000000..e5c6ae0 --- /dev/null +++ b/app/src/main/java/de/sebse/fuplanner/fragments/ScheduleFragment.java @@ -0,0 +1,109 @@ +package de.sebse.fuplanner.fragments; + +import android.content.Context; +import android.net.Uri; +import android.os.Bundle; +import android.support.v4.app.Fragment; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import de.sebse.fuplanner.R; + +/** + * A simple {@link Fragment} subclass. + * Activities that contain this fragment must implement the + * {@link ScheduleFragment.OnFragmentInteractionListener} interface + * to handle interaction events. + * Use the {@link ScheduleFragment#newInstance} factory method to + * create an instance of this fragment. + */ +public class ScheduleFragment extends Fragment { + // TODO: Rename parameter arguments, choose names that match + // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER + private static final String ARG_PARAM1 = "param1"; + private static final String ARG_PARAM2 = "param2"; + + // TODO: Rename and change types of parameters + private String mParam1; + private String mParam2; + + private OnFragmentInteractionListener mListener; + + public ScheduleFragment() { + // Required empty public constructor + } + + /** + * Use this factory method to create a new instance of + * this fragment using the provided parameters. + * + * @param param1 Parameter 1. + * @param param2 Parameter 2. + * @return A new instance of fragment ScheduleFragment. + */ + // TODO: Rename and change types and number of parameters + public static ScheduleFragment newInstance(String param1, String param2) { + ScheduleFragment fragment = new ScheduleFragment(); + Bundle args = new Bundle(); + args.putString(ARG_PARAM1, param1); + args.putString(ARG_PARAM2, param2); + fragment.setArguments(args); + return fragment; + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + if (getArguments() != null) { + mParam1 = getArguments().getString(ARG_PARAM1); + mParam2 = getArguments().getString(ARG_PARAM2); + } + } + + @Override + public View onCreateView(LayoutInflater inflater, ViewGroup container, + Bundle savedInstanceState) { + // Inflate the layout for this fragment + return inflater.inflate(R.layout.fragment_schedule, container, false); + } + + // TODO: Rename method, update argument and hook method into UI event + public void onButtonPressed(Uri uri) { + if (mListener != null) { + mListener.onFragmentInteraction(uri); + } + } + + @Override + public void onAttach(Context context) { + super.onAttach(context); + if (context instanceof OnFragmentInteractionListener) { + mListener = (OnFragmentInteractionListener) context; + } else { + throw new RuntimeException(context.toString() + + " must implement OnFragmentInteractionListener"); + } + } + + @Override + public void onDetach() { + super.onDetach(); + mListener = null; + } + + /** + * This interface must be implemented by activities that contain this + * fragment to allow an interaction in this fragment to be communicated + * to the activity and potentially other fragments contained in that + * activity. + *

+ * See the Android Training lesson Communicating with Other Fragments for more information. + */ + public interface OnFragmentInteractionListener { + // TODO: Update argument type and name + void onFragmentInteraction(Uri uri); + } +} diff --git a/app/src/main/res/layout/fragment_schedule.xml b/app/src/main/res/layout/fragment_schedule.xml new file mode 100644 index 0000000..a6e5bef --- /dev/null +++ b/app/src/main/res/layout/fragment_schedule.xml @@ -0,0 +1,14 @@ + + + + + + + \ 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 bf9724d..ec77120 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -31,4 +31,7 @@ %1$s - %2$s Open Close + + + Hello blank fragment