Skip to content

Commit 95718a7

Browse files
Philipp0002Philipp0002
committed
Ui update: make dialogs respect dark-/light-mode
1 parent 003d484 commit 95718a7

17 files changed

Lines changed: 97 additions & 129 deletions

‎app/build.gradle‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,28 @@ dependencies {
4646
}
4747
}
4848
implementation "androidx.multidex:multidex:2.0.1"
49-
implementation 'androidx.appcompat:appcompat:1.6.1'
49+
implementation 'androidx.appcompat:appcompat:1.7.1'
5050
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
5151
implementation 'androidx.vectordrawable:vectordrawable:1.2.0'
5252
implementation fileTree(include: ['*.jar', '*.aar'], dir: 'libs')
5353
implementation 'com.github.sundeepk:compact-calendar-view:3.0.0'
5454
implementation 'com.google.android.material:material:1.14.0-alpha02'
5555
implementation 'androidx.cardview:cardview:1.0.0'
56-
implementation 'androidx.recyclerview:recyclerview:1.3.0'
56+
implementation 'androidx.recyclerview:recyclerview:1.4.0'
5757
implementation 'androidx.percentlayout:percentlayout:1.0.0'
5858
implementation 'com.sothree.slidinguppanel:library:3.4.0'
59-
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
59+
implementation 'androidx.constraintlayout:constraintlayout:2.2.1'
6060
implementation 'com.prof18.rssparser:rssparser:1.3.1'
6161
implementation 'androidx.work:work-runtime:2.8.0'
6262
implementation 'com.github.dewinjm:monthyear-picker:1.0.2'
6363
implementation 'com.github.marcoscgdev:Licenser:2.0.0'
6464
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.8.10"
6565
implementation 'com.google.android.gms:play-services-base:18.2.0'
6666
implementation 'com.google.android.gms:play-services-auth:20.4.1'
67-
implementation 'com.akexorcist:round-corner-progress-bar:2.1.2'
6867
implementation 'com.github.amitshekhariitbhu:PRDownloader:1.0.2'
6968
implementation 'androidx.core:core:1.9.0'
7069
coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:2.0.2'
7170
compileOnly 'org.projectlombok:lombok:1.18.32'
7271
annotationProcessor 'org.projectlombok:lombok:1.18.32'
73-
implementation "androidx.core:core-splashscreen:1.0.0"
72+
implementation "androidx.core:core-splashscreen:1.0.1"
7473
}

‎app/src/main/java/tk/phili/dienst/dienst/calendar/CalendarFragment.java‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import android.widget.Toast;
2525

2626
import androidx.annotation.Nullable;
27-
import androidx.appcompat.view.ContextThemeWrapper;
2827
import androidx.appcompat.widget.Toolbar;
2928
import androidx.core.app.ActivityCompat;
3029
import androidx.core.content.ContextCompat;
@@ -178,7 +177,7 @@ public void onMonthScroll(Date firstDayOfNewMonth) {
178177
};
179178

