diff --git a/app/src/main/java/com/fongmi/bear/ui/SettingActivity.java b/app/src/main/java/com/fongmi/bear/ui/SettingActivity.java
index 5cb3dc10b..677aff301 100644
--- a/app/src/main/java/com/fongmi/bear/ui/SettingActivity.java
+++ b/app/src/main/java/com/fongmi/bear/ui/SettingActivity.java
@@ -2,12 +2,16 @@ package com.fongmi.bear.ui;
import android.app.Activity;
import android.content.Intent;
-import android.widget.Toast;
+import android.view.LayoutInflater;
+import android.view.View;
import androidx.viewbinding.ViewBinding;
+import com.fongmi.bear.R;
import com.fongmi.bear.databinding.ActivitySettingBinding;
+import com.fongmi.bear.databinding.DialogConfigBinding;
import com.fongmi.bear.utils.Prefers;
+import com.google.android.material.dialog.MaterialAlertDialogBuilder;
public class SettingActivity extends BaseActivity {
@@ -29,6 +33,20 @@ public class SettingActivity extends BaseActivity {
@Override
protected void initEvent() {
- binding.config.setOnClickListener(view -> Toast.makeText(SettingActivity.this, "config", Toast.LENGTH_SHORT).show());
+ binding.config.setOnClickListener(this::showConfig);
+ }
+
+ private void showConfig(View view) {
+ DialogConfigBinding dialog = DialogConfigBinding.inflate(LayoutInflater.from(this));
+ dialog.url.setText(Prefers.getString("url"));
+ dialog.url.setSelection(dialog.url.getText().length());
+ new MaterialAlertDialogBuilder(this, R.style.DialogTheme)
+ .setView(dialog.getRoot())
+ .setNegativeButton(R.string.dialog_negative, null)
+ .setPositiveButton(R.string.dialog_positive, (dialogInterface, i) -> {
+ Prefers.put("url", dialog.url.getText().toString().trim());
+ binding.url.setText(Prefers.getString("url"));
+ }).show();
+
}
}
diff --git a/app/src/main/java/com/fongmi/bear/ui/SplashActivity.java b/app/src/main/java/com/fongmi/bear/ui/SplashActivity.java
index 080e2589e..85f118ef4 100644
--- a/app/src/main/java/com/fongmi/bear/ui/SplashActivity.java
+++ b/app/src/main/java/com/fongmi/bear/ui/SplashActivity.java
@@ -38,6 +38,6 @@ public class SplashActivity extends BaseActivity {
}
private void openHome() {
- new Handler().postDelayed(() -> HomeActivity.newInstance(this), 2000);
+ new Handler().postDelayed(() -> HomeActivity.newInstance(this), 500);
}
}
diff --git a/app/src/main/res/drawable-nodpi/wallpaper_3.webp b/app/src/main/res/drawable-nodpi/wallpaper_3.webp
deleted file mode 100644
index a89e0a1a1..000000000
Binary files a/app/src/main/res/drawable-nodpi/wallpaper_3.webp and /dev/null differ
diff --git a/app/src/main/res/layout/activity_home.xml b/app/src/main/res/layout/activity_home.xml
index 5d8244631..98f2dc5b2 100644
--- a/app/src/main/res/layout/activity_home.xml
+++ b/app/src/main/res/layout/activity_home.xml
@@ -1,5 +1,4 @@
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml
index e0b1b0ebf..71f249339 100644
--- a/app/src/main/res/layout/activity_setting.xml
+++ b/app/src/main/res/layout/activity_setting.xml
@@ -3,7 +3,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@drawable/wallpaper_1"
android:orientation="vertical"
android:padding="16dp">
diff --git a/app/src/main/res/layout/activity_splash.xml b/app/src/main/res/layout/activity_splash.xml
index 53586687b..98f2dc5b2 100644
--- a/app/src/main/res/layout/activity_splash.xml
+++ b/app/src/main/res/layout/activity_splash.xml
@@ -1,6 +1,4 @@
\ No newline at end of file
+ android:layout_height="match_parent" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/dialog_config.xml b/app/src/main/res/layout/dialog_config.xml
new file mode 100644
index 000000000..a508eff0a
--- /dev/null
+++ b/app/src/main/res/layout/dialog_config.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index e385fefc8..364191ef3 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -3,5 +3,7 @@
熊爱影视
配置接口
历史配置
+ 确定
+ 取消
\ No newline at end of file
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index c532adf9c..e4eb53bc9 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -3,5 +3,7 @@
熊愛影視
配置接口
歷史配置
+ 確定
+ 取消
\ No newline at end of file
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2138cc8d2..d831d6910 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -14,5 +14,6 @@
#00000000
#33000000
#40000000
+ #80000000
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bff23eb1a..15e4ec9c0 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -3,5 +3,7 @@
BearTV
Configure
History
+ OK
+ Cancel
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4c28b1b9a..b46b0d173 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -7,9 +7,14 @@
- @color/primaryDark
- @color/accent
- @color/accent
- - @color/black
+ - @null
+ - @drawable/wallpaper_1
- true
- true
+
+