ソースを参照

initial implementaion for click events + using the import icon for upload from other apps, also fixed the checkboxes for hdpi/mdpi

Andy Scherzinger 9 年 前
コミット
e8c64ebf8d

BIN
res/drawable-hdpi/ic_checkbox_blank_outline.png


BIN
res/drawable-hdpi/ic_checkbox_marked.png


BIN
res/drawable-hdpi/ic_import.png


BIN
res/drawable-mdpi/ic_checkbox_blank_outline.png


BIN
res/drawable-mdpi/ic_checkbox_marked.png


BIN
res/drawable-mdpi/ic_import.png


BIN
res/drawable-xhdpi/ic_import.png


BIN
res/drawable-xxhdpi/ic_import.png


+ 2 - 5
res/layout/list_fragment.xml

@@ -108,7 +108,6 @@
             fab:fab_size="mini"
             fab:fab_icon="@drawable/ic_action_upload"
             fab:fab_colorNormal="@color/owncloud_blue_accent"
-            fab:fab_title="@string/actionbar_upload"
             fab:fab_colorPressed="@color/owncloud_blue"/>
 
         <com.getbase.floatingactionbutton.FloatingActionButton
@@ -118,7 +117,6 @@
             fab:fab_size="mini"
             fab:fab_icon="@drawable/ic_action_create_dir"
             fab:fab_colorNormal="@color/owncloud_blue_accent"
-            fab:fab_title="@string/actionbar_mkdir"
             fab:fab_colorPressed="@color/owncloud_blue"/>
 
         <com.getbase.floatingactionbutton.FloatingActionButton
@@ -126,10 +124,9 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             fab:fab_size="mini"
-            fab:fab_icon="@drawable/ic_action_upload"
+            fab:fab_icon="@drawable/ic_import"
             fab:fab_colorNormal="@color/owncloud_blue_accent"
-            fab:fab_title="Upload from app"
-            fab:fab_colorPressed="@color/owncloud_blue_bright"/>
+            fab:fab_colorPressed="@color/owncloud_blue"/>
 
     </com.getbase.floatingactionbutton.FloatingActionsMenu>
 </RelativeLayout>

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

@@ -144,7 +144,7 @@ public class FileDisplayActivity extends HookActivity
     private boolean mSyncInProgress = false;
 
     private static String DIALOG_UNTRUSTED_CERT = "DIALOG_UNTRUSTED_CERT";
-    private static String DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER";
+    public static String DIALOG_CREATE_FOLDER = "DIALOG_CREATE_FOLDER";
     private static String DIALOG_UPLOAD_SOURCE = "DIALOG_UPLOAD_SOURCE";
     private static String DIALOG_CERT_NOT_SAVED = "DIALOG_CERT_NOT_SAVED";
 

+ 2 - 0
src/com/owncloud/android/ui/fragment/ExtendedListFragment.java

@@ -22,6 +22,7 @@ package com.owncloud.android.ui.fragment;
 
 import java.util.ArrayList;
 
+import android.app.Activity;
 import android.os.Build;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
@@ -45,6 +46,7 @@ import com.owncloud.android.lib.common.utils.Log_OC;
 import com.owncloud.android.ui.ExtendedListView;
 import com.owncloud.android.ui.activity.OnEnforceableRefreshListener;
 import com.owncloud.android.ui.adapter.FileListListAdapter;
+import com.owncloud.android.ui.dialog.CreateFolderDialogFragment;
 
 import third_parties.in.srain.cube.GridViewWithHeaderAndFooter;