diff --git a/app/src/main/java/com/tools/device/devcheck/adapter/TempAdapter.kt b/app/src/main/java/com/tools/device/devcheck/adapter/TempAdapter.kt index 1ea2809..c08022f 100644 --- a/app/src/main/java/com/tools/device/devcheck/adapter/TempAdapter.kt +++ b/app/src/main/java/com/tools/device/devcheck/adapter/TempAdapter.kt @@ -6,9 +6,11 @@ import android.view.ViewGroup import androidx.recyclerview.widget.RecyclerView import com.tools.device.devcheck.databinding.ItemCommonTempBinding import com.tools.device.devcheck.databinding.ItemListBinding +import com.tools.device.devcheck.dialog.TempDialogFragment class TempAdapter: RecyclerView.Adapter() { private lateinit var context: Context + private lateinit var listener: OnTempClickListener override fun onCreateViewHolder( parent: ViewGroup, viewType: Int @@ -22,12 +24,20 @@ class TempAdapter: RecyclerView.Adapter() { holder: ListViewHolder, position: Int ) { - + holder.binding.view.setOnClickListener { + listener.onTempClick(position) + } } override fun getItemCount(): Int { return 3 } + fun setListener(listener: OnTempClickListener){ + this.listener = listener + } class ListViewHolder(val binding: ItemCommonTempBinding): RecyclerView.ViewHolder(binding.root) +} +interface OnTempClickListener { + fun onTempClick(position: Int) } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/BlueToothActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/BlueToothActivity.kt index 84a1c9c..747b72d 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/BlueToothActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/BlueToothActivity.kt @@ -22,5 +22,6 @@ class BlueToothActivity : AppCompatActivity() { binding.recyclerView.adapter= ListAdapter() binding.recyclerView.layoutManager= LinearLayoutManager(this) binding.titleText.text=intent.getStringExtra(TITLE_KEY) + binding.backBtn.setOnClickListener { finish() } } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dashboard/TemperatureActivity.kt b/app/src/main/java/com/tools/device/devcheck/dashboard/TemperatureActivity.kt index 72e25da..1fb059b 100644 --- a/app/src/main/java/com/tools/device/devcheck/dashboard/TemperatureActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/dashboard/TemperatureActivity.kt @@ -8,11 +8,13 @@ import androidx.core.view.ViewCompat import androidx.core.view.WindowInsetsCompat import androidx.recyclerview.widget.LinearLayoutManager import com.tools.device.devcheck.R +import com.tools.device.devcheck.adapter.OnTempClickListener import com.tools.device.devcheck.adapter.TempAdapter import com.tools.device.devcheck.databinding.ActivityTemperatureBinding import com.tools.device.devcheck.dialog.CustomPopView +import com.tools.device.devcheck.dialog.TempDialogFragment -class TemperatureActivity : AppCompatActivity() { +class TemperatureActivity : AppCompatActivity(),OnTempClickListener { private lateinit var binding: ActivityTemperatureBinding private lateinit var customPopView: CustomPopView override fun onCreate(savedInstanceState: Bundle?) { @@ -22,7 +24,9 @@ class TemperatureActivity : AppCompatActivity() { binding.imageBack.setOnClickListener { finish() } - binding.rvTemperature.adapter = TempAdapter() + val tempAdapter = TempAdapter() + tempAdapter.setListener(this) + binding.rvTemperature.adapter = tempAdapter binding.rvTemperature.layoutManager =LinearLayoutManager(this) customPopView =CustomPopView(this,3,callback = {text-> @@ -31,4 +35,9 @@ class TemperatureActivity : AppCompatActivity() { customPopView.show(binding.imageTool) } } + + override fun onTempClick(position: Int) { + val tempDialog = TempDialogFragment() + tempDialog.show(supportFragmentManager, "tempDialog") + } } \ No newline at end of file diff --git a/app/src/main/java/com/tools/device/devcheck/dialog/CustomPopView.kt b/app/src/main/java/com/tools/device/devcheck/dialog/CustomPopView.kt index e955e9e..a6577f2 100644 --- a/app/src/main/java/com/tools/device/devcheck/dialog/CustomPopView.kt +++ b/app/src/main/java/com/tools/device/devcheck/dialog/CustomPopView.kt @@ -11,7 +11,7 @@ import com.tools.device.devcheck.R import com.tools.device.devcheck.databinding.PopupLayoutBinding import androidx.core.graphics.drawable.toDrawable -class CustomPopView(context: Context,type: Int,private val callback: (String) -> Unit) { +class CustomPopView(context: Context, type: Int, private val callback: (String) -> Unit) { private val context: Context = context private val type: Int = type private lateinit var popupWindow: PopupWindow @@ -40,6 +40,36 @@ class CustomPopView(context: Context,type: Int,private val callback: (String) -> popupWindow.animationStyle = R.style.PopupAnimation setType() + binding.llMore1.setOnClickListener { + if (binding.textMore1.text.toString() == context.getString(R.string.metric_units)) { + binding.textMore1.text = context.getString(R.string.imper_units) + } else { + binding.textMore1.text = context.getString(R.string.metric_units) + } + dismiss() + } + binding.popSleep.setOnClickListener { + dismiss() + callback.invoke(binding.textSleep.text.toString()) + if (binding.textSleep.text.toString() == context.getString(R.string.hide_deep_sleep)) { + binding.textSleep.text = context.getString(R.string.show_deep_sleep) + } else { + binding.textSleep.text = context.getString(R.string.hide_deep_sleep) + } + } + binding.textMore2.setOnClickListener {} + binding.textMore3.setOnClickListener {} + binding.textMore4.setOnClickListener {} + binding.textMore5.setOnClickListener {} + binding.textMore6.setOnClickListener {} + binding.text1.setOnClickListener { + dismiss() + callback.invoke(binding.text1.text.toString()) + } + binding.text2.setOnClickListener { + dismiss() + callback.invoke(binding.text2.text.toString()) + } } private fun setType() {//0：簇1或簇2 1：隐藏深度休眠 2：主页更多 3:公制单位和重置 4：公制单位 @@ -48,42 +78,29 @@ class CustomPopView(context: Context,type: Int,private val callback: (String) -> binding.popCluster.visibility = View.VISIBLE binding.popSleep.visibility = View.GONE binding.popMore.visibility = View.GONE - binding.text1.setOnClickListener { - dismiss() - callback.invoke(binding.text1.text.toString()) - } - binding.text2.setOnClickListener { - dismiss() - callback.invoke(binding.text2.text.toString()) - } } + 1 -> { binding.popCluster.visibility = View.GONE binding.popSleep.visibility = View.VISIBLE binding.popMore.visibility = View.GONE - binding.textSleep.setOnClickListener { - dismiss() - callback.invoke(binding.textSleep.text.toString()) - } + } + 2 -> { binding.popCluster.visibility = View.GONE binding.popSleep.visibility = View.GONE binding.popMore.visibility = View.VISIBLE - binding.textMore1.setOnClickListener {} - binding.textMore2.setOnClickListener {} - binding.textMore3.setOnClickListener {} - binding.textMore4.setOnClickListener {} - binding.textMore5.setOnClickListener {} - binding.textMore6.setOnClickListener {} } + 3 -> { binding.popCluster.visibility = View.GONE binding.popSleep.visibility = View.GONE binding.popMore.visibility = View.VISIBLE binding.llHide.visibility = View.GONE } - 4->{ + + 4 -> { binding.popCluster.visibility = View.GONE binding.popSleep.visibility = View.GONE binding.popMore.visibility = View.VISIBLE diff --git a/app/src/main/java/com/tools/device/devcheck/dialog/TempDialogFragment.kt b/app/src/main/java/com/tools/device/devcheck/dialog/TempDialogFragment.kt index b60fb35..aa95e85 100644 --- a/app/src/main/java/com/tools/device/devcheck/dialog/TempDialogFragment.kt +++ b/app/src/main/java/com/tools/device/devcheck/dialog/TempDialogFragment.kt @@ -36,6 +36,15 @@ class TempDialogFragment : DialogFragment() { onPositiveClick() dismiss() } + baseBinding.imgTemp1.isSelected = true + baseBinding.imgTemp1.setOnClickListener { + baseBinding.imgTemp1.isSelected = true + baseBinding.imgTemp2.isSelected = false + } + baseBinding.imgTemp2.setOnClickListener { + baseBinding.imgTemp2.isSelected = true + baseBinding.imgTemp1.isSelected = false + } } override fun onStart() { diff --git a/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt b/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt index f9d8f3e..e075b7f 100644 --- a/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt +++ b/app/src/main/java/com/tools/device/devcheck/main/MainActivity.kt @@ -41,6 +41,7 @@ class MainActivity : BaseActivity() { SensorsFragment.newInstance() ) ) + offscreenPageLimit = 1 registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() { override fun onPageSelected(position: Int) { super.onPageSelected(position) diff --git a/app/src/main/res/drawable/radius_sel.xml b/app/src/main/res/drawable/radius_sel.xml index db96eb0..3bc7c3b 100644 --- a/app/src/main/res/drawable/radius_sel.xml +++ b/app/src/main/res/drawable/radius_sel.xml @@ -1,5 +1,5 @@ + - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_blue_tooth.xml b/app/src/main/res/layout/activity_blue_tooth.xml index 6ed02ba..89f9f66 100644 --- a/app/src/main/res/layout/activity_blue_tooth.xml +++ b/app/src/main/res/layout/activity_blue_tooth.xml @@ -21,6 +21,7 @@ android:layout_margin="10dp" android:orientation="horizontal"> + app:tabTextColor="@color/main_tab_unselected" + app:tabTextAppearance="@style/NoCapsTabTextAppearance"/> diff --git a/app/src/main/res/layout/dialog_temp.xml b/app/src/main/res/layout/dialog_temp.xml index 475ad51..87abe46 100644 --- a/app/src/main/res/layout/dialog_temp.xml +++ b/app/src/main/res/layout/dialog_temp.xml @@ -22,9 +22,10 @@ android:layout_marginTop="20dp" android:orientation="horizontal"> + android:src="@drawable/radius_sel"/> diff --git a/app/src/main/res/layout/fragment_camera.xml b/app/src/main/res/layout/fragment_camera.xml index 5b11749..935ef2f 100644 --- a/app/src/main/res/layout/fragment_camera.xml +++ b/app/src/main/res/layout/fragment_camera.xml @@ -1,11 +1,10 @@ - - + tools:context=".dashboard.BatteryFragment"> @@ -531,4 +530,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_common_temp.xml b/app/src/main/res/layout/item_common_temp.xml index 74ae56f..f1dd71c 100644 --- a/app/src/main/res/layout/item_common_temp.xml +++ b/app/src/main/res/layout/item_common_temp.xml @@ -8,6 +8,7 @@ android:paddingHorizontal="18dp" android:layout_marginHorizontal="8dp" android:paddingVertical="10dp" + android:id="@+id/view" android:orientation="horizontal"> High speed video Video stabilization Hide deep sleep + Show deep sleep Metric units + Imperial units Reset Export Share diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index edf5221..e500a08 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,5 +1,11 @@ + +