2024-10-17 修改

修改：
1. 日付费用申请 根据登录人token获取申请人列表，如果有多个则可以选择人员
2. 部分UI逻辑修改

app/src/main/java/com/pan_american/android/data/network/APIService.kt

@@ -431,7 +431,7 @@ interface APIService {
      * 日付申请，日付申请筛选列表
      */
     @POST("/api/Financial/PostPageSearchDailyPaymentPriceTypeData")
-    fun getPaymentSiftDataSource(@Body baseRequest: BaseRequest): Call<DailyPaymentSiftResponse>
+    fun getPaymentSiftDataSource(@Header("authorization") authToken: String, @Body baseRequest: BaseRequest): Call<DailyPaymentSiftResponse>
 
     /**
      * 日付申请，添加日付申请列表选项

app/src/main/java/com/pan_american/android/ui/financial_module/daily_payment/DailyPaymentListActivity.kt

@@ -131,7 +131,7 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
 
     private fun initSiftItems() {
         if (!siftInit) {
-            apiService.getPaymentSiftDataSource(BaseRequest())
+            apiService.getPaymentSiftDataSource(OASystem.token, BaseRequest())
                 .enqueue(object : Callback<DailyPaymentSiftResponse> {
                     override fun onResponse(
                         call: Call<DailyPaymentSiftResponse>,
@@ -300,19 +300,12 @@ class DailyPaymentListActivity : BaseActivity<ActivityDaliyPaymentListBinding>()
 
         binding.createUser.setOnClickListener {
 
-            if (!OASystem.authorization(OASystem.DAILY_PAYMENT, OASystem.PROCESS)) {
+            if (OASystem.dailyPaymentUserName.size == 1) {
                 return@setOnClickListener
             }
 
             selectorList.clear()
 
-            val selectAll = Selector().apply {
-                id = -1
-                cnName = resources.getString(R.string.all)
-            }
-
-            selectorList.add(selectAll)
-
             for (item in OASystem.dailyPaymentUserName) {
                 selectorList.add(item)
             }

app/src/main/java/com/pan_american/android/ui/group_invite_official/invite_data/InviteDataSearchFragment.kt

@@ -50,22 +50,6 @@ class InviteDataSearchFragment : BaseFragment<FragmentInviteDataSearchBinding>()
 
     private var createUserId = 0
 
-    private var inStuck = false
-
-    private var selectedCountry = ""
-
-    private var selectedInvitee = ""
-
-    private var selectedContact = ""
-
-    private var selectedGroupName = ""
-
-    private var selectedIndustry = ""
-
-    private var selectedStartTime = ""
-
-    private var selectedEndTime = ""
-
     override fun getViewBinding(
         inflater: LayoutInflater,
         container: ViewGroup?,
@@ -79,43 +63,6 @@ class InviteDataSearchFragment : BaseFragment<FragmentInviteDataSearchBinding>()
 
     }
 
-    override fun onStart() {
-        super.onStart()
-
-        if (inStuck) {
-            binding.inviteCountry.text = selectedCountry
-            binding.inviteeName.text = selectedInvitee
-            binding.contractName.text = selectedContact
-            binding.groupName.text = selectedGroupName
-
-            for (item in userNameData) {
-                if (createUserId == item.id) {
-                    binding.groupName.text = item.cnName
-                }
-            }
-
-            binding.industry.text = selectedIndustry
-            binding.inviteStartTime.text = selectedStartTime
-            binding.inviteEndTime.text = selectedEndTime
-
-            inStuck = false
-        }
-    }
-
-    override fun onStop() {
-        super.onStop()
-
-        selectedCountry = binding.inviteCountry.text.toString()
-        selectedInvitee = binding.inviteeName.text.toString()
-        selectedContact = binding.contractName.text.toString()
-        selectedGroupName = binding.groupName.text.toString()
-        selectedIndustry = binding.industry.text.toString()
-        selectedStartTime = binding.inviteStartTime.text.toString()
-        selectedEndTime = binding.inviteEndTime.text.toString()
-
-        inStuck = true
-    }
-
     override fun initEvents() {
         binding.inviteCountry.setOnClickListener {
             val selectorList = ArrayList<String>()

app/src/main/java/com/pan_american/android/ui/group_management/group_info/GroupInfoSearchFragment.kt

@@ -23,17 +23,6 @@ class GroupInfoSearchFragment : BaseFragment<FragmentGroupInfoSearchBinding>() {
 
     private var groupStatusId = -1
 
-    private var inStack = false
-
-    //当前界面的数据保存
-    private var groupName = ""
-
-    private var clientName = ""
-
-    private var clientUnit = ""
-
-    private var visitDate = ""
-
     override fun getViewBinding(
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGroupInfoSearchBinding.inflate(layoutInflater, container, false)
@@ -54,46 +43,6 @@ class GroupInfoSearchFragment : BaseFragment<FragmentGroupInfoSearchBinding>() {
         initEvents()
     }
 
-    override fun onStart() {
-        super.onStart()
-
-        if (inStack) {
-
-            if (groupTypeId != 0) {
-                for (item in OASystem.groupInfoGroupType) {
-                    if (item.id == groupTypeId) {
-                        binding.groupType.text = item.name
-                    }
-                }
-            }
-
-            if (groupStatusId != 0) {
-                for (item in OASystem.groupStatus) {
-                    if (item.id == groupStatusId) {
-                        binding.groupState.text = item.name
-                    }
-                }
-            }
-
-            binding.groupName.setText(groupName)
-            binding.customerName.setText(clientName)
-            binding.customerDepartment.setText(clientUnit)
-            binding.visitDate.text = visitDate
-        }
-    }
-
-    override fun onStop() {
-        super.onStop()
-
-        //保存当前界面的数据
-        groupName = binding.groupName.text.toString()
-        clientName = binding.customerName.text.toString()
-        clientUnit = binding.customerDepartment.text.toString()
-        visitDate = binding.visitDate.text.toString()
-
-        inStack = true
-    }
-
     override fun initEvents() {
 
         binding.groupType.setOnClickListener {

app/src/main/java/com/pan_american/android/ui/personnel_module/materials_operate/MaterialHistorySearchFragment.kt

@@ -38,28 +38,12 @@ class MaterialHistorySearchFragment : BaseFragment<FragmentMaterialHistorySearch
 
     private var materialSearchBaseData = OASystem.materialBaseData
 
-    private var inStack = false
-
-    private var materialType = ""
-
     private var materialTypeId = 0
 
-    private var detailType = ""
-
     private var detailTypeIds = arrayListOf(0)
 
-    private var materialName = ""
-
-    private var startTime = ""
-
-    private var endTime = ""
-
-    private var groupName = ""
-
     private var groupIds = arrayListOf(0)
 
-    private var verifyStatus = ""
-
     private var verifyStatusIds = arrayListOf(-1)
 
     private val apiService = ServiceCreator.create<APIService>()
@@ -90,62 +74,20 @@ class MaterialHistorySearchFragment : BaseFragment<FragmentMaterialHistorySearch
             })
         }
 
-        initEvents()
-    }
-
-    override fun onStart() {
-        super.onStart()
-
         initViews()
-    }
-
-    override fun onStop() {
-        super.onStop()
-
-        inStack = true
-
-        materialType = binding.materialType.text.toString()
-
-        detailType = binding.detailType.text.toString()
-
-        materialName = binding.materialName.text.toString()
 
-        startTime = binding.materialApplicationStartTime.text.toString()
-
-        endTime = binding.materialApplicationEndTime.text.toString()
-
-        groupName = binding.associationGroup.text.toString()
-
-        verifyStatus = binding.verifyStatus.text.toString()
+        initEvents()
     }
 
     override fun initViews() {
 
-        if (inStack) {
-
-            binding.materialType.text = materialType
-
-            binding.detailType.text = detailType
-
-            binding.materialName.setText(materialName)
-
-            binding.materialApplicationStartTime.text = startTime
-
-            binding.materialApplicationEndTime.text = endTime
+        binding.materialType.text = resources.getString(R.string.all)
 
-            binding.associationGroup.text = groupName
+        binding.detailType.text = resources.getString(R.string.all)
 
-            binding.verifyStatus.text = verifyStatus
+        binding.associationGroup.text = resources.getString(R.string.all)
 
-        } else {
-            binding.materialType.text = resources.getString(R.string.all)
-
-            binding.detailType.text = resources.getString(R.string.all)
-
-            binding.associationGroup.text = resources.getString(R.string.all)
-
-            binding.verifyStatus.text = resources.getString(R.string.all)
-        }
+        binding.verifyStatus.text = resources.getString(R.string.all)
 
         binding.commit.setText(resources.getString(R.string.search))
     }
@@ -387,6 +329,9 @@ class MaterialHistorySearchFragment : BaseFragment<FragmentMaterialHistorySearch
                                 verifyStatusIds.add(id)
 
                                 binding.verifyStatus.text = name
+
+
+
                             } else {
 
                                 verifyStatusIds.remove(-1)
@@ -417,6 +362,8 @@ class MaterialHistorySearchFragment : BaseFragment<FragmentMaterialHistorySearch
 
                                 binding.verifyStatus.text = valueString.trim()
                             }
+
+                            popupWindow.dismiss()
                         }
                     }
                 }

app/src/main/java/com/pan_american/android/ui/resource_management/airplane_three_code/AirplaneThreeCodeSearchFragment.kt

@@ -33,13 +33,6 @@ class AirplaneThreeCodeSearchFragment : BaseFragment<FragmentAirplaneThreeCodeSe
 
     private var selectorItems = ArrayList<Selector>()
 
-    private var inStack = false
-
-    //当前界面的数据保存
-    private var airplaneCity = ""
-
-    private var threeCode = ""
-
     override fun getViewBinding(
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentAirplaneThreeCodeSearchBinding.inflate(layoutInflater, container, false)
@@ -47,34 +40,13 @@ class AirplaneThreeCodeSearchFragment : BaseFragment<FragmentAirplaneThreeCodeSe
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        initAreaSelector()
-    }
-
-    override fun onStart() {
-        super.onStart()
-
         initViews()
-    }
-
-    override fun onStop() {
-        super.onStop()
-
-        //保存当前界面的数据
-        airplaneCity = binding.airplaneCity.text.toString()
-        threeCode = binding.threeCode.text.toString()
-        inStack = true
 
+        initAreaSelector()
     }
 
     override fun initViews() {
-        if (inStack) {
-            binding.airplaneCity.text = airplaneCity
-            binding.threeCode.setText(threeCode)
-
-            inStack = false
-        } else {
-            binding.airplaneCity.text = resources.getString(R.string.all)
-        }
+        binding.airplaneCity.text = resources.getString(R.string.all)
     }
 
     override fun initEvents() {

app/src/main/java/com/pan_american/android/ui/resource_management/car_resource/CarResourceSearchFragment.kt

@@ -33,17 +33,6 @@ class CarResourceSearchFragment : BaseFragment<FragmentCarResourceSearchBinding>
 
     private var selectorItems = ArrayList<Selector>()
 
-    private var inStack = false
-
-    //当前界面的数据保存
-    private var supplierLocation = ""
-
-    private var supplierName = ""
-
-    private var contactsName = ""
-
-    private var contactsPhone = ""
-
     override fun getViewBinding(
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentCarResourceSearchBinding.inflate(layoutInflater, container, false)
@@ -51,38 +40,14 @@ class CarResourceSearchFragment : BaseFragment<FragmentCarResourceSearchBinding>
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        initAreaSelector()
-    }
-
-    override fun onStart() {
-        super.onStart()
-
         initViews()
-    }
-
-    override fun onStop() {
-        super.onStop()
-
-        //保存当前界面的数据
-        supplierLocation = binding.supplierLocation.text.toString()
-        supplierName = binding.supplierName.text.toString()
-        contactsName = binding.contactsName.text.toString()
-        contactsPhone = binding.contactsPhone.text.toString()
-        inStack = true
 
+        initAreaSelector()
     }
 
     override fun initViews() {
-        if (inStack) {
-            binding.supplierLocation.text = supplierLocation
-            binding.supplierName.setText(supplierName)
-            binding.contactsName.setText(contactsName)
-            binding.contactsPhone.setText(contactsPhone)
-
-            inStack = false
-        } else {
-            binding.supplierLocation.text = resources.getString(R.string.all)
-        }
+
+        binding.supplierLocation.text = resources.getString(R.string.all)
 
         binding.commit.setText(resources.getString(R.string.search))
     }

app/src/main/java/com/pan_american/android/ui/resource_management/guide_resource/GuideResourceSearchFragment.kt

@@ -33,17 +33,6 @@ class GuideResourceSearchFragment : BaseFragment<FragmentGuideResourceSearchBind
 
     private var selectorItems = ArrayList<Selector>()
 
-    private var inStack = false
-
-    //当前界面的数据保存
-    private var departmentLocation = ""
-
-    private var departmentName = ""
-
-    private var contactsName = ""
-
-    private var contactsPhone = ""
-
     override fun getViewBinding(
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentGuideResourceSearchBinding.inflate(layoutInflater, container, false)
@@ -51,38 +40,14 @@ class GuideResourceSearchFragment : BaseFragment<FragmentGuideResourceSearchBind
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        initAreaSelector()
-    }
-
-    override fun onStart() {
-        super.onStart()
-
         initViews()
-    }
-
-    override fun onStop() {
-        super.onStop()
 
-        //保存当前界面的数据
-        departmentLocation = binding.departmentLocation.text.toString()
-        departmentName = binding.departmentName.text.toString()
-        contactsName = binding.contactsName.text.toString()
-        contactsPhone = binding.contactsPhone.text.toString()
-        inStack = true
+        initAreaSelector()
     }
 
     override fun initViews() {
-        if (inStack) {
-            binding.departmentLocation.text = departmentLocation
-            binding.departmentName.setText(departmentName)
-            binding.contactsName.setText(contactsName)
-            binding.contactsPhone.setText(contactsPhone)
-
-            inStack = false
 
-        } else {
-            binding.departmentLocation.text = resources.getString(R.string.all)
-        }
+        binding.departmentLocation.text = resources.getString(R.string.all)
 
         binding.commit.setText(resources.getString(R.string.search))
     }

app/src/main/java/com/pan_american/android/ui/resource_management/hotel_resource/HotelResourceSearchFragment.kt

@@ -33,17 +33,6 @@ class HotelResourceSearchFragment : BaseFragment<FragmentHotelResourceSearchBind
 
     private var selectorItems = ArrayList<Selector>()
 
-    private var inStack = false
-
-    //当前界面的数据保存
-    private var hotelLocation = ""
-
-    private var hotelName = ""
-
-    private var contactsName = ""
-
-    private var contactsPhone = ""
-
     override fun getViewBinding(
         inflater: LayoutInflater, container: ViewGroup?, bundle: Bundle?
     ) = FragmentHotelResourceSearchBinding.inflate(layoutInflater, container, false)
@@ -51,38 +40,14 @@ class HotelResourceSearchFragment : BaseFragment<FragmentHotelResourceSearchBind
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
-        initAreaSelector()
-    }
-
-    override fun onStart() {
-        super.onStart()
-
         initViews()
-    }
-
-    override fun onStop() {
-        super.onStop()
-
-        //保存当前界面的数据
-        hotelLocation = binding.hotelLocation.text.toString()
-        hotelName = binding.hotelName.text.toString()
-        contactsName = binding.contactsName.text.toString()
-        contactsPhone = binding.contactsPhone.text.toString()
-        inStack = true
 
+        initAreaSelector()
     }
 
     override fun initViews() {
-        if (inStack) {
-            binding.hotelLocation.text = hotelLocation
-            binding.hotelName.setText(hotelName)
-            binding.contactsName.setText(contactsName)
-            binding.contactsPhone.setText(contactsPhone)
-
-            inStack = false
-        } else {
-            binding.hotelLocation.text = resources.getString(R.string.all)
-        }
+
+        binding.hotelLocation.text = resources.getString(R.string.all)
 
         binding.commit.setText(resources.getString(R.string.search))
     }

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/airplane_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -19,7 +19,7 @@
         <TextView
             android:id="@+id/group_name"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
             android:textColor="@color/text_color_blue"
             android:textSize="@dimen/text_size_medium"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/payment_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding_huge"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"
@@ -62,7 +62,7 @@
                 android:layout_gravity="center"
                 android:text="@string/payment_revert"
                 android:textSize="@dimen/text_size_medium"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/payment_revert"
@@ -95,7 +95,7 @@
                 android:layout_gravity="center"
                 android:text="@string/payment_creator"
                 android:textSize="@dimen/text_size_medium"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/payment_creator"
@@ -128,7 +128,7 @@
                 android:layout_gravity="center"
                 android:text="@string/total_payment"
                 android:textSize="@dimen/text_size_medium"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/total_payment"
@@ -161,7 +161,7 @@
                 android:layout_gravity="center"
                 android:text="@string/payment_create_time"
                 android:textSize="@dimen/text_size_medium"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
             <TextView
                 android:id="@+id/create_time"
@@ -201,7 +201,7 @@
                     android:layout_gravity="start"
                     android:text="@string/finance_depart_verify"
                     android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -243,7 +243,7 @@
                     android:layout_gravity="start"
                     android:text="@string/verify_name"
                     android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/finance_reviewer"
@@ -283,7 +283,7 @@
                     android:layout_gravity="start"
                     android:text="@string/general_manager_verify"
                     android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
                 <LinearLayout
                     android:layout_width="match_parent"
@@ -325,7 +325,7 @@
                     android:layout_gravity="start"
                     android:text="@string/verify_name"
                     android:textSize="@dimen/text_size_medium"
-                    android:textStyle="bold"/>
+                    android:textStyle="bold" />
 
                 <TextView
                     android:id="@+id/general_reviewer"
@@ -359,7 +359,7 @@
                 android:gravity="center"
                 android:text="@string/is_pay"
                 android:textSize="@dimen/text_size_medium"
-                android:textStyle="bold"/>
+                android:textStyle="bold" />
 
             <LinearLayout
                 android:layout_width="match_parent"

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

@@ -19,7 +19,7 @@
         <TextView
             android:id="@+id/group_name"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
             android:layout_marginBottom="@dimen/common_padding"
             android:textColor="@color/text_color_blue"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/payment_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding_huge"
                 android:layout_weight="1"
                 android:gravity="center_vertical"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/group_convey_area"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding_huge"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/flight_code"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding_huge"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/customer_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding_huge"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/group_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -27,7 +27,7 @@
             <TextView
                 android:id="@+id/invitee_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"
                 android:textSize="@dimen/text_size_large"

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

@@ -13,7 +13,8 @@
         android:layout_height="@dimen/common_padding_heavy"
         android:layout_marginStart="@dimen/common_padding"
         android:src="@mipmap/icon_document"
-        tools:ignore="ContentDescription"/>
+        tools:ignore="ContentDescription"
+        android:layout_gravity="center"/>
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -24,7 +25,6 @@
             android:id="@+id/selector_item_name"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="center_vertical"
             android:layout_marginStart="@dimen/common_padding"
             android:layout_marginEnd="@dimen/common_padding"
             android:maxLines="1"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/supplier_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding_heavy"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/hotel_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/hotel_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding_huge"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/customer_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding_huge"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/unit_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding_heavy"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -19,7 +19,7 @@
         <TextView
             android:id="@+id/material_name"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
             android:textColor="@color/text_color_blue"
             android:textSize="@dimen/text_size_medium"

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

@@ -25,7 +25,7 @@
             <TextView
                 android:id="@+id/material_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"
                 android:textSize="@dimen/text_size_medium"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/official_department"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding_heavy"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -19,7 +19,7 @@
         <TextView
             android:id="@+id/group_name"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:textColor="@color/text_color_blue"
             android:textSize="@dimen/text_size_medium"
             android:textStyle="bold" />

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

@@ -17,7 +17,7 @@
         <TextView
             android:id="@+id/group_name"
             android:layout_width="0dp"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
             android:textColor="@color/text_color_blue"
             android:textSize="@dimen/text_size_medium"

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

@@ -19,7 +19,7 @@
         <TextView
             android:id="@+id/group_name"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
+            android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/common_padding"
             android:layout_marginBottom="@dimen/common_padding"
             android:textColor="@color/text_color_blue"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/visa_client"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding_huge"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"

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

@@ -26,7 +26,7 @@
             <TextView
                 android:id="@+id/client_name"
                 android:layout_width="0dp"
-                android:layout_height="match_parent"
+                android:layout_height="wrap_content"
                 android:layout_marginEnd="@dimen/common_padding"
                 android:layout_weight="1"
                 android:textColor="@color/text_color_blue"