diff --git a/app/src/main/ic_yingmao_logo_9972-playstore.png b/app/src/main/ic_yingmao_logo_9972-playstore.png deleted file mode 100644 index e8de605..0000000 Binary files a/app/src/main/ic_yingmao_logo_9972-playstore.png and /dev/null differ diff --git a/app/src/main/java/com/yingmao/clash/act/LossPreventionActivity.kt b/app/src/main/java/com/yingmao/clash/act/LossPreventionActivity.kt index c8b30e1..81d7c90 100644 --- a/app/src/main/java/com/yingmao/clash/act/LossPreventionActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/LossPreventionActivity.kt @@ -33,7 +33,7 @@ import kotlinx.coroutines.launch import kotlinx.coroutines.withContext class LossPreventionActivity : BaseActivity() { - var iv_lossper: ImageView? = null; + lateinit var iv_lossper: ImageView ; private lateinit var aiBack: AppCompatImageView private lateinit var tvSave:TextView override fun onCreate(savedInstanceState: Bundle?) { @@ -65,7 +65,7 @@ class LossPreventionActivity : BaseActivity() { Glide.with(this).load(fdsUrl) .placeholder(R.drawable.spinner200px200px) .fitCenter() - .into(iv_lossper!!) + .into(iv_lossper) } private suspend fun saveImage() { diff --git a/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt b/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt index f0d7c67..34dce74 100644 --- a/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt +++ b/app/src/main/java/com/yingmao/clash/act/SplashActivity.kt @@ -291,7 +291,6 @@ class SplashActivity : BaseActivity() { horizontalPadding = false ) val captchaSimple = findViewById(R.id.captCha) - captchaSimple.setBitmap(R.drawable.gv_icon) captchaSimple.setCaptchaListener(object : Captcha.CaptchaListener { override fun onAccess(time: Long): String { Toast.makeText( diff --git a/app/src/main/java/com/yingmao/clash/captcha/Captcha.java b/app/src/main/java/com/yingmao/clash/captcha/Captcha.java index 2e20e22..fd55251 100644 --- a/app/src/main/java/com/yingmao/clash/captcha/Captcha.java +++ b/app/src/main/java/com/yingmao/clash/captcha/Captcha.java @@ -105,7 +105,7 @@ public class Captcha extends LinearLayout { public Captcha(@NonNull final Context context, @Nullable AttributeSet attrs, @AttrRes int defStyleAttr) { super(context, attrs, defStyleAttr); TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.Captcha); - drawableId = typedArray.getResourceId(R.styleable.Captcha_src, R.drawable.gv_icon); +// drawableId = typedArray.getResourceId(R.styleable.Captcha_src, R.drawable.gv_icon); progressDrawableId = typedArray.getResourceId(R.styleable.Captcha_progressDrawable, R.drawable.po_seekbar); thumbDrawableId = typedArray.getResourceId(R.styleable.Captcha_thumbDrawable,R.drawable.thumb); mMode = typedArray.getInteger(R.styleable.Captcha_mode, MODE_BAR); diff --git a/app/src/main/java/com/yingmao/clash/view/dialog/ActivityViewDialog.java b/app/src/main/java/com/yingmao/clash/view/dialog/ActivityViewDialog.java index bc8e085..0c9e3f9 100644 --- a/app/src/main/java/com/yingmao/clash/view/dialog/ActivityViewDialog.java +++ b/app/src/main/java/com/yingmao/clash/view/dialog/ActivityViewDialog.java @@ -26,7 +26,7 @@ public class ActivityViewDialog extends Dialog { ImageView ivActivityImg =findViewById(R.id.ivActivityImg); Glide.with(context) .load(path) - .error(R.drawable.ic_activity_bg) +// .error(R.drawable.ic_activity_bg) .diskCacheStrategy(DiskCacheStrategy.DATA)//仅仅只缓存原来的全分辨率的图像 .into(ivActivityImg); } diff --git a/app/src/main/res/drawable-xhdpi/btn_speed_off.png b/app/src/main/res/drawable-xhdpi/btn_speed_off.png deleted file mode 100644 index bbd2634..0000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_speed_off.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/btn_speed_on.png b/app/src/main/res/drawable-xhdpi/btn_speed_on.png deleted file mode 100644 index 048c175..0000000 Binary files a/app/src/main/res/drawable-xhdpi/btn_speed_on.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/gift.png b/app/src/main/res/drawable-xhdpi/gift.png deleted file mode 100644 index 08a98be..0000000 Binary files a/app/src/main/res/drawable-xhdpi/gift.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/gv_icon.jpg b/app/src/main/res/drawable-xhdpi/gv_icon.jpg deleted file mode 100644 index be3eda8..0000000 Binary files a/app/src/main/res/drawable-xhdpi/gv_icon.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/pwd_bg.png b/app/src/main/res/drawable-xhdpi/pwd_bg.png deleted file mode 100644 index cc16788..0000000 Binary files a/app/src/main/res/drawable-xhdpi/pwd_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/register.png b/app/src/main/res/drawable-xhdpi/register.png deleted file mode 100644 index 902a609..0000000 Binary files a/app/src/main/res/drawable-xhdpi/register.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/startscreen.jpg b/app/src/main/res/drawable-xhdpi/startscreen.jpg deleted file mode 100644 index e20e066..0000000 Binary files a/app/src/main/res/drawable-xhdpi/startscreen.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/vip_bg.png b/app/src/main/res/drawable-xhdpi/vip_bg.png deleted file mode 100644 index a2d22e6..0000000 Binary files a/app/src/main/res/drawable-xhdpi/vip_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/pwd_bg.png b/app/src/main/res/drawable-xxhdpi/pwd_bg.png deleted file mode 100644 index f5889ab..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/pwd_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/register.png b/app/src/main/res/drawable-xxhdpi/register.png deleted file mode 100644 index a8f649e..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/register.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/startscreen.jpg b/app/src/main/res/drawable-xxhdpi/startscreen.jpg deleted file mode 100644 index ce36f11..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/startscreen.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-xxhdpi/vip_bg.png b/app/src/main/res/drawable-xxhdpi/vip_bg.png deleted file mode 100644 index 31bdcf2..0000000 Binary files a/app/src/main/res/drawable-xxhdpi/vip_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_speed_off.png b/app/src/main/res/drawable-xxxhdpi/btn_speed_off.png deleted file mode 100644 index 0c4a940..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_speed_off.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/btn_speed_on.png b/app/src/main/res/drawable-xxxhdpi/btn_speed_on.png deleted file mode 100644 index d580dea..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/btn_speed_on.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/gift.png b/app/src/main/res/drawable-xxxhdpi/gift.png deleted file mode 100644 index 9dcddb6..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/gift.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/pwd_bg.png b/app/src/main/res/drawable-xxxhdpi/pwd_bg.png deleted file mode 100644 index 3199b2d..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/pwd_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/register.png b/app/src/main/res/drawable-xxxhdpi/register.png deleted file mode 100644 index d8e8ddf..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/register.png and /dev/null differ diff --git a/app/src/main/res/drawable-xxxhdpi/vip_bg.png b/app/src/main/res/drawable-xxxhdpi/vip_bg.png deleted file mode 100644 index 194baaf..0000000 Binary files a/app/src/main/res/drawable-xxxhdpi/vip_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/accelerate_iv_selector.xml b/app/src/main/res/drawable/accelerate_iv_selector.xml deleted file mode 100644 index b48b714..0000000 --- a/app/src/main/res/drawable/accelerate_iv_selector.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/home_background.png b/app/src/main/res/drawable/home_background.png deleted file mode 100644 index 39312bc..0000000 Binary files a/app/src/main/res/drawable/home_background.png and /dev/null differ diff --git a/app/src/main/res/drawable/ic_activity_bg.png b/app/src/main/res/drawable/ic_activity_bg.png deleted file mode 100644 index 8d1c7e4..0000000 Binary files a/app/src/main/res/drawable/ic_activity_bg.png and /dev/null differ diff --git a/app/src/main/res/drawable/splash_background.xml b/app/src/main/res/drawable/splash_background.xml deleted file mode 100644 index b74cb2e..0000000 --- a/app/src/main/res/drawable/splash_background.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_accelerate.xml b/app/src/main/res/layout/fragment_accelerate.xml index 4db0dd8..7eab731 100644 --- a/app/src/main/res/layout/fragment_accelerate.xml +++ b/app/src/main/res/layout/fragment_accelerate.xml @@ -15,7 +15,7 @@ android:clickable="true" android:focusable="true" android:scaleType="centerInside" - android:src="@drawable/accelerate_iv_selector" + app:layout_constraintHeight_percent="0.50" app:layout_constraintTop_toTopOf="parent" tools:layout_editor_absoluteX="0dp" /> diff --git a/app/src/main/res/layout/layout_activity_losspre.xml b/app/src/main/res/layout/layout_activity_losspre.xml index 4795465..3aa9a1b 100644 --- a/app/src/main/res/layout/layout_activity_losspre.xml +++ b/app/src/main/res/layout/layout_activity_losspre.xml @@ -50,7 +50,6 @@ android:layout_marginEnd="10dp" android:contentDescription="@string/close" android:scaleType="centerInside" - android:src="@drawable/gift" app:layout_constraintBottom_toTopOf="@+id/tv_save" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/app/src/main/res/mipmap-hdpi/change_start_page.png b/app/src/main/res/mipmap-hdpi/change_start_page.png index 0901b13..ff630aa 100644 Binary files a/app/src/main/res/mipmap-hdpi/change_start_page.png and b/app/src/main/res/mipmap-hdpi/change_start_page.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_home_off.png b/app/src/main/res/mipmap-hdpi/ic_home_off.png index d248da5..8a238a7 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_home_off.png and b/app/src/main/res/mipmap-hdpi/ic_home_off.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_home_start.png b/app/src/main/res/mipmap-hdpi/ic_home_start.png index d5807b2..d65a33d 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_home_start.png and b/app/src/main/res/mipmap-hdpi/ic_home_start.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_index_bg.png b/app/src/main/res/mipmap-hdpi/ic_index_bg.png index ce196fd..e2a8ae5 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_index_bg.png and b/app/src/main/res/mipmap-hdpi/ic_index_bg.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_sharing.png b/app/src/main/res/mipmap-hdpi/ic_sharing.png index b16a976..8466bf0 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_sharing.png and b/app/src/main/res/mipmap-hdpi/ic_sharing.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_splash_bg.png b/app/src/main/res/mipmap-hdpi/ic_splash_bg.png index a1e2740..a384d70 100644 Binary files a/app/src/main/res/mipmap-hdpi/ic_splash_bg.png and b/app/src/main/res/mipmap-hdpi/ic_splash_bg.png differ diff --git a/app/src/main/res/mipmap-hdpi/index_bg.png b/app/src/main/res/mipmap-hdpi/index_bg.png index 613c648..24b4ce3 100644 Binary files a/app/src/main/res/mipmap-hdpi/index_bg.png and b/app/src/main/res/mipmap-hdpi/index_bg.png differ diff --git a/app/src/main/res/mipmap-hdpi/setting_bg.png b/app/src/main/res/mipmap-hdpi/setting_bg.png index 7309a3f..a2ceb68 100644 Binary files a/app/src/main/res/mipmap-hdpi/setting_bg.png and b/app/src/main/res/mipmap-hdpi/setting_bg.png differ diff --git a/app/src/main/res/mipmap-mdpi/change_start_page.png b/app/src/main/res/mipmap-mdpi/change_start_page.png deleted file mode 100644 index 0901b13..0000000 Binary files a/app/src/main/res/mipmap-mdpi/change_start_page.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/ic_home_off.png b/app/src/main/res/mipmap-mdpi/ic_home_off.png index d6e1e1a..4648e49 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_home_off.png and b/app/src/main/res/mipmap-mdpi/ic_home_off.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_home_start.png b/app/src/main/res/mipmap-mdpi/ic_home_start.png index 323a6d0..bebd7b0 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_home_start.png and b/app/src/main/res/mipmap-mdpi/ic_home_start.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_index_bg.png b/app/src/main/res/mipmap-mdpi/ic_index_bg.png index ce196fd..e2a8ae5 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_index_bg.png and b/app/src/main/res/mipmap-mdpi/ic_index_bg.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_sharing.png b/app/src/main/res/mipmap-mdpi/ic_sharing.png index 8ce3acc..f80ad1b 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_sharing.png and b/app/src/main/res/mipmap-mdpi/ic_sharing.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_splash_bg.png b/app/src/main/res/mipmap-mdpi/ic_splash_bg.png index ebdb9c3..adb5508 100644 Binary files a/app/src/main/res/mipmap-mdpi/ic_splash_bg.png and b/app/src/main/res/mipmap-mdpi/ic_splash_bg.png differ diff --git a/app/src/main/res/mipmap-mdpi/setting_bg.png b/app/src/main/res/mipmap-mdpi/setting_bg.png index 83385f5..d3a3a40 100644 Binary files a/app/src/main/res/mipmap-mdpi/setting_bg.png and b/app/src/main/res/mipmap-mdpi/setting_bg.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_home_off.png b/app/src/main/res/mipmap-xhdpi/ic_home_off.png index 8b96e39..3ed1e89 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_home_off.png and b/app/src/main/res/mipmap-xhdpi/ic_home_off.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_home_start.png b/app/src/main/res/mipmap-xhdpi/ic_home_start.png index 232bc1d..2ab09f1 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_home_start.png and b/app/src/main/res/mipmap-xhdpi/ic_home_start.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_sharing.png b/app/src/main/res/mipmap-xhdpi/ic_sharing.png index 11d0c66..6770e08 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_sharing.png and b/app/src/main/res/mipmap-xhdpi/ic_sharing.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_splash_bg.png b/app/src/main/res/mipmap-xhdpi/ic_splash_bg.png index aa3f298..948821e 100644 Binary files a/app/src/main/res/mipmap-xhdpi/ic_splash_bg.png and b/app/src/main/res/mipmap-xhdpi/ic_splash_bg.png differ diff --git a/app/src/main/res/mipmap-xhdpi/img.png b/app/src/main/res/mipmap-xhdpi/img.png deleted file mode 100644 index f37683b..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/img.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/index_bg.png b/app/src/main/res/mipmap-xhdpi/index_bg.png index bf74cb0..860fcd7 100644 Binary files a/app/src/main/res/mipmap-xhdpi/index_bg.png and b/app/src/main/res/mipmap-xhdpi/index_bg.png differ diff --git a/app/src/main/res/mipmap-xhdpi/setting_bg.png b/app/src/main/res/mipmap-xhdpi/setting_bg.png index e171e43..d3eaa61 100644 Binary files a/app/src/main/res/mipmap-xhdpi/setting_bg.png and b/app/src/main/res/mipmap-xhdpi/setting_bg.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_home_activity.png b/app/src/main/res/mipmap-xxhdpi/ic_home_activity.png index 5d6002e..10cffa5 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_home_activity.png and b/app/src/main/res/mipmap-xxhdpi/ic_home_activity.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_home_off.png b/app/src/main/res/mipmap-xxhdpi/ic_home_off.png index 41fd2b9..4299c1f 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_home_off.png and b/app/src/main/res/mipmap-xxhdpi/ic_home_off.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_home_start.png b/app/src/main/res/mipmap-xxhdpi/ic_home_start.png index edc1cca..aed54d8 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_home_start.png and b/app/src/main/res/mipmap-xxhdpi/ic_home_start.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_sharing.png b/app/src/main/res/mipmap-xxhdpi/ic_sharing.png index 44fff5a..fb08dbf 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_sharing.png and b/app/src/main/res/mipmap-xxhdpi/ic_sharing.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_splash_bg.png b/app/src/main/res/mipmap-xxhdpi/ic_splash_bg.png index 44ddf48..e7318aa 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/ic_splash_bg.png and b/app/src/main/res/mipmap-xxhdpi/ic_splash_bg.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/index_bg.png b/app/src/main/res/mipmap-xxhdpi/index_bg.png index ac520ca..1a62e3c 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/index_bg.png and b/app/src/main/res/mipmap-xxhdpi/index_bg.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/setting_bg.png b/app/src/main/res/mipmap-xxhdpi/setting_bg.png index 6ec7df4..f1f2886 100644 Binary files a/app/src/main/res/mipmap-xxhdpi/setting_bg.png and b/app/src/main/res/mipmap-xxhdpi/setting_bg.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_home_activity.png b/app/src/main/res/mipmap-xxxhdpi/ic_home_activity.png index 3922a5e..2b5f841 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_home_activity.png and b/app/src/main/res/mipmap-xxxhdpi/ic_home_activity.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_home_off.png b/app/src/main/res/mipmap-xxxhdpi/ic_home_off.png index 73ee9cd..2c6bf56 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_home_off.png and b/app/src/main/res/mipmap-xxxhdpi/ic_home_off.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_home_start.png b/app/src/main/res/mipmap-xxxhdpi/ic_home_start.png index f12a8d3..b8f31d6 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_home_start.png and b/app/src/main/res/mipmap-xxxhdpi/ic_home_start.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_sharing.png b/app/src/main/res/mipmap-xxxhdpi/ic_sharing.png index 2c79c44..76a004e 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_sharing.png and b/app/src/main/res/mipmap-xxxhdpi/ic_sharing.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_splash_bg.png b/app/src/main/res/mipmap-xxxhdpi/ic_splash_bg.png index 29b4820..7b303af 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_splash_bg.png and b/app/src/main/res/mipmap-xxxhdpi/ic_splash_bg.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/index_bg.png b/app/src/main/res/mipmap-xxxhdpi/index_bg.png index f8eafb8..19dd171 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/index_bg.png and b/app/src/main/res/mipmap-xxxhdpi/index_bg.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/setting_bg.png b/app/src/main/res/mipmap-xxxhdpi/setting_bg.png index 25476db..e52f8d2 100644 Binary files a/app/src/main/res/mipmap-xxxhdpi/setting_bg.png and b/app/src/main/res/mipmap-xxxhdpi/setting_bg.png differ