Skip to content

Commit 07b93a5

Browse files
luisguzman-adfaluisguzman-adfa
committed
Merge branch 'main' of github.com:appdevforall/KnowledgeToGo into refactor/K2GO-385-pill-roles-modulehub
2 parents 00b3513 + 9945270 commit 07b93a5

4 files changed

Lines changed: 36 additions & 37 deletions

File tree

‎controller/app/src/main/java/org/appdevforall/k2go/redesign/CloneFragment.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import com.journeyapps.barcodescanner.ScanOptions;
2929
import androidx.annotation.NonNull;
3030
import androidx.annotation.Nullable;
31-
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
31+
import org.appdevforall.k2go.ui.dialog.BrandDialog;
3232
import com.google.android.material.progressindicator.LinearProgressIndicator;
3333
import androidx.core.content.ContextCompat;
3434
import androidx.core.content.FileProvider;
@@ -420,11 +420,11 @@ private void requestMode(Mode target) {
420420
boolean sharing = (side == Side.SEND && page == Page.COPY && daemonStarted);
421421
if (target == mode || !sharing) { setMode(target); return; }
422422
String label = (target == Mode.HOTSPOT) ? "Hotspot" : "Wi-Fi";
423-
new MaterialAlertDialogBuilder(requireContext())
423+
new BrandDialog(requireContext())
424424
.setTitle(getString(R.string.k2go_clone_switch_title, label))
425-
.setMessage(getString(R.string.k2go_clone_switch_msg))
426-
.setNegativeButton(getString(R.string.k2go_cancel), null)
427-
.setPositiveButton(getString(R.string.k2go_clone_switch_confirm), (d, w) -> setMode(target))
425+
.setMessage(R.string.k2go_clone_switch_msg)
426+
.setNegative(R.string.k2go_cancel, null)
427+
.setPositive(R.string.k2go_clone_switch_confirm, () -> setMode(target))
428428
.show();
429429
}
430430

