Skip to content

add grid view option when choosing a file from within the app #301

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tobiasKaminsky merged 3 commits into from
Oct 6, 2016
Merged

add grid view option when choosing a file from within the app #301

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2b2916a
add grid view option when choosing a file from within the app
apicellaj Oct 1, 2016
0b7e784
fix issue with menu label not persisting
apicellaj Oct 4, 2016
3aa00bc
fix GridView layout
apicellaj Oct 4, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions res/menu/upload_files_picker.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,10 @@
app:showAsAction="never"
android:title="@string/actionbar_sort"
android:contentDescription="@string/actionbar_sort"/>
<item
android:id="@+id/action_switch_view"
android:icon="@drawable/ic_view_module"
android:orderInCategory="3"
app:showAsAction="never"
android:title="@string/action_switch_grid_view" />
</menu>
32 changes: 31 additions & 1 deletion src/com/owncloud/android/ui/activity/UploadFilesActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
import android.os.Bundle;
import android.os.Environment;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.Fragment;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.ActionBar;
import android.view.Menu;
import android.view.MenuItem;
Expand All @@ -46,6 +48,7 @@
import com.owncloud.android.ui.dialog.ConfirmationDialogFragment;
import com.owncloud.android.ui.dialog.ConfirmationDialogFragment.ConfirmationDialogFragmentListener;
import com.owncloud.android.ui.dialog.IndeterminateProgressDialog;
import com.owncloud.android.ui.fragment.ExtendedListFragment;
import com.owncloud.android.ui.fragment.LocalFileListFragment;
import com.owncloud.android.utils.FileStorageUtils;

Expand Down Expand Up @@ -148,7 +151,7 @@ public void onCreate(Bundle savedInstanceState) {
actionBar.setDisplayShowTitleEnabled(false);
actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_LIST);
actionBar.setListNavigationCallbacks(mDirectories, this);

// wait dialog
if (mCurrentDialog != null) {
mCurrentDialog.dismiss();
Expand Down Expand Up @@ -179,6 +182,8 @@ public boolean onCreateOptionsMenu(Menu menu) {
getMenuInflater().inflate(R.menu.upload_files_picker, menu);
MenuItem selectAll = menu.findItem(R.id.action_select_all);
setSelectAllMenuItem(selectAll, mSelectAll);
MenuItem switchView = menu.findItem(R.id.action_switch_view);
switchView.setTitle(isGridView() ? R.string.action_switch_list_view : R.string.action_switch_grid_view);
return super.onCreateOptionsMenu(menu);
}

Expand Down Expand Up @@ -223,6 +228,18 @@ public void onClick(DialogInterface dialog, int which) {
builder.create().show();
break;
}
case R.id.action_switch_view: {
if (isGridView()) {
item.setTitle(getString(R.string.action_switch_grid_view));
item.setIcon(R.drawable.ic_view_module);
mFileListFragment.switchToListView();
} else {
item.setTitle(getApplicationContext().getString(R.string.action_switch_list_view));
Copy link
Member

@AndyScherzinger AndyScherzinger Oct 4, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

getApplicationContext() should be removed

item.setIcon(R.drawable.ic_view_list);
mFileListFragment.switchToGridView();
}
return true;
}
default:
retval = super.onOptionsItemSelected(item);
}
Expand Down Expand Up @@ -515,4 +532,17 @@ protected void onAccountSet(boolean stateWasRecovered) {
finish();
}
}

private boolean isGridView() {
return getListOfFilesFragment().isGridEnabled();
}

