Commit 4817ae61 authored by Alan McNatty's avatar Alan McNatty
Browse files

Added in the creat public view options

parent e85b6168
......@@ -56,29 +56,7 @@
android:layout_height="wrap_content">
</EditText>
</LinearLayout>
<!--
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ArtifactFolderLayout"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:gravity="center_horizontal"
android:orientation="horizontal">
<ImageView android:id="@+id/UploadFolder"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
</ImageView>
<EditText android:text=""
android:id="@+id/txtFolderTitle"
android:singleLine="true"
android:enabled="false"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
</EditText>
</LinearLayout> -->
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/ArtifactSettingsButtonLayout"
......
......@@ -7,17 +7,22 @@
<string name="pref_upload_url_key">upload.uri</string>
<string name="pref_upload_url_title">Upload URI</string>
<string name="pref_upload_url_summary">Enter the URL to post files to Mahara</string>
<string name="pref_upload_url_default">http://www.mahara.org/artefact/file/mobileupload.php</string>
<string name="pref_upload_token_key">upload.token</string>
<string name="pref_upload_token_title">Token</string>
<string name="pref_upload_token_summary">Enter your Mahara upload token</string>
<string name="pref_upload_token_summary">Enter your Mahara upload token</string>
<string name="prefcat_advanced">Advanced</string>
<string name="pref_upload_folder_key">upload.folder</string>
<string name="pref_upload_folder_title">Upload Folder</string>
<string name="pref_upload_folder_summary">Enter the folder to upload your artefacts into</string>
<string name="pref_upload_folder_summary">Enter the (base) folder to upload your artefacts into</string>
<string name="pref_upload_folder_default">MobileUploads</string>
<string name="pref_upload_view_key">upload.view</string>
<string name="pref_upload_view_title">Create Public View</string>
<string name="pref_upload_view_summary">Automatically create a public view for this folder?</string>
<string name="pref_menu_reset">Reset</string>
<string name="pref_menu_about">About</string>
......
......@@ -7,12 +7,11 @@
android:key="@string/pref_upload_url_key"
android:title="@string/pref_upload_url_title"
android:summary="@string/pref_upload_url_summary"
android:defaultValue="http://www.mahara.org/artefact/file/mobileupload.php" />
android:defaultValue="@string/pref_upload_url_default" />
<EditTextPreference
android:key="@string/pref_upload_token_key"
android:title="@string/pref_upload_token_title"
android:summary="@string/pref_upload_token_summary" />
<PreferenceCategory
android:title="@string/prefcat_advanced">
......@@ -21,8 +20,13 @@
android:key="@string/pref_upload_folder_key"
android:title="@string/pref_upload_folder_title"
android:summary="@string/pref_upload_folder_summary"
android:defaultValue="Home" />
android:defaultValue="@string/pref_upload_folder_default" />
<CheckBoxPreference
android:key="@string/pref_upload_view_key"
android:title="@string/pref_upload_view_title"
android:summary="@string/pref_upload_view_summary"
android:enabled="false"
/>
</PreferenceCategory>
......
......@@ -91,8 +91,10 @@ public class EditPreferences extends PreferenceActivity implements OnSharedPrefe
public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String key) {
// refresh displayed values by restarting activity (a hack, but apparently there
// isn't a nicer way)
finish();
//startActivity(getIntent());
if ( key == getString(R.string.pref_upload_token_key)) {
finish();
//startActivity(getIntent());
}
}
private void showAboutPage() {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment