From 50d07193a04f829010f979e38c09c3867f523a23 Mon Sep 17 00:00:00 2001 From: Caesar2011 Date: Sun, 18 Nov 2018 11:12:13 +0100 Subject: [PATCH] Implemented News with Demo Entries --- .../java/de/sebse/fuplanner/MainActivity.java | 2 +- .../fuplanner/fragments/CanteensFragment.java | 2 +- .../fuplanner/fragments/ModulesFragment.java | 2 +- .../fuplanner/fragments/NewsAdapter.java | 61 ++++++++++++ .../fuplanner/fragments/NewsFragment.java | 98 ++++++++++++++++++- .../de/sebse/fuplanner/tools/UtilsDate.java | 14 +++ .../de/sebse/fuplanner/tools/types/News.java | 48 +++++++++ .../sebse/fuplanner/tools/types/NewsList.java | 15 +++ .../fuplanner/tools/ui/NewsViewHolder.java | 28 ++++++ .../main/res/layout/fragment_modules_list.xml | 17 ---- .../layout/fragment_recycler_norefresh.xml | 12 +++ .../res/layout/fragment_recycler_view.xml | 8 +- app/src/main/res/layout/list_all_caption.xml | 7 +- app/src/main/res/layout/list_all_items.xml | 6 +- app/src/main/res/layout/list_all_mails.xml | 4 +- .../res/layout/list_announcement_items.xml | 4 +- .../main/res/layout/list_canteen_items.xml | 4 +- app/src/main/res/layout/list_news_item.xml | 60 ++++++++++++ app/src/main/res/raw/news.json | 34 +++++++ app/src/main/res/values-de/strings.xml | 2 + app/src/main/res/values/dimens.xml | 3 + app/src/main/res/values/strings.xml | 2 + 22 files changed, 399 insertions(+), 34 deletions(-) create mode 100644 app/src/main/java/de/sebse/fuplanner/fragments/NewsAdapter.java create mode 100644 app/src/main/java/de/sebse/fuplanner/tools/types/News.java create mode 100644 app/src/main/java/de/sebse/fuplanner/tools/types/NewsList.java create mode 100644 app/src/main/java/de/sebse/fuplanner/tools/ui/NewsViewHolder.java delete mode 100644 app/src/main/res/layout/fragment_modules_list.xml create mode 100644 app/src/main/res/layout/fragment_recycler_norefresh.xml create mode 100644 app/src/main/res/layout/list_news_item.xml create mode 100644 app/src/main/res/raw/news.json diff --git a/app/src/main/java/de/sebse/fuplanner/MainActivity.java b/app/src/main/java/de/sebse/fuplanner/MainActivity.java index 2467c20..cdd0e59 100644 --- a/app/src/main/java/de/sebse/fuplanner/MainActivity.java +++ b/app/src/main/java/de/sebse/fuplanner/MainActivity.java @@ -270,7 +270,7 @@ public class MainActivity extends AppCompatActivity } private int getDefaultFragmentAfterLogin() { - return FRAGMENT_MODULES; + return FRAGMENT_NEWS; } private void toLogoutState() { diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java index 9eee7a8..99d838d 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/CanteensFragment.java @@ -48,7 +48,7 @@ public class CanteensFragment extends Fragment { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_modules_list, container, false); + View view = inflater.inflate(R.layout.fragment_recycler_view, container, false); // Set the adapter Context context = view.getContext(); RecyclerView recyclerView = view.findViewById(R.id.list); diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/ModulesFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/ModulesFragment.java index 809ab8a..c1e11c8 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/ModulesFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/ModulesFragment.java @@ -47,7 +47,7 @@ public class ModulesFragment extends Fragment { public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_modules_list, container, false); + View view = inflater.inflate(R.layout.fragment_recycler_view, container, false); // Set the adapter Context context = view.getContext(); RecyclerView recyclerView = view.findViewById(R.id.list); diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/NewsAdapter.java b/app/src/main/java/de/sebse/fuplanner/fragments/NewsAdapter.java new file mode 100644 index 0000000..a454958 --- /dev/null +++ b/app/src/main/java/de/sebse/fuplanner/fragments/NewsAdapter.java @@ -0,0 +1,61 @@ +package de.sebse.fuplanner.fragments; + +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; +import de.sebse.fuplanner.R; +import de.sebse.fuplanner.fragments.ModulesFragment.OnModulesFragmentInteractionListener; +import de.sebse.fuplanner.services.KVV.types.Modules; +import de.sebse.fuplanner.tools.UtilsDate; +import de.sebse.fuplanner.tools.types.News; +import de.sebse.fuplanner.tools.types.NewsList; +import de.sebse.fuplanner.tools.ui.NewsViewHolder; + +/** + * {@link RecyclerView.Adapter} that can display a {@link Modules.Module} and makes a call to the + * specified {@link OnModulesFragmentInteractionListener}. + */ +class NewsAdapter extends RecyclerView.Adapter { + + + private NewsList mValues; + + NewsAdapter() { + mValues = null; + } + + public void setNews(NewsList news) { + mValues = news; + this.notifyDataSetChanged(); + } + + @NonNull + @Override + public NewsViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()) + .inflate(R.layout.list_news_item, parent, false); + return new NewsViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull NewsViewHolder holder, int position) { + News news = mValues.getPast(position); + holder.mHeader.setText(news.getTitle()); + switch (news.getCategory()) { + case News.CATEGORY_UPDATE: + holder.mSubLeft.setText(R.string.update_news); + case News.CATEGORY_TRICKS: + holder.mSubLeft.setText(R.string.tricks); + } + holder.mSubRight.setText(UtilsDate.getModifiedDate(news.getDate())); + holder.mText.setText(news.getText()); + } + + @Override + public int getItemCount() { + return mValues != null ? mValues.sizePast() : 0; + } +} diff --git a/app/src/main/java/de/sebse/fuplanner/fragments/NewsFragment.java b/app/src/main/java/de/sebse/fuplanner/fragments/NewsFragment.java index 8608b1c..0253683 100644 --- a/app/src/main/java/de/sebse/fuplanner/fragments/NewsFragment.java +++ b/app/src/main/java/de/sebse/fuplanner/fragments/NewsFragment.java @@ -1,6 +1,7 @@ package de.sebse.fuplanner.fragments; +import android.content.Context; import android.os.Bundle; import androidx.annotation.NonNull; @@ -10,7 +11,22 @@ import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import org.json.JSONArray; +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.io.InputStream; + +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import de.sebse.fuplanner.R; +import de.sebse.fuplanner.tools.DateSortedList; +import de.sebse.fuplanner.tools.MainActivityListener; +import de.sebse.fuplanner.tools.UtilsDate; +import de.sebse.fuplanner.tools.logging.Logger; +import de.sebse.fuplanner.tools.types.News; +import de.sebse.fuplanner.tools.types.NewsList; /** * A simple {@link Fragment} subclass. @@ -18,6 +34,9 @@ import de.sebse.fuplanner.R; * create an instance of this fragment. */ public class NewsFragment extends Fragment { + private Logger log = new Logger(this); + private MainActivityListener mListener; + private NewsAdapter mAdapter; // TODO: Rename parameter arguments, choose names that match // the fragment initialization parameters, e.g. ARG_ITEM_NUMBER @@ -42,11 +61,86 @@ public class NewsFragment extends Fragment { return fragment; } + @Override + public void onAttach(Context context) { + super.onAttach(context); + if (context instanceof MainActivityListener) { + mListener = (MainActivityListener) context; + mListener.onTitleTextChange(R.string.news); + } + else + throw new RuntimeException(context.toString() + " must implement MainActivityListener"); + refresh(); + } + + @Override + public void onDetach() { + super.onDetach(); + mListener = null; + } + + private String loadJSONFromAsset() { + if (getActivity() == null) + return null; + String json = null; + try { + InputStream is = getActivity().getResources().openRawResource(R.raw.news); + int size = is.available(); + byte[] buffer = new byte[size]; + is.read(buffer); + is.close(); + json = new String(buffer, "UTF-8"); + } catch (IOException ex) { + ex.printStackTrace(); + return null; + } + return json; + } + @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); + View view = inflater.inflate(R.layout.fragment_recycler_norefresh, container, false); + // Set the adapter + Context context = view.getContext(); + RecyclerView recyclerView = view.findViewById(R.id.list); + recyclerView.setLayoutManager(new LinearLayoutManager(context)); + mAdapter = new NewsAdapter(); + recyclerView.setAdapter(mAdapter); + + refresh(); + + return view; + } + + private void refresh() { + if (mAdapter == null) + return; + String fromAsset = loadJSONFromAsset(); + if (fromAsset != null) { + try { + JSONObject json = new JSONObject(fromAsset); + JSONArray news = json.getJSONArray("news"); + NewsList dates = new NewsList(); + for (int i = news.length() - 1; i >= 0; i--) { + String title = news.getJSONObject(i).getString("title"); + String categoryString = news.getJSONObject(i).getString("category"); + int category; + if (categoryString.equals("CATEGORY_TRICKS")) + category = News.CATEGORY_TRICKS; + else + category = News.CATEGORY_UPDATE; + String dateString = news.getJSONObject(i).getString("date"); + long date = UtilsDate.stringToMillis(dateString, "dd.MM.yyyy"); + String text = news.getJSONObject(i).getString("text"); + News event = new News(title, category, date, text); + dates.add(event); + } + mAdapter.setNews(dates); + } catch (JSONException e) { + e.printStackTrace(); + } + } } } diff --git a/app/src/main/java/de/sebse/fuplanner/tools/UtilsDate.java b/app/src/main/java/de/sebse/fuplanner/tools/UtilsDate.java index b0262de..26e3a35 100644 --- a/app/src/main/java/de/sebse/fuplanner/tools/UtilsDate.java +++ b/app/src/main/java/de/sebse/fuplanner/tools/UtilsDate.java @@ -7,6 +7,7 @@ import android.os.Build; import androidx.annotation.Nullable; import android.text.format.DateFormat; +import java.text.ParseException; import java.text.SimpleDateFormat; import java.util.Date; import java.util.Locale; @@ -65,4 +66,17 @@ public class UtilsDate { public static boolean dateEquals(long a, long b) { return a / 86400000 == b / 86400000; } + + public static long stringToMillis(String dateString, String format) { + try { + @SuppressLint("SimpleDateFormat") SimpleDateFormat sdf = new SimpleDateFormat(format); + Date date = sdf.parse(dateString); + + return date.getTime(); + + } catch (ParseException e) { + e.printStackTrace(); + return 0; + } + } } diff --git a/app/src/main/java/de/sebse/fuplanner/tools/types/News.java b/app/src/main/java/de/sebse/fuplanner/tools/types/News.java new file mode 100644 index 0000000..eb1336d --- /dev/null +++ b/app/src/main/java/de/sebse/fuplanner/tools/types/News.java @@ -0,0 +1,48 @@ +package de.sebse.fuplanner.tools.types; + +import androidx.annotation.NonNull; + +public class News { + public static final int CATEGORY_TRICKS = 0; + public static final int CATEGORY_UPDATE = 1; + + private String title; + private int category; + private long date; + private String text; + + public News(String title, int category, long date, String text) { + this.title = title; + this.category = category; + this.date = date; + this.text = text; + } + + public String getTitle() { + return title; + } + + public int getCategory() { + return category; + } + + public long getDate() { + return date; + } + + public String getText() { + return text; + } + + @Override + public String toString() { + return "News{" + + "title='" + title + '\'' + + ", category=" + category + + ", date=" + date + + ", text='" + text + '\'' + + '}'; + } + + +} diff --git a/app/src/main/java/de/sebse/fuplanner/tools/types/NewsList.java b/app/src/main/java/de/sebse/fuplanner/tools/types/NewsList.java new file mode 100644 index 0000000..b5970b5 --- /dev/null +++ b/app/src/main/java/de/sebse/fuplanner/tools/types/NewsList.java @@ -0,0 +1,15 @@ +package de.sebse.fuplanner.tools.types; + +import de.sebse.fuplanner.tools.DateSortedList; + +public class NewsList extends DateSortedList { + @Override + protected long getDateByItem(News item) { + return item.getDate(); + } + + @Override + protected boolean reversed() { + return true; + } +} diff --git a/app/src/main/java/de/sebse/fuplanner/tools/ui/NewsViewHolder.java b/app/src/main/java/de/sebse/fuplanner/tools/ui/NewsViewHolder.java new file mode 100644 index 0000000..f4a3b48 --- /dev/null +++ b/app/src/main/java/de/sebse/fuplanner/tools/ui/NewsViewHolder.java @@ -0,0 +1,28 @@ +package de.sebse.fuplanner.tools.ui; + +import android.view.View; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import de.sebse.fuplanner.R; + +public class NewsViewHolder extends CustomViewHolder { + public final TextView mHeader; + public final TextView mSubLeft; + public final TextView mSubRight; + public final TextView mText; + + public NewsViewHolder(View view) { + super(view); + mHeader = view.findViewById(R.id.header); + mSubLeft = view.findViewById(R.id.sub_left); + mSubRight = view.findViewById(R.id.sub_right); + mText = view.findViewById(R.id.text); + } + + @NonNull + @Override + public String toString() { + return super.toString() + " '" + mHeader.getText() + "' '" + mSubLeft.getText() + "' '" + mSubRight.getText() + "' '" + mText.getText() + "'"; + } +} diff --git a/app/src/main/res/layout/fragment_modules_list.xml b/app/src/main/res/layout/fragment_modules_list.xml deleted file mode 100644 index 0d4345e..0000000 --- a/app/src/main/res/layout/fragment_modules_list.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_recycler_norefresh.xml b/app/src/main/res/layout/fragment_recycler_norefresh.xml new file mode 100644 index 0000000..7b9c828 --- /dev/null +++ b/app/src/main/res/layout/fragment_recycler_norefresh.xml @@ -0,0 +1,12 @@ + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_recycler_view.xml b/app/src/main/res/layout/fragment_recycler_view.xml index f561b1b..99fbb3d 100644 --- a/app/src/main/res/layout/fragment_recycler_view.xml +++ b/app/src/main/res/layout/fragment_recycler_view.xml @@ -4,16 +4,14 @@ xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" android:id="@+id/swipe_container" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" android:layout_width="match_parent" android:layout_height="match_parent"> + tools:listitem="@layout/list_all_items" /> \ No newline at end of file diff --git a/app/src/main/res/layout/list_all_caption.xml b/app/src/main/res/layout/list_all_caption.xml index fca7b8c..70d3c2b 100644 --- a/app/src/main/res/layout/list_all_caption.xml +++ b/app/src/main/res/layout/list_all_caption.xml @@ -9,7 +9,12 @@ android:id="@+id/string" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="@dimen/text_margin" + android:layout_marginLeft="@dimen/cardview_margin" + android:layout_marginStart="@dimen/cardview_margin" + android:layout_marginTop="@dimen/text_margin" + android:layout_marginBottom="@dimen/text_margin" + android:layout_marginRight="@dimen/cardview_margin" + android:layout_marginEnd="@dimen/cardview_margin" tools:text="Caption" android:textAppearance="@style/Base.TextAppearance.AppCompat.Headline" /> diff --git a/app/src/main/res/layout/list_all_items.xml b/app/src/main/res/layout/list_all_items.xml index 09d8e47..143b08c 100644 --- a/app/src/main/res/layout/list_all_items.xml +++ b/app/src/main/res/layout/list_all_items.xml @@ -4,12 +4,14 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="4dp"> + xmlns:card_view="http://schemas.android.com/apk/res-auto" + android:layout_margin="@dimen/cardview_margin" + card_view:cardElevation="@dimen/cardview_elevation"> + android:padding="@dimen/cardview_padding" > + android:layout_margin="@dimen/cardview_margin"> + android:padding="@dimen/cardview_padding" > + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/raw/news.json b/app/src/main/res/raw/news.json new file mode 100644 index 0000000..8912b1f --- /dev/null +++ b/app/src/main/res/raw/news.json @@ -0,0 +1,34 @@ +{ + "news": [ + { + "title": "Linear Motion", + "date": "18.11.2018", + "category": "CATEGORY_TRICKS", + "text": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet," + }, + { + "title": "Linear Motion", + "date": "20.06.2019", + "category": "CATEGORY_TRICKS", + "text": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet," + }, + { + "title": "Linear Motion", + "date": "20.03.2019", + "category": "CATEGORY_UPDATE", + "text": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet," + }, + { + "title": "Linear Motion", + "date": "30.03.2019", + "category": "CATEGORY_TRICKS", + "text": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet," + }, + { + "title": "Linear Motion", + "date": "20.03.2018", + "category": "CATEGORY_UPDATE", + "text": "Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, no sea takimata sanctus est Lorem ipsum dolor sit amet. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Lorem ipsum dolor sit amet," + } + ] +} \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index 2e986bb..5c53aae 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -79,4 +79,6 @@ Mail Icon Hallo %1$s, \n\n\n\nMit freundlichen Grüßen\n\n\n\nGesendet von der FUPlanner Android App Neuigkeiten + Update-News + Tipps/Tricks \ No newline at end of file diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml index 98828db..c8a7f02 100644 --- a/app/src/main/res/values/dimens.xml +++ b/app/src/main/res/values/dimens.xml @@ -5,6 +5,9 @@ 16dp 170dp 16dp + 4dp + 5dp + 4dp diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 815c903..b351a08 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -87,4 +87,6 @@ Mail Icon Dear %1$s, \n\n\n\nYours sincerely\n\n\n\nSend by FUPlanner Android App News + Update News + Tips/Tricks