Fixed tablet layout reloading.

captchafix
Florens Douwes 11 years ago
parent 44e416b0ba
commit ed1481f2c2
  1. 36
      Chan/res/menu/base.xml
  2. 2
      Chan/res/values/strings.xml
  3. 20
      Chan/src/org/floens/chan/activity/BoardActivity.java

@ -1,11 +1,27 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/action_reload"
android:id="@+id/action_reload_tablet"
android:icon="@drawable/ic_action_refresh"
android:orderInCategory="1"
android:showAsAction="always"
android:title="@string/action_reload" />
android:title="@string/action_reload" >
<menu>
<item
android:id="@+id/action_reload_tablet_board"
android:title="@string/action_reload_board" />
<item
android:id="@+id/action_reload_tablet_thread"
android:title="@string/action_reload_thread" />
</menu>
</item>
<item
android:id="@+id/action_reload_board"
android:icon="@drawable/ic_action_refresh"
android:orderInCategory="1"
android:showAsAction="always"
android:title="@string/action_reload_board" />
<item
android:id="@+id/action_pin"
@ -38,17 +54,23 @@
</item>
<item
android:id="@+id/action_reload_thread"
android:icon="@drawable/ic_action_refresh"
android:orderInCategory="5"
android:showAsAction="never"
android:title="@string/action_reload_thread" />
<item
android:id="@+id/action_share"
android:orderInCategory="5"
android:id="@+id/action_share"
android:orderInCategory="6"
android:showAsAction="never"
android:title="@string/action_share"
android:actionProviderClass="android.widget.ShareActionProvider" />
android:title="@string/action_share"
android:actionProviderClass="android.widget.ShareActionProvider" />
<item
android:id="@+id/action_open_browser"
android:orderInCategory="6"
android:orderInCategory="7"
android:showAsAction="never"
android:title="@string/action_open_browser" />

@ -10,6 +10,8 @@
<string name="action_settings">Settings</string>
<string name="action_reload">Reload</string>
<string name="action_reload_board">Reload board</string>
<string name="action_reload_thread">Reload thread</string>
<string name="action_pin">Pin</string>
<string name="action_reply">Reply</string>
<string name="action_reply_board">Reply to board</string>

@ -141,6 +141,7 @@ public class BoardActivity extends BaseActivity implements ActionBar.OnNavigatio
public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig);
pinDrawerListener.onConfigurationChanged(newConfig);
updateActionBarState();
}
@Override
@ -202,12 +203,16 @@ public class BoardActivity extends BaseActivity implements ActionBar.OnNavigatio
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
boolean open = threadPane.isOpen();
boolean slidable = threadPane.isSlideable();
setMenuItemEnabled(menu.findItem(R.id.action_reload_board), slidable && open);
setMenuItemEnabled(menu.findItem(R.id.action_reload_thread), slidable && !open);
setMenuItemEnabled(menu.findItem(R.id.action_reload_tablet), !slidable);
setMenuItemEnabled(menu.findItem(R.id.action_reload), !threadPane.isSlideable() || open);
setMenuItemEnabled(menu.findItem(R.id.action_pin), !threadPane.isSlideable() || !open);
setMenuItemEnabled(menu.findItem(R.id.action_pin), !slidable || !open);
setMenuItemEnabled(menu.findItem(R.id.action_reply), threadPane.isSlideable());
setMenuItemEnabled(menu.findItem(R.id.action_reply_tablet), !threadPane.isSlideable());
setMenuItemEnabled(menu.findItem(R.id.action_reply), slidable);
setMenuItemEnabled(menu.findItem(R.id.action_reply_tablet), !slidable);
return super.onPrepareOptionsMenu(menu);
}
@ -226,9 +231,14 @@ public class BoardActivity extends BaseActivity implements ActionBar.OnNavigatio
}
switch(item.getItemId()) {
case R.id.action_reload:
case R.id.action_reload_board:
case R.id.action_reload_tablet_board:
boardFragment.reload();
return true;
case R.id.action_reload_thread:
case R.id.action_reload_tablet_thread:
threadFragment.reload();
return true;
case R.id.action_reply:
if (threadPane.isOpen()) {
boardFragment.openReply();

Loading…
Cancel
Save