Make resource values for some hardcoded string

diff --git a/res/menu/account_picker.xml b/res/menu/account_picker.xml
index 1001cd1..800dae2 100644 (file)
--- a/res/menu/account_picker.xml
+++ b/res/menu/account_picker.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >

-    <item android:id="@+id/createAccount" android:title="Create Account" android:showAsAction="ifRoom|withText"></item>
+    <item android:id="@+id/createAccount" android:title="@string/create_account" android:showAsAction="ifRoom|withText"></item>

     
 
 </menu>
\ No newline at end of file
     
 
 </menu>
\ No newline at end of file

diff --git a/res/menu/account_picker_long_click.xml b/res/menu/account_picker_long_click.xml
index e724398..8c8083d 100644 (file)
--- a/res/menu/account_picker_long_click.xml
+++ b/res/menu/account_picker_long_click.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android" >

-    <item android:id="@+id/delete_account" android:title="Delete account"></item>
+    <item android:id="@+id/delete_account" android:title="@string/delete_account"></item>

     
 
 </menu>
\ No newline at end of file
     
 
 </menu>
\ No newline at end of file

diff --git a/res/menu/menu.xml b/res/menu/menu.xml
index 8ba2c3a..4bee2e8 100644 (file)
--- a/res/menu/menu.xml
+++ b/res/menu/menu.xml
@@ -7,5 +7,5 @@
     <!--  <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>-->
     <item android:id="@+id/action_upload" android:title="@string/actionbar_upload" android:icon="@drawable/ic_action_upload"></item>
     <item android:id="@+id/action_settings" android:title="@string/actionbar_settings" android:icon="@android:drawable/ic_menu_preferences"></item>
     <!--  <item android:id="@+id/search" android:title="@string/actionbar_search" android:icon="@drawable/ic_action_search"></item>-->
     <item android:id="@+id/action_upload" android:title="@string/actionbar_upload" android:icon="@drawable/ic_action_upload"></item>
     <item android:id="@+id/action_settings" android:title="@string/actionbar_settings" android:icon="@android:drawable/ic_menu_preferences"></item>

-    <item android:id="@+id/about_app" android:title="About" android:icon="@android:drawable/ic_menu_info_details"></item>
+    <item android:id="@+id/about_app" android:title="@string/about_title" android:icon="@android:drawable/ic_menu_info_details"></item>

 </menu>
 </menu>

diff --git a/res/values/strings.xml b/res/values/strings.xml
index bf75e13..7ade27c 100644 (file)
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -33,6 +33,7 @@
     <string name="prefs_trackmydevice_interval">Update interval</string>
     <string name="prefs_trackmydevice_interval_summary">Update every %1$s minutes</string>
     <string name="prefs_accounts">Accounts</string>
     <string name="prefs_trackmydevice_interval">Update interval</string>
     <string name="prefs_trackmydevice_interval_summary">Update every %1$s minutes</string>
     <string name="prefs_accounts">Accounts</string>

+    <string name="prefs_manage_accounts">Manage accounts</string>    

     
     <string name="auth_host_url">ownCloud URL</string>
     <string name="auth_username">Username</string>
     
     <string name="auth_host_url">ownCloud URL</string>
     <string name="auth_username">Username</string>


@@ -69,6 +70,12 @@
     <string name="common_cancel">Cancel</string>
     <string name="common_save_exit">Save &amp; Exit</string>
     <string name="common_error">Error</string>
     <string name="common_cancel">Cancel</string>
     <string name="common_save_exit">Save &amp; Exit</string>
     <string name="common_error">Error</string>

+    <string name="about_title">About</string>
+    
+    <string name="delete_account">Delete account</string>
+    <string name="create_account">Create account</string>
+    
+    <string name="upload_chooser_title">Upload file from &#8230;</string>

     <string name="uploader_info_dirname">Directory name</string>
        <string name="uploader_upload_in_progress_ticker">Uploading &#8230;</string>    
        <string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>    
     <string name="uploader_info_dirname">Directory name</string>
        <string name="uploader_upload_in_progress_ticker">Uploading &#8230;</string>    
        <string name="uploader_upload_in_progress_content">%1$d%% Uploading %2$s</string>    

diff --git a/res/xml/preferences.xml b/res/xml/preferences.xml
index 5b2d63e..00d2903 100644 (file)
--- a/res/xml/preferences.xml
+++ b/res/xml/preferences.xml
@@ -7,7 +7,7 @@
         android:title="@string/prefs_select_oc_account"
         android:summary="@string/prefs_summary_select_oc_account" 
         / -->
         android:title="@string/prefs_select_oc_account"
         android:summary="@string/prefs_summary_select_oc_account" 
         / -->

