mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-22 13:15:35 +03:00
Code Issues Projects Releases Packages Wiki Activity

FileDetailsFragment now working on tablets

Browse source
This commit is contained in:
Lennart Rosam 2012-05-18 00:37:53 +02:00
parent 54909e5372
commit ffc941e440
3 changed files with 40 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
res/layout-large-land/files.xml
View file

@ -24,7 +24,7 @@
<LinearLayout
android:id="@+id/file_list_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="1" >
<fragment
@ -39,7 +39,7 @@
<LinearLayout android:id="@+id/file_details_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_height="fill_parent"
android:layout_weight="2" >
<fragment

34
src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
View file

@ -53,7 +53,7 @@ public class FileDetailFragment extends SherlockFragment implements
public static final String FILE = "FILE";
private Intent mIntent;
private View mView;
//private View mView;
private DownloadFinishReceiver mDownloadFinishReceiver;
private OCFile mFile;
@ -73,7 +73,7 @@ public class FileDetailFragment extends SherlockFragment implements
* to contain {@link FileDetailFragment#FILE} with an OCFile and also
* {@link FileDownloader#EXTRA_ACCOUNT} with the account.
*
* @param nonEmptyFragment True, to enable file detail rendering
* @param intent Intent with an account and a file in it for rendering
*/
public FileDetailFragment(Intent intent) {
mLayout = R.layout.file_details_fragment;
@ -124,7 +124,7 @@ public class FileDetailFragment extends SherlockFragment implements
setFilesize(mFile.getFileLength());
// set file preview if available and possible
VideoView videoView = (VideoView) mView
VideoView videoView = (VideoView) getView()
.findViewById(R.id.videoView1);
videoView.setVisibility(View.INVISIBLE);
if (mFile.getStoragePath() == null) {
@ -134,7 +134,7 @@ public class FileDetailFragment extends SherlockFragment implements
imageView.setOnClickListener(this);
} else {
if (mFile.getMimetype().startsWith("image/")) {
ImageView imageView = (ImageView) mView
ImageView imageView = (ImageView) getView()
.findViewById(R.id.imageView2);
Bitmap bmp = BitmapFactory.decodeFile(mFile.getStoragePath());
imageView.setImageBitmap(bmp);
@ -151,23 +151,25 @@ public class FileDetailFragment extends SherlockFragment implements
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
View view = null;
view = inflater.inflate(mLayout, container, false);
mIntent = getActivity().getIntent();
mView = view;
// make sure we are not using the empty layout
if (mEmptyLayout == false) {
updateFileDetails();
}
return view;
}
@Override
public View getView() {
return mView == null ? super.getView() : mView;
};
public void onStart() {
super.onStart();
// Fill in required information about file displaying
if(mIntent == null){
mIntent = getActivity().getIntent();
}
// Fill in the details if the layout is not empty
if(!mEmptyLayout){
updateFileDetails();
}
}
private void setFilename(String filename) {
TextView tv = (TextView) getView().findViewById(R.id.textView1);

23
src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java
View file

@ -84,6 +84,8 @@ public class FileListFragment extends FragmentListView {
((FileDisplayActivity) getActivity()).pushPath(dirname);
populateFileList();
resetFileFragment();
return;
}
@ -107,11 +109,11 @@ public class FileListFragment extends FragmentListView {
if (fd.isEmptyLayout()) {
// True, if this is the first time a user taps on a file
fd = new FileDetailFragment(showDetailsIntent);
FragmentTransaction transaction = getFragmentManager()
.beginTransaction();
transaction.replace(R.id.file_details_container, fd,
"FileDetails");
fd = new FileDetailFragment(showDetailsIntent);
transaction.replace(R.id.fileDetail, fd, "FileDetails");
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
transaction.commit();
} else {
fd.updateFileDetails(showDetailsIntent);
@ -122,6 +124,20 @@ public class FileListFragment extends FragmentListView {
}
}
/**
* Resets the FileDetailsFragment on Tablets
* so that it always displays "Tab on a file to display it's details"
*/
private void resetFileFragment() {
FileDetailFragment fileDetails = (FileDetailFragment) getFragmentManager().findFragmentByTag("FileDetails");
if(fileDetails != null){
FragmentTransaction transaction = getFragmentManager().beginTransaction();
transaction.remove(fileDetails);
transaction.add(R.id.file_details_container, new FileDetailFragment());
transaction.commit();
}
}
@Override
public boolean onItemLongClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
@ -140,6 +156,7 @@ public class FileListFragment extends FragmentListView {
public void onNavigateUp() {
mDirNames.pop();
populateFileList();
resetFileFragment();
}
/**