From 0819deb1a718166a63729c353f48c40aecb1d8b3 Mon Sep 17 00:00:00 2001
From: kareemradwan <kradwan@students.iugaza.edu.ps>
Date: Wed, 1 Jul 2020 16:40:35 +0300
Subject: [PATCH]  fix full screen step layout

---
 .../com/kareemradwan/stepeer/MainActivity.kt  |  2 +-
 .../com/kareemradwan/stepeer/OrderAdapter.kt  |  2 +-
 app/src/main/res/layout/order_step.xml        | 49 +++++++++++++------
 app/src/main/res/values/strings.xml           |  2 +
 stepeer/src/main/res/layout/item_step.xml     |  2 +-
 5 files changed, 39 insertions(+), 18 deletions(-)

diff --git a/app/src/main/java/com/kareemradwan/stepeer/MainActivity.kt b/app/src/main/java/com/kareemradwan/stepeer/MainActivity.kt
index b7249be..d8b8248 100644
--- a/app/src/main/java/com/kareemradwan/stepeer/MainActivity.kt
+++ b/app/src/main/java/com/kareemradwan/stepeer/MainActivity.kt
@@ -18,7 +18,7 @@ class MainActivity : AppCompatActivity(), SteeperView.SteeperHandler {
 
         val adapter = OrderAdapter(
             this, listOf(
-                Order(1, "Step1" , true),
+                Order(1, "Step1" ),
                 Order(2, "Step2"),
                 Order(3, "Step3"),
                 Order(4, "Step4")
diff --git a/app/src/main/java/com/kareemradwan/stepeer/OrderAdapter.kt b/app/src/main/java/com/kareemradwan/stepeer/OrderAdapter.kt
index 38c5847..43c4274 100644
--- a/app/src/main/java/com/kareemradwan/stepeer/OrderAdapter.kt
+++ b/app/src/main/java/com/kareemradwan/stepeer/OrderAdapter.kt
@@ -20,7 +20,7 @@ class OrderAdapter(private val context: Context, list: List<Order>) : StepAdapte
         val tvDescriptor = view.findViewById<TextView>(R.id.tvDesc)
 
         tvTitle.text = model.title
-        tvDescriptor.text = "${model.id}"
+        tvDescriptor.text = "This Sub Title of Cutome View ${model.id}"
 
         return view
     }
diff --git a/app/src/main/res/layout/order_step.xml b/app/src/main/res/layout/order_step.xml
index 1e9ed0f..5f228b9 100644
--- a/app/src/main/res/layout/order_step.xml
+++ b/app/src/main/res/layout/order_step.xml
@@ -1,29 +1,48 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:paddingStart="20dp"
-    android:paddingBottom="10dp"
-    android:paddingEnd="20dp"
     android:layout_height="match_parent"
-    android:orientation="vertical">
+    android:layout_marginStart="20dp"
+    android:layout_marginLeft="20dp"
+    android:orientation="vertical"
+    android:paddingBottom="4dp">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:id="@+id/tvTitle"
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@android:color/black"
-        android:text="@string/app_name"
-        android:textSize="24sp" />
+        android:orientation="horizontal">
 
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="50dp"/>
+
+        <TextView
+            android:id="@+id/tvTitle"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/title_label"
+            android:textColor="@android:color/black"
+            android:textSize="24sp" />
+
+        <TextView
+            android:id="@+id/tvTitleEnd"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="top"
+            android:layout_weight="0"
+            android:gravity="top"
+            android:text="@string/d_2_hour_label"
+            android:textColor="@android:color/holo_red_dark"
+            android:textSize="14sp"
+            android:textStyle="bold" />
+
+    </LinearLayout>
 
     <TextView
         android:id="@+id/tvDesc"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_margin="4dp"
+        android:lines="3"
+        android:text="@string/title_label"
         android:textColor="@android:color/black"
         android:textSize="14sp" />
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 6da0792..d1d6883 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,3 +1,5 @@
 <resources>
     <string name="app_name">Stepeer</string>
+    <string name="title_label">Title</string>
+    <string name="d_2_hour_label">2 hour</string>
 </resources>
diff --git a/stepeer/src/main/res/layout/item_step.xml b/stepeer/src/main/res/layout/item_step.xml
index 092c148..aef76f0 100644
--- a/stepeer/src/main/res/layout/item_step.xml
+++ b/stepeer/src/main/res/layout/item_step.xml
@@ -51,7 +51,7 @@
     <LinearLayout
 
         android:id="@+id/stepContentContainer"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
         android:gravity="center"