Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

restructured: xml files for regex item*.xml #1870

Merged
merged 1 commit into from
Aug 9, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:orientation="vertical">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recycler_collections"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/recycler_collections"
android:layout_gravity="center"
tools:listitem="@layout/item_individual_collection_sheet"/>
tools:listitem="@layout/item_individual_collection_sheet" />
</RelativeLayout>
11 changes: 8 additions & 3 deletions mifosng-android/src/main/res/layout/item_checker_task.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:textAllCaps="true"
android:textColor="@color/black"
Expand All @@ -77,6 +78,7 @@
style="@style/TextAppearance.AppCompat.Medium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:maxLines="1"
android:text="Client"
Expand All @@ -90,6 +92,7 @@
android:id="@+id/cb_checker_task"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true" />

</RelativeLayout>
Expand All @@ -116,6 +119,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:text="Ed Cable"
android:textColor="@color/black"
Expand All @@ -126,7 +130,7 @@
style="@style/TextAppearance.AppCompat.Small"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right"
android:gravity="end"
android:text="24 Jun 2019"
android:textStyle="bold" />

Expand Down Expand Up @@ -171,16 +175,17 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="right">
android:gravity="end">

<ImageView
android:id="@+id/iv_approve_icon"
android:layout_width="@dimen/dimension_32_dp"
android:layout_height="@dimen/dimension_32_dp"
android:layout_centerVertical="true"
android:layout_marginEnd="@dimen/layout_padding_16dp"
android:layout_marginRight="@dimen/layout_padding_16dp"
android:background="?selectableItemBackground"
android:clickable="true"
android:focusable="true"
android:scaleType="centerInside"
app:srcCompat="@drawable/ic_check_green_24dp" />

Expand Down
44 changes: 22 additions & 22 deletions mifosng-android/src/main/res/layout/item_client_runreport.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,24 +2,25 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="15dp">
android:layout_margin="15dp"
android:orientation="horizontal">

<LinearLayout
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/circular_bg_gray"
android:layout_marginRight="10dp"
android:layout_marginEnd="10dp"
android:layout_gravity="center"
android:layout_marginEnd="10dp"
android:layout_marginRight="10dp"
android:background="@drawable/circular_bg_gray"
android:gravity="center">

<ImageView
android:id="@+id/iv_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:srcCompat="@drawable/ic_report_item"
android:id="@+id/iv_image"/>
app:srcCompat="@drawable/ic_report_item" />
</LinearLayout>


Expand All @@ -29,34 +30,33 @@
android:layout_weight="1">

<TextView
android:id="@+id/tv_report_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="22sp"
android:layout_marginBottom="5dp"
android:textColor="@color/black"
tools:text="Client Listing(Pentaho)"
android:id="@+id/tv_report_name"
android:layout_marginBottom="5dp" />
android:textSize="22sp"
tools:text="Client Listing(Pentaho)" />

<TextView
android:id="@+id/tv_report_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15sp"
tools:text="Table"
android:textColor="@color/gray_dark"
android:id="@+id/tv_report_type"
android:layout_below="@+id/tv_report_name"
/>
android:textColor="@color/gray_dark"
android:textSize="15sp"
tools:text="Table" />

<TextView
android:id="@+id/tv_report_category"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="15sp"
android:textColor="@color/gray_dark"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_alignBaseline="@+id/tv_report_type"
tools:text="Client"
android:id="@+id/tv_report_category"/>
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:textColor="@color/gray_dark"
android:textSize="15sp"
tools:text="Client" />
</RelativeLayout>

</LinearLayout>
5 changes: 2 additions & 3 deletions mifosng-android/src/main/res/layout/item_data_table.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
~ This project is licensed under the open source MPL V2.
~ See https://github.com/openMF/android-client/blob/master/LICENSE.md
-->
<androidx.cardview.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -32,7 +31,7 @@
android:lines="1"
android:text="@string/medium_text"
android:textColor="@color/black"
android:textSize="16sp"/>
android:textSize="16sp" />

</LinearLayout>

Expand Down
Loading