private ExtendedListFragment getListOfFilesFragment() {
Fragment listOfFiles = mFileListFragment;
if (listOfFiles != null) {
return (ExtendedListFragment) listOfFiles;
}
Log_OC.e(TAG, "Access to unexisting list of files fragment!!");
return null;
}
}
34 changes: 22 additions & 12 deletions src/com/owncloud/android/ui/adapter/LocalFileListAdapter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,9 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AbsListView;
import android.widget.BaseAdapter;
import android.widget.GridView;
import android.widget.ImageView;
import android.widget.ListView;
import android.widget.TextView;
Expand Down Expand Up @@ -103,10 +105,12 @@ public int getItemViewType(int position) {
@Override
public View getView(int position, View convertView, ViewGroup parent) {
View view = convertView;
boolean isGridView = parent instanceof GridView;
if (view == null) {
LayoutInflater inflator = (LayoutInflater) mContext
.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
view = inflator.inflate(R.layout.list_item, null);
view = isGridView ? inflator.inflate(R.layout.grid_item, null) :
inflator.inflate(R.layout.list_item, null);
}
if (mFiles != null && mFiles.length > position && mFiles[position] != null) {
File file = mFiles[position];
Expand All @@ -129,20 +133,24 @@ public View getView(int position, View convertView, ViewGroup parent) {
}
fileIcon.setTag(file.hashCode());

ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
TextView fileSizeV = (TextView) view.findViewById(R.id.file_size);
TextView fileSizeSeparatorV = (TextView) view.findViewById(R.id.file_separator);
TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
ImageView checkBoxV = (ImageView) view.findViewById(R.id.custom_checkbox);
lastModV.setVisibility(View.VISIBLE);
lastModV.setText(DisplayUtils.getRelativeTimestamp(mContext, file.lastModified()));
if (!isGridView) {
TextView lastModV = (TextView) view.findViewById(R.id.last_mod);
lastModV.setVisibility(View.VISIBLE);
lastModV.setText(DisplayUtils.getRelativeTimestamp(mContext, file.lastModified()));
}

if (!file.isDirectory()) {
fileSizeSeparatorV.setVisibility(View.VISIBLE);
fileSizeV.setVisibility(View.VISIBLE);
fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.length()));
if (!isGridView) {
fileSizeSeparatorV.setVisibility(View.VISIBLE);
fileSizeV.setVisibility(View.VISIBLE);
fileSizeV.setText(DisplayUtils.bytesToHumanReadable(file.length()));
}

ListView parentList = (ListView) parent;
if (parentList.getChoiceMode() == ListView.CHOICE_MODE_NONE) {
AbsListView parentList = (AbsListView) parent;
if (parentList.getChoiceMode() == ListView.CHOICE_MODE_NONE) {
checkBoxV.setVisibility(View.GONE);
} else {
if (parentList.isItemChecked(position)) {
Expand Down Expand Up @@ -191,8 +199,10 @@ public View getView(int position, View convertView, ViewGroup parent) {
}

} else {
fileSizeSeparatorV.setVisibility(View.GONE);
fileSizeV.setVisibility(View.GONE);
if (!isGridView) {
fileSizeSeparatorV.setVisibility(View.GONE);
fileSizeV.setVisibility(View.GONE);
}
checkBoxV.setVisibility(View.GONE);
}

Expand Down
9 changes: 5 additions & 4 deletions src/com/owncloud/android/ui/fragment/LocalFileListFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.AbsListView;
import android.widget.AdapterView;
import android.widget.ImageView;
import android.widget.ListView;
Expand Down Expand Up @@ -127,7 +128,7 @@ public void onItemClick(AdapterView<?> l, View v, int position, long id) {
} else { /// Click on a file
ImageView checkBoxV = (ImageView) v.findViewById(R.id.custom_checkbox);
if (checkBoxV != null) {
if (((ListView)getListView()).isItemChecked(position)) {
if (((AbsListView)getListView()).isItemChecked(position)) {
checkBoxV.setImageResource(R.drawable.ic_checkbox_marked);
} else {
checkBoxV.setImageResource(R.drawable.ic_checkbox_blank_outline);
Expand Down Expand Up @@ -206,7 +207,7 @@ public void listDirectory(File directory) {
}

// by now, only files in the same directory will be kept as selected
((ListView)mCurrentListView).clearChoices();
((AbsListView)mCurrentListView).clearChoices();
mAdapter.swapDirectory(directory);
if (mDirectory == null || !mDirectory.equals(directory)) {
mCurrentListView.setSelection(0);
Expand All @@ -222,7 +223,7 @@ public void listDirectory(File directory) {
*/
public String[] getCheckedFilePaths() {
ArrayList<String> result = new ArrayList<String>();
SparseBooleanArray positions = ((ListView)mCurrentListView).getCheckedItemPositions();
SparseBooleanArray positions = ((AbsListView)mCurrentListView).getCheckedItemPositions();
if (positions.size() > 0) {
for (int i = 0; i < positions.size(); i++) {
if (positions.get(positions.keyAt(i)) == true) {
Expand Down Expand Up @@ -254,7 +255,7 @@ public void sortBySize(boolean descending) {
* @param select <code>true</code> to select all, <code>false</code> to deselect all
*/
public void selectAllFiles(boolean select) {
ListView listView = (ListView) getListView();
AbsListView listView = (AbsListView) getListView();
for (int position = 0; position < listView.getCount(); position++) {
File file = (File) mAdapter.getItem(position);
if (file.isFile()) {
Expand Down