[mobile] fix update dialog style

pull/123/head
FongMi 3 years ago
parent c3fbc726fa
commit 4dac11be2d
  1. 18
      app/src/main/java/com/fongmi/android/tv/api/Updater.java
  2. 3
      app/src/mobile/res/layout/dialog_config.xml
  3. 3
      app/src/mobile/res/layout/dialog_link.xml
  4. 57
      app/src/mobile/res/layout/dialog_update.xml

@ -1,6 +1,7 @@
package com.fongmi.android.tv.api;
import android.app.Activity;
import android.content.DialogInterface;
import android.view.LayoutInflater;
import android.view.View;
@ -92,25 +93,24 @@ public class Updater implements Download.Callback {
private void show(Activity activity, String version, String desc) {
binding = DialogUpdateBinding.inflate(LayoutInflater.from(activity));
binding.version.setText(ResUtil.getString(R.string.update_version, version));
binding.confirm.setOnClickListener(this::confirm);
binding.cancel.setOnClickListener(this::cancel);
check().create(activity, ResUtil.getString(R.string.update_version, version)).show();
dialog.getButton(DialogInterface.BUTTON_POSITIVE).setOnClickListener(this::confirm);
dialog.getButton(DialogInterface.BUTTON_NEGATIVE).setOnClickListener(this::cancel);
binding.desc.setText(desc);
check().create(activity).show();
}
private AlertDialog create(Activity activity) {
return dialog = new MaterialAlertDialogBuilder(activity).setView(binding.getRoot()).setCancelable(false).create();
private AlertDialog create(Activity activity, String title) {
return dialog = new MaterialAlertDialogBuilder(activity).setTitle(title).setView(binding.getRoot()).setPositiveButton(R.string.update_confirm, null).setNegativeButton(R.string.dialog_negative, null).setCancelable(false).create();
}
private void cancel(View view) {
Prefers.putUpdate(false);
dismiss();
dialog.dismiss();
}
private void confirm(View view) {
binding.confirm.setEnabled(false);
Download.create(getApk(), getFile(), this).start();
view.setEnabled(false);
}
private void dismiss() {
@ -122,7 +122,7 @@ public class Updater implements Download.Callback {
@Override
public void progress(int progress) {
binding.confirm.setText(String.format(Locale.getDefault(), "%1$d%%", progress));
dialog.getButton(DialogInterface.BUTTON_POSITIVE).setText(String.format(Locale.getDefault(), "%1$d%%", progress));
}
@Override

@ -6,8 +6,7 @@
android:orientation="vertical"
android:paddingStart="24dp"
android:paddingTop="16dp"
android:paddingEnd="24dp"
android:paddingBottom="16dp">
android:paddingEnd="24dp">
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/input"

@ -5,8 +5,7 @@
android:orientation="vertical"
android:paddingStart="24dp"
android:paddingTop="16dp"
android:paddingEnd="24dp"
android:paddingBottom="16dp">
android:paddingEnd="24dp">
<com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"

@ -4,33 +4,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:padding="16dp">
<TextView
android:id="@+id/version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:letterSpacing="0.02"
android:textColor="@color/grey_900"
android:textSize="16sp"
tools:text="@string/update_version" />
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:background="@color/grey_300" />
android:paddingStart="24dp"
android:paddingTop="16dp"
android:paddingEnd="24dp">
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="16dp"
android:layout_weight="1">
android:layout_height="match_parent"
android:fillViewport="true">
<TextView
android:id="@+id/desc"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:letterSpacing="0.02"
android:lineSpacingExtra="8dp"
@ -39,34 +24,4 @@
tools:text="1. 新增 ffmpeg 音頻軟解\n2. 詳情頁新增分詞快搜\n3. 修復搜尋閃退問題\n4. 設定支援渲染切換" />
</androidx.core.widget.NestedScrollView>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<TextView
android:id="@+id/confirm"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginEnd="16dp"
android:layout_weight="1"
android:background="@drawable/shape_text"
android:gravity="center"
android:text="@string/update_confirm"
android:textColor="@color/white"
android:textSize="14sp" />
<TextView
android:id="@+id/cancel"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="@drawable/shape_text"
android:gravity="center"
android:text="@string/dialog_negative"
android:textColor="@color/white"
android:textSize="14sp" />
</LinearLayout>
</LinearLayout>
Loading…
Cancel
Save