commit 5b7b6827c80bcbe0f8a6f438ab21b1f4f2482adc
parent b7b533a852ee2c80db70308b5d503f7c380c7d70
Author: Jan Dankert <devnull@localhost>
Date: Wed, 10 Oct 2012 23:57:14 +0200
Menüpunkt \"Einstellungen\" auch für andere Activitys.
Diffstat:
8 files changed, 59 insertions(+), 32 deletions(-)
diff --git a/res/menu/forum.xml b/res/menu/forum.xml
@@ -8,20 +8,20 @@
<item android:id="@+id/menu_subscribe" android:title="@string/subscribe_forum"
android:icon="@android:drawable/ic_input_get"></item>
-
+
<item android:id="@+id/menu_mode" android:title="@string/mode"
android:icon="@android:drawable/ic_menu_share"></item>
-
+
<item android:id="@+id/menu_mark_read" android:title="@string/mark_forum_read"
android:icon="@android:drawable/ic_menu_agenda"></item>
-
+
<item android:id="@+id/menu_mark_all_read" android:title="@string/mark_all_forum_read"
android:icon="@android:drawable/ic_menu_agenda"></item>
-<!--
-
- <item android:id="@+id/menu_mailbox" android:title="@string/mailbox"
+ <!--
+
+ <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>
@@ -39,6 +39,10 @@
<item android:id="@+id/menu_logout" android:title="@string/logout"
android:icon="@android:drawable/ic_lock_lock"></item>
+
+ <item android:id="@+id/menu_preferences" android:title="@string/preferences"
+ android:icon="@android:drawable/ic_menu_preferences"></item>
+
</menu>
</item>
</menu>
diff --git a/res/menu/forum_guest.xml b/res/menu/forum_guest.xml
@@ -7,5 +7,9 @@
<item android:id="@+id/menu_search" android:title="@string/search"
android:icon="@android:drawable/ic_menu_search"></item>
+
+ <item android:id="@+id/menu_preferences" android:title="@string/preferences"
+ android:icon="@android:drawable/ic_menu_preferences"></item>
+
</menu>
\ No newline at end of file
diff --git a/res/menu/forumoverview.xml b/res/menu/forumoverview.xml
@@ -26,5 +26,9 @@
<item android:id="@+id/menu_logout" android:title="@string/logout"
android:icon="@android:drawable/ic_lock_lock"></item>
+
+ <item android:id="@+id/menu_preferences" android:title="@string/preferences"
+ android:icon="@android:drawable/ic_menu_preferences"></item>
+
</menu>
\ No newline at end of file
diff --git a/res/menu/topic.xml b/res/menu/topic.xml
@@ -1,16 +1,20 @@
<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_subscribe" android:title="@string/subscribe_topic"
android:icon="@android:drawable/ic_input_get"></item>
- <item android:id="@+id/menu_reply" android:title="@string/reply"
- android:icon="@android:drawable/ic_menu_gallery"></item>
-
<item android:id="@+id/menu_top" android:title="@string/goto_top"
android:icon="@android:drawable/ic_menu_directions"></item>
-
+
<item android:id="@+id/menu_bottom" android:title="@string/goto_bottom"
android:icon="@android:drawable/ic_menu_directions"></item>
+
+ <item android:id="@+id/menu_preferences" android:title="@string/preferences"
+ android:icon="@android:drawable/ic_menu_preferences"></item>
+
<!--
Erst ab Tapatalk-API-Version 4 <item android:id="@+id/menu_mark_read"
android:title="@string/mark_topic_read"
diff --git a/src/de/mtbnews/android/ForumActivity.java b/src/de/mtbnews/android/ForumActivity.java
@@ -64,7 +64,7 @@ public class ForumActivity extends EndlessListActivity<Topic>
protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
-
+
setTheme(((IBCApplication) getApplication()).themeResId);
setContentView(R.layout.listing);
@@ -224,6 +224,10 @@ public class ForumActivity extends EndlessListActivity<Topic>
{
switch (item.getItemId())
{
+ case R.id.menu_preferences:
+ startActivity(new Intent(this, Configuration.class));
+ return true;
+
case R.id.menu_mailbox:
startActivity(new Intent(this, MailboxActivity.class));
return true;
diff --git a/src/de/mtbnews/android/ForumOverviewActivity.java b/src/de/mtbnews/android/ForumOverviewActivity.java
@@ -45,7 +45,7 @@ public class ForumOverviewActivity extends ExpandableListActivity
protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
-
+
setTheme(((IBCApplication) getApplication()).themeResId);
setContentView(R.layout.exp_listing);
@@ -108,7 +108,7 @@ public class ForumOverviewActivity extends ExpandableListActivity
forumList = client.getAllForum();
((IBCApplication) getApplication()).setForumList(forumList);
-
+
unterforenFlachkloppen();
}
}
@@ -284,6 +284,10 @@ public class ForumOverviewActivity extends ExpandableListActivity
loadForum();
return true;
+ case R.id.menu_preferences:
+ startActivity(new Intent(this, Configuration.class));
+ return true;
+
case R.id.menu_login:
if (TextUtils.isEmpty(prefs.getString("username", "")))
diff --git a/src/de/mtbnews/android/SubscriptionForenActivity.java b/src/de/mtbnews/android/SubscriptionForenActivity.java
@@ -162,6 +162,10 @@ public class SubscriptionForenActivity extends ListActivity
{
switch (item.getItemId())
{
+ case R.id.menu_preferences:
+ startActivity(new Intent(this, Configuration.class));
+ return true;
+
case R.id.menu_mailbox:
startActivity(new Intent(this, MailboxActivity.class));
return true;
diff --git a/src/de/mtbnews/android/TopicActivity.java b/src/de/mtbnews/android/TopicActivity.java
@@ -46,10 +46,10 @@ public class TopicActivity extends EndlessListActivity<Post>
protected void onCreate(Bundle savedInstanceState)
{
super.onCreate(savedInstanceState);
-
+
setTheme(((IBCApplication) getApplication()).themeResId);
setContentView(R.layout.listing);
-
+
client = ((IBCApplication) getApplication()).getTapatalkClient();
topicId = TopicActivity.this.getIntent().getStringExtra(TOPIC_ID);
@@ -64,22 +64,17 @@ public class TopicActivity extends EndlessListActivity<Post>
final ListView list = getListView();
/*
- list.setOnItemClickListener(new OnItemClickListener()
- {
- @Override
- public void onItemClick(AdapterView<?> parent, View view,
- int position, long id)
- {
- int aktPosition = displayFrom + position + 1;
- Toast.makeText(TopicActivity.this, "" + aktPosition,
- Toast.LENGTH_SHORT).show();
-
- // final Intent intent = new Intent(TopicActivity.this,
- // PostActivity.class);
- // intent.putExtra("itemid", position);
- // startActivity(intent);
- }
- });*/
+ * list.setOnItemClickListener(new OnItemClickListener() {
+ *
+ * @Override public void onItemClick(AdapterView<?> parent, View view,
+ * int position, long id) { int aktPosition = displayFrom + position +
+ * 1; Toast.makeText(TopicActivity.this, "" + aktPosition,
+ * Toast.LENGTH_SHORT).show();
+ *
+ * // final Intent intent = new Intent(TopicActivity.this, //
+ * PostActivity.class); // intent.putExtra("itemid", position); //
+ * startActivity(intent); } });
+ */
}
@Override
@@ -136,6 +131,10 @@ public class TopicActivity extends EndlessListActivity<Post>
{
switch (item.getItemId())
{
+ case R.id.menu_preferences:
+ startActivity(new Intent(this, Configuration.class));
+ return true;
+
case R.id.menu_top:
getListView().setOnScrollListener(null);
