Skip to content

Commit

Permalink
V1.0.1 / RELEASE verze
Browse files Browse the repository at this point in the history
  • Loading branch information
@Ghasteek
Ghasteek committed Apr 16, 2019
1 parent 37e0b7b commit c4b10c0
Show file tree
Hide file tree
Showing 22 changed files with 150 additions and 191 deletions.
6 changes: 3 additions & 3 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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" >
<activity
android:name="com.workhours.SettingsTheme"
android:label="@string/settingsColorTheme"/>
Expand Down Expand Up @@ -52,5 +53,4 @@
android:authorities="com.workhours"
android:exported="false" />
</application>

</manifest>
11 changes: 6 additions & 5 deletions app/src/main/java/com/workhours/MainActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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")){
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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();}
}

Expand All @@ -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(); }
}
}
Expand Down Expand Up @@ -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);
}
Expand Down Expand Up @@ -635,5 +635,6 @@ public static class Globals {
public static int timeOutHours;
public static int timeOutMinutes;
public static boolean isEdited;
public static String theme;
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/workhours/SettingsCorrection.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
17 changes: 12 additions & 5 deletions app/src/main/java/com/workhours/Shift.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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 {
Expand All @@ -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();}
}
}
Expand Down
33 changes: 28 additions & 5 deletions app/src/main/java/com/workhours/TimePickerFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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()));
}
}
}
}
4 changes: 2 additions & 2 deletions app/src/main/java/com/workhours/data/ShiftsProvider.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
9 changes: 0 additions & 9 deletions app/src/main/res/drawable-v21/ic_menu_manage.xml
View file

This file was deleted.

0 app/src/main/res/drawable-v21/check_in.png → app/src/main/res/drawable/check_in.png
View file
File renamed without changes
0 app/src/main/res/drawable-v21/check_out.png → app/src/main/res/drawable/check_out.png
View file
File renamed without changes
Loading

0 comments on commit c4b10c0

Please sign in to comment.