Miroirs/xwords
1
0
Fork 0
mirror of git://xwords.git.sourceforge.net/gitroot/xwords/xwords synced 2025-02-12 08:47:50 +01:00
Code Issues Projects Releases Packages Wiki Activity

remove zoom button and menu

Browse source 
Everybody has multi-touch phones now.
This commit is contained in:
Eric House 2016-08-15 16:13:01 -07:00
parent ab24140813
commit d15eab013d
12 changed files with 846 additions and 900 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1700
xwords4/android/XWords4/archive/R.java
View file

File diff suppressed because it is too large Load diff

BIN
xwords4/android/XWords4/res/drawable/zoom.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 16 KiB

4
xwords4/android/XWords4/res/layout/toolbar.xml
View file

@ -38,8 +38,4 @@
style="@style/toolbar_button" style="@style/toolbar_button"
android:src="@drawable/flip" android:src="@drawable/flip"
/> />
<ImageButton android:id="@+id/zoom_button"
style="@style/toolbar_button"
android:src="@drawable/zoom"
/>
</LinearLayout> </LinearLayout>

3
xwords4/android/XWords4/res/menu-small/board_menu.xml
View file

@ -56,9 +56,6 @@
android:title="@string/board_menu_undo_last" android:title="@string/board_menu_undo_last"
/> />
<item android:id="@+id/board_menu_zoom"
android:title="@string/menu_zoom"
/>
<item android:id="@+id/board_menu_chat" <item android:id="@+id/board_menu_chat"
android:title="@string/menu_chat" android:title="@string/menu_chat"
/> />

1
xwords4/android/XWords4/res/values/common_rsrc.xml
View file

@ -99,7 +99,6 @@
<string name="key_notagain_hintnext">key_notagain_hintnext</string> <string name="key_notagain_hintnext">key_notagain_hintnext</string>
<string name="key_notagain_juggle">key_notagain_juggle</string> <string name="key_notagain_juggle">key_notagain_juggle</string>
<string name="key_notagain_flip">key_notagain_flip</string> <string name="key_notagain_flip">key_notagain_flip</string>
<string name="key_notagain_zoom">key_notagain_zoom</string>
<string name="key_notagain_undo">key_notagain_undo</string> <string name="key_notagain_undo">key_notagain_undo</string>
<string name="key_notagain_done">key_notagain_done</string> <string name="key_notagain_done">key_notagain_done</string>
<string name="key_notagain_unlock">key_notagain_unlock</string> <string name="key_notagain_unlock">key_notagain_unlock</string>

5
xwords4/android/XWords4/res/values/strings.xml
View file

@ -1638,11 +1638,6 @@
Board screen --> Board screen -->
<string name="not_again_flip">This button flips the board across a <string name="not_again_flip">This button flips the board across a
diagonal axis.</string> diagonal axis.</string>
<!-- Shown when you tap the zoom (+/-) button on the toolbar of
the main Board screen -->
<string name="not_again_zoom">This button toggles the board
between zoomed and regular size. Drag it when it is zoomed to
see parts that are hidden.</string>
<!-- Shown when you tap the undo/redo button on the toolbar of the <!-- Shown when you tap the undo/redo button on the toolbar of the
main Board screen --> main Board screen -->
<string name="not_again_undo">This button undos or redoes the <string name="not_again_undo">This button undos or redoes the

5
xwords4/android/XWords4/res_src/values-ba_CK/strings.xml
View file

@ -1405,11 +1405,6 @@
Board screen --> Board screen -->
<string name="not_again_flip">Siht nottub spilf eht draob ssorca a <string name="not_again_flip">Siht nottub spilf eht draob ssorca a
lanogaid sixa.</string> lanogaid sixa.</string>
<!-- Shown when you tap the zoom (+/-) button on the toolbar of
the main Board screen -->
<string name="not_again_zoom">Siht nottub selggot eht draob
neewteb demooz dna raluger ezis. Gard ti nehw ti si demooz ot
ees strap taht era neddih.</string>
<!-- Shown when you tap the undo/redo button on the toolbar of the <!-- Shown when you tap the undo/redo button on the toolbar of the
main Board screen --> main Board screen -->
<string name="not_again_undo">Siht nottub sodnu ro seoder eht <string name="not_again_undo">Siht nottub sodnu ro seoder eht

5
xwords4/android/XWords4/res_src/values-ca_PS/strings.xml
View file

@ -1405,11 +1405,6 @@
Board screen --> Board screen -->
<string name="not_again_flip">THIS BUTTON FLIPS THE BOARD ACROSS A <string name="not_again_flip">THIS BUTTON FLIPS THE BOARD ACROSS A
DIAGONAL AXIS.</string> DIAGONAL AXIS.</string>
<!-- Shown when you tap the zoom (+/-) button on the toolbar of
the main Board screen -->
<string name="not_again_zoom">THIS BUTTON TOGGLES THE BOARD
BETWEEN ZOOMED AND REGULAR SIZE. DRAG IT WHEN IT IS ZOOMED TO
SEE PARTS THAT ARE HIDDEN.</string>
<!-- Shown when you tap the undo/redo button on the toolbar of the <!-- Shown when you tap the undo/redo button on the toolbar of the
main Board screen --> main Board screen -->
<string name="not_again_undo">THIS BUTTON UNDOS OR REDOES THE <string name="not_again_undo">THIS BUTTON UNDOS OR REDOES THE