180179
if (!sp.contains("CalendarSyncActive")) {
181-
new MaterialAlertDialogBuilder(new ContextThemeWrapper(getContext(), R.style.AppThemeDark), R.style.MaterialAlertDialogCenterStyle)
180+
new MaterialAlertDialogBuilder(requireContext(), R.style.MaterialAlertDialogCenterStyle)
182181
.setTitle(R.string.calendar_activate_gcal_title)
183182
.setMessage(R.string.calendar_activate_gcal_msg)
184183
.setIcon(R.drawable.ic_baseline_sync_24)
@@ -203,7 +202,6 @@ private void showMonthYearPicker(SimpleDateFormat dateFormat) {
203202
MonthYearPickerDialog simpleDatePickerDialog;
204203

205204
try {
206-
ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(getContext(), R.style.AppThemeDark);
207205
Constructor constructor = MonthYearPickerDialog.class.getDeclaredConstructor(Context.class,
208206
int.class,
209207
int.class,
@@ -213,7 +211,7 @@ private void showMonthYearPicker(SimpleDateFormat dateFormat) {
213211

214212
constructor.setAccessible(true);
215213
simpleDatePickerDialog = (MonthYearPickerDialog) constructor.newInstance(
216-
contextThemeWrapper,
214+
requireContext(),
217215
R.style.DialogStyleBasic,
218216
cal.get(Calendar.YEAR),
219217
cal.get(Calendar.MONTH),
@@ -242,11 +240,11 @@ private void showMonthYearPicker(SimpleDateFormat dateFormat) {
242240
simpleDatePickerDialog.show();
243241
simpleDatePickerDialog
244242
.getButton(DialogInterface.BUTTON_POSITIVE)
245-
.setTextColor(ContextCompat.getColor(contextThemeWrapper, R.color.settings_title));
243+
.setTextColor(ContextCompat.getColor(requireContext(), R.color.settings_title));
246244

247245
simpleDatePickerDialog
248246
.getButton(DialogInterface.BUTTON_NEGATIVE)
249-
.setTextColor(ContextCompat.getColor(contextThemeWrapper, R.color.settings_title));
247+
.setTextColor(ContextCompat.getColor(requireContext(), R.color.settings_title));
250248
} catch (Exception e) {
251249
e.printStackTrace();
252250
}
@@ -355,7 +353,7 @@ public void query_calendar() {
355353
cur.close();
356354
}
357355
if (calendarIdList.size() != 0) {
358-
MaterialAlertDialogBuilder adb = new MaterialAlertDialogBuilder(new ContextThemeWrapper(getContext(), R.style.AppThemeDark));
356+
MaterialAlertDialogBuilder adb = new MaterialAlertDialogBuilder(requireContext());
359357
adb.setTitle("Kalender wählen"); //TODO MULTI LANG
360358
CharSequence items[] = accountNameList.toArray(new CharSequence[accountNameList.size()]);
361359
adb.setSingleChoiceItems(items, -1, new DialogInterface.OnClickListener() {

‎app/src/main/java/tk/phili/dienst/dienst/calendar/CalendarList.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
import android.widget.ArrayAdapter;
1515
import android.widget.TextView;
1616

17-
import androidx.appcompat.view.ContextThemeWrapper;
1817
import androidx.core.content.ContextCompat;
1918

2019
import com.github.sundeepk.compactcalendarview.domain.Event;
@@ -96,7 +95,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
9695
holder.mainView.setOnLongClickListener(view -> {
9796

9897
String[] entries = new String[]{context.getString(R.string.calendar_menu_edit), context.getString(R.string.calendar_menu_delete)};
99-
new MaterialAlertDialogBuilder(new ContextThemeWrapper(getContext(), R.style.AppThemeDark))
98+
new MaterialAlertDialogBuilder(context)
10099
.setTitle(context.getString(R.string.calendar_menu_title))
101100
.setItems(entries, (dialog, which) -> {
102101
if (which == 0) {
@@ -109,7 +108,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
109108
partner.isEmpty() ? null : partner,
110109
description.isEmpty() ? null : description);
111110
} else if (which == 1) {
112-
new MaterialAlertDialogBuilder(new ContextThemeWrapper(getContext(), R.style.AppThemeDark), R.style.MaterialAlertDialogCenterStyle)
111+
new MaterialAlertDialogBuilder(getContext(), R.style.MaterialAlertDialogCenterStyle)
113112
.setMessage(R.string.calendar_menu_delete_msg)
114113
.setTitle((context.getString(R.string.calendar_menu_delete_title)))
115114
.setPositiveButton(context.getString(R.string.delete_ok), (d, e) -> {

‎app/src/main/java/tk/phili/dienst/dienst/drawer/Drawer.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import android.widget.TextView;
1313

1414
import androidx.annotation.NonNull;
15-
import androidx.appcompat.view.ContextThemeWrapper;
1615
import androidx.drawerlayout.widget.DrawerLayout;
1716
import androidx.fragment.app.Fragment;
1817

@@ -205,7 +204,7 @@ private void onItemClicked(WrapperActivity activity, Class toOpen) {
205204
for (Object[] mapping : positionMapping) {
206205
if (mapping[0] == toOpen) {
207206
if ((int) mapping[3] > Build.VERSION.SDK_INT) {
208-
new MaterialAlertDialogBuilder(new ContextThemeWrapper(activity, R.style.AppThemeDark), R.style.MaterialAlertDialogCenterStyle)
207+
new MaterialAlertDialogBuilder(activity, R.style.MaterialAlertDialogCenterStyle)
209208
.setTitle(R.string.error)
210209
.setIcon(R.drawable.ic_baseline_error_outline_24)
211210
.setPositiveButton(R.string.ok, (dialog, which) -> dialog.dismiss())

‎app/src/main/java/tk/phili/dienst/dienst/report/ReportAddDialog.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import androidx.annotation.NonNull;
2222
import androidx.annotation.Nullable;
2323
import androidx.appcompat.app.AlertDialog;
24-
import androidx.appcompat.view.ContextThemeWrapper;
2524
import androidx.appcompat.widget.Toolbar;
2625
import androidx.core.view.ViewCompat;
2726
import androidx.fragment.app.DialogFragment;
@@ -299,7 +298,7 @@ public void afterTextChanged(Editable s) {
299298
}
300299

301300
public void showError(final String messagebox) {
302-
AlertDialog dialog = new MaterialAlertDialogBuilder(new ContextThemeWrapper(getContext(), R.style.AppThemeDark)).setTitle(getString(R.string.error)).setMessage(messagebox).setPositiveButton(R.string.ok, null).setNegativeButton("", null).create();
301+
AlertDialog dialog = new MaterialAlertDialogBuilder(requireContext()).setTitle(getString(R.string.error)).setMessage(messagebox).setPositiveButton(R.string.ok, null).setNegativeButton("", null).create();
303302
dialog.show();
304303

305304
dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setEnabled(false);

‎app/src/main/java/tk/phili/dienst/dienst/report/ReportFragment.java‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
import androidx.annotation.NonNull;
1919
import androidx.annotation.Nullable;
20-
import androidx.appcompat.view.ContextThemeWrapper;
2120
import androidx.appcompat.widget.Toolbar;
2221
import androidx.core.content.ContextCompat;
2322
import androidx.fragment.app.Fragment;
@@ -174,7 +173,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
174173
}
175174
});
176175

177-
new MaterialAlertDialogBuilder(new ContextThemeWrapper(getContext(), R.style.AppThemeDark))
176+
new MaterialAlertDialogBuilder(requireContext())
178177
.setTitle(getString(R.string.title_section6))
179178
.setMessage(getString(R.string.report_input_name))
180179
.setView(input_view)
@@ -190,7 +189,7 @@ public void onViewCreated(View view, Bundle savedInstanceState) {
190189

191190
carryOverButton.setOnClickListener(v -> {
192191
if (carryOverButton.getAlpha() != 0F) {
193-
new MaterialAlertDialogBuilder(new ContextThemeWrapper(getContext(), R.style.AppThemeDark), R.style.MaterialAlertDialogCenterStyle)
192+
new MaterialAlertDialogBuilder(requireContext(), R.style.MaterialAlertDialogCenterStyle)
194193
.setIcon(R.drawable.ic_baseline_redo_24)
195194
.setTitle(getString(R.string.carryover))
196195
.setMessage(getString(R.string.carryover_msg))
@@ -241,7 +240,6 @@ private void showMonthYearPicker() {
241240
MonthYearPickerDialog simpleDatePickerDialog;
242241

243242
try {
244-
ContextThemeWrapper contextThemeWrapper = new ContextThemeWrapper(getContext(), R.style.AppThemeDark);
245243
Constructor<MonthYearPickerDialog> constructor = MonthYearPickerDialog.class.getDeclaredConstructor(Context.class,
246244
int.class,
247245
int.class,
@@ -251,7 +249,7 @@ private void showMonthYearPicker() {
251249

252250
constructor.setAccessible(true);
253251
simpleDatePickerDialog = constructor.newInstance(
254-
contextThemeWrapper,
252+
requireContext(),
255253
R.style.DialogStyleBasic,
256254
calendarShow.get(Calendar.YEAR),
257255
calendarShow.get(Calendar.MONTH),
@@ -279,11 +277,11 @@ private void showMonthYearPicker() {
279277
simpleDatePickerDialog.show();
280278
simpleDatePickerDialog
281279
.getButton(DialogInterface.BUTTON_POSITIVE)
282-
.setTextColor(ContextCompat.getColor(contextThemeWrapper, R.color.settings_title));
280+
.setTextColor(ContextCompat.getColor(requireContext(), R.color.settings_title));
283281

284282
simpleDatePickerDialog
285283
.getButton(DialogInterface.BUTTON_NEGATIVE)
286-
.setTextColor(ContextCompat.getColor(contextThemeWrapper, R.color.settings_title));
284+
.setTextColor(ContextCompat.getColor(requireContext(), R.color.settings_title));
287285
} catch (Exception e) {
288286
e.printStackTrace();
289287
}
@@ -476,7 +474,7 @@ public void openGoalEditDialog() {
476474
if (sp.contains("goal") && !sp.getString("goal", "0").equals("0")) {
477475
edt.setText(sp.getString("goal", "0"));
478476
}
479-
new MaterialAlertDialogBuilder(new ContextThemeWrapper(getContext(), R.style.AppThemeDark))
477+
new MaterialAlertDialogBuilder(requireContext())
480478
.setView(input_view)
481479
.setTitle(getString(R.string.goal_set))
482480
.setMessage(getString(R.string.goal_msg))

0 commit comments

Comments
 (0)