From a29469016eabccfd6e011659ccd426c2a0bc84c3 Mon Sep 17 00:00:00 2001 From: Lennart Rosam Date: Sat, 14 Apr 2012 18:55:15 +0200 Subject: [PATCH] More cleanup / refactoring: Name Fragments consistantly way --- AndroidManifest.xml | 3 ++- res/layout/file_activity_details.xml | 2 +- res/layout/{file_details.xml => file_details_fragment.xml} | 0 res/layout/files.xml | 2 +- src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java | 6 +++--- src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java | 4 ++-- .../ui/fragment/{FileDetail.java => FileDetailFragment.java} | 4 ++-- .../owncloud/ui/fragment/{FileList.java => FileListFragment.java} | 6 +++--- 8 files changed, 14 insertions(+), 13 deletions(-) rename res/layout/{file_details.xml => file_details_fragment.xml} (100%) rename src/eu/alefzero/owncloud/ui/fragment/{FileDetail.java => FileDetailFragment.java} (94%) rename src/eu/alefzero/owncloud/ui/fragment/{FileList.java => FileListFragment.java} (94%) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 493cbfe4..c278a8e1 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -114,7 +114,8 @@ - + + class="eu.alefzero.owncloud.ui.fragment.FileDetailFragment" /> \ No newline at end of file diff --git a/res/layout/file_details.xml b/res/layout/file_details_fragment.xml similarity index 100% rename from res/layout/file_details.xml rename to res/layout/file_details_fragment.xml diff --git a/res/layout/files.xml b/res/layout/files.xml index c64e3e85..9cbd3bb9 100644 --- a/res/layout/files.xml +++ b/res/layout/files.xml @@ -8,7 +8,7 @@ android:id="@+id/fileList" android:layout_width="fill_parent" android:layout_height="fill_parent" - class="eu.alefzero.owncloud.ui.fragment.FileList" > + class="eu.alefzero.owncloud.ui.fragment.FileListFragment" > \ No newline at end of file diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java index 08710c51..f772e1db 100644 --- a/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/FileDetailActivity.java @@ -25,7 +25,7 @@ import android.view.Window; import com.actionbarsherlock.app.SherlockFragmentActivity; import eu.alefzero.owncloud.R; -import eu.alefzero.owncloud.ui.fragment.FileDetail; +import eu.alefzero.owncloud.ui.fragment.FileDetailFragment; /** * This activity displays the details of a file like @@ -34,7 +34,7 @@ import eu.alefzero.owncloud.ui.fragment.FileDetail; * */ public class FileDetailActivity extends SherlockFragmentActivity { - private FileDetail mFileDetail; + private FileDetailFragment mFileDetail; @Override protected void onCreate(Bundle savedInstanceState) { @@ -43,7 +43,7 @@ protected void onCreate(Bundle savedInstanceState) { getWindow().requestFeature(Window.FEATURE_NO_TITLE); setContentView(R.layout.file_activity_details); - mFileDetail = new FileDetail(); + mFileDetail = new FileDetailFragment(); FragmentTransaction ft = getSupportFragmentManager().beginTransaction(); ft.add(R.id.fileDetail, mFileDetail); ft.commit(); diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java index 5656d3fc..0d042515 100644 --- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java +++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java @@ -46,7 +46,7 @@ import eu.alefzero.owncloud.R; import eu.alefzero.owncloud.authenticator.AccountAuthenticator; import eu.alefzero.owncloud.authenticator.AuthUtils; import eu.alefzero.owncloud.datamodel.OCFile; -import eu.alefzero.owncloud.ui.fragment.FileList; +import eu.alefzero.owncloud.ui.fragment.FileListFragment; import eu.alefzero.webdav.WebdavClient; /** @@ -154,7 +154,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements startActivity(intent); return; } - ((FileList) getSupportFragmentManager().findFragmentById(R.id.fileList)) + ((FileListFragment) getSupportFragmentManager().findFragmentById(R.id.fileList)) .onNavigateUp(); } diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java similarity index 94% rename from src/eu/alefzero/owncloud/ui/fragment/FileDetail.java rename to src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java index 5e729ffb..fac9fa4a 100644 --- a/src/eu/alefzero/owncloud/ui/fragment/FileDetail.java +++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java @@ -45,7 +45,7 @@ import eu.alefzero.owncloud.db.ProviderMeta.ProviderTableMeta; * @author Bartek Przybylski * */ -public class FileDetail extends SherlockFragment implements OnClickListener { +public class FileDetailFragment extends SherlockFragment implements OnClickListener { private Intent mIntent; private View mView; @@ -106,7 +106,7 @@ public class FileDetail extends SherlockFragment implements OnClickListener { View v = null; if (getActivity().getIntent() != null && getActivity().getIntent().getStringExtra("FILE_ID") != null) { - v = inflater.inflate(R.layout.file_details, container, false); + v = inflater.inflate(R.layout.file_details_fragment, container, false); mIntent = getActivity().getIntent(); setStuff(v); } else { diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileList.java b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java similarity index 94% rename from src/eu/alefzero/owncloud/ui/fragment/FileList.java rename to src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java index 785b6baa..a8bc9d39 100644 --- a/src/eu/alefzero/owncloud/ui/fragment/FileList.java +++ b/src/eu/alefzero/owncloud/ui/fragment/FileListFragment.java @@ -38,12 +38,12 @@ import eu.alefzero.owncloud.ui.adapter.FileListListAdapter; * @author Bartek Przybylski * */ -public class FileList extends FragmentListView { +public class FileListFragment extends FragmentListView { private Account mAccount; private Stack mDirNames; private Vector mFiles; - public FileList() { + public FileListFragment() { mDirNames = new Stack(); } @@ -78,7 +78,7 @@ public class FileList extends FragmentListView { i.putExtra("FULL_PATH", file.getPath()); i.putExtra("FILE_ID", id_); i.putExtra("ACCOUNT", mAccount); - FileDetail fd = (FileDetail) getFragmentManager().findFragmentById(R.id.fileDetail); + FileDetailFragment fd = (FileDetailFragment) getFragmentManager().findFragmentById(R.id.fileDetail); if (fd != null) { fd.setStuff(i); } else { -- 2.11.0