diff --git a/app/src/main/java/com/timber/soft/newkeyboard/activity/ApplyActivity.kt b/app/src/main/java/com/timber/soft/newkeyboard/activity/ApplyActivity.kt index ef59f93..bc0d013 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/activity/ApplyActivity.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/activity/ApplyActivity.kt @@ -72,7 +72,6 @@ class ApplyActivity : AppCompatActivity(), View.OnClickListener { binding.idStep2.setOnClickListener(this) binding.applyBack.setOnClickListener(this) - } override fun onResume() { @@ -106,7 +105,7 @@ class ApplyActivity : AppCompatActivity(), View.OnClickListener { } else { binding.idStep2.setBackgroundResource(R.drawable.shape_theme_set) } - if (isChoose()&&isEnable()){ + if (isChoose() && isEnable()) { showDialog() } } diff --git a/app/src/main/java/com/timber/soft/newkeyboard/activity/MainActivity.kt b/app/src/main/java/com/timber/soft/newkeyboard/activity/MainActivity.kt index 589bf65..b9ea3e3 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/activity/MainActivity.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/activity/MainActivity.kt @@ -20,6 +20,7 @@ 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 @@ -60,11 +61,8 @@ class MainActivity : AppCompatActivity() { (View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN or View.SYSTEM_UI_FLAG_LAYOUT_STABLE) or View.SYSTEM_UI_FLAG_LIGHT_STATUS_BAR window.statusBarColor = Color.TRANSPARENT } - initDrawer() - initTabLayOut() - binding.viewpager.offscreenPageLimit = 3 binding.viewpager.adapter = object : FragmentPagerAdapter(supportFragmentManager) { override fun getCount(): Int { @@ -81,6 +79,23 @@ 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) + } + binding.bt2.setOnClickListener(){ + binding.drawerParent.openDrawer(GravityCompat.END) + } } private fun initTabLayOut() { @@ -128,7 +143,7 @@ class MainActivity : AppCompatActivity() { val textView = TextView(this) //字体样式 val selectedSize = - TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX, 22f, resources.displayMetrics) + TypedValue.applyDimension(TypedValue.COMPLEX_UNIT_PX, 24f, resources.displayMetrics) textView.setTextSize(TypedValue.COMPLEX_UNIT_SP, selectedSize) textView.typeface = Typeface.defaultFromStyle(Typeface.BOLD) //加粗 textView.gravity = Gravity.CENTER @@ -139,6 +154,7 @@ class MainActivity : AppCompatActivity() { } private fun initDrawer() { + binding.drawerParent.setDrawerLockMode(DrawerLayout.LOCK_MODE_LOCKED_CLOSED) binding.layoutRate.setOnClickListener() { val url = getString(R.string.share_link) + packageName // 创建intent打开链接 @@ -159,15 +175,13 @@ class MainActivity : AppCompatActivity() { val intent = Intent(this, ApplyActivity::class.java) startActivity(intent) } + binding.drawerBack.setOnClickListener(){ + binding.drawerParent.closeDrawer(GravityCompat.END) + } // 绑定抽屉中的版本信息 val versionName = getVersionName() binding.textAppVersion.text = versionName - // 打开抽屉 - binding.imageMenu.setOnClickListener() { - binding.drawerParent.openDrawer(GravityCompat.START) - } - binding.drawerParent.addDrawerListener(object : DrawerLayout.DrawerListener { override fun onDrawerSlide(drawerView: View, slideOffset: Float) { } diff --git a/app/src/main/java/com/timber/soft/newkeyboard/view/MyKeyboardView.kt b/app/src/main/java/com/timber/soft/newkeyboard/view/MyKeyboardView.kt index c53c9f1..ca761e7 100644 --- a/app/src/main/java/com/timber/soft/newkeyboard/view/MyKeyboardView.kt +++ b/app/src/main/java/com/timber/soft/newkeyboard/view/MyKeyboardView.kt @@ -36,15 +36,15 @@ class MyKeyboardView @JvmOverloads constructor( lateinit var spBackgroundDraw: Drawable lateinit var normalBackgroundDraw: Drawable var icShittLock: Drawable? = - ContextCompat.getDrawable(context, R.drawable.svg_shift_lit) + ContextCompat.getDrawable(context, R.drawable.svg_shift) var icDel: Drawable? = - ContextCompat.getDrawable(context, R.drawable.svg_dele) + ContextCompat.getDrawable(context, R.drawable.svg_delete) var allBg: Drawable? = ContextCompat.getDrawable(context, R.mipmap.main_bg) var icBshift: Drawable? = - ContextCompat.getDrawable(context, R.drawable.svg_shift_lit) + ContextCompat.getDrawable(context, R.drawable.svg_shift) var icSshift: Drawable? = - ContextCompat.getDrawable(context, R.drawable.svg_shift_lit) + ContextCompat.getDrawable(context, R.drawable.svg_shift) @RequiresApi(Build.VERSION_CODES.M) var keycolor: Int = context.resources.getColor(R.color.white, null) @@ -87,8 +87,6 @@ class MyKeyboardView @JvmOverloads constructor( } eventT = xmlP.next() } - - } @@ -151,7 +149,6 @@ class MyKeyboardView @JvmOverloads constructor( } - getbgic(con, it.plus(AppVal.parent_path).plus(AppVal.title_shitf_ic))?.let { icSshift = it icBshift = it @@ -209,9 +206,9 @@ class MyKeyboardView @JvmOverloads constructor( myKey.icon = this var icon_w = myKey.icon.intrinsicWidth.toFloat() - var icon_wr = icon_w / myKey.width.toFloat() + val icon_wr = icon_w / myKey.width.toFloat() var icon_h = myKey.icon.intrinsicHeight.toFloat() - var icon_hr = icon_h / myKey.height.toFloat() + val icon_hr = icon_h / myKey.height.toFloat() var tep1 = 0f diff --git a/app/src/main/res/drawable/shape_theme_set.xml b/app/src/main/res/drawable/shape_theme_set.xml index 5005e6d..e7a7584 100644 --- a/app/src/main/res/drawable/shape_theme_set.xml +++ b/app/src/main/res/drawable/shape_theme_set.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_theme_set_over.xml b/app/src/main/res/drawable/shape_theme_set_over.xml index 9e75a75..1b094f3 100644 --- a/app/src/main/res/drawable/shape_theme_set_over.xml +++ b/app/src/main/res/drawable/shape_theme_set_over.xml @@ -2,6 +2,6 @@ - + \ No newline at end of file diff --git a/app/src/main/res/drawable/svg_delete.xml b/app/src/main/res/drawable/svg_delete.xml new file mode 100644 index 0000000..d2b83a3 --- /dev/null +++ b/app/src/main/res/drawable/svg_delete.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/svg_home.xml b/app/src/main/res/drawable/svg_home.xml new file mode 100644 index 0000000..289efcd --- /dev/null +++ b/app/src/main/res/drawable/svg_home.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/svg_menu_main.xml b/app/src/main/res/drawable/svg_menu_main.xml new file mode 100644 index 0000000..f4b2b8a --- /dev/null +++ b/app/src/main/res/drawable/svg_menu_main.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/svg_shift.xml b/app/src/main/res/drawable/svg_shift.xml new file mode 100644 index 0000000..639f9e7 --- /dev/null +++ b/app/src/main/res/drawable/svg_shift.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 81fb40c..f48b86d 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -1,5 +1,5 @@ - - - - - - - - @@ -66,11 +41,23 @@ + + - + + + + + + + + + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 4a3b954..ae28766 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,4 +13,6 @@ Application failed, please try again For normal use, please enter the setting to complete the setting steps. Loading… + Home + Menu \ No newline at end of file