From: jabarros Date: Thu, 24 Jul 2014 16:34:12 +0000 (+0200) Subject: Add message when LocalFileList and OCFileLIst are empty X-Git-Tag: oc-android-1.7.0_signed~238^2~5 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/fb1a4bad5933c8dc9b73ba5f948bb23462822b73?ds=inline;hp=--cc Add message when LocalFileList and OCFileLIst are empty --- fb1a4bad5933c8dc9b73ba5f948bb23462822b73 diff --git a/res/layout/list_fragment.xml b/res/layout/list_fragment.xml index c5dbef12..d03aa322 100644 --- a/res/layout/list_fragment.xml +++ b/res/layout/list_fragment.xml @@ -17,11 +17,10 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . --> - + android:layout_weight="1" > + android:layout_height="match_parent" /> @@ -45,4 +43,4 @@ android:visibility="gone" /> - + diff --git a/res/values/strings.xml b/res/values/strings.xml index c1a1e2cb..c76ef4fa 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -53,7 +53,8 @@ No content was received. Nothing to upload. %1$s is not allowed to access the shared content Uploading - There are no files in this folder.\nNew files can be added with the \"Upload\" menu option. + Nothing in here. Upload something! + There are no files in this folder. Tap on a file to display additional information. Size: Type: diff --git a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java index 5915ab42..69704c9f 100644 --- a/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java +++ b/src/com/owncloud/android/ui/fragment/ExtendedListFragment.java @@ -18,21 +18,21 @@ package com.owncloud.android.ui.fragment; -import com.actionbarsherlock.app.SherlockFragment; -import com.owncloud.android.R; -import com.owncloud.android.ui.ExtendedListView; -import com.owncloud.android.utils.Log_OC; - - import android.os.Bundle; import android.support.v4.widget.SwipeRefreshLayout; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; -import android.widget.ListAdapter; import android.widget.AdapterView.OnItemClickListener; +import android.widget.ListAdapter; import android.widget.ListView; +import android.widget.TextView; + +import com.actionbarsherlock.app.SherlockFragment; +import com.owncloud.android.R; +import com.owncloud.android.ui.ExtendedListView; +import com.owncloud.android.utils.Log_OC; /** * TODO extending SherlockListFragment instead of SherlockFragment @@ -46,6 +46,7 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic protected ExtendedListView mList; private SwipeRefreshLayout mRefreshLayout; + private TextView mEmptyListMessage; public void setListAdapter(ListAdapter listAdapter) { mList.setAdapter(listAdapter); @@ -63,9 +64,10 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic //mList = new ExtendedListView(getActivity()); View v = inflater.inflate(R.layout.list_fragment, null); + mEmptyListMessage = (TextView) v.findViewById(R.id.empty_list_view); mList = (ExtendedListView)(v.findViewById(R.id.list_root)); mList.setOnItemClickListener(this); - //mList.setEmptyView(v.findViewById(R.id.empty_list_view)); // looks like it's not a cool idea + mList.setEmptyView(mEmptyListMessage); // looks like it's not a cool idea mList.setDivider(getResources().getDrawable(R.drawable.uploader_list_separator)); mList.setDividerHeight(1); @@ -161,6 +163,13 @@ public class ExtendedListFragment extends SherlockFragment implements OnItemClic public void hideSwipeProgress() { mRefreshLayout.setRefreshing(false); } + + /** + * Set message for empty list view + */ + public void setMessageforEmptyView(int message) { + mEmptyListMessage.setText(message); + } } diff --git a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java index bc466016..9e212723 100644 --- a/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/LocalFileListFragment.java @@ -19,11 +19,6 @@ package com.owncloud.android.ui.fragment; import java.io.File; -import com.owncloud.android.R; -import com.owncloud.android.ui.adapter.LocalFileListAdapter; -import com.owncloud.android.utils.Log_OC; - - import android.app.Activity; import android.os.Bundle; import android.os.Environment; @@ -35,6 +30,10 @@ import android.widget.AdapterView; import android.widget.ImageView; import android.widget.ListView; +import com.owncloud.android.R; +import com.owncloud.android.ui.adapter.LocalFileListAdapter; +import com.owncloud.android.utils.Log_OC; + /** * A Fragment that lists all files and folders in a given LOCAL path. @@ -78,6 +77,7 @@ public class LocalFileListFragment extends ExtendedListFragment { View v = super.onCreateView(inflater, container, savedInstanceState); getListView().setChoiceMode(ListView.CHOICE_MODE_MULTIPLE); disableSwipe(); // Disable pull refresh + setMessageforEmptyView(R.string.local_file_list_empty); Log_OC.i(TAG, "onCreateView() end"); return v; } diff --git a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java index c53b3781..0c8ffcae 100644 --- a/src/com/owncloud/android/ui/fragment/OCFileListFragment.java +++ b/src/com/owncloud/android/ui/fragment/OCFileListFragment.java @@ -20,12 +20,21 @@ package com.owncloud.android.ui.fragment; import java.io.File; import java.util.ArrayList; +import android.app.Activity; +import android.os.Bundle; +import android.view.ContextMenu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; +import android.widget.AdapterView; +import android.widget.AdapterView.AdapterContextMenuInfo; + import com.owncloud.android.R; import com.owncloud.android.datamodel.FileDataStorageManager; import com.owncloud.android.datamodel.OCFile; import com.owncloud.android.files.FileMenuFilter; -import com.owncloud.android.ui.adapter.FileListListAdapter; import com.owncloud.android.ui.activity.FileDisplayActivity; +import com.owncloud.android.ui.adapter.FileListListAdapter; import com.owncloud.android.ui.dialog.ConfirmationDialogFragment; import com.owncloud.android.ui.dialog.RemoveFileDialogFragment; import com.owncloud.android.ui.dialog.RenameFileDialogFragment; @@ -33,15 +42,6 @@ import com.owncloud.android.ui.preview.PreviewImageFragment; import com.owncloud.android.ui.preview.PreviewMediaFragment; import com.owncloud.android.utils.Log_OC; -import android.app.Activity; -import android.os.Bundle; -import android.view.ContextMenu; -import android.view.MenuInflater; -import android.view.MenuItem; -import android.view.View; -import android.widget.AdapterView; -import android.widget.AdapterView.AdapterContextMenuInfo; - /** * A Fragment that lists all files and folders in a given path. * @@ -107,6 +107,8 @@ public class OCFileListFragment extends ExtendedListFragment { super.onActivityCreated(savedInstanceState); Log_OC.e(TAG, "onActivityCreated() start"); + setMessageforEmptyView(R.string.file_list_empty); + mAdapter = new FileListListAdapter(getSherlockActivity(), mContainerActivity); if (savedInstanceState != null) { @@ -129,8 +131,7 @@ public class OCFileListFragment extends ExtendedListFragment { setListAdapter(mAdapter); registerForContextMenu(getListView()); - getListView().setOnCreateContextMenuListener(this); - + getListView().setOnCreateContextMenuListener(this); } /**