rele-per-2

.idea/deploymentTargetDropDown.xml

@@ -3,7 +3,20 @@
   <component name="deploymentTargetDropDown">
     <value>
       <entry key="app">
-        <State />
+        <State>
+          <targetSelectedWithDropDown>
+            <Target>
+              <type value="QUICK_BOOT_TARGET" />
+              <deviceKey>
+                <Key>
+                  <type value="VIRTUAL_DEVICE_PATH" />
+                  <value value="C:\Users\timbe\.android\avd\Pixel_8_API_34.avd" />
+                </Key>
+              </deviceKey>
+            </Target>
+          </targetSelectedWithDropDown>
+          <timeTargetWasSelectedWithDropDown value="2024-04-08T02:01:13.600126200Z" />
+        </State>
       </entry>
     </value>
   </component>

app/build.gradle

@@ -19,7 +19,7 @@ android {
 
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }

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
+#-renamesourcefileattribute SourceFile
+

app/src/main/AndroidManifest.xml

@@ -16,7 +16,7 @@
         android:theme="@style/Theme.NewKeyboard"
         tools:targetApi="31">
         <activity
-            android:name=".activity.MainActivity"
+            android:name=".activityandview.MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -38,10 +38,10 @@
         </service>
 
         <activity
-            android:name=".activity.DetailsActivity"
+            android:name=".activityandview.DetailsActivity"
             android:exported="false" />
         <activity
-            android:name=".activity.ApplyActivity"
+            android:name=".activityandview.ApplyActivity"
             android:exported="false" />
     </application>
 

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)

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!!

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<MaterialButtonToggleGroup>(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)
         }

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

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)
 

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() {
 

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

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">
 
     <!--主视图-->
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/activity_details.xml

@@ -6,7 +6,7 @@
     android:layout_height="match_parent"
     android:paddingStart="12dp"
     android:paddingEnd="12dp"
-    tools:context=".activity.DetailsActivity">
+    tools:context=".activityandview.DetailsActivity">
 
     <!--主视图-->
     <androidx.constraintlayout.widget.ConstraintLayout

app/src/main/res/layout/activity_main.xml

@@ -4,7 +4,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".activity.MainActivity">
+    tools:context=".activityandview.MainActivity">
 
     <androidx.drawerlayout.widget.DrawerLayout
         android:id="@+id/drawer_parent"

app/src/main/res/layout/view_input.xml

@@ -3,7 +3,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <com.timber.soft.newkeyboard.view.MyKeyboardView
+    <com.timber.soft.newkeyboard.activityandview.MyKeyboardView
         android:id="@+id/my_custom_input"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/values/colors.xml

@@ -2,6 +2,6 @@
 <resources>
     <color name="black">#FF000000</color>
     <color name="white">#FFFFFFFF</color>
-    <color name="theme_color">#FFBB86FC</color>
+    <color name="theme_color">#E91E63</color>
     <color name="gray">#FF888888</color>
 </resources>