From 5396a2c41fc8f69ef2184e178dc49cde33b620c6 Mon Sep 17 00:00:00 2001 From: LUX-Timber Date: Mon, 8 Apr 2024 10:36:09 +0800 Subject: [PATCH] rele-per-2 --- .idea/deploymentTargetDropDown.xml | 15 ++++++++++++++- app/build.gradle | 2 +- app/proguard-rules.pro | 3 ++- app/src/main/AndroidManifest.xml | 6 +++--- .../ApplyActivity.kt | 3 +-- .../DetailsActivity.kt | 5 ++--- .../MainActivity.kt | 18 +++--------------- .../MyKeyboardView.kt | 2 +- .../{adapter => fragment}/MyPagerAdapter.kt | 10 +++++----- .../soft/newkeyboard/fragment/VPFragment.kt | 8 +++----- .../{model => tools}/JsonDeserializer.kt | 2 +- app/src/main/res/drawable/png_loading.png | Bin 5935 -> 5212 bytes app/src/main/res/drawable/png_loading_err.png | Bin 5922 -> 5483 bytes app/src/main/res/layout/activity_apply.xml | 2 +- app/src/main/res/layout/activity_details.xml | 2 +- app/src/main/res/layout/activity_main.xml | 2 +- app/src/main/res/layout/view_input.xml | 2 +- app/src/main/res/values/colors.xml | 2 +- 18 files changed, 41 insertions(+), 43 deletions(-) rename app/src/main/java/com/timber/soft/newkeyboard/{activity => activityandview}/ApplyActivity.kt (98%) rename app/src/main/java/com/timber/soft/newkeyboard/{activity => activityandview}/DetailsActivity.kt (99%) rename app/src/main/java/com/timber/soft/newkeyboard/{activity => activityandview}/MainActivity.kt (91%) rename app/src/main/java/com/timber/soft/newkeyboard/{view => activityandview}/MyKeyboardView.kt (99%) rename app/src/main/java/com/timber/soft/newkeyboard/{adapter => fragment}/MyPagerAdapter.kt (90%) rename app/src/main/java/com/timber/soft/newkeyboard/{model => tools}/JsonDeserializer.kt (96%) diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml index 0c0c338..2cd7bfe 100644 --- a/.idea/deploymentTargetDropDown.xml +++ b/.idea/deploymentTargetDropDown.xml @@ -3,7 +3,20 @@ - + + + + + + + + + + + + + + diff --git a/app/build.gradle b/app/build.gradle index 8830fcb..25b76f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro index 481bb43..cf50408 100644 --- a/app/proguard-rules.pro +++ b/app/proguard-rules.pro @@ -18,4 +18,5 @@ # If you keep the line number information, uncomment this to # hide the original source file name. -#-renamesourcefileattribute SourceFile \ No newline at end of file +#-renamesourcefileattribute SourceFile + diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e003df8..aa4861d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -16,7 +16,7 @@ android:theme="@style/Theme.NewKeyboard" tools:targetApi="31"> @@ -38,10 +38,10 @@ diff --git a/app/src/main/java/com/timber/soft/newkeyboard/activity/ApplyActivity.kt b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/ApplyActivity.kt similarity index 98% rename from app/src/main/java/com/timber/soft/newkeyboard/activity/ApplyActivity.kt rename to app/src/main/java/com/timber/soft/newkeyboard/activityandview/ApplyActivity.kt index bc0d013..a39f1be 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/activity/ApplyActivity.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/ApplyActivity.kt @@ -1,4 +1,4 @@ -package com.timber.soft.newkeyboard.activity +package com.timber.soft.newkeyboard.activityandview import android.content.BroadcastReceiver import android.content.Context @@ -67,7 +67,6 @@ class ApplyActivity : AppCompatActivity(), View.OnClickListener { updateUi() listener = StepReceive() register() - binding.idStep1.setOnClickListener(this) binding.idStep2.setOnClickListener(this) binding.applyBack.setOnClickListener(this) diff --git a/app/src/main/java/com/timber/soft/newkeyboard/activity/DetailsActivity.kt b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/DetailsActivity.kt similarity index 99% rename from app/src/main/java/com/timber/soft/newkeyboard/activity/DetailsActivity.kt rename to app/src/main/java/com/timber/soft/newkeyboard/activityandview/DetailsActivity.kt index e38a0c4..b2c5df5 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/activity/DetailsActivity.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/DetailsActivity.kt @@ -1,4 +1,4 @@ -package com.timber.soft.newkeyboard.activity +package com.timber.soft.newkeyboard.activityandview import android.content.Context import android.content.Intent @@ -23,7 +23,7 @@ import com.bumptech.glide.request.target.Target import com.timber.soft.newkeyboard.R import com.timber.soft.newkeyboard.databinding.ActivityDetailsBinding import com.timber.soft.newkeyboard.listener.ApplyListener -import com.timber.soft.newkeyboard.model.DataModel +import com.timber.soft.newkeyboard.tools.DataModel import com.timber.soft.newkeyboard.tools.AppVal import com.timber.soft.newkeyboard.tools.StatusBarTools import net.sf.sevenzipjbinding.ArchiveFormat @@ -266,7 +266,6 @@ class DetailsActivity : AppCompatActivity(), ApplyListener { } - private fun getAllThemePath(zip: String): String { val result = sp.getString(zip, "") return result!! diff --git a/app/src/main/java/com/timber/soft/newkeyboard/activity/MainActivity.kt b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MainActivity.kt similarity index 91% rename from app/src/main/java/com/timber/soft/newkeyboard/activity/MainActivity.kt rename to app/src/main/java/com/timber/soft/newkeyboard/activityandview/MainActivity.kt index b9ea3e3..8d455a5 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/activity/MainActivity.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MainActivity.kt @@ -1,4 +1,4 @@ -package com.timber.soft.newkeyboard.activity +package com.timber.soft.newkeyboard.activityandview import android.content.Intent import android.content.pm.PackageInfo @@ -20,13 +20,12 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentPagerAdapter -import com.google.android.material.button.MaterialButtonToggleGroup import com.google.android.material.tabs.TabLayout import com.timber.soft.newkeyboard.R import com.timber.soft.newkeyboard.databinding.ActivityMainBinding import com.timber.soft.newkeyboard.fragment.VPFragment -import com.timber.soft.newkeyboard.model.JsonDeserializer.parseJsonFromAssets -import com.timber.soft.newkeyboard.model.RootModel +import com.timber.soft.newkeyboard.tools.JsonDeserializer.parseJsonFromAssets +import com.timber.soft.newkeyboard.tools.RootModel import com.timber.soft.newkeyboard.tools.StatusBarTools.dpCovertPx class MainActivity : AppCompatActivity() { @@ -79,17 +78,6 @@ class MainActivity : AppCompatActivity() { } binding.tabLayout.setupWithViewPager(binding.viewpager) - -// val toggleGroup = findViewById(R.id.toggle_group) -// toggleGroup.addOnButtonCheckedListener { group, checkedId, isChecked -> -// if (isChecked) { -// when (checkedId) { -// R.id.bt1 -> binding.drawerParent.closeDrawer(GravityCompat.END) -// R.id.bt2 -> binding.drawerParent.openDrawer(GravityCompat.END) -// } -// } -// } - binding.bt1.setOnClickListener(){ binding.drawerParent.closeDrawer(GravityCompat.END) } diff --git a/app/src/main/java/com/timber/soft/newkeyboard/view/MyKeyboardView.kt b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MyKeyboardView.kt similarity index 99% rename from app/src/main/java/com/timber/soft/newkeyboard/view/MyKeyboardView.kt rename to app/src/main/java/com/timber/soft/newkeyboard/activityandview/MyKeyboardView.kt index ca761e7..717dab8 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/view/MyKeyboardView.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/activityandview/MyKeyboardView.kt @@ -1,4 +1,4 @@ -package com.timber.soft.newkeyboard.view +package com.timber.soft.newkeyboard.activityandview import android.annotation.SuppressLint import android.content.Context diff --git a/app/src/main/java/com/timber/soft/newkeyboard/adapter/MyPagerAdapter.kt b/app/src/main/java/com/timber/soft/newkeyboard/fragment/MyPagerAdapter.kt similarity index 90% rename from app/src/main/java/com/timber/soft/newkeyboard/adapter/MyPagerAdapter.kt rename to app/src/main/java/com/timber/soft/newkeyboard/fragment/MyPagerAdapter.kt index 421a1e3..88c22f7 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/adapter/MyPagerAdapter.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/fragment/MyPagerAdapter.kt @@ -1,4 +1,4 @@ -package com.timber.soft.newkeyboard.adapter +package com.timber.soft.newkeyboard.fragment import android.content.Context import android.view.LayoutInflater @@ -12,8 +12,8 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy import com.bumptech.glide.load.resource.drawable.DrawableTransitionOptions import com.bumptech.glide.request.RequestOptions import com.timber.soft.newkeyboard.R -import com.timber.soft.newkeyboard.model.DataModel -import com.timber.soft.newkeyboard.model.RootModel +import com.timber.soft.newkeyboard.tools.DataModel +import com.timber.soft.newkeyboard.tools.RootModel class MyPagerAdapter( private val context: Context, @@ -55,12 +55,12 @@ class MyPagerAdapter( override fun onCreateViewHolder( parent: ViewGroup, viewType: Int - ): MyPagerAdapter.PreViewHolder { + ): PreViewHolder { val view = LayoutInflater.from(context).inflate(R.layout.item_pre_img, parent, false) return PreViewHolder(view) } - override fun onBindViewHolder(holder: MyPagerAdapter.PreViewHolder, position: Int) { + override fun onBindViewHolder(holder: PreViewHolder, position: Int) { val dataModel = dataModels[position % dataModels.size] holder.loadPreImg(context, dataModel.thumb, holder.imgItemView) diff --git a/app/src/main/java/com/timber/soft/newkeyboard/fragment/VPFragment.kt b/app/src/main/java/com/timber/soft/newkeyboard/fragment/VPFragment.kt index 2bcc404..da2e661 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/fragment/VPFragment.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/fragment/VPFragment.kt @@ -6,16 +6,14 @@ import android.util.Log import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import android.widget.Toast import androidx.fragment.app.Fragment import androidx.recyclerview.widget.LinearLayoutManager.VERTICAL import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.StaggeredGridLayoutManager import com.timber.soft.newkeyboard.R -import com.timber.soft.newkeyboard.activity.DetailsActivity -import com.timber.soft.newkeyboard.adapter.MyPagerAdapter -import com.timber.soft.newkeyboard.model.DataModel -import com.timber.soft.newkeyboard.model.RootModel +import com.timber.soft.newkeyboard.activityandview.DetailsActivity +import com.timber.soft.newkeyboard.tools.DataModel +import com.timber.soft.newkeyboard.tools.RootModel class VPFragment(private val rootModel: RootModel) : Fragment() { diff --git a/app/src/main/java/com/timber/soft/newkeyboard/model/JsonDeserializer.kt b/app/src/main/java/com/timber/soft/newkeyboard/tools/JsonDeserializer.kt similarity index 96% rename from app/src/main/java/com/timber/soft/newkeyboard/model/JsonDeserializer.kt rename to app/src/main/java/com/timber/soft/newkeyboard/tools/JsonDeserializer.kt index 261b8a2..847f630 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/model/JsonDeserializer.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/tools/JsonDeserializer.kt @@ -1,4 +1,4 @@ -package com.timber.soft.newkeyboard.model +package com.timber.soft.newkeyboard.tools import android.content.Context import com.google.gson.Gson diff --git a/app/src/main/res/drawable/png_loading.png b/app/src/main/res/drawable/png_loading.png index 10e0d17fe78644f869a354c292846e164abfbfb3..e19dde01dcdaa6bbc721d35353bca53c0a7bb656 100644 GIT binary patch literal 5212 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 CQ!S(b literal 5935 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 diff --git a/app/src/main/res/drawable/png_loading_err.png b/app/src/main/res/drawable/png_loading_err.png index 7721bbd44907c05b7cc5a3c0397fb58a7baf6dac..13386263b7cd3fb731e8d86217750a0675f294f7 100644 GIT binary patch delta 3747 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 diff --git a/app/src/main/res/layout/activity_apply.xml b/app/src/main/res/layout/activity_apply.xml index 4bcc7dd..3efd543 100644 --- a/app/src/main/res/layout/activity_apply.xml +++ b/app/src/main/res/layout/activity_apply.xml @@ -6,7 +6,7 @@ android:layout_height="match_parent" android:paddingStart="12dp" android:paddingEnd="12dp" - tools:context=".activity.DetailsActivity"> + tools:context=".activityandview.DetailsActivity"> + tools:context=".activityandview.DetailsActivity"> + tools:context=".activityandview.MainActivity"> - #FF000000 #FFFFFFFF - #FFBB86FC + #E91E63 #FF888888 \ No newline at end of file