From c4b10c0ae3491619f9832c3fc7aa150aaededb9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Podolsk=C3=BD?= Date: Tue, 16 Apr 2019 12:35:38 +0200 Subject: [PATCH] V1.0.1 / RELEASE verze --- app/build.gradle | 6 +- app/src/main/AndroidManifest.xml | 4 +- .../main/java/com/workhours/MainActivity.java | 11 ++- .../com/workhours/SettingsCorrection.java | 2 +- app/src/main/java/com/workhours/Shift.java | 17 +++- .../com/workhours/TimePickerFragment.java | 33 ++++++- .../com/workhours/data/ShiftsProvider.java | 4 +- .../main/res/drawable-v21/ic_menu_manage.xml | 9 -- .../{drawable-v21 => drawable}/check_in.png | Bin .../{drawable-v21 => drawable}/check_out.png | Bin app/src/main/res/layout/activity_preview.xml | 25 ----- .../layout/activity_settings_correction.xml | 4 - .../res/layout/activity_settings_default.xml | 33 ++----- .../res/layout/activity_settings_theme.xml | 2 - .../main/res/layout/activity_shift_table.xml | 8 -- app/src/main/res/layout/content_main.xml | 48 ++++------ app/src/main/res/layout/content_shift.xml | 88 ++++++++---------- app/src/main/res/layout/list_item.xml | 8 +- .../res/layout/month_year_picker_dialog.xml | 1 - app/src/main/res/values-v21/styles.xml | 8 -- app/src/main/res/values/strings.xml | 7 +- app/src/main/res/values/styles.xml | 23 +++++ 22 files changed, 150 insertions(+), 191 deletions(-) delete mode 100644 app/src/main/res/drawable-v21/ic_menu_manage.xml rename app/src/main/res/{drawable-v21 => drawable}/check_in.png (100%) rename app/src/main/res/{drawable-v21 => drawable}/check_out.png (100%) delete mode 100644 app/src/main/res/values-v21/styles.xml diff --git a/app/build.gradle b/app/build.gradle index be21a14..44afa82 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,10 +4,10 @@ android { compileSdkVersion 28 defaultConfig { applicationId "com.workhours" - minSdkVersion 16 + minSdkVersion 21 targetSdkVersion 28 - versionCode 1 - versionName "1.0" + versionCode 101 + versionName "1.0.1" testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9248f36..0863520 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,7 +9,8 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/AppTheme"> + android:theme="@style/AppTheme" + android:screenOrientation="portrait" > @@ -52,5 +53,4 @@ android:authorities="com.workhours" android:exported="false" /> - \ No newline at end of file diff --git a/app/src/main/java/com/workhours/MainActivity.java b/app/src/main/java/com/workhours/MainActivity.java index a2bcce3..6184b27 100644 --- a/app/src/main/java/com/workhours/MainActivity.java +++ b/app/src/main/java/com/workhours/MainActivity.java @@ -51,6 +51,9 @@ protected void onCreate(Bundle savedInstanceState) { pref = getApplicationContext().getSharedPreferences("Settings", 0); // definovani SharedPreference temp = getApplicationContext().getSharedPreferences("Temporary", 0); + Globals.theme = "light"; + if (pref.contains("layout")) {Globals.theme = pref.getString("layout", "light");} + if (pref.contains("layout")){ String savedLayout = pref.getString("layout", "light"); if (savedLayout != null && savedLayout.equals("light")){ @@ -190,7 +193,6 @@ private void checkYesterday() { } //Toast.makeText(this, " " + workDaysArray.length, Toast.LENGTH_LONG).show(); } //else {displayView.append("\n zaznamy kompletni");} -//TODO zkontrolovat doplnění defaultních dní dovolené pro temp při překlopení roku String dateHelp = String.valueOf(lastDbDate); int lastDbDateYear = Integer.parseInt(dateHelp.substring(0, 4)); int todayYear = calendar.get(Calendar.YEAR); @@ -251,7 +253,7 @@ else if (todayMonthInt >= 2 && todayMonthInt <= 9) { monthValues.put(ShiftsContract.ShiftEntry.COLUMN_OVERTIMESUM_MONTHS, actualOverwatch); Uri newUriMonth = getContentResolver().insert(ShiftsContract.ShiftEntry.CONTENT_URI_MONTHS, monthValues); if (newUriMonth == null) { - Toast.makeText(this, "chyba pridani MONTH", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, getText(R.string.addMonthFailed), Toast.LENGTH_SHORT).show(); } //else { Toast.makeText(this, getText(R.string.editor_insert_shift_successful), Toast.LENGTH_SHORT).show();} } @@ -261,7 +263,7 @@ else if (todayMonthInt >= 2 && todayMonthInt <= 9) { monthValues.put(ShiftsContract.ShiftEntry.COLUMN_OVERTIMESUM_MONTHS, 0); Uri newUriMonth = getContentResolver().insert(ShiftsContract.ShiftEntry.CONTENT_URI_MONTHS, monthValues); if (newUriMonth == null) { - Toast.makeText(this, "chyba pridani MONTH", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, getText(R.string.addMonthFailed), Toast.LENGTH_SHORT).show(); } //else { Toast.makeText(this, getText(R.string.editor_insert_shift_successful), Toast.LENGTH_SHORT).show(); } } } @@ -498,8 +500,6 @@ public void onTimeSet(TimePicker view, int hourOfDay, int minute) { editTodayButton.setVisibility(View.VISIBLE); showInfo(); } //else {Toast.makeText(this,"chyba ", Toast.LENGTH_LONG).show();} - - //TODO dodělat přidání overwatche do MONTHS tabulky po přidání dokončené směny + dodělat korekce v SHIFTS - insert/delete/update todayBreakInput.setVisibility(View.INVISIBLE); todayBreak.setVisibility(View.INVISIBLE); } @@ -635,5 +635,6 @@ public static class Globals { public static int timeOutHours; public static int timeOutMinutes; public static boolean isEdited; + public static String theme; } } \ No newline at end of file diff --git a/app/src/main/java/com/workhours/SettingsCorrection.java b/app/src/main/java/com/workhours/SettingsCorrection.java index 9c46c07..12513a2 100644 --- a/app/src/main/java/com/workhours/SettingsCorrection.java +++ b/app/src/main/java/com/workhours/SettingsCorrection.java @@ -44,7 +44,7 @@ public void save_settings(){ editorTemp.apply(); } - Toast.makeText(this, getString(R.string.settings_saved), Toast.LENGTH_SHORT).show(); + Toast.makeText(this, getString(R.string.correctionDone), Toast.LENGTH_SHORT).show(); } @Override diff --git a/app/src/main/java/com/workhours/Shift.java b/app/src/main/java/com/workhours/Shift.java index 4d899d3..17bb0f1 100644 --- a/app/src/main/java/com/workhours/Shift.java +++ b/app/src/main/java/com/workhours/Shift.java @@ -85,7 +85,9 @@ public void onClick(DialogInterface dialogInterface, int i) { showUnsavedChangesDialog(discardButtonClickListener); return true; case (R.id.action_save): - saveShift(); + if (mShiftChanged) { + saveShift(); + } else {Toast.makeText(this, getText(R.string.nothingToSave), Toast.LENGTH_SHORT).show();} finish(); return true; case (R.id.action_delete): @@ -255,6 +257,9 @@ public void fillUp (Uri uri){ overtimeLengthStr = Tools.timeIntToStr(cursor.getInt(overtimeLengthColumnIndex)); holidayTypeInt = cursor.getInt(holidayTypeColumnIndex); + if (departureStr.equals("0:00")){ + departureStr = pref.getString("defaultOutTime", "14:30"); + } date.setText(dateStr); arriveTime.setText(arrivalStr); @@ -407,6 +412,8 @@ public void saveShift (){ } } + if (overtimeLengthStr == null){overtimeLengthStr = "0:00";} + if ((holidayTypeSelectedInt == ShiftsContract.ShiftEntry.HOLIDAY_VACATION) && (holidayTypeInt != ShiftsContract.ShiftEntry.HOLIDAY_VACATION)) { // je zvolena dovolena, ale nebyla int oldHolidaySum = temp.getInt("holidaySum", 0); int newHolidaySum = oldHolidaySum - 1; @@ -499,15 +506,15 @@ private void editDbSum(String whichMonth, int overtimeDif){ int oldSum = cursorOvertime.getInt(overtimeLengthColumnIndex); id = cursorOvertime.getInt(0); Uri editUri = Uri.withAppendedPath(ShiftsContract.ShiftEntry.CONTENT_URI_MONTHS, String.valueOf(id)); - Toast.makeText(this, "editing uri-" + editUri.toString(), Toast.LENGTH_SHORT).show(); + //Toast.makeText(this, "editing uri-" + editUri.toString(), Toast.LENGTH_SHORT).show(); ContentValues monthValues = new ContentValues(); monthValues.put(ShiftsContract.ShiftEntry.COLUMN_OVERTIMESUM_MONTHS, (oldSum + overtimeDif)); int rowsAffected = getContentResolver().update(editUri, monthValues, null, null); if (rowsAffected == 0) { - Toast.makeText(this, getText(R.string.editor_update_shift_failed), Toast.LENGTH_SHORT).show(); - } else {Toast.makeText(this, "added " + (oldSum + overtimeDif) + " min to URI-" + editUri.toString() , Toast.LENGTH_LONG).show();} + Toast.makeText(this, getText(R.string.addMonthFailed), Toast.LENGTH_SHORT).show(); + } //else {Toast.makeText(this, "added " + (oldSum + overtimeDif) + " min to URI-" + editUri.toString() , Toast.LENGTH_LONG).show();} } cursorOvertime.close(); } else { @@ -516,7 +523,7 @@ private void editDbSum(String whichMonth, int overtimeDif){ monthValues.put(ShiftsContract.ShiftEntry.COLUMN_OVERTIMESUM_MONTHS, overtimeDif); Uri newUriMonth = getContentResolver().insert(ShiftsContract.ShiftEntry.CONTENT_URI_MONTHS, monthValues); if (newUriMonth == null) { - Toast.makeText(this, "chyba pridani MONTH", Toast.LENGTH_SHORT).show(); + Toast.makeText(this, getText(R.string.addMonthFailed), Toast.LENGTH_SHORT).show(); } //else { Toast.makeText(this, getText(R.string.editor_insert_shift_successful), Toast.LENGTH_SHORT).show();} } } diff --git a/app/src/main/java/com/workhours/TimePickerFragment.java b/app/src/main/java/com/workhours/TimePickerFragment.java index 770c1a8..c8ff42b 100644 --- a/app/src/main/java/com/workhours/TimePickerFragment.java +++ b/app/src/main/java/com/workhours/TimePickerFragment.java @@ -10,24 +10,47 @@ import java.util.Calendar; public class TimePickerFragment extends DialogFragment { + @NonNull @Override public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) { + String theme = MainActivity.Globals.theme; int hour, minute; switch (MainActivity.Globals.whichTime) { case "IN": hour = MainActivity.Globals.timeInHours;//c.get(Calendar.HOUR_OF_DAY); minute = MainActivity.Globals.timeInMinutes;//c.get(Calendar.MINUTE); - return new TimePickerDialog(getActivity(), (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); - case "OUT": + switch (theme){ + case "light": + return new TimePickerDialog(getActivity(), R.style.lightTimePickerDialogStyle, (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); + case "dark": + return new TimePickerDialog(getActivity(), R.style.darkTimePickerDialogStyle, (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); + default: + return new TimePickerDialog(getActivity(), R.style.lightTimePickerDialogStyle, (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); + } + case "OUT": hour = MainActivity.Globals.timeOutHours; minute = MainActivity.Globals.timeOutMinutes; - return new TimePickerDialog(getActivity(), (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); - default: + switch (theme){ + case "light": + return new TimePickerDialog(getActivity(), R.style.lightTimePickerDialogStyle, (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); + case "dark": + return new TimePickerDialog(getActivity(), R.style.darkTimePickerDialogStyle, (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); + default: + return new TimePickerDialog(getActivity(), R.style.lightTimePickerDialogStyle, (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); + } + default: Calendar c = Calendar.getInstance(); hour = c.get(Calendar.HOUR_OF_DAY); minute = c.get(Calendar.MINUTE); - return new TimePickerDialog(getActivity(), (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); + switch (theme){ + case "light": + return new TimePickerDialog(getActivity(), R.style.lightTimePickerDialogStyle, (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); + case "dark": + return new TimePickerDialog(getActivity(), R.style.darkTimePickerDialogStyle, (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); + default: + return new TimePickerDialog(getActivity(), R.style.lightTimePickerDialogStyle, (TimePickerDialog.OnTimeSetListener) getActivity(), hour, minute, android.text.format.DateFormat.is24HourFormat(getActivity())); + } } } } \ No newline at end of file diff --git a/app/src/main/java/com/workhours/data/ShiftsProvider.java b/app/src/main/java/com/workhours/data/ShiftsProvider.java index b8181f4..3af27b5 100644 --- a/app/src/main/java/com/workhours/data/ShiftsProvider.java +++ b/app/src/main/java/com/workhours/data/ShiftsProvider.java @@ -200,10 +200,10 @@ public int updateShift (@NonNull Uri uri, ContentValues values, String selection throw new IllegalArgumentException( "Arrival time invalid."); } int departure = values.getAsInteger(ShiftsContract.ShiftEntry.COLUMN_DEPARTURE); - if ((departure > 1439) || (departure == 0)){ + if ((departure > 1439)){ throw new IllegalArgumentException( "Departure time invalid."); } - if (arrival > departure){ + if (departure != 0 && arrival > departure){ throw new IllegalArgumentException( "Arrival time must be before departure."); } int breakLength = values.getAsInteger(ShiftsContract.ShiftEntry.COLUMN_BREAK_LENGTH); diff --git a/app/src/main/res/drawable-v21/ic_menu_manage.xml b/app/src/main/res/drawable-v21/ic_menu_manage.xml deleted file mode 100644 index aeb047d..0000000 --- a/app/src/main/res/drawable-v21/ic_menu_manage.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable-v21/check_in.png b/app/src/main/res/drawable/check_in.png similarity index 100% rename from app/src/main/res/drawable-v21/check_in.png rename to app/src/main/res/drawable/check_in.png diff --git a/app/src/main/res/drawable-v21/check_out.png b/app/src/main/res/drawable/check_out.png similarity index 100% rename from app/src/main/res/drawable-v21/check_out.png rename to app/src/main/res/drawable/check_out.png diff --git a/app/src/main/res/layout/activity_preview.xml b/app/src/main/res/layout/activity_preview.xml index 5943d13..edaed98 100644 --- a/app/src/main/res/layout/activity_preview.xml +++ b/app/src/main/res/layout/activity_preview.xml @@ -11,10 +11,8 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" - android:layout_marginRight="16dp" android:rotation="90" app:layout_constraintEnd_toStartOf="@+id/showMonthYearId" app:layout_constraintTop_toTopOf="parent" @@ -27,9 +25,7 @@ android:layout_height="30dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" android:layout_toStartOf="@+id/button" - android:layout_toLeftOf="@+id/button" android:textSize="20sp" app:layout_constraintEnd_toStartOf="@+id/button" app:layout_constraintTop_toTopOf="parent" @@ -40,12 +36,9 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" - android:layout_marginRight="16dp" app:layout_constraintEnd_toStartOf="@+id/monthUpId" app:layout_constraintTop_toTopOf="parent" app:srcCompat="@android:drawable/ic_menu_my_calendar" @@ -56,10 +49,8 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" - android:layout_marginRight="16dp" android:rotation="270" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -72,7 +63,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:layout_marginLeft="30dp" android:layout_marginTop="30dp" android:textSize="20sp" android:text="@string/overtimeFromLastMonth" @@ -85,7 +75,6 @@ android:layout_height="wrap_content" android:layout_marginTop="30dp" android:layout_marginEnd="30dp" - android:layout_marginRight="30dp" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/showMonthYearId" /> @@ -96,7 +85,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:layout_marginLeft="30dp" android:layout_marginTop="30dp" android:textSize="20sp" android:text="@string/workHoursPlan" @@ -109,7 +97,6 @@ android:layout_height="wrap_content" android:layout_marginTop="30dp" android:layout_marginEnd="30dp" - android:layout_marginRight="30dp" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/overtimeFromLastMonthValueId" /> @@ -121,7 +108,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:layout_marginLeft="30dp" android:layout_marginTop="30dp" android:textSize="20sp" android:text="@string/workHoursDone" @@ -134,7 +120,6 @@ android:layout_height="wrap_content" android:layout_marginTop="30dp" android:layout_marginEnd="30dp" - android:layout_marginRight="30dp" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/workHoursPlanValueId" /> @@ -146,7 +131,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:layout_marginLeft="30dp" android:layout_marginTop="30dp" android:textSize="20sp" android:text="@string/workHoursMonthlyDifference" @@ -159,7 +143,6 @@ android:layout_height="wrap_content" android:layout_marginTop="30dp" android:layout_marginEnd="30dp" - android:layout_marginRight="30dp" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/workHoursDoneValueId" /> @@ -171,7 +154,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:layout_marginLeft="30dp" android:layout_marginTop="30dp" android:textSize="20sp" android:text="@string/workHoursToNextMonth" @@ -184,7 +166,6 @@ android:layout_height="wrap_content" android:layout_marginTop="30dp" android:layout_marginEnd="30dp" - android:layout_marginRight="30dp" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/workHoursMonthlyDifferenceValueId" /> @@ -196,7 +177,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:layout_marginLeft="30dp" android:layout_marginTop="30dp" android:textSize="20sp" android:text="@string/usedHoliday" @@ -209,7 +189,6 @@ android:layout_height="wrap_content" android:layout_marginTop="30dp" android:layout_marginEnd="30dp" - android:layout_marginRight="30dp" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/workHoursToNextMonthValueId" /> @@ -221,7 +200,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:layout_marginLeft="30dp" android:layout_marginTop="30dp" android:textSize="20sp" android:text="@string/remainingHoliday" @@ -234,7 +212,6 @@ android:layout_height="wrap_content" android:layout_marginTop="30dp" android:layout_marginEnd="30dp" - android:layout_marginRight="30dp" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/usedHolidayValueId" /> @@ -246,7 +223,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:layout_marginLeft="30dp" android:layout_marginTop="30dp" android:textSize="20sp" android:text="@string/publicHolidays" @@ -259,7 +235,6 @@ android:layout_height="wrap_content" android:layout_marginTop="30dp" android:layout_marginEnd="30dp" - android:layout_marginRight="30dp" android:textSize="20sp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toBottomOf="@+id/remainingHolidayValueId" /> diff --git a/app/src/main/res/layout/activity_settings_correction.xml b/app/src/main/res/layout/activity_settings_correction.xml index 1d48f9a..147dcc5 100644 --- a/app/src/main/res/layout/activity_settings_correction.xml +++ b/app/src/main/res/layout/activity_settings_correction.xml @@ -12,7 +12,6 @@ android:layout_height="52dp" android:layout_marginTop="12dp" android:layout_marginEnd="35dp" - android:layout_marginRight="35dp" android:ems="10" android:inputType="numberSigned" android:hint="@string/vacationHint" @@ -28,7 +27,6 @@ android:text="@string/settingsOvertimeCorrection" android:layout_marginTop="25dp" android:layout_marginEnd="10dp" - android:layout_marginRight="10dp" android:textSize="20sp" app:layout_constraintEnd_toStartOf="@+id/overtimeCorrectionEdit" app:layout_constraintTop_toTopOf="parent"/> @@ -39,7 +37,6 @@ android:layout_height="52dp" android:layout_marginTop="10dp" android:layout_marginEnd="35dp" - android:layout_marginRight="35dp" android:ems="10" android:inputType="numberSigned" android:hint="@string/vacationHint" @@ -55,7 +52,6 @@ android:text="@string/settingsHolidayCorrection" android:layout_marginTop="30dp" android:layout_marginEnd="10dp" - android:layout_marginRight="10dp" android:textSize="20sp" app:layout_constraintEnd_toStartOf="@+id/overtimeCorrectionEdit" app:layout_constraintTop_toBottomOf="@+id/textView2"/> diff --git a/app/src/main/res/layout/activity_settings_default.xml b/app/src/main/res/layout/activity_settings_default.xml index 2298bf1..1c1fa3c 100644 --- a/app/src/main/res/layout/activity_settings_default.xml +++ b/app/src/main/res/layout/activity_settings_default.xml @@ -8,11 +8,10 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_settings_theme.xml b/app/src/main/res/layout/activity_settings_theme.xml index b06382a..2d18186 100644 --- a/app/src/main/res/layout/activity_settings_theme.xml +++ b/app/src/main/res/layout/activity_settings_theme.xml @@ -12,7 +12,6 @@ android:layout_height="wrap_content" android:layout_marginTop="20sp" android:layout_marginStart="20sp" - android:layout_marginLeft="20sp" android:text="@string/darkTheme" android:textSize="24sp" app:layout_constraintStart_toStartOf="parent" @@ -23,7 +22,6 @@ android:layout_width="55dp" android:layout_height="25dp" android:layout_marginStart="50dp" - android:layout_marginLeft="50dp" android:layout_marginTop="5dp" app:layout_constraintStart_toEndOf="@+id/textView3" app:layout_constraintTop_toTopOf="@+id/textView3" /> diff --git a/app/src/main/res/layout/activity_shift_table.xml b/app/src/main/res/layout/activity_shift_table.xml index 30b466f..8bdcb5b 100644 --- a/app/src/main/res/layout/activity_shift_table.xml +++ b/app/src/main/res/layout/activity_shift_table.xml @@ -25,9 +25,7 @@ android:layout_height="30dp" android:layout_marginTop="8dp" android:layout_marginEnd="8dp" - android:layout_marginRight="8dp" android:layout_toStartOf="@+id/showMonthYearId" - android:layout_toLeftOf="@+id/showMonthYearId" android:rotation="90" app:srcCompat="@android:drawable/arrow_down_float" tools:ignore="ContentDescription" /> @@ -40,7 +38,6 @@ android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:layout_toStartOf="@+id/button" - android:layout_toLeftOf="@+id/button" android:textSize="20sp" tools:ignore="RelativeOverlap" /> @@ -49,12 +46,9 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_marginStart="8dp" - android:layout_marginLeft="8dp" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" - android:layout_marginRight="16dp" android:layout_toStartOf="@+id/monthUpId" - android:layout_toLeftOf="@+id/monthUpId" app:srcCompat="@android:drawable/ic_menu_my_calendar" tools:ignore="ContentDescription" /> @@ -63,10 +57,8 @@ android:layout_width="30dp" android:layout_height="30dp" android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" android:layout_marginTop="8dp" android:layout_marginEnd="16dp" - android:layout_marginRight="16dp" android:rotation="270" app:srcCompat="@android:drawable/arrow_down_float" tools:ignore="ContentDescription" /> diff --git a/app/src/main/res/layout/content_main.xml b/app/src/main/res/layout/content_main.xml index 017aeed..cab929a 100644 --- a/app/src/main/res/layout/content_main.xml +++ b/app/src/main/res/layout/content_main.xml @@ -13,7 +13,6 @@ android:layout_width="100dp" android:layout_height="100dp" android:layout_marginStart="30dp" - android:layout_marginLeft="30dp" android:layout_marginTop="30dp" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" @@ -30,7 +29,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:layout_marginLeft="30dp" android:layout_marginTop="15dp" android:textSize="18sp" android:textStyle="bold" @@ -43,7 +41,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="0dp" - android:layout_marginLeft="0dp" android:layout_marginTop="2dp" android:textSize="18sp" android:text="@string/secondRowLabel" @@ -55,7 +52,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="20dp" - android:layout_marginLeft="20dp" android:layout_marginTop="2dp" android:textSize="18sp" app:layout_constraintStart_toStartOf="@+id/thisMonthViewId" @@ -66,7 +62,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="0dp" - android:layout_marginLeft="0dp" android:layout_marginTop="2dp" android:textSize="18sp" android:text="@string/thirdRowLabel" @@ -78,7 +73,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="30dp" - android:layout_marginLeft="30dp" android:layout_marginTop="2dp" android:textSize="18sp" app:layout_constraintStart_toStartOf="@+id/thisMonthViewId" @@ -101,28 +95,26 @@ android:layout_height="wrap_content" android:layout_marginTop="20dp" android:layout_marginStart="0dp" - android:layout_marginLeft="0dp" android:gravity="center" app:layout_constraintTop_toBottomOf="@+id/todayDepartureInfoId"> - - - + + + + app:layout_constraintTop_toBottomOf="@+id/holidaySpinner" /> @@ -94,7 +91,6 @@ android:layout_height="wrap_content" android:layout_marginTop="28dp" android:layout_marginEnd="220dp" - android:layout_marginRight="200dp" android:text="@string/date" android:textSize="24sp" app:layout_constraintEnd_toEndOf="parent" @@ -104,9 +100,8 @@ android:id="@+id/textView5" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginTop="32dp" + android:layout_marginTop="28dp" android:layout_marginEnd="0dp" - android:layout_marginRight="0dp" android:text="@string/arrivalTime" android:textSize="24sp" app:layout_constraintEnd_toEndOf="@+id/textView3" @@ -118,7 +113,6 @@ android:layout_height="wrap_content" android:layout_marginTop="28dp" android:layout_marginEnd="0dp" - android:layout_marginRight="0dp" android:text="@string/departureTime" android:textSize="24sp" app:layout_constraintEnd_toEndOf="@+id/textView3" @@ -130,58 +124,54 @@ android:layout_height="wrap_content" android:layout_marginTop="28dp" android:layout_marginEnd="0dp" - android:layout_marginRight="0dp" android:text="@string/breakLength" android:textSize="24sp" app:layout_constraintEnd_toEndOf="@+id/textView3" app:layout_constraintTop_toBottomOf="@+id/textView6" /> + + + app:layout_constraintTop_toBottomOf="@+id/textView10" /> + app:layout_constraintTop_toBottomOf="@+id/textView8" /> - \ No newline at end of file diff --git a/app/src/main/res/layout/list_item.xml b/app/src/main/res/layout/list_item.xml index 51df41c..a2fecdc 100644 --- a/app/src/main/res/layout/list_item.xml +++ b/app/src/main/res/layout/list_item.xml @@ -12,9 +12,7 @@ android:layout_height="wrap_content" android:fontFamily="sans-serif" android:textAppearance="?android:textAppearanceMedium" - android:paddingRight="10dp" android:paddingEnd="10dp" - android:paddingLeft="5dp" android:paddingStart="5dp" android:paddingTop="5dp" android:paddingBottom="5dp"/> @@ -56,10 +54,9 @@ diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml deleted file mode 100644 index fd7a058..0000000 --- a/app/src/main/res/values-v21/styles.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 228dc78..c2141ed 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,8 +1,8 @@ - Píchačky + Docházka Otevřít navigaci Zavřít navigaci - Píchačky + Docházka Registrace směn Navigation header OK @@ -52,6 +52,9 @@ Typ směny musí být zadán Pro toto datum již směna existuje Nastavení uloženo + Korekce provedena + Chyba při přidávání přesčasu pro minulý měsíc + Neprovedena žádná změna. Podrobnosti měsíce diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 52c36e9..85fb92b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -10,8 +10,22 @@ @color/primaryText @color/itemTextColor @color/itemIconTint + @style/mySpinnerItemLightStyle + + + + + + +