-    <Preference android:title="Manage accounts" android:key="manage_account" />
+    <Preference android:title="@string/prefs_manage_accounts" android:key="manage_account" />

     <CheckBoxPreference android:title="ownCloud App PIN" android:key="set_pincode" 
                         android:summary="Protect your ownCloud client"/>
     <CheckBoxPreference android:key="instant_uploading" 
     <CheckBoxPreference android:title="ownCloud App PIN" android:key="set_pincode" 
                         android:summary="Protect your ownCloud client"/>
     <CheckBoxPreference android:key="instant_uploading" 

diff --git a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
index 39d6e38..ce89b87 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
+++ b/src/eu/alefzero/owncloud/ui/activity/FileDisplayActivity.java
@@ -185,7 +185,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
                 action = action.setType("*/*")\r
                         .addCategory(Intent.CATEGORY_OPENABLE);\r
                 startActivityForResult(\r
                 action = action.setType("*/*")\r
                         .addCategory(Intent.CATEGORY_OPENABLE);\r
                 startActivityForResult(\r

-                        Intent.createChooser(action, "Upload file from..."),\r
+                        Intent.createChooser(action, getString(R.string.upload_chooser_title)),\r

                         ACTION_SELECT_FILE);\r
                 break;\r
             }\r
                         ACTION_SELECT_FILE);\r
                 break;\r
             }\r


@@ -441,7 +441,7 @@ public class FileDisplayActivity extends SherlockFragmentActivity implements
             break;\r
         case DIALOG_ABOUT_APP: {\r
             builder = new AlertDialog.Builder(this);\r
             break;\r
         case DIALOG_ABOUT_APP: {\r
             builder = new AlertDialog.Builder(this);\r

-            builder.setTitle("About");\r
+            builder.setTitle(getString(R.string.about_title));\r

             PackageInfo pkg;\r
             try {\r
                 pkg = getPackageManager().getPackageInfo(getPackageName(), 0);\r
             PackageInfo pkg;\r
             try {\r
                 pkg = getPackageManager().getPackageInfo(getPackageName(), 0);\r

diff --git a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
index ce1ede9..aa59a5c 100644 (file)
--- a/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
+++ b/src/eu/alefzero/owncloud/ui/fragment/FileDetailFragment.java
@@ -406,51 +406,6 @@ public class FileDetailFragment extends SherlockFragment implements
                 \r
                 setButtonsForDown();\r
                 \r
                 \r
                 setButtonsForDown();\r
                 \r

-                // Change download button to open button\r
-                /*downloadButton.setText(R.string.filedetails_open);\r
-                downloadButton.setOnClickListener(new OnClickListener() {\r
-                    @Override\r
-                    public void onClick(View v) {\r
-                        String storagePath = mFile.getStoragePath();\r
-                        String encodedStoragePath = WebdavUtils.encodePath(storagePath);\r
-                        try {\r
-                            Intent i = new Intent(Intent.ACTION_VIEW);\r
-                            i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mFile.getMimetype());\r
-                            i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);\r
-                            startActivity(i);\r
-                            \r
-                        } catch (Throwable t) {\r
-                            Log.e(TAG, "Fail when trying to open with the mimeType provided from the ownCloud server: " + mFile.getMimetype());\r
-                            boolean toastIt = true; \r
-                            String mimeType = "";\r
-                            try {\r
-                                Intent i = new Intent(Intent.ACTION_VIEW);\r
-                                mimeType = MimeTypeMap.getSingleton().getMimeTypeFromExtension(storagePath.substring(storagePath.lastIndexOf('.') + 1));\r
-                                if (mimeType != null && !mimeType.equals(mFile.getMimetype())) {\r
-                                    i.setDataAndType(Uri.parse("file://"+ encodedStoragePath), mimeType);\r
-                                    i.setFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION | Intent.FLAG_GRANT_WRITE_URI_PERMISSION);\r
-                                    startActivity(i);\r
-                                    toastIt = false;\r
-                                }\r
-                                \r
-                            } catch (IndexOutOfBoundsException e) {\r
-                                Log.e(TAG, "Trying to find out MIME type of a file without extension: " + storagePath);\r
-                                \r
-                            } catch (ActivityNotFoundException e) {\r
-                                Log.e(TAG, "No activity found to handle: " + storagePath + " with MIME type " + mimeType + " obtained from extension");\r
-                                \r
-                            } catch (Throwable th) {\r
-                                Log.e(TAG, "Unexpected problem when opening: " + storagePath, th);\r
-                                \r
-                            } finally {\r
-                                if (toastIt) {\r
-                                    Toast.makeText(getActivity(), "There is no application to handle file " + mFile.getFileName(), Toast.LENGTH_SHORT).show();\r
-                                }\r
-                            }\r
-                            \r
-                        }\r
-                    }\r
-                });*/\r

             } else {\r
                 setButtonsForRemote();\r
             }\r
             } else {\r
                 setButtonsForRemote();\r
             }\r