Skip to content

I
intern-amin-qms
Commit 7a2fde31 authored by Amin's avatar Amin
Browse files
Options

add badge at filter icon on withdraw issue

parent 50cc33ec
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 54 deletions
app/src/main/res/drawable/note_icon_border.xml 0 → 100644
View file @ 7a2fde31
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="@color/black" />
<stroke android:width="1dp" android:color="@color/black" />
<corners android:radius="300dp" />
</shape>
\ No newline at end of file
app/src/main/res/layout/activity_history.xml
View file @ 7a2fde31
......@@ -76,8 +76,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingHorizontal="21dp"
android:paddingBottom="32dp">
android:paddingHorizontal="21dp">
<LinearLayout
android:layout_width="match_parent"
......@@ -300,13 +299,27 @@
android:backgroundTint="@color/yellow"
android:layout_marginStart="15dp"
android:paddingVertical="15dp"
android:paddingHorizontal="20dp">
android:paddingStart="15dp"
android:paddingEnd="30dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/note_icon_border"
android:backgroundTint="@color/white"
android:padding="10dp"
android:layout_marginEnd="10dp">
<ImageView
android:layout_width="23dp"
android:layout_height="27dp"
android:src="@drawable/note_icon"
app:tint="@color/yellow"/>
</LinearLayout>
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:src="@drawable/yellow_paper" />
<LinearLayout
android:layout_width="wrap_content"
......@@ -336,6 +349,7 @@
android:layout_marginTop="20dp"
android:textSize="19sp">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -429,7 +443,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
android:orientation="horizontal"
android:layout_marginBottom="20dp">
<LinearLayout
android:layout_width="wrap_content"
......@@ -447,11 +462,6 @@
android:textColor="@color/white"
android:textSize="17sp" />
<View
android:layout_width="2dp"
android:layout_height="match_parent"
android:background="@color/timeline_grey" />
</LinearLayout>
......@@ -461,16 +471,30 @@
android:gravity="center_vertical"
android:orientation="horizontal"
android:background="@drawable/history_status_badge"
android:backgroundTint="@color/black"
android:backgroundTint="@color/white"
android:layout_marginStart="15dp"
android:paddingVertical="15dp"
android:paddingHorizontal="20dp">
android:paddingStart="15dp"
android:paddingEnd="30dp">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@drawable/note_icon_border"
android:backgroundTint="@color/black"
android:padding="10dp"
android:layout_marginEnd="10dp">
<ImageView
android:layout_width="23dp"
android:layout_height="27dp"
android:src="@drawable/note_icon"
app:tint="@color/white"/>
</LinearLayout>
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginEnd="15dp"
android:src="@drawable/yellow_paper" />
<LinearLayout
android:layout_width="wrap_content"
......@@ -482,7 +506,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:text="Defect Created"
android:textColor="@color/white"
android:textColor="@color/black"
android:textSize="19sp"
android:textStyle="bold" />
</LinearLayout>
......
app/src/main/res/layout/activity_withdraw_issue.xml
View file @ 7a2fde31
......@@ -55,26 +55,26 @@
android:id="@+id/mid_bar"
android:layout_width="match_parent"
android:layout_height="149dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/top_nav"
android:orientation="vertical"
android:paddingHorizontal="21dp">
android:paddingHorizontal="21dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/top_nav">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="76dp"
android:orientation="horizontal"
android:gravity="center">
android:gravity="center"
android:orientation="horizontal">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="50dp"
android:layout_marginEnd="20dp"
android:layout_weight="1"
android:background="@drawable/search_background"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingHorizontal="15dp"
android:layout_weight="1"
android:layout_marginEnd="20dp">
android:paddingHorizontal="15dp">
<ImageView
android:layout_width="21dp"
......@@ -95,35 +95,70 @@
android:textSize="19sp" />
</LinearLayout>
<ImageButton
android:layout_width="27dp"
android:layout_height="27dp"
android:src="@drawable/filter"
android:background="@color/white"/>
<FrameLayout
android:layout_width="50dp"
android:layout_height="50dp">
<ImageButton
android:layout_width="27dp"
android:layout_height="27dp"
android:layout_gravity="center"
android:background="@android:color/transparent"
android:src="@drawable/filter" />
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="25dp"
android:layout_height="wrap_content"
android:layout_gravity="top|end"
android:background="@drawable/history_status_badge"
android:backgroundTint="@color/red"
android:gravity="center"
android:orientation="vertical"
android:paddingHorizontal="5dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="2"
android:textAlignment="center"
android:textColor="@color/white"
android:textSize="15sp" />
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</FrameLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="76dp"
android:orientation="horizontal"
android:gravity="center_vertical">
android:gravity="center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="All Issues"
android:textStyle="bold"
android:textSize="21sp"
android:layout_weight="1"/>
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Select All"
android:textSize="19sp"
android:textColor="@color/primary"/>
android:textColor="@color/primary"
android:textSize="19sp" />
</LinearLayout>
......@@ -135,9 +170,9 @@
android:layout_height="0dp"
android:background="@color/light_grey"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintBottom_toTopOf="@+id/bottom_bar"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/mid_bar"
app:layout_constraintBottom_toTopOf="@+id/bottom_bar">
app:layout_constraintTop_toBottomOf="@+id/mid_bar">
<LinearLayout
......@@ -436,31 +471,31 @@
android:id="@+id/bottom_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:gravity="center"
android:orientation="horizontal"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
android:padding="20dp"
android:gravity="center"
android:background="@color/white">
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_weight="1">
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Issue(s) selected:"
android:textSize="19sp"/>
android:textSize="19sp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0 / 3"
android:textStyle="bold"
android:textSize="21sp"/>
android:textSize="21sp"
android:textStyle="bold" />
</LinearLayout>
......
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