diff --git a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/DownloadActivity.kt b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/DownloadActivity.kt index 24b41f6..74312ee 100644 --- a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/DownloadActivity.kt +++ b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/DownloadActivity.kt @@ -6,6 +6,7 @@ import android.content.SharedPreferences import android.util.Log import android.view.View import android.widget.Toast +import androidx.core.view.isVisible import androidx.recyclerview.widget.LinearLayoutManager import com.bumptech.glide.Glide import com.bumptech.glide.load.DataSource @@ -80,7 +81,6 @@ class DownloadActivity : } - private fun initTitle() { binding.bgName.text = "Keyboard background" } @@ -100,6 +100,7 @@ class DownloadActivity : } private fun initStyleList() { + retryBtnStatus(false) val listOf = mutableListOf() backgroundEntity.skinNumber.let { for (i in 0 until 5) { @@ -114,7 +115,7 @@ class DownloadActivity : val keyAdapter = KeyAdapter(this, defaultStyle, listOf) { selectedStyle = it + 1 if (appliedSkinNumber == backgroundEntity.skinNumber.toString()) { - updateBtn(appliedSkinStyle == selectedStyle) + updateBtn(if (appliedSkinStyle == selectedStyle) 0 else 1) } } binding.listRecycler.run { @@ -126,35 +127,49 @@ class DownloadActivity : } - private fun initButton() { binding.downloadBack.setOnClickListener(this) binding.btnDownload.setOnClickListener(this) binding.imLike.setOnClickListener(this) + binding.btnRetry.setOnClickListener(this) } /** - * isApplied 是否已经apply + * 0 已经apply 2 下载失败置灰 */ - private fun updateBtn(isApplied: Boolean) { - binding.btnDownload.isSelected = isApplied - binding.btnDownload.isEnabled = !isApplied - if (isApplied) { - binding.btnDownload.text = getString(R.string.applied) - } else { - binding.btnDownload.text = getString(R.string.apply) + private fun updateBtn(type: Int) { + + when (type) { + 0 -> { + binding.btnDownload.isSelected = true + binding.btnDownload.isEnabled = false + binding.btnDownload.text = getString(R.string.applied) + } + + 1 -> { + binding.btnDownload.isSelected = false + binding.btnDownload.isEnabled = true + binding.btnDownload.text = getString(R.string.apply) + } + + 2 -> { + binding.btnDownload.isSelected = true + binding.btnDownload.isEnabled = false + binding.btnDownload.text = getString(R.string.apply) + } } + } private fun initImg() { appliedSkinNumber = sp.getString(AppConstant.KEY_CUR_Skin_Number, "") ?: run { "-1" } appliedSkinStyle = sp.getInt(AppConstant.KEY_CUR_STYLE, -1) - if (appliedSkinNumber == backgroundEntity.skinNumber.toString()) { - updateBtn(appliedSkinStyle == selectedStyle) - }else{ - updateBtn(false) - } +// if (appliedSkinNumber == backgroundEntity.skinNumber.toString()) { +// updateBtn(if (appliedSkinStyle == selectedStyle) 0 else 1) +// } else { +// updateBtn(1) +// } binding.imLike.isSelected = backgroundEntity.like try { Glide @@ -181,13 +196,26 @@ class DownloadActivity : } + binding.btnRetry->{ + binding.downloadProgress.visibility = View.VISIBLE + initDownload() + } + binding.imLike -> { - AdManager.showTopOn(this@DownloadActivity){ + AdManager.showTopOn(this@DownloadActivity) { binding.imLike.isSelected = !binding.imLike.isSelected - if(binding.imLike.isSelected){ - Toast.makeText(this@DownloadActivity,getString(R.string.add_success),Toast.LENGTH_SHORT).show() - }else{ - Toast.makeText(this@DownloadActivity,getString(R.string.cancel_success),Toast.LENGTH_SHORT).show() + if (binding.imLike.isSelected) { + Toast.makeText( + this@DownloadActivity, + getString(R.string.add_success), + Toast.LENGTH_SHORT + ).show() + } else { + Toast.makeText( + this@DownloadActivity, + getString(R.string.cancel_success), + Toast.LENGTH_SHORT + ).show() } } @@ -235,7 +263,10 @@ class DownloadActivity : putInt(AppConstant.KEY_CUR_STYLE, selectedStyle) putString(AppConstant.KEY_CUR_Bg, backgroundEntity.coverPath) apply() - Log.d(App.TAG, "------putConfig ----skin_Number = ${ backgroundEntity.skinNumber} style=${selectedStyle} ") + Log.d( + App.TAG, + "------putConfig ----skin_Number = ${backgroundEntity.skinNumber} style=${selectedStyle} " + ) } binding.downloadProgress.visibility = View.GONE @@ -318,11 +349,21 @@ class DownloadActivity : unzipPath = str binding.downloadProgress.visibility = View.GONE if (isSuccess) { - initStyleList() } else { - Toast.makeText(this, getString(R.string.reenter), Toast.LENGTH_LONG).show() + retryBtnStatus(true) + Toast.makeText(this, getString(R.string.reenter), Toast.LENGTH_SHORT).show() } } + private fun retryBtnStatus(showRetry:Boolean){ + binding.btnRetry.isVisible = showRetry + if(showRetry){ + updateBtn(2) + }else{ + updateBtn(1) + } + + } + } \ No newline at end of file diff --git a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/LoadingActivity.kt b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/LoadingActivity.kt index 8bb14d5..8783882 100644 --- a/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/LoadingActivity.kt +++ b/app/src/main/java/com/sunny/app/soft/timberkeyboardnew/ui/activity/LoadingActivity.kt @@ -13,7 +13,7 @@ class LoadingActivity : BaseActivity() { private var countDownTimer: CountDownTimer?= null - private val time = 12000L + private val time = 13000L override fun onUI() { countDownTimer = AdManager.showWelcomeAd(this@LoadingActivity, time, { millisUntilFinished -> val percentage: Float = 100 - millisUntilFinished.toFloat() / time * 100 diff --git a/app/src/main/res/layout/activity_download.xml b/app/src/main/res/layout/activity_download.xml index b47dbb4..429b941 100644 --- a/app/src/main/res/layout/activity_download.xml +++ b/app/src/main/res/layout/activity_download.xml @@ -1,5 +1,4 @@ - @@ -100,7 +99,7 @@ android:layout_width="match_parent" android:layout_height="50dp" android:layout_marginStart="70dp" - android:layout_marginTop="50dp" + android:layout_marginTop="30dp" android:layout_marginEnd="70dp" android:background="@drawable/selector_step" android:gravity="center" @@ -108,6 +107,24 @@ android:textColor="@color/step_text_color" android:textSize="19sp" /> + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b35ec9f..20ac425 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -19,7 +19,7 @@ If the keyboard is not enabled, please set it in the settings Application successful Application failed, please try again - Download failed, please re-enter this page + Please check your network connection and try again Please select the following button background Display Enter text to see the effect @@ -27,6 +27,7 @@ Privacy Policy Added to favorites successfully Successfully canceled the collection + Retry skin_%s_delete_emoji.png skin_%s_caps_enabled.png