@@ -965,11 +965,11 @@ private String bitsLabel(int bits) {
965965
// nothing to copy — warn before probing rather than pulling an empty library.
966966
private void probeOrWarnEmpty(SyncHandshakeHelper.SyncCredentials creds) {
967967
if (!creds.hasRootfs) {
968-
new MaterialAlertDialogBuilder(requireContext())
969-
.setTitle(getString(R.string.k2go_clone_nolib_title))
970-
.setMessage(getString(R.string.k2go_clone_nolib_msg))
971-
.setNegativeButton(getString(R.string.k2go_cancel), null)
972-
.setPositiveButton(getString(R.string.k2go_clone_try_anyway), (d, w) -> syncVm.startProbe(requireContext().getApplicationContext(), shareConfig, creds))
968+
new BrandDialog(requireContext())
969+
.setTitle(R.string.k2go_clone_nolib_title)
970+
.setMessage(R.string.k2go_clone_nolib_msg)
971+
.setNegative(R.string.k2go_cancel, null)
972+
.setPositive(R.string.k2go_clone_try_anyway, () -> syncVm.startProbe(requireContext().getApplicationContext(), shareConfig, creds))
973973
.show();
974974
return;
975975
}
@@ -1376,10 +1376,10 @@ private void showReceiveTerminal(boolean ok, String message) {
13761376
exitStartAt = android.os.SystemClock.elapsedRealtime();
13771377
SyncProgressRepository.get().postIdle(); // the copy is done; drop the busy/progress state
13781378
startExitPoll();
1379-
new MaterialAlertDialogBuilder(requireContext())
1380-
.setTitle(getString(R.string.k2go_clone_copy_complete))
1379+
new BrandDialog(requireContext())
1380+
.setTitle(R.string.k2go_clone_copy_complete)
13811381
.setCancelable(false)
1382-
.setPositiveButton(android.R.string.ok, (d, w) -> {
1382+
.setPositive(android.R.string.ok, () -> {
13831383
exitAck = true;
13841384
rStage = RStage.START; // land on step 2, where the status zone lives
13851385
maybeStartCountdown(); // if services already answered, begin the 3-2-1 now
@@ -1399,11 +1399,11 @@ private void showReceiveTerminal(boolean ok, String message) {
13991399
// Retry re-scans (rsync resumes from the half-written tree — the maravilla Luis relies on);
14001400
// Recover goes to the hub (restore / install over internet / clone again). The Back guard has
14011401
// already turned off (FAILED is not active), so leaving the app is free too.
1402-
new MaterialAlertDialogBuilder(requireContext())
1403-
.setTitle(getString(R.string.k2go_clone_copy_stopped))
1402+
new BrandDialog(requireContext())
1403+
.setTitle(R.string.k2go_clone_copy_stopped)
14041404
.setMessage(body)
1405-
.setPositiveButton(getString(R.string.k2go_home_retry), (d, w) -> { SyncProgressRepository.get().postIdle(); renderReceive(); })
1406-
.setNegativeButton(getString(R.string.k2go_home_recover), (d, w) -> {
1405+
.setPositive(R.string.k2go_home_retry, () -> { SyncProgressRepository.get().postIdle(); renderReceive(); })
1406+
.setNegative(R.string.k2go_home_recover, () -> {
14071407
SyncProgressRepository.get().postIdle();
14081408
SetupLibraryActivity.recover(requireContext());
14091409
})
@@ -1456,11 +1456,11 @@ public void onDestroyView() {
14561456
}
14571457

14581458
private void confirmStop() {
1459-
new MaterialAlertDialogBuilder(requireContext())
1460-
.setTitle(getString(R.string.k2go_clone_stopshare_title))
1461-
.setMessage(getString(R.string.k2go_clone_stopshare_msg))
1462-
.setNegativeButton(getString(R.string.k2go_cancel), null)
1463-
.setPositiveButton(getString(R.string.k2go_clone_stop_confirm), (d, w) -> {
1459+
new BrandDialog(requireContext())
1460+
.setTitle(R.string.k2go_clone_stopshare_title)
1461+
.setMessage(R.string.k2go_clone_stopshare_msg)
1462+
.setNegative(R.string.k2go_cancel, null)
1463+
.setDestructive(R.string.k2go_clone_stop_confirm, () -> {
14641464
if (transport != null) transport.stop();
14651465
daemonStarted = false;
14661466
userStopped = true; // do not auto-restart on the next render

‎controller/app/src/main/java/org/appdevforall/k2go/redesign/InstallConfirm.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@
22

33
import android.app.Activity;
44

5-
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
6-
75
import org.appdevforall.k2go.R;
6+
import org.appdevforall.k2go.ui.dialog.BrandDialog;
87
import org.appdevforall.k2go.system.domain.Operation;
98

109
/**
@@ -32,11 +31,11 @@ public static void gate(Activity activity, Operation op, Runnable onProceed) {
3231
onProceed.run();
3332
return;
3433
}
35-
new MaterialAlertDialogBuilder(activity)
34+
new BrandDialog(activity)
3635
.setTitle(R.string.k2go_install_confirm_title)
3736
.setMessage(R.string.k2go_install_confirm_body)
38-
.setNegativeButton(R.string.k2go_install_confirm_cancel, null)
39-
.setPositiveButton(R.string.k2go_install_confirm_go, (d, w) -> onProceed.run())
37+
.setNegative(R.string.k2go_install_confirm_cancel, null)
38+
.setPositive(R.string.k2go_install_confirm_go, () -> onProceed.run())
4039
.show();
4140
}
4241
}

‎controller/app/src/main/java/org/appdevforall/k2go/redesign/KiwixManageController.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040

4141
import com.google.android.material.button.MaterialButton;
4242
import com.google.android.material.color.MaterialColors;
43-
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
43+
import org.appdevforall.k2go.ui.dialog.BrandDialog;
4444
import com.google.android.material.floatingactionbutton.FloatingActionButton;
4545

4646
import org.appdevforall.k2go.R;
@@ -297,11 +297,11 @@ private View row(JSONObject item) {
297297
}
298298

299299
private void confirmDelete(String name) {
300-
new MaterialAlertDialogBuilder(themed)
300+
new BrandDialog(themed)
301301
.setTitle(activity.getString(R.string.k2go_zim_delete_confirm_title, prettyName(name)))
302302
.setMessage(R.string.k2go_zim_delete_confirm_msg)
303-
.setNegativeButton(android.R.string.cancel, null)
304-
.setPositiveButton(R.string.k2go_zim_delete, (d, w) -> {
303+
.setNegative(android.R.string.cancel, null)
304+
.setDestructive(R.string.k2go_zim_delete, () -> {
305305
Toast.makeText(activity, R.string.k2go_zim_deleting, Toast.LENGTH_SHORT).show();
306306
KiwixClient.delete(name, new KiwixClient.OkCb() {
307307
@Override public void onOk(boolean deferred) {
@@ -323,9 +323,9 @@ private void confirmDelete(String name) {
323323
}
324324
@Override public void onErr(String message) {
325325
if (activity.isFinishing()) return;
326-
new MaterialAlertDialogBuilder(themed)
326+
new BrandDialog(themed)
327327
.setMessage(R.string.k2go_zim_delete_failed)
328-
.setPositiveButton(android.R.string.ok, null).show();
328+
.setPositive(android.R.string.ok, null).show();
329329
}
330330
});
331331
})

‎controller/app/src/main/java/org/appdevforall/k2go/redesign/WizardActivity.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
import androidx.appcompat.app.AppCompatActivity;
1616
import androidx.core.app.NotificationManagerCompat;
1717
import androidx.core.content.ContextCompat;
18-
import com.google.android.material.dialog.MaterialAlertDialogBuilder;
18+
import org.appdevforall.k2go.ui.dialog.BrandDialog;
1919
import org.appdevforall.k2go.R;
2020
import org.appdevforall.k2go.applang.data.AppLocaleController;
2121
import org.appdevforall.k2go.applang.data.ContentLanguage;
@@ -201,12 +201,12 @@ private void maybeAskAnalytics(Runnable onDone) {
201201
// ADFA-5337: no analytics compiled in (no google-services.json) → nothing to consent to; skip.
202202
if (!org.appdevforall.k2go.BuildConfig.ANALYTICS_ENABLED) { onDone.run(); return; }
203203
if (AnalyticsConsent.wasAsked(this)) { onDone.run(); return; }
204-
new MaterialAlertDialogBuilder(this)
204+
new BrandDialog(this)
205205
.setTitle(R.string.analytics_enroll_title)
206206
.setMessage(getString(R.string.analytics_enroll_body, getString(R.string.app_name)))
207207
.setCancelable(false)
208-
.setPositiveButton(R.string.analytics_enroll_accept, (d, w) -> setAnalytics(true, onDone))
209-
.setNegativeButton(R.string.analytics_enroll_decline, (d, w) -> setAnalytics(false, onDone))
208+
.setPositive(R.string.analytics_enroll_accept, () -> setAnalytics(true, onDone))
209+
.setNegative(R.string.analytics_enroll_decline, () -> setAnalytics(false, onDone))
210210
.show();
211211
}
212212

0 commit comments

Comments
 (0)