From 75fd15d3bf14b56c3eb06fdd6b7e43db44b8942c Mon Sep 17 00:00:00 2001
From: Peter Osterlund <peterosterlund2@gmail.com>
Date: Fri, 21 Sep 2012 19:39:29 +0000
Subject: [PATCH] DroidFish: Use custom title bar also for edit board mode.
 Most title bar widgets are hidden though.

---
 DroidFish/res/layout-land/editboard.xml             |  5 +++++
 DroidFish/res/layout/editboard.xml                  |  5 +++++
 .../petero/droidfish/activities/ChessBoardEdit.java |  5 ++++-
 .../org/petero/droidfish/activities/EditBoard.java  | 13 +++++++++++++
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/DroidFish/res/layout-land/editboard.xml b/DroidFish/res/layout-land/editboard.xml
index 3a3bd80..32c98ea 100644
--- a/DroidFish/res/layout-land/editboard.xml
+++ b/DroidFish/res/layout-land/editboard.xml
@@ -13,6 +13,11 @@
         android:orientation="vertical"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent">
+        <include
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            layout="@layout/title">
+        </include>
         <TextView
             android:text=""
             android:id="@+id/eb_status"
diff --git a/DroidFish/res/layout/editboard.xml b/DroidFish/res/layout/editboard.xml
index 30afc39..a42b50e 100644
--- a/DroidFish/res/layout/editboard.xml
+++ b/DroidFish/res/layout/editboard.xml
@@ -4,6 +4,11 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent">
+    <include
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        layout="@layout/title">
+    </include>
     <view
         class="org.petero.droidfish.activities.ChessBoardEdit"
         android:id="@+id/eb_chessboard"
diff --git a/DroidFish/src/org/petero/droidfish/activities/ChessBoardEdit.java b/DroidFish/src/org/petero/droidfish/activities/ChessBoardEdit.java
index 6e3c3cc..7292136 100644
--- a/DroidFish/src/org/petero/droidfish/activities/ChessBoardEdit.java
+++ b/DroidFish/src/org/petero/droidfish/activities/ChessBoardEdit.java
@@ -24,6 +24,7 @@ import org.petero.droidfish.gamelogic.Piece;
 import org.petero.droidfish.gamelogic.Position;
 
 import android.content.Context;
+import android.content.res.Configuration;
 import android.graphics.Canvas;
 import android.graphics.Paint;
 import android.util.AttributeSet;
@@ -55,7 +56,9 @@ public class ChessBoardEdit extends ChessBoard {
     @Override
     protected void computeOrigin(int width, int height) {
         x0 = (width - sqSize * 8) / 2;
-        y0 = (height - (sqSize * 10 + gap)) / 2;
+        Configuration config = getResources().getConfiguration();
+        boolean landScape = (config.orientation == Configuration.ORIENTATION_LANDSCAPE);
+        y0 = landScape ? 0 : (height - (sqSize * 10 + gap)) / 2;
     }
 
     private final int extraPieces(int x, int y) {
diff --git a/DroidFish/src/org/petero/droidfish/activities/EditBoard.java b/DroidFish/src/org/petero/droidfish/activities/EditBoard.java
index 90b7295..4007079 100644
--- a/DroidFish/src/org/petero/droidfish/activities/EditBoard.java
+++ b/DroidFish/src/org/petero/droidfish/activities/EditBoard.java
@@ -51,6 +51,7 @@ import android.view.View.OnClickListener;
 import android.view.View.OnKeyListener;
 import android.view.View.OnLongClickListener;
 import android.view.View.OnTouchListener;
+import android.view.Window;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
@@ -61,12 +62,15 @@ public class EditBoard extends Activity {
     private TextView status;
     private Button okButton;
     private Button cancelButton;
+    private TextView whiteTitleText, blackTitleText, engineTitleText;
+    private View secondTitleLine;
 
     boolean egtbHints;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        requestWindowFeature(Window.FEATURE_NO_TITLE);
 
         initUI();
 
@@ -106,6 +110,15 @@ public class EditBoard extends Activity {
         okButton = (Button)findViewById(R.id.eb_ok);
         cancelButton = (Button)findViewById(R.id.eb_cancel);
 
+        whiteTitleText = (TextView)findViewById(R.id.white_clock);
+        whiteTitleText.setText(R.string.edit_board);
+        blackTitleText = (TextView)findViewById(R.id.black_clock);
+        blackTitleText.setVisibility(View.GONE);
+        engineTitleText = (TextView)findViewById(R.id.title_text);
+        engineTitleText.setVisibility(View.GONE);
+        secondTitleLine = findViewById(R.id.second_title_line);
+        secondTitleLine.setVisibility(View.GONE);
+
         okButton.setOnClickListener(new OnClickListener() {
             public void onClick(View v) {
                 sendBackResult();