Kaynağa Gözat

minor layout changes

AndyScherzinger 8 yıl önce
ebeveyn
işleme
472f300e26

+ 14 - 5
src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java

@@ -83,8 +83,20 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             ((ActivityViewHolder) holder).dateTime.setText(DisplayUtils.getRelativeTimestamp(context,
                     activity.getDate().getTime()));
         }
-        ((ActivityViewHolder)holder).subject.setText(activity.getSubject());
-        ((ActivityViewHolder)holder).message.setText(activity.getMessage());
+
+        if (!TextUtils.isEmpty(activity.getSubject())) {
+            ((ActivityViewHolder) holder).subject.setText(activity.getSubject());
+            ((ActivityViewHolder) holder).subject.setVisibility(View.VISIBLE);
+        } else {
+            ((ActivityViewHolder) holder).subject.setVisibility(View.GONE);
+        }
+
+        if (!TextUtils.isEmpty(activity.getMessage())) {
+            ((ActivityViewHolder) holder).message.setText(activity.getMessage());
+            ((ActivityViewHolder) holder).message.setVisibility(View.VISIBLE);
+        } else {
+            ((ActivityViewHolder) holder).message.setVisibility(View.GONE);
+        }
 
         if (!TextUtils.isEmpty(activity.getIcon())) {
             downloadIcon(activity.getIcon(), ((ActivityViewHolder) holder).activityIcon);
@@ -132,8 +144,5 @@ public class ActivityListAdapter extends RecyclerView.Adapter<RecyclerView.ViewH
             message = (TextView) itemView.findViewById(R.id.activity_message);
             dateTime = (TextView) itemView.findViewById(R.id.activity_datetime);
         }
-
     }
-
-
 }

+ 37 - 34
src/main/res/layout/activity_list_item.xml

@@ -22,51 +22,54 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="horizontal">
+    android:orientation="horizontal"
+    android:paddingTop="@dimen/standard_padding"
+    android:paddingRight="@dimen/standard_padding"
+    android:paddingBottom="@dimen/standard_padding"
+    android:paddingLeft="12dp">
 
     <ImageView
         android:id="@+id/activity_icon"
         android:layout_width="@dimen/user_icon_size"
         android:layout_height="@dimen/user_icon_size"
-        android:layout_centerVertical="true"
-        android:layout_margin="@dimen/standard_quarter_margin"
+        android:layout_alignParentTop="true"
+        android:layout_marginRight="24dp"
         android:src="@drawable/ic_activity"/>
 
-    <TextView
-        android:id="@+id/activity_subject"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/standard_quarter_margin"
-        android:layout_toRightOf="@id/activity_icon"
+        android:orientation="vertical"
         android:layout_alignTop="@id/activity_icon"
-        android:ellipsize="end"
-        android:gravity="bottom"
-        android:maxLines="2"
-        android:text="@string/placeholder_filename"
-        android:textAppearance="?android:attr/textAppearanceListItem"/>
+        android:layout_toRightOf="@id/activity_icon">
 
-    <TextView
-        android:id="@+id/activity_message"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/activity_subject"
-        android:layout_margin="@dimen/standard_quarter_margin"
-        android:layout_toRightOf="@id/activity_icon"
-        android:ellipsize="end"
-        android:gravity="top"
-        android:maxLines="3"
-        android:text="@string/placeholder_sentence"
-        android:textColor="?android:attr/textColorSecondary"/>
+        <TextView
+            android:id="@+id/activity_subject"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="2"
+            android:text="@string/placeholder_filename"
+            android:textAppearance="?android:attr/textAppearanceListItem"/>
 
-    <TextView
-        android:id="@+id/activity_datetime"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_alignParentBottom="true"
-        android:layout_margin="@dimen/standard_quarter_margin"
-        android:ellipsize="end"
-        android:text="@string/placeholder_sentence"
-        android:textColor="?android:attr/textColorSecondary"/>
+        <TextView
+            android:id="@+id/activity_message"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:ellipsize="end"
+            android:maxLines="3"
+            android:text="@string/placeholder_sentence"
+            android:textColor="?android:attr/textColorSecondary"/>
+
+        <TextView
+            android:id="@+id/activity_datetime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:ellipsize="end"
+            android:text="@string/placeholder_sentence"
+            android:textColor="?android:attr/textColorSecondary"/>
+
+    </LinearLayout>
 
 </RelativeLayout>

+ 1 - 1
src/main/res/layout/user_info_layout.xml

@@ -46,7 +46,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:orientation="vertical"
-                android:visibility="gone">
+                android:visibility="visible">
 
                 <android.support.v7.widget.CardView
                     android:id="@+id/primary_user_info_view"