Skip to content

I
intern-amin-qms
Commit 26098f97 authored by Amin's avatar Amin
Browse files
Options

fix history ui badge

parent 2693c56c
Hide whitespace changes
Inline Side-by-side
Showing with 66 additions and 168 deletions
app/src/main/res/drawable/card_border_issue.xml
View file @ 26098f97
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" <shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" > android:shape="rectangle" >
<!-- This is the stroke you want to define -->
<stroke android:width="1dp" <stroke android:width="1dp"
android:color="@color/white"/> android:color="@color/white"/>
<!-- Optional, round your corners -->
<corners android:bottomLeftRadius="21dp" <corners android:bottomLeftRadius="21dp"
android:topLeftRadius="21dp" android:topLeftRadius="21dp"
android:bottomRightRadius="21dp" android:bottomRightRadius="21dp"
android:topRightRadius="21dp" /> android:topRightRadius="21dp" />
<!-- Optional, fill the rest of your background with a color or gradient, use transparent if you only want the border to be displayed-->
<gradient android:startColor="@android:color/white" <gradient android:startColor="@android:color/white"
android:endColor="@android:color/white" android:endColor="@android:color/white"
android:angle="90"/> android:angle="90"/>
......
app/src/main/res/drawable/history_status_badge.xml 0 → 100644
View file @ 26098f97
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" >
<stroke android:width="1dp"
android:color="@color/white"/>
<corners android:bottomLeftRadius="100dp"
android:topLeftRadius="100dp"
android:bottomRightRadius="100dp"
android:topRightRadius="100dp" />
<gradient android:startColor="@android:color/white"
android:endColor="@android:color/white"
android:angle="90"/>
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_history.xml
View file @ 26098f97
...@@ -292,56 +292,39 @@ ...@@ -292,56 +292,39 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:background="@drawable/history_status_badge"
android:backgroundTint="@color/yellow"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginBottom="15dp" android:paddingVertical="15dp"
android:background="@drawable/card_border_issue" android:paddingHorizontal="20dp">
android:orientation="vertical"
android:padding="15dp"> <ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:src="@drawable/yellow_paper" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:orientation="vertical">
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView <TextView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:src="@drawable/round_grey" />
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:layout_marginBottom="5dp"
android:text="WIP"
<TextView android:textColor="@color/white"
android:layout_width="wrap_content" android:textSize="19sp"
android:layout_height="wrap_content" android:textStyle="bold" />
android:layout_marginBottom="5dp"
android:text="Project Supervisor"
android:textSize="19sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="@color/light_grey" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10dp"
android:text="Work will need to be done by 05 Jan 2024"
android:textSize="19sp" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
...@@ -350,7 +333,7 @@ ...@@ -350,7 +333,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:paddingTop="20dp" android:layout_marginTop="20dp"
android:textSize="19sp"> android:textSize="19sp">
<TextView <TextView
...@@ -473,144 +456,40 @@ ...@@ -473,144 +456,40 @@
<LinearLayout <LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="15dp"
android:layout_marginBottom="15dp"
android:background="@drawable/card_border_issue"
android:orientation="vertical"
android:padding="15dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:src="@drawable/round_grey" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:text="Project Supervisor"
android:textSize="19sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="@color/light_grey" />
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="100dp"
app:cardCornerRadius="27dp">
<ImageView
android:id="@+id/myImageView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
android:src="@drawable/home_details" />
</androidx.cardview.widget.CardView>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/history_badge"
android:paddingHorizontal="10dp"
android:paddingVertical="10dp"
android:text="12:24 PM"
android:textColor="@color/white"
android:textSize="17sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center_vertical"
android:orientation="horizontal"
android:background="@drawable/history_status_badge"
android:backgroundTint="@color/black"
android:layout_marginStart="15dp" android:layout_marginStart="15dp"
android:layout_marginBottom="15dp" android:paddingVertical="15dp"
android:background="@drawable/card_border_issue" android:paddingHorizontal="20dp">
android:orientation="vertical"
android:padding="15dp"> <ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:src="@drawable/yellow_paper" />
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:orientation="vertical">
android:gravity="center_vertical"
android:orientation="horizontal">
<ImageView <TextView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:src="@drawable/round_grey" />
<LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"> android:layout_marginBottom="5dp"
android:text="Defect Created"
<TextView android:textColor="@color/white"
android:layout_width="wrap_content" android:textSize="19sp"
android:layout_height="wrap_content" android:textStyle="bold" />
android:layout_marginBottom="5dp"
android:text="Project Supervisor"
android:textSize="19sp"
android:textStyle="bold" />
</LinearLayout>
</LinearLayout> </LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_marginTop="8dp"
android:layout_marginBottom="8dp"
android:background="@color/light_grey" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingVertical="10dp"
android:text="Work will need to be done by 05 Jan 2024"
android:textSize="19sp" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment