commit 5d0fec0d92ef668d74f2befe134b6360f859c27e
parent 228e088ad9dfbfd4d1f9c6a502026035b1d374e5
Author: Jan Dankert <devnull@localhost>
Date: Sun, 5 Feb 2012 00:51:52 +0100
Menüs erweitert.
Diffstat:
8 files changed, 105 insertions(+), 14 deletions(-)
diff --git a/res/menu/forum.xml b/res/menu/forum.xml
@@ -1,15 +1,31 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/menu_mailbox" android:title="@string/mailbox"
- android:icon="@android:drawable/ic_menu_send"></item>
+
<item android:id="@+id/menu_create_topic" android:title="@string/new_topic"
android:icon="@android:drawable/ic_menu_edit"></item>
- <item android:id="@+id/menu_participated_topics" android:title="@string/participated_topics"
- android:icon="@android:drawable/ic_menu_view"></item>
- <item android:id="@+id/menu_latest_topics" android:title="@string/latest_topics"
- android:icon="@android:drawable/ic_menu_today"></item>
- <item android:id="@+id/menu_unread_topics" android:title="@string/unread_topics"
- android:icon="@android:drawable/ic_menu_info_details"></item>
- <item android:id="@+id/menu_logout" android:title="@string/logout"
- android:icon="@android:drawable/ic_lock_lock"></item>
+
+ <item android:id="@+id/menu_search" android:title="@string/search"
+ android:icon="@android:drawable/ic_menu_search"></item>
+
+ <item android:id="@+id/menu_mailbox" android:title="@string/mailbox"
+ android:icon="@android:drawable/ic_menu_send"></item>
+
+ <item android:id="@+id/menu_subscribed_forums" android:title="@string/subscription_forums"
+ android:icon="@android:drawable/ic_input_get"></item>
+ <item android:id="@+id/menu_subscribed_topics" android:title="@string/subscription_topics"
+ android:icon="@android:drawable/ic_input_get"></item>
+
+ <item android:title="@string/more" android:icon="@android:drawable/ic_menu_share">
+ <menu>
+ <item android:id="@+id/menu_participated_topics" android:title="@string/participated_topics"
+ android:icon="@android:drawable/ic_menu_view"></item>
+ <item android:id="@+id/menu_latest_topics" android:title="@string/latest_topics"
+ android:icon="@android:drawable/ic_menu_today"></item>
+ <item android:id="@+id/menu_unread_topics" android:title="@string/unread_topics"
+ android:icon="@android:drawable/ic_menu_info_details"></item>
+
+ <item android:id="@+id/menu_logout" android:title="@string/logout"
+ android:icon="@android:drawable/ic_lock_lock"></item>
+ </menu>
+ </item>
</menu>
\ No newline at end of file
diff --git a/res/menu/forum_guest.xml b/res/menu/forum_guest.xml
@@ -1,5 +1,9 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/menu_login" android:title="@string/login"
android:icon="@android:drawable/ic_lock_lock"></item>
+
+
+ <item android:id="@+id/menu_search" android:title="@string/search"
+ android:icon="@android:drawable/ic_menu_search"></item>
</menu>
\ No newline at end of file
diff --git a/res/menu/forumoverview.xml b/res/menu/forumoverview.xml
@@ -0,0 +1,30 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:id="@+id/menu_mailbox" android:title="@string/mailbox"
+ android:icon="@android:drawable/ic_menu_send"></item>
+
+ <item android:id="@+id/menu_search" android:title="@string/search"
+ android:icon="@android:drawable/ic_menu_search"></item>
+
+ <item android:id="@+id/menu_participated_topics" android:title="@string/participated_topics"
+ android:icon="@android:drawable/ic_menu_view"></item>
+
+ <item android:id="@+id/menu_latest_topics" android:title="@string/latest_topics"
+ android:icon="@android:drawable/ic_menu_today"></item>
+ <item android:id="@+id/menu_unread_topics" android:title="@string/unread_topics"
+ android:icon="@android:drawable/ic_menu_info_details"></item>
+
+ <!--
+ Android zeigt nur max. 6 Menüpunkte an: Die nächsten Menüpunkte werden
+ in einem Submenü angezeigt.
+ -->
+
+ <item android:id="@+id/menu_subscribed_forums" android:title="@string/subscription_forums"
+ android:icon="@android:drawable/ic_input_get"></item>
+ <item android:id="@+id/menu_subscribed_topics" android:title="@string/subscription_topics"
+ android:icon="@android:drawable/ic_input_get"></item>
+
+ <item android:id="@+id/menu_logout" android:title="@string/logout"
+ android:icon="@android:drawable/ic_lock_lock"></item>
+</menu>
+ +
\ No newline at end of file
diff --git a/res/menu/main.xml b/res/menu/main.xml
@@ -1,11 +1,14 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android">
- <item android:id="@+id/menu_preferences" android:title="@string/preferences"
- android:icon="@android:drawable/ic_menu_preferences"></item>
-
+ <item android:id="@+id/menu_mailbox" android:title="@string/mailbox"
+ android:icon="@android:drawable/ic_menu_send"></item>
+
<item android:id="@+id/menu_photo" android:title="@string/photos"
android:icon="@android:drawable/ic_menu_gallery"></item>
+ <item android:id="@+id/menu_preferences" android:title="@string/preferences"
+ android:icon="@android:drawable/ic_menu_preferences"></item>
+
<item android:id="@+id/menu_links" android:title="@string/links"
android:icon="@android:drawable/ic_menu_info_details">
<menu>
diff --git a/res/menu/topic.xml b/res/menu/topic.xml
@@ -0,0 +1,10 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:id="@+id/menu_reply" android:title="@string/reply"
+ android:icon="@android:drawable/ic_menu_gallery"></item>
+
+ <item android:id="@+id/menu_mark_read" android:title="@string/mark_topic_read"
+ android:icon="@android:drawable/ic_menu_agenda"></item>
+
+</menu>
+ +
\ No newline at end of file
diff --git a/res/values/strings.xml b/res/values/strings.xml
@@ -1,9 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <string name="more">Mehr</string>
<string name="sub_only">Forum enthält keine Themen</string>
<string name="app_name">IBC</string>
<string name="search_for_topics">Suche nach Themen</string>
+ <string name="search">Suche</string>
<string name="preferences">Einstellungen</string>
<string name="username">Benutzername</string>
<string name="path">Pfad</string>
@@ -136,6 +138,14 @@
<string name="subscription_service_desc">Informiert bei ungelesenen, abonnierten Foren oder Themen</string>
<string name="subscription_forums">Abbonierte Foren</string>
<string name="subscription_topics">Abbonierte Themen</string>
+
+ <string name="mark_all_forum_read">Alle Foren als gelesen markieren</string>
+ <string name="mark_forum_read">Forum als gelesen markieren</string>
+ <string name="mark_topic_read">Thema als gelesen markieren</string>
+ <string name="mark_unread">Als ungelesen markieren</string>
+ <string name="subscribe_forum">Forum abbonieren</string>
+ <string name="subscribe_topic">Thema abbonieren</string>
+
<string name="interval">Intervall</string>
<string-array name="interval_list">
<item>1</item>
diff --git a/src/de/mtbnews/android/ForumOverviewActivity.java b/src/de/mtbnews/android/ForumOverviewActivity.java
@@ -9,6 +9,7 @@ import java.util.List;
import java.util.Map;
import android.app.ExpandableListActivity;
+import android.app.SearchManager;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
@@ -219,7 +220,7 @@ public class ForumOverviewActivity extends ExpandableListActivity
.getTapatalkClient();
if (client.loggedIn)
- mi.inflate(R.menu.forum, menu);
+ mi.inflate(R.menu.forumoverview, menu);
else
mi.inflate(R.menu.forum_guest, menu);
@@ -244,6 +245,18 @@ public class ForumOverviewActivity extends ExpandableListActivity
case R.id.menu_mailbox:
startActivity(new Intent(this, MailboxActivity.class));
return true;
+
+ case R.id.menu_search:
+ onSearchRequested();
+ return true;
+
+ case R.id.menu_subscribed_forums:
+ startActivity(new Intent(this, SubscriptionForenActivity.class));
+ return true;
+
+ case R.id.menu_subscribed_topics:
+ startActivity(new Intent(this, SubscriptionTopicsActivity.class));
+ return true;
case R.id.menu_participated_topics:
Intent intent = new Intent(this, SearchActivity.class);
diff --git a/src/de/mtbnews/android/IBCActivity.java b/src/de/mtbnews/android/IBCActivity.java
@@ -173,6 +173,9 @@ public class IBCActivity extends ListActivity
case R.id.menu_photo:
startActivity(new Intent(IBCActivity.this, PhotoActivity.class));
return true;
+ case R.id.menu_mailbox:
+ startActivity(new Intent(IBCActivity.this, MailboxActivity.class));
+ return true;
case R.id.www_bikemarkt:
startActivity(new Intent(Intent.ACTION_VIEW, Uri