diff --git a/app/src/main/java/com/coldmint/rust/pro/AboutActivity.kt b/app/src/main/java/com/coldmint/rust/pro/AboutActivity.kt index 4b738dc..816307b 100644 --- a/app/src/main/java/com/coldmint/rust/pro/AboutActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/AboutActivity.kt @@ -3,23 +3,31 @@ package com.coldmint.rust.pro import android.content.Intent import android.content.pm.PackageManager import android.os.Bundle -import android.text.Html -import android.view.* -import com.coldmint.rust.core.web.ServerConfiguration +import android.view.LayoutInflater +import android.view.Menu +import android.view.MenuItem +import androidx.core.text.HtmlCompat import com.coldmint.rust.pro.base.BaseActivity import com.coldmint.rust.pro.databinding.ActivityAboutBinding -import com.coldmint.rust.pro.tool.AppSettings import java.text.SimpleDateFormat +import java.util.Locale class AboutActivity : BaseActivity() { - fun initView() { + private fun initView() { try { val packageInfo = packageManager.getPackageInfo(packageName, 0) - viewBinding.versionView.text = "v." + packageInfo.versionName + if (packageInfo != null) { + viewBinding.versionView.text = "v.${packageInfo.versionName}" + } } catch (e: PackageManager.NameNotFoundException) { e.printStackTrace() } - val year = Integer.valueOf(SimpleDateFormat("yyyy").format(System.currentTimeMillis())) + val year = Integer.valueOf( + SimpleDateFormat( + "yyyy", + Locale.getDefault() + ).format(System.currentTimeMillis()) + ) val copyright = String.format(getString(R.string.copyright), year) viewBinding.copyRightView.text = copyright val aboutText = """
起源
@@ -57,39 +65,12 @@ class AboutActivity : BaseActivity() { | | """.trimMargin() - viewBinding.aboutView.text = Html.fromHtml(aboutText) - val time = AppSettings.getValue(com.coldmint.rust.pro.tool.AppSettings.Setting.ExpirationTime, 0.toLong()) - if (time == 0.toLong()) { - viewBinding.expirationTimeView.text = getString(R.string.tourist_pattern) - } else { - val stringTime = ServerConfiguration.toStringTime(time) - viewBinding.expirationTimeView.text = - if (stringTime == ServerConfiguration.ForeverTime) { - getString(R.string.forever_time) - } else { - String.format( - getString(R.string.expiration_time_tip), - stringTime - ) - } - } + viewBinding.aboutView.text = + HtmlCompat.fromHtml(aboutText, HtmlCompat.FROM_HTML_MODE_COMPACT) } fun initAction() { - viewBinding.privacyPolicyView.setOnClickListener { - val link = - ServerConfiguration.getRealLink("/resources/agreement/privacy_policy.html") - val thisIntent = Intent(this, BrowserActivity::class.java) - thisIntent.putExtra("link", link) - startActivity(thisIntent) - } - viewBinding.serviceAgreementView.setOnClickListener { - val link = - ServerConfiguration.getRealLink("/resources/agreement/service_agreement.html") - val thisIntent = Intent(this, BrowserActivity::class.java) - thisIntent.putExtra("link", link) - startActivity(thisIntent) - } + } @@ -103,6 +84,7 @@ class AboutActivity : BaseActivity() { R.id.thanks -> { startActivity(Intent(this, ThanksActivity::class.java)) } + R.id.libs -> { startActivity(Intent(this, LibraryActivity::class.java)) } diff --git a/app/src/main/java/com/coldmint/rust/pro/ActivateActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ActivateActivity.kt deleted file mode 100644 index 0beb5c2..0000000 --- a/app/src/main/java/com/coldmint/rust/pro/ActivateActivity.kt +++ /dev/null @@ -1,301 +0,0 @@ -package com.coldmint.rust.pro - -import android.content.Intent -import android.net.Uri -import android.os.Bundle -import android.text.SpannableString -import android.text.Spanned -import android.text.method.LinkMovementMethod -import android.text.style.ClickableSpan -import android.view.LayoutInflater -import android.view.Menu -import android.view.MenuItem -import android.view.View -import androidx.core.view.isVisible -import androidx.recyclerview.widget.GridLayoutManager -import androidx.recyclerview.widget.LinearLayoutManager -import androidx.recyclerview.widget.RecyclerView -import com.coldmint.rust.core.dataBean.ApiResponse -import com.coldmint.rust.core.dataBean.CouponListDataBean -import com.coldmint.rust.core.dataBean.PlanDataBean -import com.coldmint.rust.core.interfaces.ApiCallBack -import com.coldmint.rust.core.tool.AppOperator -import com.coldmint.rust.core.web.ActivationApp -import com.coldmint.rust.core.web.Coupon -import com.coldmint.rust.core.web.ServerConfiguration -import com.coldmint.rust.pro.adapters.CouponAdapter -import com.coldmint.rust.pro.adapters.FunAdapter -import com.coldmint.rust.pro.adapters.PlanAdapter -import com.coldmint.rust.pro.base.BaseActivity -import com.coldmint.rust.pro.databean.FunctionInfo -import com.coldmint.rust.pro.databinding.ActivityActivateBinding -import com.coldmint.rust.pro.tool.AppSettings -import com.coldmint.rust.pro.tool.GlobalMethod -import com.coldmint.rust.pro.ui.StableLinearLayoutManager -import com.google.android.material.dialog.MaterialAlertDialogBuilder -import com.google.android.material.snackbar.Snackbar - -class ActivateActivity : BaseActivity() { - var planAdapter: PlanAdapter? = null - var planId: String? = null - var couponId: Int? = null - - /** - * 加载计划列表 - * @param account String - */ - private fun loadPlanList(account: String) { - ActivationApp.instance.getPlanList(account, object : ApiCallBack { - override fun onResponse(t: PlanDataBean) { - if (t.code == ServerConfiguration.Success_Code) { - val data = t.data - if (data != null && data.isNotEmpty()) { - val layoutManager = StableLinearLayoutManager(this@ActivateActivity) - layoutManager.orientation = RecyclerView.HORIZONTAL - viewBinding.recyclerview.layoutManager = layoutManager - viewBinding.couponRecyclerview.layoutManager = - StableLinearLayoutManager(this@ActivateActivity) - val adapter = PlanAdapter(this@ActivateActivity, data) - planAdapter = adapter - adapter.setItemEvent { i, itemPlanBinding, viewHolder, data -> - itemPlanBinding.linearLayout.setOnClickListener { - selectItemAndLoadInfo(data, adapter, i) - } - } - //默认加载第一个元素 - selectItemAndLoadInfo(data[0], adapter, 0) - viewBinding.recyclerview.adapter = adapter - initAllFunctionList() - viewBinding.linearLayout.isVisible = false - viewBinding.nestedScrollView.isVisible = true - viewBinding.button.isVisible = true - } - } else { - showInfoToView(string = t.message) - } - } - - override fun onFailure(e: Exception) { - showInfoToView(R.string.network_error) - } - - }) - } - - /** - * 加载上下文菜单 - * @param menu Menu - * @return Boolean - */ - override fun onCreateOptionsMenu(menu: Menu): Boolean { - val inflater = menuInflater - inflater.inflate(R.menu.menu_pay, menu) - return true - } - - override fun onOptionsItemSelected(item: MenuItem): Boolean { - when (item.itemId) { - R.id.order_list -> { - val thisIntent = Intent(this, OrderListActivity::class.java) - startActivity(thisIntent) - } - } - return super.onOptionsItemSelected(item) - } - - - /** - * 加载优惠券列表 - * @param account String - */ - fun loadCouponList(account: String) { - Coupon.instance.list(account, object : ApiCallBack { - override fun onResponse(t: CouponListDataBean) { - val list = t.data - if (t.code == ServerConfiguration.Success_Code && list != null) { - val couponTip = String.format(getString(R.string.coupon_num), list.size) - viewBinding.couponView.text = couponTip - val adapter = CouponAdapter(this@ActivateActivity, list) - adapter.setItemEvent { i, itemCouponBinding, viewHolder, data -> - itemCouponBinding.useButton.setOnClickListener { - val finalPlanAdapter = planAdapter - if (finalPlanAdapter != null) { - couponId = data.id - finalPlanAdapter.setCoupon(null) - finalPlanAdapter.setCoupon(data) - selectItemAndLoadInfo( - finalPlanAdapter.getItemData(0), - finalPlanAdapter, - 0 - ) - val spannableString = - SpannableString(data.describe + "[" + getString(R.string.clean) + "]") - viewBinding.couponDescribeView.movementMethod = - LinkMovementMethod.getInstance() - spannableString.setSpan( - object : ClickableSpan() { - override fun onClick(widget: View) { - couponId = null - finalPlanAdapter.setCoupon(null) - viewBinding.couponDescribeView.text = - getString(R.string.coupon_not_use) - selectItemAndLoadInfo( - finalPlanAdapter.getItemData(0), - finalPlanAdapter, - 0 - ) - } - }, - data.describe.length, - spannableString.length, - Spanned.SPAN_INCLUSIVE_EXCLUSIVE - ); - viewBinding.couponDescribeView.text = spannableString - } - } - } - viewBinding.couponRecyclerview.adapter = adapter - } else { - viewBinding.couponDescribeView.text = t.message - } - } - - override fun onFailure(e: Exception) { - showInternetError(viewBinding.button, e) - } - - }) - } - - /** - * 初始化功能列表 - */ - fun initAllFunctionList() { - val list: ArrayList = ArrayList() - list.add(FunctionInfo("中文编辑", iconRes = R.drawable.translate)) - list.add(FunctionInfo("模组优化", iconRes = R.drawable.flash)) - list.add(FunctionInfo("代码高亮", iconRes = R.drawable.highlighted)) - list.add(FunctionInfo("智能联想", iconRes = R.drawable.lenovo)) - list.add(FunctionInfo("单位构建", iconRes = R.drawable.build)) - list.add(FunctionInfo("代码检查", iconRes = R.drawable.error_check)) - list.add(FunctionInfo("模组回收站", iconRes = R.drawable.auto_delete)) - list.add(FunctionInfo("模板系统", iconRes = R.drawable.template)) - val adapter = FunAdapter(this, list) - viewBinding.functionRecyclerView.layoutManager = GridLayoutManager(this, 4) - viewBinding.functionRecyclerView.adapter = adapter - } - - /** - * 选中项目并加载信息 - * @param data Data 数据 - */ - fun selectItemAndLoadInfo(data: PlanDataBean.Data, adapter: PlanAdapter, position: Int) { - planId = data.id - val tip = String.format(getString(R.string.open_tip), data.price) - viewBinding.button.text = tip - adapter.selectItem(position) - //如果折扣，计算并显示折扣信息 - val originalPrize = data.originalPrice - if (originalPrize > data.price) { - viewBinding.planDescribeView.text = String.format( - getString(R.string.discount_prompt), - data.describe, - (originalPrize - data.price) - ) - } else { - viewBinding.planDescribeView.text = data.describe - } - } - - - override fun getViewBindingObject(layoutInflater: LayoutInflater): ActivityActivateBinding { - return ActivityActivateBinding.inflate(layoutInflater) - } - - /** - * 显示信息在视图上 - * @param resId Int? - * @param string String? - */ - fun showInfoToView(resId: Int? = null, string: String? = null) { - viewBinding.button.isVisible = false - viewBinding.nestedScrollView.isVisible = false - viewBinding.linearLayout.isVisible = true - viewBinding.tipView.isVisible = true - viewBinding.progressBar.isVisible = false - if (resId != null) { - viewBinding.tipView.setText(resId) - } - if (string != null) { - viewBinding.tipView.text = string - } - } - - override fun whenCreateActivity(savedInstanceState: Bundle?, canUseView: Boolean) { - if (canUseView) { - title = getText(R.string.activation_app) - setReturnButton() - val account = AppSettings.getValue(AppSettings. - Setting.Account, "") - if (account.isBlank()) { - showError(getString(R.string.please_login_first)) - return - } - loadPlanList(account) - loadCouponList(account) - viewBinding.button.setOnClickListener { - val finalPlanId = planId ?: return@setOnClickListener - val finalCouponId = couponId - val func: () -> Unit = { - ActivationApp.instance.createOrder( - account, - finalPlanId, - object : ApiCallBack { - override fun onResponse(t: ApiResponse) { - if (t.code == ServerConfiguration.Success_Code) { - val uuid = t.data - if (uuid != null) { - val newIntent = Intent( - this@ActivateActivity, - PayActivity::class.java - ) - newIntent.putExtra("uuid", uuid) - newIntent.putExtra("account", account) - startActivity( - newIntent - ) - } - } else { - Snackbar.make( - viewBinding.button, - t.message, - Snackbar.LENGTH_SHORT - ) - .show() - } - } - - override fun onFailure(e: Exception) { - showInternetError(view = viewBinding.button, e) - } - - }, - couponsId = couponId - ) - } - if (finalCouponId != null) { - MaterialAlertDialogBuilder(this).setTitle(R.string.coupon) - .setMessage(R.string.use_coupon) - .setPositiveButton(R.string.dialog_ok) { i, i2 -> - func.invoke() - }.setNegativeButton(R.string.dialog_cancel) { i, i2 -> - }.show() - } else { - func.invoke() - } - } - } - } - - -} \ No newline at end of file diff --git a/app/src/main/java/com/coldmint/rust/pro/ApplicationListActivity.kt b/app/src/main/java/com/coldmint/rust/pro/ApplicationListActivity.kt index 150a7c2..32663d6 100644 --- a/app/src/main/java/com/coldmint/rust/pro/ApplicationListActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/ApplicationListActivity.kt @@ -1,12 +1,11 @@ package com.coldmint.rust.pro -import androidx.recyclerview.widget.LinearLayoutManager -import android.os.Looper -import android.content.pm.PackageInfo import android.content.pm.ApplicationInfo +import android.content.pm.PackageInfo import android.content.pm.PackageManager import android.os.Bundle import android.os.Handler +import android.os.Looper import android.view.LayoutInflater import android.view.Menu import android.view.MenuItem @@ -15,7 +14,6 @@ import com.coldmint.rust.pro.adapters.ApplicationListAdapter import com.coldmint.rust.pro.base.BaseActivity import com.coldmint.rust.pro.databinding.ActivityApplicationListBinding import com.coldmint.rust.pro.ui.StableLinearLayoutManager -import java.util.ArrayList class ApplicationListActivity : BaseActivity() { private var loading = true diff --git a/app/src/main/java/com/coldmint/rust/pro/BookmarkManagerActivity.kt b/app/src/main/java/com/coldmint/rust/pro/BookmarkManagerActivity.kt index 888451c..4d75b9d 100644 --- a/app/src/main/java/com/coldmint/rust/pro/BookmarkManagerActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/BookmarkManagerActivity.kt @@ -2,40 +2,30 @@ package com.coldmint.rust.pro import android.annotation.SuppressLint -import com.coldmint.rust.pro.tool.BookmarkManager -import android.widget.EditText -import android.os.Bundle -import androidx.recyclerview.widget.LinearLayoutManager import android.content.Intent - +import android.os.Bundle import android.view.KeyEvent import android.view.LayoutInflater import android.view.MenuItem -import android.view.View -import androidx.appcompat.app.AlertDialog import androidx.core.view.isVisible -import com.coldmint.dialog.CoreDialog import com.coldmint.rust.pro.adapters.BookmarkAdapter import com.coldmint.rust.pro.base.BaseActivity import com.coldmint.rust.pro.databean.Bookmark import com.coldmint.rust.pro.databinding.ActivityBookmarkManagerBinding -import com.coldmint.rust.pro.databinding.EditBookmarkBinding import com.coldmint.rust.pro.dialog.BookmarkDialog +import com.coldmint.rust.pro.tool.BookmarkManager import com.coldmint.rust.pro.ui.StableLinearLayoutManager -import com.google.android.material.dialog.MaterialAlertDialogBuilder - import java.io.File -import java.util.ArrayList class BookmarkManagerActivity : BaseActivity() { private lateinit var bookmarkManager: BookmarkManager - lateinit var bookmarkAdapter: BookmarkAdapter - lateinit var bookmarkDialog :BookmarkDialog + private lateinit var bookmarkAdapter: BookmarkAdapter + private lateinit var bookmarkDialog :BookmarkDialog /** * 重新构建对话框（实例化一个对话框，并使成员变量指向他） */ - fun recreateBookmarkDialog(){ + private fun recreateBookmarkDialog(){ bookmarkDialog = BookmarkDialog(this) bookmarkDialog.setButtonAction { val bundle = Bundle() diff --git a/app/src/main/java/com/coldmint/rust/pro/LoginActivity.kt b/app/src/main/java/com/coldmint/rust/pro/LoginActivity.kt index f9c3960..08ec984 100644 --- a/app/src/main/java/com/coldmint/rust/pro/LoginActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/LoginActivity.kt @@ -131,7 +131,6 @@ class LoginActivity : BaseActivity() { //更新本地激活时间 val expirationTime = userData.data.expirationTime val time = ServerConfiguration.toLongTime(expirationTime) - AppSettings.forceSetValue(AppSettings.Setting.ExpirationTime, time) AppSettings.forceSetValue(AppSettings.Setting.LoginStatus, true) startActivity(Intent(this@LoginActivity, MainActivity::class.java)) finish() @@ -292,8 +291,8 @@ class LoginActivity : BaseActivity() { val agreementAgreed = getString(R.string.agreement_agreed) val spannableString = SpannableString(agreementAgreed) - val serviceAgreement = getString(R.string.service_agreement) - val privacyPolicy = getString(R.string.privacy_policy) + val serviceAgreement = "1" + val privacyPolicy = "2" val start = agreementAgreed.indexOf(serviceAgreement) val start2 = agreementAgreed.indexOf(privacyPolicy) if (start > -1 && start2 > -1) { diff --git a/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt b/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt index d717534..c6c8be9 100644 --- a/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/MainActivity.kt @@ -44,6 +44,7 @@ import java.io.File import java.util.Locale import java.util.concurrent.Executors import java.util.zip.ZipEntry + @Suppress("ConstPropertyName") class MainActivity : BaseActivity() { @@ -69,20 +70,20 @@ class MainActivity : BaseActivity() { */ private fun initNav() { appBarConfiguration = AppBarConfiguration( - setOf(R.id.community_item, R.id.mod_item, R.id.database_item, R.id.template_item), - viewBinding.drawerlayout + setOf(R.id.community_item, R.id.mod_item, R.id.database_item, R.id.template_item), + viewBinding.drawerlayout ) val navController = findNavController(R.id.baseFragment) navController.navInflater.inflate(R.navigation.main_nav).apply { val use = - AppSettings.getValue(AppSettings.Setting.UseTheCommunityAsTheLaunchPage, true) + AppSettings.getValue(AppSettings.Setting.UseTheCommunityAsTheLaunchPage, true) this.setStartDestination( - if (use) { + if (use) { // viewBinding.mainButton.hide() - R.id.community_item - } else { - R.id.mod_item - } + R.id.community_item + } else { + R.id.mod_item + } ) navController.graph = this } @@ -91,11 +92,11 @@ class MainActivity : BaseActivity() { viewBinding.navaiagtion.addHeaderView(headLayout.root) //actionbar动画 val actionToggle = ActionBarDrawerToggle( - this, - viewBinding.drawerlayout, - viewBinding.toolbar, - R.string.app_name, - R.string.app_name + this, + viewBinding.drawerlayout, + viewBinding.toolbar, + R.string.app_name, + R.string.app_name ) viewBinding.drawerlayout.addDrawerListener(actionToggle) actionToggle.syncState() @@ -145,7 +146,7 @@ class MainActivity : BaseActivity() { //检查更新 val packageInfo: PackageInfo = packageManager.getPackageInfo(packageName, 0) val checkBetaUpdate = - AppSettings.getValue(AppSettings.Setting.CheckBetaUpdate, false) + AppSettings.getValue(AppSettings.Setting.CheckBetaUpdate, false) var needShowDialog = false if (data.versionNumber > packageInfo.versionCode) { if (data.isBeta) { @@ -162,18 +163,18 @@ class MainActivity : BaseActivity() { //显示对话框 runOnUiThread { val materialAlertDialogBuilder = - MaterialAlertDialogBuilder(this).setTitle(data.title).setMessage(data.content) + MaterialAlertDialogBuilder(this).setTitle(data.title).setMessage(data.content) if (data.forced) { //禁用点击空白关闭 materialAlertDialogBuilder.setCancelable(false) } else { materialAlertDialogBuilder.setNegativeButton( - R.string.dialog_cancel + R.string.dialog_cancel ) { _, _ -> } } materialAlertDialogBuilder.setPositiveButton( - R.string.downlod + R.string.downlod ) { _, _ -> AppOperator.useBrowserAccessWebPage(this, data.link) } @@ -190,25 +191,25 @@ class MainActivity : BaseActivity() { if (!AppSettings.getValue(AppSettings.Setting.SetGameStorage, false)) { try { val packageInfo = packageManager.getPackageInfo( - GlobalMethod.DEFAULT_GAME_PACKAGE, - PackageManager.GET_UNINSTALLED_PACKAGES + GlobalMethod.DEFAULT_GAME_PACKAGE, + PackageManager.GET_UNINSTALLED_PACKAGES ) val versionCode = packageInfo.versionCode //如果在1.15 p3及以上 (159) if (versionCode >= 159) { MaterialAlertDialogBuilder(this).setTitle(R.string.game_configured) - .setMessage(R.string.unable_to_detect) - .setPositiveButton(R.string.show_details) { _, _ -> - startActivity( - Intent( - this@MainActivity, - GameCheckActivity::class.java - ) + .setMessage(R.string.unable_to_detect) + .setPositiveButton(R.string.show_details) { _, _ -> + startActivity( + Intent( + this@MainActivity, + GameCheckActivity::class.java ) - }.setNeutralButton(R.string.no_longer_prompt) { _, _ -> - AppSettings.setValue(AppSettings.Setting.SetGameStorage, true) - }.setNeutralButton(R.string.dialog_cancel) { _, _ -> - }.setCancelable(false).show() + ) + }.setNeutralButton(R.string.no_longer_prompt) { _, _ -> + AppSettings.setValue(AppSettings.Setting.SetGameStorage, true) + }.setNeutralButton(R.string.dialog_cancel) { _, _ -> + }.setCancelable(false).show() } else { AppSettings.setValue(AppSettings.Setting.SetGameStorage, true) } @@ -224,8 +225,8 @@ class MainActivity : BaseActivity() { first = false } else { val newDynamicColor = AppSettings.getValue( - AppSettings.Setting.DynamicColor, - DynamicColors.isDynamicColorAvailable() + AppSettings.Setting.DynamicColor, + DynamicColors.isDynamicColorAvailable() ) if (oldDynamicColor != newDynamicColor) { recreate() @@ -363,17 +364,17 @@ class MainActivity : BaseActivity() { } menu.findItem(R.id.startGame).setOnMenuItemClickListener { val packName = AppSettings.getValue( - AppSettings.Setting.GamePackage, - GlobalMethod.DEFAULT_GAME_PACKAGE + AppSettings.Setting.GamePackage, + GlobalMethod.DEFAULT_GAME_PACKAGE ) if (AppOperator.isAppInstalled(this, packName)) { AppOperator.openApp(this, packName) } else { viewBinding.drawerlayout.closeDrawer(GravityCompat.START) Snackbar.make( - viewBinding.root, - R.string.no_game_installed, - Snackbar.LENGTH_SHORT + viewBinding.root, + R.string.no_game_installed, + Snackbar.LENGTH_SHORT ).show() } false @@ -395,39 +396,6 @@ class MainActivity : BaseActivity() { startActivity(Intent(this@MainActivity, SettingsActivity::class.java)) false } - - //激活暂时不可用 - val longTime = AppSettings.getValue( - AppSettings.Setting.ExpirationTime, - 0.toLong() - ) - val loginStatus = AppSettings.getValue( - AppSettings.Setting.LoginStatus, - false - ) - val activationItem = menu.findItem(R.id.activation_item) - if (loginStatus) { - val time = ServerConfiguration.toStringTime( - longTime - ) - if (time == ServerConfiguration.ForeverTime) { - activationItem.isVisible = false - } else { - activationItem.isVisible = true - if (isActive) { - activationItem.title = getText(R.string.renewal) - } else { - activationItem.title = getText(R.string.activate) - } - activationItem.setOnMenuItemClickListener { - startActivity(Intent(this, ActivateActivity::class.java)) - false - } - } - } else { - activationItem.isVisible = false - } - } override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { @@ -444,38 +412,46 @@ class MainActivity : BaseActivity() { val to = File(modDirectory + from.name) if (FileOperator.copyFile(from, to)) { Snackbar.make( - viewBinding.root, - String.format(Locale.getDefault(),getString(R.string.import_complete), from.name), - Snackbar.LENGTH_SHORT + viewBinding.root, + String.format( + Locale.getDefault(), + getString(R.string.import_complete), + from.name + ), + Snackbar.LENGTH_SHORT ).show() } else { Snackbar.make( - viewBinding.root, - String.format(Locale.getDefault(),getString(R.string.import_failed), from.name), - Snackbar.LENGTH_SHORT + viewBinding.root, + String.format( + Locale.getDefault(), + getString(R.string.import_failed), + from.name + ), + Snackbar.LENGTH_SHORT ).show() } } else { Snackbar.make( - viewBinding.root, - R.string.bad_file_type, - Snackbar.LENGTH_SHORT + viewBinding.root, + R.string.bad_file_type, + Snackbar.LENGTH_SHORT ).show() } } else if (requestCode == 2) { if ("rp" == type) { val outputFolder = File( - AppSettings.getValue( - AppSettings.Setting.TemplateDirectory, - this.filesDir.absolutePath + "/template/" - ) + LocalTemplatePackage.getAbsoluteFileName(from) + AppSettings.getValue( + AppSettings.Setting.TemplateDirectory, + this.filesDir.absolutePath + "/template/" + ) + LocalTemplatePackage.getAbsoluteFileName(from) ) importTemplate(from, outputFolder) } else { Snackbar.make( - viewBinding.root, - R.string.bad_file_type, - Snackbar.LENGTH_SHORT + viewBinding.root, + R.string.bad_file_type, + Snackbar.LENGTH_SHORT ).show() } } @@ -492,100 +468,104 @@ class MainActivity : BaseActivity() { Thread(Runnable { try { - //如果建立缓存完成，并且模板文件存在 - val compressionManager = CompressionManager.instance - if (templateDirectory.exists()) { - val gson = Gson() - val newInfoData = + //如果建立缓存完成，并且模板文件存在 + val compressionManager = CompressionManager.instance + if (templateDirectory.exists()) { + val gson = Gson() + val newInfoData = compressionManager.readEntry(formFile, LocalTemplatePackage.INFONAME) - if (newInfoData == null) { - handler.post { - Snackbar.make( + if (newInfoData == null) { + handler.post { + Snackbar.make( viewBinding.root, getString(R.string.import_failed2), Snackbar.LENGTH_LONG - ).show() - } - return@Runnable - } else { - val newInfo = gson.fromJson(newInfoData, TemplateInfo::class.java) - val templateClass = LocalTemplatePackage(templateDirectory) - val oldInfo = templateClass.getInfo() - if (oldInfo == null) { - handler.post { - Snackbar.make( - viewBinding.root, - R.string.import_failed2, - Snackbar.LENGTH_SHORT ).show() } return@Runnable - } - val thisAppVersion = - AppOperator.getAppVersionNum(this, this.packageName) - if (newInfo.versionNum > thisAppVersion) { - handler.post { - Snackbar.make( - viewBinding.root, - String.format(Locale.getDefault(), - getString(R.string.app_version_error), - formFile.name - ), Snackbar.LENGTH_LONG - ).show() - } - return@Runnable - } - if (newInfo.versionNum < oldInfo.versionNum) { - handler.post { - MaterialAlertDialogBuilder(this).setTitle(oldInfo.name).setMessage( - String.format(Locale.getDefault(), - getString(R.string.covers_the_import), - newInfo.versionName, oldInfo.versionName - ) - ).setPositiveButton(R.string.dialog_ok) { _, _ -> - FileOperator.delete_files(templateDirectory) - importTemplate(formFile, templateDirectory) - }.setNegativeButton(R.string.dialog_cancel) { _, _ -> - }.show() - } - return@Runnable } else { - //同等版本，不做处理（覆盖安装） + val newInfo = gson.fromJson(newInfoData, TemplateInfo::class.java) + val templateClass = LocalTemplatePackage(templateDirectory) + val oldInfo = templateClass.getInfo() + if (oldInfo == null) { + handler.post { + Snackbar.make( + viewBinding.root, + R.string.import_failed2, + Snackbar.LENGTH_SHORT + ).show() + } + return@Runnable + } + val thisAppVersion = + AppOperator.getAppVersionNum(this, this.packageName) + if (newInfo.versionNum > thisAppVersion) { + handler.post { + Snackbar.make( + viewBinding.root, + String.format( + Locale.getDefault(), + getString(R.string.app_version_error), + formFile.name + ), Snackbar.LENGTH_LONG + ).show() + } + return@Runnable + } + if (newInfo.versionNum < oldInfo.versionNum) { + handler.post { + MaterialAlertDialogBuilder(this).setTitle(oldInfo.name).setMessage( + String.format( + Locale.getDefault(), + getString(R.string.covers_the_import), + newInfo.versionName, oldInfo.versionName + ) + ).setPositiveButton(R.string.dialog_ok) { _, _ -> + FileOperator.delete_files(templateDirectory) + importTemplate(formFile, templateDirectory) + }.setNegativeButton(R.string.dialog_cancel) { _, _ -> + }.show() + } + return@Runnable + } else { + //同等版本，不做处理（覆盖安装） + } } - } - } else { - //常规导入 - val newInfo = compressionManager.readEntry(formFile, LocalTemplatePackage.INFONAME) - if (newInfo == null) { - handler.post { - Snackbar.make( + } else { + //常规导入 + val newInfo = + compressionManager.readEntry(formFile, LocalTemplatePackage.INFONAME) + if (newInfo == null) { + handler.post { + Snackbar.make( viewBinding.root, getString(R.string.import_failed2), Snackbar.LENGTH_LONG - ).show() - } - return@Runnable - } else { - val jsonObject = JSONObject(newInfo) - val appVersion = jsonObject.getInt("appVersionNum") - val thisAppVersion = - AppOperator.getAppVersionNum(this, this.packageName) - if (appVersion > thisAppVersion) { - handler.post { - Snackbar.make( - viewBinding.root, - String.format(Locale.getDefault(), - getString(R.string.app_version_error), - formFile.name - ), Snackbar.LENGTH_LONG ).show() } return@Runnable + } else { + val jsonObject = JSONObject(newInfo) + val appVersion = jsonObject.getInt("appVersionNum") + val thisAppVersion = + AppOperator.getAppVersionNum(this, this.packageName) + if (appVersion > thisAppVersion) { + handler.post { + Snackbar.make( + viewBinding.root, + String.format( + Locale.getDefault(), + getString(R.string.app_version_error), + formFile.name + ), Snackbar.LENGTH_LONG + ).show() + } + return@Runnable + } } } - } - compressionManager.unzip( + compressionManager.unzip( formFile, templateDirectory, object : UnzipListener { @@ -601,11 +581,12 @@ class MainActivity : BaseActivity() { handler.post { handler.post { Snackbar.make( - viewBinding.root, - String.format(Locale.getDefault(), - getString(R.string.import_complete), - formFile.name - ), Snackbar.LENGTH_LONG + viewBinding.root, + String.format( + Locale.getDefault(), + getString(R.string.import_complete), + formFile.name + ), Snackbar.LENGTH_LONG ).show() } } @@ -613,24 +594,24 @@ class MainActivity : BaseActivity() { }) - }catch (e: Exception){ + } catch (e: Exception) { error(e) } }).start() } - @Deprecated("Deprecated in Java") override fun onBackPressed() { val navController = findNavController(R.id.baseFragment) //判断是否在第一个导航 社区或者仓库 if (navController.currentDestination?.id == navController.graph.startDestinationId) { MaterialAlertDialogBuilder(this).setTitle(R.string.dialog_close).setMessage( - String.format(Locale.getDefault(), - getString(R.string.exit_tip), - getString(R.string.app_name) - ) + String.format( + Locale.getDefault(), + getString(R.string.exit_tip), + getString(R.string.app_name) + ) ).setPositiveButton(R.string.dialog_ok) { _, _ -> finish() }.setNegativeButton(R.string.dialog_cancel) { _, _ -> @@ -682,8 +663,8 @@ class MainActivity : BaseActivity() { val headIcon = it.data.headIcon if (headIcon != null) { Glide.with(this).load(ServerConfiguration.getRealLink(headIcon)) - .apply(GlobalMethod.getRequestOptions(true, !it.data.activation)) - .into(headLayout.imageView) + .apply(GlobalMethod.getRequestOptions(true, !it.data.activation)) + .into(headLayout.imageView) } val account = it.data.account headLayout.imageView.setOnClickListener { @@ -700,10 +681,10 @@ class MainActivity : BaseActivity() { headLayout.emailView.text = "" headLayout.imageView.setOnClickListener { startActivity( - Intent( - this, - LoginActivity::class.java - ) + Intent( + this, + LoginActivity::class.java + ) ) } } else { @@ -721,10 +702,10 @@ class MainActivity : BaseActivity() { if (it) { //显示签名错误 CoreDialog(this).setTitle(R.string.sign_error) - .setMessage(R.string.sign_error_message).setCancelable(false) - .setPositiveButton(R.string.dialog_close) { - finish() - } + .setMessage(R.string.sign_error_message).setCancelable(false) + .setPositiveButton(R.string.dialog_close) { + finish() + } } } @@ -736,16 +717,16 @@ class MainActivity : BaseActivity() { startViewModel.verifyErrorMsgLiveData.observe(this) { if (it.isNotBlank()) { CoreDialog(this).setTitle(R.string.login).setMessage(it) - .setCancelable(false).setPositiveButton(R.string.login) { - startActivity( - Intent( - this, - LoginActivity::class.java - ) + .setCancelable(false).setPositiveButton(R.string.login) { + startActivity( + Intent( + this, + LoginActivity::class.java ) - }.setNegativeButton(R.string.close) { - finish() - }.show() + ) + }.setNegativeButton(R.string.close) { + finish() + }.show() } } @@ -756,8 +737,8 @@ class MainActivity : BaseActivity() { if (canUseView) { oldLanguage = AppSettings.getValue(AppSettings.Setting.AppLanguage, "en") oldDynamicColor = AppSettings.getValue( - AppSettings.Setting.DynamicColor, - DynamicColors.isDynamicColorAvailable() + AppSettings.Setting.DynamicColor, + DynamicColors.isDynamicColorAvailable() ) // useToolbarSetSupportActionBar() initNav() diff --git a/app/src/main/java/com/coldmint/rust/pro/UserHomePageActivity.kt b/app/src/main/java/com/coldmint/rust/pro/UserHomePageActivity.kt index f47f427..f17b581 100644 --- a/app/src/main/java/com/coldmint/rust/pro/UserHomePageActivity.kt +++ b/app/src/main/java/com/coldmint/rust/pro/UserHomePageActivity.kt @@ -213,7 +213,6 @@ class UserHomePageActivity : BaseActivity() { if (spaceInfoData.data.expirationTime == ServerConfiguration.ForeverTime) { viewBinding.cardView.isVisible = true viewBinding.cardView.setCardBackgroundColor(Color.parseColor("#33a3dc")) - viewBinding.positionView.setText(R.string.forever_time) } } } diff --git a/app/src/main/java/com/coldmint/rust/pro/adapters/FunAdapter.kt b/app/src/main/java/com/coldmint/rust/pro/adapters/FunAdapter.kt deleted file mode 100644 index 535a5b5..0000000 --- a/app/src/main/java/com/coldmint/rust/pro/adapters/FunAdapter.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.coldmint.rust.pro.adapters - -import android.content.Context -import android.view.LayoutInflater -import android.view.ViewGroup -import com.bumptech.glide.Glide -import com.coldmint.rust.pro.base.BaseAdapter -import com.coldmint.rust.pro.databean.FunctionInfo -import com.coldmint.rust.pro.databinding.ItemFunBinding -import com.coldmint.rust.pro.databinding.ItemServiceBinding - -class FunAdapter( context: Context, dataList: MutableList) : - BaseAdapter(context, dataList) { - override fun getViewBindingObject( - layoutInflater: LayoutInflater, - parent: ViewGroup, - viewType: Int - ): ItemFunBinding { - return ItemFunBinding.inflate(layoutInflater, parent, false) - } - - override fun onBingView( - data: FunctionInfo, - viewBinding: ItemFunBinding, - viewHolder: ViewHolder, - position: Int - ) { - viewBinding.titleView.text = data.name - val resId = data.iconRes - if (resId != null) { - viewBinding.iconView.setImageResource(resId) - } - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/coldmint/rust/pro/adapters/UserGroupAdapter.kt b/app/src/main/java/com/coldmint/rust/pro/adapters/UserGroupAdapter.kt deleted file mode 100644 index c4c6391..0000000 --- a/app/src/main/java/com/coldmint/rust/pro/adapters/UserGroupAdapter.kt +++ /dev/null @@ -1,35 +0,0 @@ -package com.coldmint.rust.pro.adapters - -import android.content.Context -import android.view.LayoutInflater -import android.view.ViewGroup -import com.bumptech.glide.Glide -import com.coldmint.rust.pro.base.BaseAdapter -import com.coldmint.rust.pro.databean.UserGroupData -import com.coldmint.rust.pro.databinding.ItemTemplateBinding -import com.coldmint.rust.pro.databinding.ItemUserBinding -import com.coldmint.rust.pro.databinding.ItemUserGroupBinding - -/** - * 用户群适配器 - */ -class UserGroupAdapter(context: Context, dataList: MutableList) : - BaseAdapter(context, dataList) { - override fun getViewBindingObject( - layoutInflater: LayoutInflater, - parent: ViewGroup, - viewType: Int - ): ItemUserGroupBinding { - return ItemUserGroupBinding.inflate(layoutInflater, parent, false) - } - - override fun onBingView( - data: UserGroupData, - viewBinding: ItemUserGroupBinding, - viewHolder: ViewHolder, - position: Int - ) { - viewBinding.imageView.setImageResource(data.iconRes) - viewBinding.titleView.setText(data.titleRes) - } -} \ No newline at end of file diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/RecommendedFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/RecommendedFragment.kt index 283dd11..b17db67 100644 --- a/app/src/main/java/com/coldmint/rust/pro/fragments/RecommendedFragment.kt +++ b/app/src/main/java/com/coldmint/rust/pro/fragments/RecommendedFragment.kt @@ -130,17 +130,12 @@ class RecommendedFragment : BaseFragment() { if (t.code == ServerConfiguration.Success_Code) { val dataList = t.data if (!dataList.isNullOrEmpty()) { - val forever = - AppSettings.getValue( - AppSettings.Setting.ExpirationTime, - 0.toLong() - ) == (-2).toLong() val textStyleMaker = TextStyleMaker.instance val showList = dataList.filter { var show = true val type = textStyleMaker.getType(it.link) //如果点击事件为激活助手，但此用户已经永久激活，那么隐藏轮播图 - if (type == "activate" && forever) { + if (type == "activate") { show = false } show diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/UserGroupFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/UserGroupFragment.kt deleted file mode 100644 index 622ae99..0000000 --- a/app/src/main/java/com/coldmint/rust/pro/fragments/UserGroupFragment.kt +++ /dev/null @@ -1,57 +0,0 @@ -package com.coldmint.rust.pro.fragments - -import android.os.Bundle -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.recyclerview.widget.LinearLayoutManager -import com.coldmint.rust.core.tool.AppOperator -import com.coldmint.rust.pro.R -import com.coldmint.rust.pro.adapters.UserGroupAdapter -import com.coldmint.rust.pro.databean.UserGroupData -import com.coldmint.rust.pro.databinding.FragmentUserGroupBinding -import com.coldmint.rust.pro.ui.StableLinearLayoutManager -import com.google.android.material.bottomsheet.BottomSheetDialogFragment - -/** - * 用户群碎片 - * @property viewBinding FragmentUserGroupBinding - */ -class UserGroupFragment : BottomSheetDialogFragment() { - - private lateinit var viewBinding: FragmentUserGroupBinding - - override fun onCreateView( - inflater: LayoutInflater, - container: ViewGroup?, - savedInstanceState: Bundle? - ): View? { - viewBinding = FragmentUserGroupBinding.inflate(inflater, container, false) - return viewBinding.root - } - - override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - viewBinding.recyclerView.layoutManager = StableLinearLayoutManager(requireContext()) - val dataList = ArrayList() - dataList.add(UserGroupData(R.drawable.ic_qq, R.string.qq_group)) - dataList.add(UserGroupData(R.drawable.ic_discord, R.string.discord_group)) - val adapter = UserGroupAdapter(requireContext(), dataList) - viewBinding.recyclerView.adapter = adapter - adapter.setItemEvent { i, itemUserGroupBinding, viewHolder, userGroupData -> - itemUserGroupBinding.root.setOnClickListener { - if (userGroupData.titleRes == R.string.qq_group) { - AppOperator.useBrowserAccessWebPage( - requireContext(), - "https://qun.qq.com/qqweb/qunpro/share?_wv=3&_wwv=128&appChannel=share&inviteCode=1W7Dpb0&businessType=9&from=246610&biz=ka" - ) - } else if (userGroupData.titleRes == R.string.discord_group) { - AppOperator.useBrowserAccessWebPage( - requireContext(), - "https://discord.gg/DTQDmVdVK3" - ) - } - } - } - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/coldmint/rust/pro/fragments/UserInfoFragment.kt b/app/src/main/java/com/coldmint/rust/pro/fragments/UserInfoFragment.kt index 32248db..bd5d79a 100644 --- a/app/src/main/java/com/coldmint/rust/pro/fragments/UserInfoFragment.kt +++ b/app/src/main/java/com/coldmint/rust/pro/fragments/UserInfoFragment.kt @@ -172,10 +172,6 @@ class UserInfoFragment : BaseFragment() { viewBinding.logOutButton.setOnClickListener { AppSettings.setValue(AppSettings.Setting.LoginStatus, false) // GlobalMethod.isActive = false - AppSettings.setValue( - AppSettings.Setting.ExpirationTime, - 0.toLong() - ) (requireActivity() as MainActivity).startViewModel.isActivationLiveData.value = false startActivity(Intent(requireContext(), LoginActivity::class.java)) } diff --git a/app/src/main/java/com/coldmint/rust/pro/tool/AppSettings.kt b/app/src/main/java/com/coldmint/rust/pro/tool/AppSettings.kt index 48002de..491605b 100644 --- a/app/src/main/java/com/coldmint/rust/pro/tool/AppSettings.kt +++ b/app/src/main/java/com/coldmint/rust/pro/tool/AppSettings.kt @@ -38,7 +38,7 @@ object AppSettings { } enum class Setting { - DatabaseDirectory, DatabasePath, TemplateDirectory, AppLanguage, DeveloperMode, CustomSymbol, AutoCreateNomedia, OnlyLoadConantLanguageTemple, NightMode, GamePackage, KeywordColor, KeywordColorDark, AnnotationColor, AnnotationColorDark, TextColor, TextColorDark, SectionColor, SectionColorDark, KeepRwmodFile, EnableRecoveryStation, RecoveryStationFileSaveDays, RecoveryStationFolder, IndependentFolder, SetGameStorage, PackDirectory, IdentifiersPromptNumber, UserName, UseJetBrainsMonoFont, AppID, Account, PassWord, ExpirationTime, CheckBetaUpdate, UpdateData, ShareTip, AgreePolicy, EnglishEditingMode, NightModeFollowSystem, UseMobileNetwork, MapFolder, ModFolder, UseTheCommunityAsTheLaunchPage, AutoSave, ServerAddress, Token, LoginStatus, DynamicColor, ExperiencePlan, FileSortType, CodeEditBackGroundEnable, BlurTransformationValue, CodeEditBackGroundPath, SimpleDisplayOfAutoCompleteMenu, SourceFileType, ClipboardCue + DatabaseDirectory, DatabasePath, TemplateDirectory, AppLanguage, DeveloperMode, CustomSymbol, AutoCreateNomedia, OnlyLoadConantLanguageTemple, NightMode, GamePackage, KeywordColor, KeywordColorDark, AnnotationColor, AnnotationColorDark, TextColor, TextColorDark, SectionColor, SectionColorDark, KeepRwmodFile, EnableRecoveryStation, RecoveryStationFileSaveDays, RecoveryStationFolder, IndependentFolder, SetGameStorage, PackDirectory, IdentifiersPromptNumber, UserName, UseJetBrainsMonoFont, AppID, Account, PassWord, CheckBetaUpdate, UpdateData, ShareTip, AgreePolicy, EnglishEditingMode, NightModeFollowSystem, UseMobileNetwork, MapFolder, ModFolder, UseTheCommunityAsTheLaunchPage, AutoSave, ServerAddress, Token, LoginStatus, DynamicColor, ExperiencePlan, FileSortType, CodeEditBackGroundEnable, BlurTransformationValue, CodeEditBackGroundPath, SimpleDisplayOfAutoCompleteMenu, SourceFileType, ClipboardCue } @@ -141,7 +141,6 @@ object AppSettings { map[Setting.AppID] = "AppId" map[Setting.Account] = "Account" map[Setting.PassWord] = "PassWord" - map[Setting.ExpirationTime] = "ExpirationTime" map[Setting.UpdateData] = "UpdateData" map[Setting.ShareTip] = "ShareTip" map[Setting.AgreePolicy] = "AgreePolicy" diff --git a/app/src/main/java/com/coldmint/rust/pro/tool/TextStyleMaker.kt b/app/src/main/java/com/coldmint/rust/pro/tool/TextStyleMaker.kt index 2b52e1e..ebc2977 100644 --- a/app/src/main/java/com/coldmint/rust/pro/tool/TextStyleMaker.kt +++ b/app/src/main/java/com/coldmint/rust/pro/tool/TextStyleMaker.kt @@ -295,22 +295,6 @@ class TextStyleMaker private constructor() { ).show() } } - "activate" -> { - val time = ServerConfiguration.toStringTime( - AppSettings - .getValue(AppSettings.Setting.ExpirationTime, 0.toLong()) - ) - if (time == ServerConfiguration.ForeverTime) { - Toast.makeText( - context, - R.string.can_t_activate, - Toast.LENGTH_SHORT - ).show() - } else { - val intent = Intent(context, ActivateActivity::class.java) - context.startActivity(intent) - } - } else -> { Toast.makeText( context, diff --git a/app/src/main/java/com/coldmint/rust/pro/viewmodel/StartViewModel.kt b/app/src/main/java/com/coldmint/rust/pro/viewmodel/StartViewModel.kt index ee801d8..4e63b74 100644 --- a/app/src/main/java/com/coldmint/rust/pro/viewmodel/StartViewModel.kt +++ b/app/src/main/java/com/coldmint/rust/pro/viewmodel/StartViewModel.kt @@ -126,17 +126,17 @@ class StartViewModel(application: Application) : BaseAndroidViewModel(applicatio } else { User.getUserActivationInfo(token, object : ApiCallBack { override fun onFailure(e: Exception) { - val localTime = AppSettings.getValue( - AppSettings.Setting.ExpirationTime, - 0.toLong() - ) - if (localTime == (-2).toLong()) { - isActivationLiveData.value = true - } else { - val nowTime = System.currentTimeMillis() - //本地时间大于当前时间 激活 - isActivationLiveData.value = localTime > nowTime - } +// val localTime = AppSettings.getValue( +// AppSettings.Setting.ExpirationTime, +// 0.toLong() +// ) +// if (localTime == (-2).toLong()) { +// isActivationLiveData.value = true +// } else { +// val nowTime = System.currentTimeMillis() +// //本地时间大于当前时间 激活 +// isActivationLiveData.value = localTime > nowTime +// } } @@ -146,10 +146,6 @@ class StartViewModel(application: Application) : BaseAndroidViewModel(applicatio //更新本地激活时间 val expirationTime = activationInfo.data.expirationTime val time = ServerConfiguration.toLongTime(expirationTime) - AppSettings.forceSetValue( - AppSettings.Setting.ExpirationTime, - time - ) isActivationLiveData.value = activationInfo.data.activation } else { // 用户登录失败 diff --git a/app/src/main/res/drawable/ic_outline_free_breakfast_24.xml b/app/src/main/res/drawable/ic_outline_free_breakfast_24.xml deleted file mode 100644 index 47a9fa1..0000000 --- a/app/src/main/res/drawable/ic_outline_free_breakfast_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/outline_book_24.xml b/app/src/main/res/drawable/outline_book_24.xml deleted file mode 100644 index 283b63a..0000000 --- a/app/src/main/res/drawable/outline_book_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml index ae14fb9..620a94e 100644 --- a/app/src/main/res/layout/activity_about.xml +++ b/app/src/main/res/layout/activity_about.xml @@ -55,13 +55,6 @@ android:layout_marginTop="8dp" android:text="@string/setting_app_version" /> - @@ -93,33 +86,6 @@ - - -