Skip to content
This repository was archived by the owner on Aug 31, 2022. It is now read-only.

Commit 0a112e8

Browse files
committed
3.2.1 Fix issue with dates
1 parent 26d5d99 commit 0a112e8

File tree

3 files changed

+29
-18
lines changed

3 files changed

+29
-18
lines changed

CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,10 @@
22

33
## [Non sorti]
44

5+
## [3.2.1] - 2020-11-04
6+
### Réglé
7+
- Problème de date
8+
59
## [3.2.0] - 2020-11-03
610
### Ajouté
711
- Sauvegarde des motifs

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "com.poupa.attestationdeplacement"
99
minSdkVersion 16
1010
targetSdkVersion 29
11-
versionCode 21
12-
versionName "3.2.0"
11+
versionCode 22
12+
versionName "3.2.1"
1313
multiDexEnabled true
1414
vectorDrawables.useSupportLibrary = true
1515

app/src/main/java/com/poupa/attestationdeplacement/CreateAttestationActivity.java

+23-16
Original file line numberDiff line numberDiff line change
@@ -61,19 +61,20 @@ protected void onCreate(Bundle savedInstanceState) {
6161

6262
setSupportActionBar(toolbar);
6363

64-
initFields();
64+
initFields(true);
6565
}
6666

6767
@Override
6868
public void onResume(){
6969
super.onResume();
70-
initFields();
70+
71+
initFields(false);
7172
}
7273

7374
/**
7475
* Initialize the input fields
7576
*/
76-
private void initFields() {
77+
private void initFields(boolean initDate) {
7778
attestation = new Attestation();
7879

7980
attestationGenerator = new AttestationDeplacementDerogatoireGenerator(this, attestation);
@@ -114,13 +115,15 @@ private void initFields() {
114115

115116
travelHourInput = findViewById(R.id.travel_hour);
116117

117-
DateTextWatcher birthDateTextWatcher = new DateTextWatcher(birthDateInput);
118+
if (initDate) {
119+
DateTextWatcher birthDateTextWatcher = new DateTextWatcher(birthDateInput);
118120

119-
birthDateInput.addTextChangedListener(birthDateTextWatcher);
121+
birthDateInput.addTextChangedListener(birthDateTextWatcher);
120122

121-
DateTextWatcher travelDateTextWatcher = new DateTextWatcher(travelDateInput);
123+
DateTextWatcher travelDateTextWatcher = new DateTextWatcher(travelDateInput);
122124

123-
travelDateInput.addTextChangedListener(travelDateTextWatcher);
125+
travelDateInput.addTextChangedListener(travelDateTextWatcher);
126+
}
124127

125128
travelHourInput.setOnClickListener(new View.OnClickListener() {
126129
@Override
@@ -140,15 +143,7 @@ public void onTimeSet(TimePicker timePicker, int hour, int minute) {
140143
}
141144
});
142145

143-
((CheckBox) findViewById(R.id.reason1)).setChecked(userDetails.getBoolean("reason1", false));
144-
((CheckBox) findViewById(R.id.reason2)).setChecked(userDetails.getBoolean("reason2", false));
145-
((CheckBox) findViewById(R.id.reason3)).setChecked(userDetails.getBoolean("reason3", false));
146-
((CheckBox) findViewById(R.id.reason4)).setChecked(userDetails.getBoolean("reason4", false));
147-
((CheckBox) findViewById(R.id.reason5)).setChecked(userDetails.getBoolean("reason5", false));
148-
((CheckBox) findViewById(R.id.reason6)).setChecked(userDetails.getBoolean("reason6", false));
149-
((CheckBox) findViewById(R.id.reason7)).setChecked(userDetails.getBoolean("reason7", false));
150-
((CheckBox) findViewById(R.id.reason8)).setChecked(userDetails.getBoolean("reason8", false));
151-
((CheckBox) findViewById(R.id.reason9)).setChecked(userDetails.getBoolean("reason9", false));
146+
setReasonsCheckboxes(userDetails);
152147

153148
setDate();
154149

@@ -168,6 +163,18 @@ public void onClick(View v) {
168163
constraintSet.applyTo(constraintLayout);
169164
}
170165

166+
private void setReasonsCheckboxes(SharedPreferences userDetails) {
167+
((CheckBox) findViewById(R.id.reason1)).setChecked(userDetails.getBoolean("reason1", false));
168+
((CheckBox) findViewById(R.id.reason2)).setChecked(userDetails.getBoolean("reason2", false));
169+
((CheckBox) findViewById(R.id.reason3)).setChecked(userDetails.getBoolean("reason3", false));
170+
((CheckBox) findViewById(R.id.reason4)).setChecked(userDetails.getBoolean("reason4", false));
171+
((CheckBox) findViewById(R.id.reason5)).setChecked(userDetails.getBoolean("reason5", false));
172+
((CheckBox) findViewById(R.id.reason6)).setChecked(userDetails.getBoolean("reason6", false));
173+
((CheckBox) findViewById(R.id.reason7)).setChecked(userDetails.getBoolean("reason7", false));
174+
((CheckBox) findViewById(R.id.reason8)).setChecked(userDetails.getBoolean("reason8", false));
175+
((CheckBox) findViewById(R.id.reason9)).setChecked(userDetails.getBoolean("reason9", false));
176+
}
177+
171178
/**
172179
* Generates the PDF by calling the async task
173180
* @param v

0 commit comments

Comments
 (0)