sebse/android-fuplanner
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Weekview design geändert

Browse Source
This commit is contained in:
Joshua
2018-09-16 14:51:34 +02:00
parent 662f9bc240
commit 7b4fd9dfab
5 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/src/main/java/de/sebse/fuplanner/fragments/canteen/MealFragment.java
View File

@@ -44,9 +44,9 @@ public class MealFragment extends Fragment {
* Use this factory method to create a new instance of * Use this factory method to create a new instance of
* this fragment using the provided parameters. * this fragment using the provided parameters.
* *
* @param canteenId Item position in module list. * @param canteenId ID der Kantine.
* @param dayPosition Item position in module list. * @param dayPosition anzuzeigender Tag.
* @return A new instance of fragment ModDetailAnnounceFragment. * @return A new instance of fragment MealFragment.
*/ */
public static MealFragment newInstance(int canteenId, int dayPosition) { public static MealFragment newInstance(int canteenId, int dayPosition) {
MealFragment fragment = new MealFragment(); MealFragment fragment = new MealFragment();

5
app/src/main/java/de/sebse/fuplanner/tools/ui/weekview/WeekView.java
View File

@@ -47,6 +47,7 @@ import java.util.Locale;
import de.sebse.fuplanner.R; import de.sebse.fuplanner.R;
import de.sebse.fuplanner.tools.ColorRes; import de.sebse.fuplanner.tools.ColorRes;
import de.sebse.fuplanner.tools.UtilsDate; import de.sebse.fuplanner.tools.UtilsDate;
import de.sebse.fuplanner.tools.UtilsUi;
import de.sebse.fuplanner.tools.logging.Logger; import de.sebse.fuplanner.tools.logging.Logger;
import static de.sebse.fuplanner.tools.ui.weekview.WeekViewUtil.daysBetween; import static de.sebse.fuplanner.tools.ui.weekview.WeekViewUtil.daysBetween;
@@ -61,7 +62,7 @@ import static de.sebse.fuplanner.tools.ui.weekview.WeekViewUtil.today;
*/ */
@SuppressWarnings("unused") @SuppressWarnings("unused")
public class WeekView extends View { public class WeekView extends View {
///////////////////////////////////////////Änderung in zeile 991 überprüfen!!!!!!!!!!!!!!!!!!!!!
private enum Direction { private enum Direction {
NONE, LEFT, RIGHT, VERTICAL NONE, LEFT, RIGHT, VERTICAL
} }
@@ -987,7 +988,7 @@ public class WeekView extends View {
String dayLabel = getDateTimeInterpreter().interpretDate(day); String dayLabel = getDateTimeInterpreter().interpretDate(day);
if (dayLabel == null) if (dayLabel == null)
throw new IllegalStateException("A DateTimeInterpreter must not return null date"); throw new IllegalStateException("A DateTimeInterpreter must not return null date");
canvas.drawText(dayLabel, startPixel + mWidthPerDay / 2, mHeaderTextHeight + mHeaderRowPadding, isToday ? mTodayHeaderTextPaint : mHeaderTextPaint); canvas.drawText(dayLabel, startPixel + mWidthPerDay / 2, mHeaderTextHeight + mHeaderRowPadding+ UtilsUi.convertPixelsToDp(40, mContext), isToday ? mTodayHeaderTextPaint : mHeaderTextPaint);
drawAllDayEvents(day, startPixel, canvas); drawAllDayEvents(day, startPixel, canvas);
startPixel += mWidthPerDay + mColumnGap; startPixel += mWidthPerDay + mColumnGap;
} }

3
app/src/main/res/layout/fragment_schedule.xml
View File

@@ -18,7 +18,7 @@
app:headerRowPadding="12dp" app:headerRowPadding="12dp"
app:columnGap="8dp" app:columnGap="8dp"
app:noOfVisibleDays="5" app:noOfVisibleDays="5"
app:headerRowBackgroundColor="#ffefefef" app:headerRowBackgroundColor="@color/colorFUGray"
app:firstDayOfWeek="monday" app:firstDayOfWeek="monday"
app:showFirstDayOfWeekFirst="true" app:showFirstDayOfWeekFirst="true"
app:futureWeekendBackgroundColor="@color/colorFURedLight" app:futureWeekendBackgroundColor="@color/colorFURedLight"
@@ -31,6 +31,7 @@
app:hourSeparatorColor="@android:color/black" app:hourSeparatorColor="@android:color/black"
app:showNowLine="true" app:showNowLine="true"
app:defaultEventColor="@color/colorFUBlue" app:defaultEventColor="@color/colorFUBlue"
app:headerColumnBackground="@color/colorFUGray"
/> />

1
app/src/main/res/values-de/strings.xml
View File

@@ -54,4 +54,5 @@
<string name="soups">Suppen</string> <string name="soups">Suppen</string>
<string name="starters">Vorspeisen</string> <string name="starters">Vorspeisen</string>
<string name="others">Sonstiges</string> <string name="others">Sonstiges</string>
<string name="resourcen">Ressourcen</string>
</resources> </resources>

1
app/src/main/res/values/strings.xml
View File

@@ -61,4 +61,5 @@
<string name="soups">Soups</string> <string name="soups">Soups</string>
<string name="starters">Starters</string> <string name="starters">Starters</string>
<string name="others">Others</string> <string name="others">Others</string>
<string name="resourcen">Resourcen</string>
</resources> </resources>