diff --git a/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java b/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java index 5823a535d..0ea87cfe8 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java +++ b/app/src/main/java/ru/vtosters/lite/ui/dialogs/OTADialog.java @@ -2,18 +2,25 @@ package ru.vtosters.lite.ui.dialogs; import android.app.Activity; +import android.graphics.Typeface; +import android.view.View; +import android.widget.LinearLayout; +import android.widget.TextView; import com.vtosters.lite.R; import ru.vtosters.lite.downloaders.OTADownloader; import ru.vtosters.lite.ui.vkui.ModalBottomSheetWrapper; +import ru.vtosters.lite.utils.AndroidUtils; import ru.vtosters.lite.utils.OTAUtils; +import ru.vtosters.lite.utils.ThemesUtils; -public class OTADialog implements OTAUtils.OTAListener { +public class OTADialog extends ModalBottomSheetWrapper implements OTAUtils.OTAListener { private final Activity mActivity; private final OTAUtils mHelper; public OTADialog(Activity activity) { + super(activity); mActivity = activity; mHelper = new OTAUtils(this); @@ -26,16 +33,28 @@ public class OTADialog implements OTAUtils.OTAListener { @Override public void onUpdateApplied() { -// mActivity.runOnUiThread(() -> { -// // Toast.makeText(mActivity, "Обновления найдены", Toast.LENGTH_SHORT).show(); -// new ModalBottomSheetWrapper(mActivity) -// .setTitle(mActivity.getString(R.string.newversion) + " " + mHelper.getNewVersionName()) -// .setUpdateInfoView(mHelper.getUpdateDescription()) -// .setPositiveButton(mActivity.getString(R.string.updateanddownload), () -> { -// OTADownloader.downloadBuild(mHelper.getDownloadUrl(), mHelper.getCommitSHA()); -// }) -// .show(); -// }); + mActivity.runOnUiThread(() -> { + // Toast.makeText(mActivity, "Обновления найдены", Toast.LENGTH_SHORT).show(); + setTitle(mActivity.getString(R.string.newversion) + " " + mHelper.getNewVersionName()) + .setView(makeUpdateInfoView(mHelper.getUpdateDescription())) + .setPositiveButton(mActivity.getString(R.string.updateanddownload), () -> { + OTADownloader.downloadBuild(mHelper.getDownloadUrl(), mHelper.getCommitSHA()); + }) + .show("ota"); + }); + } + + private View makeUpdateInfoView(String changelog) { + var container = new LinearLayout(mActivity); + var changelogView = new TextView(mActivity); + + container.setOrientation(LinearLayout.VERTICAL); + + changelogView.setText("Изменения: \n" + changelog); + changelogView.setTextColor(ThemesUtils.getTextAttr()); + container.addView(changelogView, new LinearLayout.LayoutParams(-1, -2)); + + return container; } @Override diff --git a/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java b/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java index 1e3e2a6f7..3f2aa533a 100644 --- a/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java +++ b/app/src/main/java/ru/vtosters/lite/ui/vkui/ModalBottomSheetWrapper.java @@ -30,7 +30,7 @@ public class ModalBottomSheetWrapper { String text, Runnable callback ) { - mBuilder.a(text, kostil -> callback.run()); + mBuilder.a(text, listener -> callback.run()); return (T) this; }