commit ca2e7213c9ed8d61eab151476910a111285feea0
parent 59d65c7a730aa2f974b96d504f1bd2d43c3d1b85
Author: dankert <devnull@localhost>
Date: Sun, 16 Oct 2011 23:39:04 +0200
Weitere Activitys für \"Eigenschaften\", \"Editor\" und \"Neu\" angelegt.
Diffstat:
13 files changed, 222 insertions(+), 42 deletions(-)
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -4,24 +4,25 @@
android:versionName="1.0">
<application android:icon="@drawable/logo" android:label="@string/app_name">
- <activity android:name=".OpenRatBlog" android:label="@string/app_name">
+ <activity android:name=".OpenRatBlog" android:label="@string/connect">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
- <activity android:name="Configuration"></activity>
+ <activity android:name="Configuration" android:label="@string/preferences"></activity>
+ <activity android:name="ProjectActivity" android:label="@string/project_list"></activity>
+ <activity android:name="FolderActivity" android:label="@string/folder_content"></activity>
+ <activity android:name="PageElementsActivity" android:label="@string/page_content"></activity>
+ <activity android:name="PropertiesActivity" android:label="@string/folder_properties"></activity>
+ <activity android:name="NewActivity" android:label="@string/new1"></activity>
+ <activity android:name="EditorActivity" android:label="@string/editor"></activity>
- <activity android:name="ProjectActivity"></activity>
- <activity android:name="FolderActivity"></activity>
- <activity android:name="PageElementsActivity"></activity>
- <activity android:name="PropertiesActivity"></activity>
+ <service android:name=".service.PublishIntentService"></service>
+ <service android:name=".service.UploadIntentService"></service>
+ </application>
- <service android:name=".service.PublishIntentService"></service>
-<service android:name=".service.UploadIntentService"></service>
-</application>
-
<uses-permission android:name="android.permission.INTERNET" />
<!-- Android 1.6 -->
diff --git a/res/layout/editor.xml b/res/layout/editor.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+</LinearLayout>
diff --git a/res/layout/listing_pageelement.xml b/res/layout/listing_pageelement.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="fill_parent"
+ android:layout_height="fill_parent" android:padding="5sp">
+
+ <TextView android:text="Name" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:id="@+id/name"
+ android:textSize="14sp"></TextView>
+
+</LinearLayout>
diff --git a/res/layout/new1.xml b/res/layout/new1.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+
+ <TableLayout android:id="@+id/TableLayout01"
+ android:layout_width="wrap_content" android:layout_height="wrap_content">
+ <TableRow>
+ <TextView android:text="@string/name" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:textSize="14sp"></TextView>
+ <EditText android:text="@+id/EditText01" android:id="@+id/EditText01"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"></EditText>
+ </TableRow>
+ <TableRow android:id="@+id/template">
+ <TextView android:text="@string/template"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"></TextView>
+ <RadioGroup android:id="@+id/RadioGroupTemplates"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:orientation="vertical"></RadioGroup>
+ </TableRow>
+ </TableLayout>
+
+ <Button android:id="@+id/button_save" android:text="@string/save"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+</LinearLayout>
diff --git a/res/layout/properties.xml b/res/layout/properties.xml
@@ -1,6 +1,25 @@
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:orientation="vertical">
+
+ <TableLayout android:layout_width="wrap_content"
+ android:layout_height="wrap_content">
+
+ <TableRow>
+ <TextView android:text="@string/name" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ <EditText android:id="@+id/name" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </TableRow>
+ <TableRow>
+ <TextView android:text="@string/filename"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
+ <EditText android:id="@+id/filename" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+ </TableRow>
+ </TableLayout>
+
+ <Button android:id="@+id/button_save" android:text="@string/save"
+ android:layout_width="wrap_content" android:layout_height="wrap_content" />
</LinearLayout>
diff --git a/res/menu/folder.xml b/res/menu/folder.xml
@@ -1,8 +1,25 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/menu_language" android:title="@string/language" android:icon="@android:drawable/ic_menu_mapmode"></item>
- <item android:id="@+id/menu_model" android:title="@string/model" android:icon="@android:drawable/ic_menu_set_as"></item>
- <item android:id="@+id/menu_new" android:title="@string/new1" android:icon="@android:drawable/ic_menu_add"></item>
- <item android:id="@+id/menu_upload" android:title="@string/upload" android:icon="@android:drawable/ic_menu_save"></item>
- <item android:id="@+id/menu_upload_image" android:title="@string/upload_image" android:icon="@android:drawable/ic_menu_gallery"></item>
+ <item android:id="@+id/menu_language" android:title="@string/language"
+ android:icon="@android:drawable/ic_menu_mapmode"></item>
+ <item android:id="@+id/menu_model" android:title="@string/model"
+ android:icon="@android:drawable/ic_menu_set_as"></item>
+ <item android:id="@+id/menu_new" android:title="@string/new1"
+ android:icon="@android:drawable/ic_menu_add">
+ <menu>
+ <item android:id="@+id/menu_newpage" android:title="@string/new_page"
+ android:icon="@android:drawable/ic_menu_add" />
+ <item android:id="@+id/menu_newfolder" android:title="@string/new_folder"
+ android:icon="@android:drawable/ic_menu_add" />
+ </menu>
+ </item>
+
+ <item android:title="@string/upload" android:icon="@android:drawable/ic_menu_upload">
+ <menu>
+ <item android:id="@+id/menu_upload" android:title="@string/upload_file"
+ android:icon="@android:drawable/ic_menu_save"></item>
+ <item android:id="@+id/menu_upload_image" android:title="@string/upload_image"
+ android:icon="@android:drawable/ic_menu_gallery"></item>
+ </menu>
+ </item>
</menu>
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -32,11 +32,23 @@
<string name="language">Sprache</string>
<string name="model">Variante</string>
<string name="new1">Neu</string>
- <string name="upload">Datei hochladen</string>
+ <string name="new_folder">Neuer Unterordner</string>
+ <string name="new_page">Neue Seite</string>
+ <string name="upload">Hochladen</string>
+ <string name="upload_file">Datei hochladen</string>
<string name="upload_image">Bild hochladen</string>
<string name="upload_ok">Hochladevorgang abgeschlossen</string>
<string name="upload_fail">Hochladevorgang fehlerhaft</string>
<string name="publish_ok">Wurde veröffentlicht</string>
<string name="publish_fail">Veröffentlichung nicht erfolgreich</string>
<string name="delete">Löschen</string>
+ <string name="name">Name</string>
+ <string name="filename">Dateiname</string>
+ <string name="template">Vorlage</string>
+ <string name="save">Speichern</string>
+ <string name="project_list">Projetliste</string>
+ <string name="folder_content">Ordnerinhalt</string>
+ <string name="folder_properties">Eigenschaften</string>
+ <string name="page_content">Seiteninhalt</string>
+ <string name="editor">Inhalt bearbeiten</string>
</resources>
diff --git a/src/de/openrat/android/blog/EditorActivity.java b/src/de/openrat/android/blog/EditorActivity.java
@@ -1,6 +1,15 @@
package de.openrat.android.blog;
-public class EditorActivity
+import android.app.Activity;
+import android.os.Bundle;
+
+public class EditorActivity extends Activity
{
+ @Override
+ protected void onCreate(Bundle savedInstanceState)
+ {
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.editor);
+ }
}
diff --git a/src/de/openrat/android/blog/FolderActivity.java b/src/de/openrat/android/blog/FolderActivity.java
@@ -5,6 +5,7 @@ package de.openrat.android.blog;
import java.io.File;
import java.io.IOException;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
@@ -67,14 +68,9 @@ public class FolderActivity extends ListActivity
protected void onCreate(Bundle savedInstanceState)
{
setContentView(R.layout.listing);
- setTitle(R.string.connect);
super.onCreate(savedInstanceState);
- int[] to = new int[] { R.id.listentry_name, R.id.listentry_description };
- ;
- String[] from = new String[] { NAME, DESCRIPTION };
- ;
data = new ArrayList<FolderEntry>();
request = (CMSRequest) getIntent().getSerializableExtra(CLIENT);
@@ -369,14 +365,18 @@ public class FolderActivity extends ListActivity
.getMenuInfo();
entry = data.get(menuInfo.position);
- final Intent publishIntent = new Intent(this,PublishIntentService.class);
+ final Intent publishIntent = new Intent(this,
+ PublishIntentService.class);
- publishIntent.putExtra(PublishIntentService.EXTRA_REQUEST,request);
- publishIntent.putExtra(PublishIntentService.EXTRA_TYPE,entry.type.name().toLowerCase());
- publishIntent.putExtra(PublishIntentService.EXTRA_NAME,entry.name);
- publishIntent.putExtra(PublishIntentService.EXTRA_ID,entry.id);
+ publishIntent.putExtra(PublishIntentService.EXTRA_REQUEST,
+ request);
+ publishIntent.putExtra(PublishIntentService.EXTRA_TYPE,
+ entry.type.name().toLowerCase());
+ publishIntent.putExtra(PublishIntentService.EXTRA_NAME,
+ entry.name);
+ publishIntent.putExtra(PublishIntentService.EXTRA_ID, entry.id);
startService(publishIntent);
-
+
Toast.makeText(this, R.string.publish, Toast.LENGTH_SHORT);
return true;
@@ -447,14 +447,22 @@ public class FolderActivity extends ListActivity
return true;
case R.id.menu_upload_image:
- // Intent chooseFile;
- // Intent intent;
chooseFile = new Intent(Intent.ACTION_GET_CONTENT);
chooseFile.setType("image/*");
intent = Intent.createChooser(chooseFile, "Choose an image");
startActivityForResult(intent, ACTIVITY_CHOOSE_IMAGE);
return true;
+ case R.id.menu_newfolder:
+ case R.id.menu_newpage:
+
+ intent = new Intent(this, NewActivity.class);
+ intent.putExtra("request", getIntent().getSerializableExtra(
+ "request"));
+ intent.putExtra("menuid", item.getItemId());
+ startActivity(intent);
+ return true;
+
default:
Toast.makeText(this, "??: " + item.getItemId(),
Toast.LENGTH_SHORT);
@@ -487,8 +495,8 @@ public class FolderActivity extends ListActivity
filePath = uri.getPath();
}
- final Intent uploadIntent = new Intent(FolderActivity.this,
- UploadIntentService.class);
+ final Intent uploadIntent = new Intent(
+ FolderActivity.this, UploadIntentService.class);
uploadIntent.putExtra(
UploadIntentService.EXTRA_FILENAME, filePath);
uploadIntent.putExtra(
diff --git a/src/de/openrat/android/blog/NewActivity.java b/src/de/openrat/android/blog/NewActivity.java
@@ -1,6 +1,36 @@
package de.openrat.android.blog;
-public class NewActivity
+import android.app.Activity;
+import android.os.Bundle;
+import android.widget.RadioButton;
+import android.widget.RadioGroup;
+import de.openrat.client.CMSRequest;
+
+public class NewActivity extends Activity
{
+ private CMSRequest request;
+ private int menuid;
+
+ /**
+ * {@inheritDoc}
+ *
+ * @see android.app.Activity#onCreate(android.os.Bundle)
+ */
+ @Override
+ protected void onCreate(Bundle savedInstanceState)
+ {
+ super.onCreate(savedInstanceState);
+ request = (CMSRequest) getIntent().getSerializableExtra("request");
+ menuid = getIntent().getIntExtra("menuid", 0);
+
+ setContentView(R.layout.new1);
+
+ final RadioGroup radioGroupTemplates = (RadioGroup) findViewById(R.id.RadioGroupTemplates);
+ radioGroupTemplates.setEnabled(menuid == R.id.menu_newpage);
+
+ RadioButton radioButton = new RadioButton(this);
+ radioButton.setText("test");
+ radioGroupTemplates.addView(radioButton);
+ }
}
diff --git a/src/de/openrat/android/blog/PageElementsActivity.java b/src/de/openrat/android/blog/PageElementsActivity.java
@@ -3,14 +3,36 @@
*/
package de.openrat.android.blog;
-import android.app.Activity;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+import android.app.ListActivity;
+import android.os.Bundle;
+import android.widget.SimpleAdapter;
/**
* @author dankert
- *
+ *
*/
-public class PageElementsActivity extends Activity
+public class PageElementsActivity extends ListActivity
{
+ private static final String NAME = "name";
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState)
+ {
+ // TODO Auto-generated method stub
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.listing);
+
+ int[] to = new int[] { R.id.name };
+ String[] from = new String[] { NAME };
+
+ ArrayList<Map<String,?>> list = new ArrayList<Map<String,?>>();
+ new SimpleAdapter(this,list,R.layout.listing_pageelement, from, to);
+
+ }
-
}
diff --git a/src/de/openrat/android/blog/ProjectActivity.java b/src/de/openrat/android/blog/ProjectActivity.java
@@ -41,7 +41,6 @@ public class ProjectActivity extends ListActivity
protected void onCreate(Bundle savedInstanceState)
{
setContentView(R.layout.listing);
- setTitle(R.string.connect);
super.onCreate(savedInstanceState);
diff --git a/src/de/openrat/android/blog/PropertiesActivity.java b/src/de/openrat/android/blog/PropertiesActivity.java
@@ -1,8 +1,29 @@
package de.openrat.android.blog;
import android.app.Activity;
+import android.os.Bundle;
+import android.view.View;
+import android.view.View.OnClickListener;
public class PropertiesActivity extends Activity
{
+ @Override
+ protected void onCreate(Bundle savedInstanceState)
+ {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.properties);
+
+ findViewById(R.id.button_save).setOnClickListener(new OnClickListener()
+ {
+
+ @Override
+ public void onClick(View v)
+ {
+
+ }
+ });
+
+ }
}
