diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml index f87ca38..4a1392e 100644 --- a/app/src/main/res/layout/include_base_order_detail.xml +++ b/app/src/main/res/layout/include_base_order_detail.xml @@ -42,6 +42,7 @@ @@ -49,6 +50,8 @@ android:id="@+id/orderCodeView" style="@style/textViewStyle" android:layout_alignParentEnd="true" + android:layout_marginStart="@dimen/dp_10" + android:layout_toEndOf="@id/tempView" android:text="@string/unknown" android:textColor="@color/subTextColor" android:textSize="@dimen/textFontSize" /> @@ -67,7 +70,7 @@ style="@style/textViewStyle" android:layout_alignParentEnd="true" android:text="@string/unknown" - android:textColor="@color/mainThemeColor" + android:textColor="@color/subTextColor" android:textSize="@dimen/textFontSize" /> @@ -154,9 +157,8 @@ style="@style/textViewStyle" android:layout_width="match_parent" android:layout_alignParentEnd="true" + android:layout_marginStart="@dimen/dp_10" android:layout_toEndOf="@id/locationLayout" - android:gravity="end|center_vertical" - android:singleLine="true" android:text="@string/unknown" android:textColor="@color/subTextColor" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml index f87ca38..4a1392e 100644 --- a/app/src/main/res/layout/include_base_order_detail.xml +++ b/app/src/main/res/layout/include_base_order_detail.xml @@ -42,6 +42,7 @@ @@ -49,6 +50,8 @@ android:id="@+id/orderCodeView" style="@style/textViewStyle" android:layout_alignParentEnd="true" + android:layout_marginStart="@dimen/dp_10" + android:layout_toEndOf="@id/tempView" android:text="@string/unknown" android:textColor="@color/subTextColor" android:textSize="@dimen/textFontSize" /> @@ -67,7 +70,7 @@ style="@style/textViewStyle" android:layout_alignParentEnd="true" android:text="@string/unknown" - android:textColor="@color/mainThemeColor" + android:textColor="@color/subTextColor" android:textSize="@dimen/textFontSize" /> @@ -154,9 +157,8 @@ style="@style/textViewStyle" android:layout_width="match_parent" android:layout_alignParentEnd="true" + android:layout_marginStart="@dimen/dp_10" android:layout_toEndOf="@id/locationLayout" - android:gravity="end|center_vertical" - android:singleLine="true" android:text="@string/unknown" android:textColor="@color/subTextColor" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/item_expand_recycleview.xml b/app/src/main/res/layout/item_expand_recycleview.xml index 446f51b..638389b 100644 --- a/app/src/main/res/layout/item_expand_recycleview.xml +++ b/app/src/main/res/layout/item_expand_recycleview.xml @@ -18,6 +18,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="@dimen/dp_10" + android:layout_toEndOf="@id/dateView" + android:gravity="end" android:text="@string/unknown" android:textColor="@color/hintTextColor" /> \ No newline at end of file diff --git a/app/src/main/res/layout/include_base_order_detail.xml b/app/src/main/res/layout/include_base_order_detail.xml index f87ca38..4a1392e 100644 --- a/app/src/main/res/layout/include_base_order_detail.xml +++ b/app/src/main/res/layout/include_base_order_detail.xml @@ -42,6 +42,7 @@ @@ -49,6 +50,8 @@ android:id="@+id/orderCodeView" style="@style/textViewStyle" android:layout_alignParentEnd="true" + android:layout_marginStart="@dimen/dp_10" + android:layout_toEndOf="@id/tempView" android:text="@string/unknown" android:textColor="@color/subTextColor" android:textSize="@dimen/textFontSize" /> @@ -67,7 +70,7 @@ style="@style/textViewStyle" android:layout_alignParentEnd="true" android:text="@string/unknown" - android:textColor="@color/mainThemeColor" + android:textColor="@color/subTextColor" android:textSize="@dimen/textFontSize" /> @@ -154,9 +157,8 @@ style="@style/textViewStyle" android:layout_width="match_parent" android:layout_alignParentEnd="true" + android:layout_marginStart="@dimen/dp_10" android:layout_toEndOf="@id/locationLayout" - android:gravity="end|center_vertical" - android:singleLine="true" android:text="@string/unknown" android:textColor="@color/subTextColor" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/item_expand_recycleview.xml b/app/src/main/res/layout/item_expand_recycleview.xml index 446f51b..638389b 100644 --- a/app/src/main/res/layout/item_expand_recycleview.xml +++ b/app/src/main/res/layout/item_expand_recycleview.xml @@ -18,6 +18,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentEnd="true" + android:layout_marginStart="@dimen/dp_10" + android:layout_toEndOf="@id/dateView" + android:gravity="end" android:text="@string/unknown" android:textColor="@color/hintTextColor" /> \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5f29564..c71ff3b 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -71,8 +71,9 @@