10
xwords4/android/XWords4/src/org/eehouse/android/xw4/BoardDelegate.java
View file

@ -897,9 +897,6 @@ public class BoardDelegate extends DelegateBase
case R.id.board_menu_flip: case R.id.board_menu_flip:
cmd = JNICmd.CMD_FLIP; cmd = JNICmd.CMD_FLIP;
break; break;
case R.id.board_menu_zoom:
cmd = JNICmd.CMD_TOGGLEZOOM;
break;
case R.id.board_menu_chat: case R.id.board_menu_chat:
startChatActivity(); startChatActivity();
break; break;
@ -1054,9 +1051,6 @@ public class BoardDelegate extends DelegateBase
case FLIP_ACTION: case FLIP_ACTION:
cmd = JNICmd.CMD_FLIP; cmd = JNICmd.CMD_FLIP;
break; break;
case ZOOM_ACTION:
cmd = JNICmd.CMD_TOGGLEZOOM;
break;
case UNDO_ACTION: case UNDO_ACTION:
cmd = JNICmd.CMD_UNDO_CUR; cmd = JNICmd.CMD_UNDO_CUR;
break; break;
@ -2250,10 +2244,6 @@ public class BoardDelegate extends DelegateBase
R.string.not_again_flip, R.string.not_again_flip,
R.string.key_notagain_flip, R.string.key_notagain_flip,
Action.FLIP_ACTION ); Action.FLIP_ACTION );
m_toolbar.setListener( Buttons.BUTTON_ZOOM,
R.string.not_again_zoom,
R.string.key_notagain_zoom,
Action.ZOOM_ACTION );
m_toolbar.setListener( Buttons.BUTTON_VALUES, m_toolbar.setListener( Buttons.BUTTON_VALUES,
R.string.not_again_values, R.string.not_again_values,
R.string.key_na_values, R.string.key_na_values,

1
xwords4/android/XWords4/src/org/eehouse/android/xw4/DlgDelegate.java
View file

@ -81,7 +81,6 @@ public class DlgDelegate {
NEXT_HINT_ACTION, NEXT_HINT_ACTION,
JUGGLE_ACTION, JUGGLE_ACTION,
FLIP_ACTION, FLIP_ACTION,
ZOOM_ACTION,
UNDO_ACTION, UNDO_ACTION,
CHAT_ACTION, CHAT_ACTION,
START_TRADE_ACTION, START_TRADE_ACTION,

1
xwords4/android/XWords4/src/org/eehouse/android/xw4/Toolbar.java
View file

@ -40,7 +40,6 @@ public class Toolbar {
BUTTON_HINT_NEXT(R.id.nexthint_button), BUTTON_HINT_NEXT(R.id.nexthint_button),
BUTTON_FLIP(R.id.flip_button), BUTTON_FLIP(R.id.flip_button),
BUTTON_JUGGLE(R.id.shuffle_button), BUTTON_JUGGLE(R.id.shuffle_button),
BUTTON_ZOOM(R.id.zoom_button),
BUTTON_UNDO(R.id.undo_button), BUTTON_UNDO(R.id.undo_button),
BUTTON_CHAT(R.id.chat_button), BUTTON_CHAT(R.id.chat_button),
BUTTON_VALUES(R.id.values_button) BUTTON_VALUES(R.id.values_button)

11
xwords4/android/XWords4/src/org/eehouse/android/xw4/jni/JNIThread.java
View file

@ -79,7 +79,6 @@ public class JNIThread extends Thread {
CMD_UNDO_CUR, CMD_UNDO_CUR,
CMD_UNDO_LAST, CMD_UNDO_LAST,
CMD_ZOOM, CMD_ZOOM,
CMD_TOGGLEZOOM,
CMD_PREV_HINT, CMD_PREV_HINT,
CMD_NEXT_HINT, CMD_NEXT_HINT,
CMD_VALUES, CMD_VALUES,
@ -581,16 +580,6 @@ public class JNIThread extends Thread {
} }
break; break;
case CMD_TOGGLEZOOM:
XwJNI.board_zoom( m_jniGamePtr, 0 , barr );
int zoomBy = 0;
if ( barr[1] ) { // always go out if possible
zoomBy = -5;
} else if ( barr[0] ) {
zoomBy = 5;
}
draw = XwJNI.board_zoom( m_jniGamePtr, zoomBy, barr );
break;
case CMD_ZOOM: case CMD_ZOOM:
draw = XwJNI.board_zoom( m_jniGamePtr, draw = XwJNI.board_zoom( m_jniGamePtr,
((Integer)args[0]).intValue(), ((Integer)args[0]).intValue(),