Revert "Initial commit"

This reverts commit c9aec15.
TonnyL · Apr 14, 2017 · ced794c · ced794c
1 parent 3c16e45
commit ced794c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 18 deletions.
diff --git a/wear/src/main/java/io/github/marktony/espresso/PackageRecyclerAdapter.java b/wear/src/main/java/io/github/marktony/espresso/PackageRecyclerAdapter.java
@@ -57,7 +57,7 @@ public void onBindViewHolder(RecyclerView.ViewHolder holder, int position) {
             if (p.getData() != null && p.getData().size() > 0) {
                 vh.textViewStatus.setText(p.getData().get(0).getContext());
             } else {
-                vh.textViewStatus.setText("Electronic Notification Received: Your order has been processed and tracking will be updated soon.");
+                vh.textViewStatus.setText("Can not get the latest status.");
             }
         }
     }

diff --git a/wear/src/main/res/layout/item_package.xml b/wear/src/main/res/layout/item_package.xml
@@ -20,32 +20,30 @@
     android:orientation="horizontal"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_marginTop="@dimen/activity_vertical_margin"
-    android:layout_marginBottom="@dimen/activity_vertical_margin">
+    android:layout_marginTop="8dp"
+    android:layout_marginBottom="8dp">
 
     <FrameLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content">
 
         <android.support.wearable.view.CircledImageView
-            android:id="@+id/avatar"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            app:circle_color="@color/blue"
-            app:circle_radius="24dp"
-            app:circle_radius_pressed="24dp"
-            app:circle_padding="2dp"
-            app:circle_border_width="0dp"
-            app:circle_border_color="@color/white"/>
+            android:id="@+id/avatar"
+            android:src="@android:color/holo_blue_light"
+            app:circle_color="@android:color/holo_blue_light"
+            app:circle_border_width="2dp"
+            app:circle_radius_pressed="40dp"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/textViewAvatar"
             android:textColor="@android:color/white"
+            android:text="P"
             android:layout_gravity="center"
-            android:textSize="@dimen/big_char_size"/>
+            android:textSize="24sp"/>
 
     </FrameLayout>
 
@@ -62,14 +60,15 @@
             android:maxLines="1"
             android:ellipsize="end"
             android:textColor="@color/primary_text_dark"
-            android:textSize="@dimen/primary_text_size" />
+            android:text="Package2456" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/textViewStatus"
             android:textColor="@color/primary_text_dark"
-            android:textSize="@dimen/secondary_text_size" />
+            android:textSize="12sp"
+            android:text="已到达：长沙理工大学"/>
 
     </LinearLayout>
 

diff --git a/wear/src/main/res/values/dimens.xml b/wear/src/main/res/values/dimens.xml
@@ -20,8 +20,4 @@
     <dimen name="activity_vertical_margin">8dp</dimen>
     <dimen name="activity_horizontal_margin">8dp</dimen>
 
-    <dimen name="big_char_size">24sp</dimen>
-    <dimen name="primary_text_size">14sp</dimen>
-    <dimen name="secondary_text_size">10sp</dimen>
-
 </resources>