xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2024-11-23 11:31:33 +01:00
Code Issues Packages Projects Releases Wiki Activity

DroidFish: Swapped ok/cancel buttons in views for consistency with Android dialogs.

Browse Source
This commit is contained in:
Peter Osterlund 2011-11-27 01:52:17 +00:00
parent e8d1ef5dd6
commit d945a2bc5e
6 changed files with 46 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
DroidFish/res/layout-land/editboard.xml
View File

@ -26,21 +26,21 @@
android:id="@+id/LinearLayout02"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<Button
android:text="Cancel"
android:id="@+id/eb_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
</Button>
<Button
android:text="Ok"
android:id="@+id/eb_ok"
android:layout_width="wrap_content"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
</Button>
</LinearLayout>
<Button
android:text="Cancel"
android:id="@+id/eb_cancel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
</Button>
</LinearLayout>
</LinearLayout>
</LinearLayout>

14
DroidFish/res/layout/create_pgn_file.xml
View File

@ -27,13 +27,6 @@
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/create_pgn_cancel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Cancel">
</Button>
<Button
android:id="@+id/create_pgn_ok"
android:layout_width="fill_parent"
@ -41,5 +34,12 @@
android:layout_weight="1"
android:text="Ok">
</Button>
<Button
android:id="@+id/create_pgn_cancel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Cancel">
</Button>
</LinearLayout>
</LinearLayout>

16
DroidFish/res/layout/edit_comments.xml
View File

@ -85,13 +85,6 @@
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/ed_comments_cancel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Cancel">
</Button>
<Button
android:id="@+id/ed_comments_ok"
android:layout_width="fill_parent"
@ -99,7 +92,14 @@
android:layout_weight="1"
android:text="Ok">
</Button>
</LinearLayout>
<Button
android:id="@+id/ed_comments_cancel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Cancel">
</Button>
</LinearLayout>
</LinearLayout>
</ScrollView>

16
DroidFish/res/layout/edit_headers.xml
View File

@ -105,13 +105,6 @@
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<Button
android:id="@+id/ed_header_cancel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Cancel">
</Button>
<Button
android:id="@+id/ed_header_ok"
android:layout_width="fill_parent"
@ -119,7 +112,14 @@
android:layout_weight="1"
android:text="Ok">
</Button>
</LinearLayout>
<Button
android:id="@+id/ed_header_cancel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Cancel">
</Button>
</LinearLayout>
</LinearLayout>
</ScrollView>

18
DroidFish/res/layout/editboard.xml
View File

@ -22,19 +22,19 @@
android:id="@+id/LinearLayout02"
android:layout_width="fill_parent"
android:layout_height="wrap_content">
<Button
android:text="Cancel"
android:id="@+id/eb_cancel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1">
</Button>
<Button
android:text="Ok"
android:id="@+id/eb_ok"
android:layout_width="wrap_content"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
</Button>
</LinearLayout>
<Button
android:text="Cancel"
android:id="@+id/eb_cancel"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_weight="1">
</Button>
</LinearLayout>
</LinearLayout>

5
DroidFish/src/org/petero/droidfish/ChessBoard.java
View File

@ -102,6 +102,9 @@ public class ChessBoard extends View {
moveMarkPaint.add(p);
}
if (isInEditMode())
return;
Typeface chessFont = Typeface.createFromAsset(getContext().getAssets(), "ChessCases.ttf");
whitePiecePaint.setTypeface(chessFont);
blackPiecePaint.setTypeface(chessFont);
@ -353,6 +356,8 @@ public class ChessBoard extends View {
@Override
protected void onDraw(Canvas canvas) {
if (isInEditMode())
return;
// long t0 = System.currentTimeMillis();
boolean animActive = anim.updateState();
final int width = getWidth();