Răsfoiți Sursa

implementation of #1193 - optimizing the uploader layout and taking user configured sorting into account

Andy Scherzinger 9 ani în urmă
părinte
comite
74fa10964a

+ 1 - 3
res/layout/uploader_layout.xml

@@ -21,7 +21,6 @@
 	android:layout_height="wrap_content"
 	android:orientation="vertical"
 	android:layout_width="wrap_content"
-	android:background="@color/white"
 	android:gravity="center">
 
 	<FrameLayout
@@ -45,8 +44,7 @@
 	    android:layout_width="fill_parent"
 	    android:layout_height="wrap_content"
 	    android:layout_alignParentBottom="true"
-	    android:orientation="horizontal"
-		android:padding="@dimen/standard_padding">
+	    android:orientation="horizontal" >
 
 		<android.support.v7.widget.AppCompatButton
 			android:theme="@style/Button"

+ 1 - 2
src/com/owncloud/android/ui/activity/ReceiveExternalFilesActivity.java

@@ -412,14 +412,13 @@ public class ReceiveExternalFilesActivity extends FileActivity
                     HashMap<String, Object> h = new HashMap<>();
                     h.put("dirname", f);
                     data.add(h);
-                }
             }
 
             UploaderAdapter sa = new UploaderAdapter(this,
                                                 data,
                                                 R.layout.uploader_list_item_layout,
                                                 new String[] {"dirname"},
-                                                new int[] {R.id.filename},
+                                                new int[] {R.id.filename, R.id.last_mod});
                                                 getStorageManager(), getAccount());
 
             mListView.setAdapter(sa);

+ 1 - 1
src/com/owncloud/android/utils/DisplayUtils.java

@@ -169,7 +169,7 @@ public class DisplayUtils {
     }
 
     @SuppressWarnings("deprecation")
-    public static CharSequence getRelativeDateTimeString (
+    private static CharSequence getRelativeDateTimeString (
             Context c, long time, long minResolution, long transitionResolution, int flags
             ){