From dc6b4b91e5a49176ee8df22cd616fa1bdbf26a7c Mon Sep 17 00:00:00 2001 From: squallzhjch Date: Tue, 23 May 2023 09:48:07 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4UI=20=E5=A2=9E=E5=8A=A0?= =?UTF-8?q?=E9=81=93=E8=B7=AF=E5=B1=9E=E6=80=A7=E9=9D=A2=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/navinfo/omqs/bean/SignBean.kt | 4 +- .../omqs/ui/activity/map/MainActivity.kt | 41 +++++++++++++-- .../omqs/ui/activity/map/MainViewModel.kt | 52 ++++++++++++------- .../omqs/ui/activity/map/SignAdapter.kt | 5 +- .../omqs/ui/activity/map/TopSignAdapter.kt | 34 ++++++++++++ .../EvaluationResultViewModel.kt | 6 +-- .../fragment/evaluationresult/LeftAdapter.kt | 12 ++++- .../evaluationresult/PhenomenonFragment.kt | 16 +++--- .../evaluationresult/ProblemLinkFragment.kt | 14 ++--- .../RightGroupHeaderAdapter.kt | 2 +- .../com/navinfo/omqs/ui/widget/SignUtil.kt | 11 ++-- .../res/color/selector_white_blue_color.xml | 5 ++ .../selector_adapter_item_select_text.xml | 5 ++ .../res/drawable/shape_middle_fragment_bg.xml | 14 ++--- .../main/res/drawable/shape_oval_blue_bg.xml | 7 +++ app/src/main/res/layout/activity_main.xml | 9 +++- app/src/main/res/layout/adapter_top_sign.xml | 28 ++++++++++ .../main/res/layout/fragment_phenomenon.xml | 23 ++++---- app/src/main/res/layout/text_item_select.xml | 12 ++--- app/src/main/res/layout/text_item_select2.xml | 20 +++++++ app/src/main/res/values-w1024dp/dimens.xml | 2 +- app/src/main/res/values-w600dp/dimens.xml | 2 +- 22 files changed, 242 insertions(+), 82 deletions(-) create mode 100644 app/src/main/java/com/navinfo/omqs/ui/activity/map/TopSignAdapter.kt create mode 100644 app/src/main/res/color/selector_white_blue_color.xml create mode 100644 app/src/main/res/drawable/selector_adapter_item_select_text.xml create mode 100644 app/src/main/res/drawable/shape_oval_blue_bg.xml create mode 100644 app/src/main/res/layout/adapter_top_sign.xml create mode 100644 app/src/main/res/layout/text_item_select2.xml diff --git a/app/src/main/java/com/navinfo/omqs/bean/SignBean.kt b/app/src/main/java/com/navinfo/omqs/bean/SignBean.kt index 597ee5bd..b79dcc55 100644 --- a/app/src/main/java/com/navinfo/omqs/bean/SignBean.kt +++ b/app/src/main/java/com/navinfo/omqs/bean/SignBean.kt @@ -6,7 +6,7 @@ import kotlinx.parcelize.Parcelize @Parcelize data class SignBean( //图标ID - val iconId: Int, + var iconId: Int = 0, //定位点到目标距离 val distance: Int = 0, //图表中的问题 @@ -18,7 +18,7 @@ data class SignBean( //坐标 val geometry: String, //底部文字 - val bottomText: String, + val name: String, //底部右侧文字 val bottomRightText: String, //要素code类型 diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt index 0fcc1677..ccc0e82d 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainActivity.kt @@ -12,6 +12,7 @@ import androidx.databinding.DataBindingUtil import androidx.lifecycle.lifecycleScope import androidx.navigation.findNavController import androidx.recyclerview.widget.LinearLayoutManager +import androidx.recyclerview.widget.RecyclerView import com.blankj.utilcode.util.SPStaticUtils import com.google.gson.Gson import com.google.gson.reflect.TypeToken @@ -23,6 +24,7 @@ import com.navinfo.omqs.databinding.ActivityMainBinding import com.navinfo.omqs.http.offlinemapdownload.OfflineMapDownloadManager import com.navinfo.omqs.tools.LayerConfigUtils import com.navinfo.omqs.ui.activity.BaseActivity +import com.navinfo.omqs.ui.widget.RecycleViewDivider import com.navinfo.omqs.util.FlowEventBus import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.launch @@ -52,12 +54,11 @@ class MainActivity : BaseActivity() { findNavController(R.id.main_activity_right_fragment) } + /** + * 提前显示要素看板 + */ private val signAdapter by lazy { SignAdapter { position, signBean -> -// val directions = -// EmptyFragmentDirections.emptyFragmentToEvaluationResultFragment( -// ) -// rightController.navigate(directions) rightController.currentDestination?.let { if (it.id == R.id.EmptyFragment) { val bundle = Bundle() @@ -68,6 +69,22 @@ class MainActivity : BaseActivity() { } } + /** + * 道路信息看板 + */ + private val topSignAdapter by lazy { + TopSignAdapter { position, signBean -> + rightController.currentDestination?.let { + if (it.id == R.id.EmptyFragment) { + val bundle = Bundle() + bundle.putParcelable("SignBean", signBean) + rightController.navigate(R.id.EvaluationResultFragment, bundle) + } + } + } + } + + override fun onCreate(savedInstanceState: Bundle?) { WindowCompat.setDecorFitsSystemWindows(window, false) super.onCreate(savedInstanceState) @@ -125,6 +142,18 @@ class MainActivity : BaseActivity() { } + //道路属性面板 + binding.mainActivityTopSignRecyclerview.layoutManager = LinearLayoutManager( + this, + RecyclerView.HORIZONTAL, false + ) + binding.mainActivityTopSignRecyclerview.addItemDecoration( + RecycleViewDivider(this, LinearLayoutManager.HORIZONTAL) + ) + binding.mainActivityTopSignRecyclerview.adapter = topSignAdapter + + + //提前显示面板 binding.mainActivitySignRecyclerview.layoutManager = LinearLayoutManager(this) binding.mainActivitySignRecyclerview.adapter = signAdapter //增加4dp的间隔 @@ -139,6 +168,10 @@ class MainActivity : BaseActivity() { signAdapter.refreshData(it) } + viewModel.liveDataTopSignList.observe(this) { + topSignAdapter.refreshData(it) + } + lifecycleScope.launch { // 初始化地图图层控制接收器 FlowEventBus.subscribe>( diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt index a3722bfd..71d81301 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/MainViewModel.kt @@ -67,9 +67,12 @@ class MainViewModel @Inject constructor( //地图点击捕捉到的质检数据ID列表 val liveDataQsRecordIdList = MutableLiveData>() - //看板数据 + //左侧看板数据 val liveDataSignList = MutableLiveData>() + //顶部看板数据 + val liveDataTopSignList = MutableLiveData>() + // var testPoint = GeoPoint(0, 0) //语音窗体 @@ -150,8 +153,7 @@ class MainViewModel @Inject constructor( // location.latitude = testPoint.latitude val geometry = GeometryTools.createGeometry( GeoPoint( - location.latitude, - location.longitude + location.latitude, location.longitude ) ) val tileX = RealmSet() @@ -176,8 +178,7 @@ class MainViewModel @Inject constructor( mapController.locationLayerHandler.niLocationFlow.collectLatest { location -> // location.longitude = testPoint.longitude // location.latitude = testPoint.latitude - if (!isSelectRoad()) - captureLink(GeoPoint(location.latitude, location.longitude)) + if (!isSelectRoad()) captureLink(GeoPoint(location.latitude, location.longitude)) } } @@ -196,6 +197,8 @@ class MainViewModel @Inject constructor( ) //看板数据 val signList = mutableListOf() + val topSignList = mutableListOf() + if (linkList.isNotEmpty()) { val link = linkList[0] val linkId = link.properties[RenderEntity.Companion.LinkTable.linkPid] @@ -204,27 +207,36 @@ class MainViewModel @Inject constructor( var elementList = realmOperateHelper.queryLinkByLinkPid(it) for (element in elementList) { val distance = GeometryTools.distanceToDouble( - point, - GeometryTools.createGeoPoint(element.geometry) + point, GeometryTools.createGeoPoint(element.geometry) ) - signList.add( - SignBean( - iconId = SignUtil.getSignIcon(element), - iconText = SignUtil.getSignIconText(element), - distance = distance.toInt(), - elementId = element.id, - linkId = linkId, - geometry = element.geometry, - bottomText = SignUtil.getSignBottomText(element), - bottomRightText = SignUtil.getSignBottomRightText(element), - elementCode = element.code + + val signBean = SignBean( + iconId = SignUtil.getSignIcon(element), + iconText = SignUtil.getSignIconText(element), + distance = distance.toInt(), + elementId = element.id, + linkId = linkId, + geometry = element.geometry, + name = SignUtil.getSignNameText(element), + bottomRightText = SignUtil.getSignBottomRightText(element), + elementCode = element.code + ) + + when (element.code) { + 2041, 2008 -> topSignList.add( + signBean ) - ) + else -> signList.add( + signBean + ) + } + } } } - liveDataSignList.postValue(signList) + liveDataTopSignList.postValue(topSignList.distinctBy { it.elementCode }) + liveDataSignList.postValue(signList.distinctBy { it.elementCode }) Log.e("jingo", "自动捕捉数据 共${signList.size}条") } } diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt index 1d8e4778..fb78a41e 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/SignAdapter.kt @@ -23,9 +23,10 @@ class SignAdapter(private var itemListener: ((Int, SignBean) -> Unit?)? = null) override fun onBindViewHolder(holder: BaseViewHolder, position: Int) { val bd = holder.viewBinding as AdapterSignBinding val item = data[position] - bd.signMainIcon.background = holder.viewBinding.root.context.getDrawable(item.iconId) + if (item.iconId != 0) + bd.signMainIcon.background = holder.viewBinding.root.context.getDrawable(item.iconId) bd.signMainIcon.text = item.iconText - bd.signBottomText.text = item.bottomText + bd.signBottomText.text = item.name bd.signBottomRightText.text = item.bottomRightText bd.root.setOnClickListener { itemListener?.invoke(position, item) diff --git a/app/src/main/java/com/navinfo/omqs/ui/activity/map/TopSignAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/activity/map/TopSignAdapter.kt new file mode 100644 index 00000000..b920a5b6 --- /dev/null +++ b/app/src/main/java/com/navinfo/omqs/ui/activity/map/TopSignAdapter.kt @@ -0,0 +1,34 @@ +package com.navinfo.omqs.ui.activity.map + +import android.view.LayoutInflater +import android.view.ViewGroup +import com.navinfo.omqs.R +import com.navinfo.omqs.bean.SignBean +import com.navinfo.omqs.databinding.AdapterTopSignBinding +import com.navinfo.omqs.ui.other.BaseRecyclerViewAdapter +import com.navinfo.omqs.ui.other.BaseViewHolder + +class TopSignAdapter(private var itemListener: ((Int, SignBean) -> Unit?)? = null) : + BaseRecyclerViewAdapter() { + override fun getItemViewRes(position: Int): Int { + return R.layout.adapter_top_sign + } + + override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder { + val viewBinding = + AdapterTopSignBinding.inflate(LayoutInflater.from(parent.context), parent, false) + return BaseViewHolder(viewBinding) + } + + override fun onBindViewHolder(holder: BaseViewHolder, position: Int) { + val bd = holder.viewBinding as AdapterTopSignBinding + val item = data[position] + if (item.iconId != 0) + bd.topSignText.background = holder.viewBinding.root.context.getDrawable(item.iconId) + bd.topSignName.text = item.name + bd.topSignText.text = item.iconText + bd.root.setOnClickListener { + itemListener?.invoke(position, item) + } + } +} \ No newline at end of file diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt index 29fd71db..0178fd9c 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/EvaluationResultViewModel.kt @@ -64,7 +64,7 @@ class EvaluationResultViewModel @Inject constructor( /** * 问题类型 liveData 给[MiddleAdapter]展示的数据 */ - val liveDataMiddleTypeList = MutableLiveData>() +// val liveDataMiddleTypeList = MutableLiveData>() /** * 问题现象 liveData 给[RightGroupHeaderAdapter]展示的数据 @@ -240,7 +240,7 @@ class EvaluationResultViewModel @Inject constructor( Log.e("jingo", "getProblemLinkList ${rightList[0].text}") } liveDataQsRecordBean.postValue(liveDataQsRecordBean.value) - liveDataMiddleTypeList.postValue(middleList) +// liveDataMiddleTypeList.postValue(middleList) liveDataRightTypeList.postValue(rightList) } } @@ -272,7 +272,7 @@ class EvaluationResultViewModel @Inject constructor( liveDataQsRecordBean.value!!.problemType = typeTitleList[0] Log.e("jingo", "getProblemList ${typeTitleList[0]}") } - liveDataMiddleTypeList.postValue(typeTitleList) +// liveDataMiddleTypeList.postValue(typeTitleList) if (liveDataQsRecordBean.value!!.phenomenon.isEmpty()) { liveDataQsRecordBean.value!!.phenomenon = phenomenonRightList[0].text Log.e("jingo", "getProblemList ${phenomenonRightList[0].text}") diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt index 4b30dd25..0097c56c 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/LeftAdapter.kt @@ -29,10 +29,18 @@ class LeftAdapter(private var itemListener: ((Int, String) -> Unit?)? = null) : val title = data[position] bd.itemId.text = title if (selectTitle == title) { - bd.itemId.setBackgroundResource(R.drawable.shape_rect_white_2dp_bg) + bd.itemLayout.setBackgroundColor( + holder.viewBinding.root.context.getColor( + R.color.button_press_color, + ) + ) bd.itemId.setTextColor(holder.viewBinding.root.context.getColor(R.color.highFontColor)) } else { - bd.itemId.setBackgroundResource(R.drawable.shape_rect_white_2dp_bg) + bd.itemLayout.setBackgroundColor( + holder.viewBinding.root.context.getColor( + R.color.white, + ) + ) bd.itemId.setTextColor(holder.viewBinding.root.context.getColor(R.color.black)) } bd.root.setOnClickListener { diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt index 4958f2e0..4033b1ca 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/PhenomenonFragment.kt @@ -106,15 +106,15 @@ class PhenomenonFragment : }) - //中间菜单 - binding.phenomenonMiddleRecyclerview.setHasFixedSize(true) - binding.phenomenonMiddleRecyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) - - binding.phenomenonMiddleRecyclerview.adapter = middleAdapter +// //中间菜单 +// binding.phenomenonMiddleRecyclerview.setHasFixedSize(true) +// binding.phenomenonMiddleRecyclerview.layoutManager = LinearLayoutManager(requireContext(), LinearLayoutManager.HORIZONTAL, false) +// +// binding.phenomenonMiddleRecyclerview.adapter = middleAdapter //中间侧菜单查询结果监听 - viewModel.liveDataMiddleTypeList.observe(viewLifecycleOwner) { - middleAdapter.refreshData(it) - } +// viewModel.liveDataMiddleTypeList.observe(viewLifecycleOwner) { +// middleAdapter.refreshData(it) +// } // binding.phenomenonDrawer.setOnClickListener { // when (binding.group.visibility) { // View.INVISIBLE, View.GONE -> diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/ProblemLinkFragment.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/ProblemLinkFragment.kt index 0bdc6225..878cb446 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/ProblemLinkFragment.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/ProblemLinkFragment.kt @@ -75,14 +75,14 @@ class ProblemLinkFragment : BaseFragment() { } }) - //中间菜单 - binding.linkMiddleRecyclerview.setHasFixedSize(true) - binding.linkMiddleRecyclerview.layoutManager = LinearLayoutManager(requireContext()) - binding.linkMiddleRecyclerview.adapter = middleAdapter +// //中间菜单 +// binding.linkMiddleRecyclerview.setHasFixedSize(true) +// binding.linkMiddleRecyclerview.layoutManager = LinearLayoutManager(requireContext()) +// binding.linkMiddleRecyclerview.adapter = middleAdapter //中间侧菜单查询结果监听 - viewModel.liveDataMiddleTypeList.observe(viewLifecycleOwner) { - middleAdapter.refreshData(it) - } +// viewModel.liveDataMiddleTypeList.observe(viewLifecycleOwner) { +// middleAdapter.refreshData(it) +// } binding.linkDrawer.setOnClickListener { when (binding.group.visibility) { View.INVISIBLE, View.GONE -> diff --git a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/RightGroupHeaderAdapter.kt b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/RightGroupHeaderAdapter.kt index d2d77b76..d3b5cc20 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/RightGroupHeaderAdapter.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/fragment/evaluationresult/RightGroupHeaderAdapter.kt @@ -11,7 +11,7 @@ class RightGroupHeaderAdapter(private var itemListener: ((Int, RightBean) -> Uni BaseRecyclerViewAdapter() { private var groupTitleList = mutableListOf() override fun getItemViewRes(position: Int): Int { - return R.layout.text_item_select + return R.layout.text_item_select2 } override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): BaseViewHolder { diff --git a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt index 78735c96..b8a60117 100644 --- a/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt +++ b/app/src/main/java/com/navinfo/omqs/ui/widget/SignUtil.kt @@ -7,6 +7,7 @@ import com.navinfo.omqs.R class SignUtil { companion object { + /** * 获取面板上的文字 */ @@ -24,7 +25,7 @@ class SignUtil { } } - fun getSignBottomText(data: RenderEntity): String { + fun getSignNameText(data: RenderEntity): String { return when (data.code) { //可变点限速 4004 -> "可变点限速" @@ -57,7 +58,7 @@ class SignUtil { * 条件点限速文字 */ - fun getConditionLimitText(data: RenderEntity): String { + private fun getConditionLimitText(data: RenderEntity): String { var stringBuffer = StringBuffer() try { val dependent = data.properties["speedDependent"] @@ -121,7 +122,7 @@ class SignUtil { /** * 限速图标 */ - fun getSpeedLimitIcon(data: RenderEntity): Int { + private fun getSpeedLimitIcon(data: RenderEntity): Int { try { //限速标志 0 限速开始 1 限速解除 return when (data.properties["speed_flag"]) { @@ -150,7 +151,7 @@ class SignUtil { 4002, 4003 -> getSpeedLimitIcon(data) //可变点限速 4004 -> R.drawable.icon_change_limit - else -> R.drawable.icon_speed_limit + else -> 0 } } @@ -159,7 +160,7 @@ class SignUtil { /** * 获取种别图标 */ - fun getKindCodeIcon(data: RenderEntity): Int { + private fun getKindCodeIcon(data: RenderEntity): Int { try { val kind = data.properties["kind"] return when (kind!!.toInt()) { diff --git a/app/src/main/res/color/selector_white_blue_color.xml b/app/src/main/res/color/selector_white_blue_color.xml new file mode 100644 index 00000000..ac2e2b4e --- /dev/null +++ b/app/src/main/res/color/selector_white_blue_color.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/selector_adapter_item_select_text.xml b/app/src/main/res/drawable/selector_adapter_item_select_text.xml new file mode 100644 index 00000000..7efb8886 --- /dev/null +++ b/app/src/main/res/drawable/selector_adapter_item_select_text.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_middle_fragment_bg.xml b/app/src/main/res/drawable/shape_middle_fragment_bg.xml index 593ef0c2..fda3245c 100644 --- a/app/src/main/res/drawable/shape_middle_fragment_bg.xml +++ b/app/src/main/res/drawable/shape_middle_fragment_bg.xml @@ -1,19 +1,19 @@ - - - - - + diff --git a/app/src/main/res/drawable/shape_oval_blue_bg.xml b/app/src/main/res/drawable/shape_oval_blue_bg.xml new file mode 100644 index 00000000..18bb32c4 --- /dev/null +++ b/app/src/main/res/drawable/shape_oval_blue_bg.xml @@ -0,0 +1,7 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index d61ad0ba..661c34b6 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -51,6 +51,13 @@ app:layout_constraintRight_toRightOf="parent" app:layout_constraintTop_toTopOf="parent" /> + diff --git a/app/src/main/res/layout/adapter_top_sign.xml b/app/src/main/res/layout/adapter_top_sign.xml new file mode 100644 index 00000000..8c695162 --- /dev/null +++ b/app/src/main/res/layout/adapter_top_sign.xml @@ -0,0 +1,28 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_phenomenon.xml b/app/src/main/res/layout/fragment_phenomenon.xml index 1f936a86..50b235c1 100644 --- a/app/src/main/res/layout/fragment_phenomenon.xml +++ b/app/src/main/res/layout/fragment_phenomenon.xml @@ -18,31 +18,30 @@ - + + + + + + + + app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintRight_toRightOf="parent" + app:layout_constraintTop_toTopOf="parent" /> diff --git a/app/src/main/res/layout/text_item_select.xml b/app/src/main/res/layout/text_item_select.xml index 7b161041..d97dd2ef 100644 --- a/app/src/main/res/layout/text_item_select.xml +++ b/app/src/main/res/layout/text_item_select.xml @@ -1,20 +1,20 @@ + android:layout_height="wrap_content" + android:background="@drawable/selector_adapter_item_select_bg"> + android:padding="3dp" + android:drawableLeft="@drawable/selector_task_link_edit_icon" + android:textColor="@color/default_blue_text_color" + android:textSize="14sp"/> - \ No newline at end of file diff --git a/app/src/main/res/layout/text_item_select2.xml b/app/src/main/res/layout/text_item_select2.xml new file mode 100644 index 00000000..50a6339f --- /dev/null +++ b/app/src/main/res/layout/text_item_select2.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values-w1024dp/dimens.xml b/app/src/main/res/values-w1024dp/dimens.xml index 56fc8b4e..f7a9ffb0 100644 --- a/app/src/main/res/values-w1024dp/dimens.xml +++ b/app/src/main/res/values-w1024dp/dimens.xml @@ -8,5 +8,5 @@ 256dp 230dp 28dp - + 360dp \ No newline at end of file diff --git a/app/src/main/res/values-w600dp/dimens.xml b/app/src/main/res/values-w600dp/dimens.xml index ad9117b6..d5a61bf1 100644 --- a/app/src/main/res/values-w600dp/dimens.xml +++ b/app/src/main/res/values-w600dp/dimens.xml @@ -1,4 +1,4 @@ 48dp - 310dp + 360dp \ No newline at end of file