xZero707/droidfish
1
0
Fork 0
mirror of https://github.com/peterosterlund2/droidfish.git synced 2025-04-03 19:00:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use binding in LoadFEN and EditPGN

Browse Source
This commit is contained in:
Ebrahim Byagowi 2019-04-23 09:49:51 +04:30 committed by Peter Osterlund
parent 0324409feb
commit 31d8ebab0e
7 changed files with 295 additions and 268 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
DroidFishApp/src/main/java/org/petero/droidfish/activities/EditPGN.java
View File

@ -18,27 +18,12 @@
package org.petero.droidfish.activities; package org.petero.droidfish.activities;
import java.io.File;
import java.util.ArrayList;
import java.util.Locale;
import org.petero.droidfish.ColorTheme;
import org.petero.droidfish.DroidFishApp;
import org.petero.droidfish.ObjectCache;
import org.petero.droidfish.R;
import org.petero.droidfish.Util;
import org.petero.droidfish.activities.PGNFile.GameInfo;
import org.petero.droidfish.activities.PGNFile.GameInfoResult;
import org.petero.droidfish.gamelogic.Pair;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.app.Dialog; import android.app.Dialog;
import android.app.ListActivity; import android.app.ListActivity;
import android.app.ProgressDialog; import android.app.ProgressDialog;
import android.content.DialogInterface;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.DialogInterface.OnCancelListener;
import android.content.SharedPreferences.Editor; import android.content.SharedPreferences.Editor;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
@ -49,14 +34,26 @@ import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.EditText;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemLongClickListener; import androidx.databinding.DataBindingUtil;
import org.petero.droidfish.ColorTheme;
import org.petero.droidfish.DroidFishApp;
import org.petero.droidfish.ObjectCache;
import org.petero.droidfish.R;
import org.petero.droidfish.Util;
import org.petero.droidfish.activities.PGNFile.GameInfo;
import org.petero.droidfish.activities.PGNFile.GameInfoResult;
import org.petero.droidfish.databinding.SelectGameBinding;
import org.petero.droidfish.gamelogic.Pair;
import java.io.File;
import java.util.ArrayList;
import java.util.Locale;
public abstract class EditPGN extends ListActivity { public abstract class EditPGN extends ListActivity {
static ArrayList<GameInfo> gamesInFile = new ArrayList<>(); static ArrayList<GameInfo> gamesInFile = new ArrayList<>();
@ -65,8 +62,6 @@ public abstract class EditPGN extends ListActivity {
ProgressDialog progress; ProgressDialog progress;
private GameInfo selectedGi = null; private GameInfo selectedGi = null;
ArrayAdapter<GameInfo> aa = null; ArrayAdapter<GameInfo> aa = null;
TextView hintText = null;
EditText filterText = null;
SharedPreferences settings; SharedPreferences settings;
int defaultItem = 0; int defaultItem = 0;
@ -80,6 +75,8 @@ public abstract class EditPGN extends ListActivity {
boolean loadGame; // True when loading game, false when saving boolean loadGame; // True when loading game, false when saving
String pgnToSave; String pgnToSave;
private SelectGameBinding binding;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
@ -237,7 +234,7 @@ public abstract class EditPGN extends ListActivity {
private void showList() { private void showList() {
progress = null; progress = null;
removeDialog(PROGRESS_DIALOG); removeDialog(PROGRESS_DIALOG);
setContentView(R.layout.select_game); binding = DataBindingUtil.setContentView(this, R.layout.select_game);
Util.overrideViewAttribs(findViewById(android.R.id.content)); Util.overrideViewAttribs(findViewById(android.R.id.content));
aa = new ArrayAdapter<GameInfo>(this, R.layout.select_game_list_item, gamesInFile) { aa = new ArrayAdapter<GameInfo>(this, R.layout.select_game_list_item, gamesInFile) {
@Override @Override
@ -272,24 +269,26 @@ public abstract class EditPGN extends ListActivity {
return true; return true;
}); });
filterText = findViewById(R.id.select_game_filter); binding.selectGameFilter.addTextChangedListener(new TextWatcher() {
filterText.addTextChangedListener(new TextWatcher() {
@Override @Override
public void afterTextChanged(Editable s) { } public void afterTextChanged(Editable s) {
}
@Override @Override
public void beforeTextChanged(CharSequence s, int start, int count, int after) { } public void beforeTextChanged(CharSequence s, int start, int count, int after) {
}
@Override @Override
public void onTextChanged(CharSequence s, int start, int before, int count) { public void onTextChanged(CharSequence s, int start, int before, int count) {
aa.getFilter().filter(s); aa.getFilter().filter(s);
lastSearchString = s.toString(); lastSearchString = s.toString();
} }
}); });
filterText.setText(lastSearchString); binding.selectGameFilter.setText(lastSearchString);
hintText = findViewById(R.id.select_game_hint);
if (loadGame) { if (loadGame) {
hintText.setVisibility(View.GONE); binding.selectGameHint.setVisibility(View.GONE);
} else { } else {
hintText.setText(R.string.save_game_hint); binding.selectGameHint.setText(R.string.save_game_hint);
} }
lv.requestFocus(); lv.requestFocus();
} }
@ -304,7 +303,9 @@ public abstract class EditPGN extends ListActivity {
final static int SAVE_GAME_DIALOG = 2; final static int SAVE_GAME_DIALOG = 2;
final static int DELETE_PGN_FILE_DIALOG = 3; final static int DELETE_PGN_FILE_DIALOG = 3;
/** Remove and show a dialog. */ /**
* Remove and show a dialog.
*/
private void reShowDialog(int id) { private void reShowDialog(int id) {
removeDialog(id); removeDialog(id);
showDialog(id); showDialog(id);
@ -355,11 +356,18 @@ public abstract class EditPGN extends ListActivity {
builder.setItems(items, (dialog, item) -> { builder.setItems(items, (dialog, item) -> {
GameInfo giToReplace; GameInfo giToReplace;
switch (item) { switch (item) {
case 0: giToReplace = new GameInfo().setNull(gi.startPos); break; case 0:
case 1: giToReplace = new GameInfo().setNull(gi.endPos); break; giToReplace = new GameInfo().setNull(gi.startPos);
case 2: giToReplace = gi; break; break;
case 1:
giToReplace = new GameInfo().setNull(gi.endPos);
break;
case 2:
giToReplace = gi;
break;
default: default:
finish(); return; finish();
return;
} }
pgnFile.replacePGN(pgnToSave, giToReplace); pgnFile.replacePGN(pgnToSave, giToReplace);
finish(); finish();
@ -434,7 +442,7 @@ public abstract class EditPGN extends ListActivity {
int pos = lv.pointToPosition(0, 0); int pos = lv.pointToPosition(0, 0);
aa = new ArrayAdapter<>(this, R.layout.select_game_list_item, gamesInFile); aa = new ArrayAdapter<>(this, R.layout.select_game_list_item, gamesInFile);
setListAdapter(aa); setListAdapter(aa);
String s = filterText.getText().toString(); String s = binding.selectGameFilter.getText().toString();
aa.getFilter().filter(s); aa.getFilter().filter(s);
lv.setSelection(pos); lv.setSelection(pos);
// Update lastModTime, since current change has already been handled // Update lastModTime, since current change has already been handled

66
DroidFishApp/src/main/java/org/petero/droidfish/activities/LoadFEN.java
View File

@ -18,22 +18,6 @@
package org.petero.droidfish.activities; package org.petero.droidfish.activities;
import java.io.File;
import java.util.ArrayList;
import java.util.concurrent.CountDownLatch;
import org.petero.droidfish.ChessBoardPlay;
import org.petero.droidfish.ColorTheme;
import org.petero.droidfish.DroidFishApp;
import org.petero.droidfish.R;
import org.petero.droidfish.Util;
import org.petero.droidfish.activities.FENFile.FenInfo;
import org.petero.droidfish.activities.FENFile.FenInfoResult;
import org.petero.droidfish.gamelogic.ChessParseError;
import org.petero.droidfish.gamelogic.Pair;
import org.petero.droidfish.gamelogic.Position;
import org.petero.droidfish.gamelogic.TextIO;
import android.app.Activity; import android.app.Activity;
import android.app.Dialog; import android.app.Dialog;
import android.app.DialogFragment; import android.app.DialogFragment;
@ -48,16 +32,30 @@ import android.content.res.Configuration;
import android.os.Bundle; import android.os.Bundle;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.view.View; import android.view.View;
import android.view.View.OnClickListener;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.AdapterView;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.Button; import android.widget.Button;
import android.widget.ListView; import android.widget.ListView;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; import android.widget.Toast;
import android.widget.AdapterView.OnItemClickListener;
import android.widget.AdapterView.OnItemLongClickListener; import androidx.databinding.DataBindingUtil;
import org.petero.droidfish.ColorTheme;
import org.petero.droidfish.DroidFishApp;
import org.petero.droidfish.R;
import org.petero.droidfish.Util;
import org.petero.droidfish.activities.FENFile.FenInfo;
import org.petero.droidfish.activities.FENFile.FenInfoResult;
import org.petero.droidfish.databinding.LoadFenBinding;
import org.petero.droidfish.gamelogic.ChessParseError;
import org.petero.droidfish.gamelogic.Pair;
import org.petero.droidfish.gamelogic.Position;
import org.petero.droidfish.gamelogic.TextIO;
import java.io.File;
import java.util.ArrayList;
import java.util.concurrent.CountDownLatch;
public class LoadFEN extends ListActivity { public class LoadFEN extends ListActivity {
private static ArrayList<FenInfo> fensInFile = new ArrayList<>(); private static ArrayList<FenInfo> fensInFile = new ArrayList<>();
@ -76,8 +74,7 @@ public class LoadFEN extends ListActivity {
private CountDownLatch progressLatch = null; private CountDownLatch progressLatch = null;
private boolean canceled = false; private boolean canceled = false;
private ChessBoardPlay cb; LoadFenBinding binding;
private Button okButton;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
@ -192,17 +189,13 @@ public class LoadFEN extends ListActivity {
progress = null; progress = null;
removeProgressDialog(); removeProgressDialog();
setContentView(R.layout.load_fen); setContentView(R.layout.load_fen);
binding = DataBindingUtil.setContentView(this, R.layout.load_fen);
cb = findViewById(R.id.loadfen_chessboard); binding.loadfenOk.setEnabled(false);
okButton = findViewById(R.id.loadfen_ok); binding.loadfenOk.setOnClickListener(v -> {
Button cancelButton = findViewById(R.id.loadfen_cancel);
okButton.setEnabled(false);
okButton.setOnClickListener(v -> {
if (selectedFi != null) if (selectedFi != null)
sendBackResult(selectedFi, false); sendBackResult(selectedFi, false);
}); });
cancelButton.setOnClickListener(v -> { binding.loadfenCancel.setOnClickListener(v -> {
setResult(RESULT_CANCELED); setResult(RESULT_CANCELED);
finish(); finish();
}); });
@ -235,8 +228,8 @@ public class LoadFEN extends ListActivity {
chessPos = e2.pos; chessPos = e2.pos;
} }
if (chessPos != null) { if (chessPos != null) {
cb.setPosition(chessPos); binding.loadfenChessboard.setPosition(chessPos);
okButton.setEnabled(true); binding.loadfenOk.setEnabled(true);
} }
}); });
lv.setOnItemLongClickListener((parent, view, pos, id) -> { lv.setOnItemLongClickListener((parent, view, pos, id) -> {
@ -260,11 +253,11 @@ public class LoadFEN extends ListActivity {
@Override @Override
public void onConfigurationChanged(Configuration newConfig) { public void onConfigurationChanged(Configuration newConfig) {
super.onConfigurationChanged(newConfig); super.onConfigurationChanged(newConfig);
if (cb != null) { if (binding.loadfenChessboard != null) {
Position pos = cb.pos; Position pos = binding.loadfenChessboard.pos;
showList(); showList();
cb.setPosition(pos); binding.loadfenChessboard.setPosition(pos);
okButton.setEnabled(selectedFi != null); binding.loadfenOk.setEnabled(selectedFi != null);
} }
} }
@ -279,6 +272,7 @@ public class LoadFEN extends ListActivity {
a.progressLatch.countDown(); a.progressLatch.countDown();
return progress; return progress;
} }
@Override @Override
public void onCancel(DialogInterface dialog) { public void onCancel(DialogInterface dialog) {
super.onCancel(dialog); super.onCancel(dialog);

2
DroidFishApp/src/main/res/layout-land/editoptions.xml
View File

@ -17,6 +17,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" /> android:orientation="vertical" />
</ScrollView> </ScrollView>
<LinearLayout <LinearLayout
@ -44,6 +45,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:text="@android:string/ok" /> android:text="@android:string/ok" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>

59
DroidFishApp/src/main/res/layout-land/load_fen.xml
View File

@ -1,54 +1,63 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:baselineAligned="false" android:baselineAligned="false"
android:orientation="horizontal"> android:orientation="horizontal">
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_weight="1"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:focusable="false"> android:layout_weight="1"
</ListView> android:focusable="false" />
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_weight="2"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="false"> android:layout_weight="2"
android:baselineAligned="false"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_weight="1"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
<view android:layout_weight="1"
class="org.petero.droidfish.ChessBoardPlay" android:orientation="horizontal">
<org.petero.droidfish.ChessBoardPlay
android:id="@+id/loadfen_chessboard" android:id="@+id/loadfen_chessboard"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content"> android:layout_height="wrap_content" />
</view>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_weight="1"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent"
android:layout_weight="1"
android:orientation="horizontal">
<Button <Button
android:id="@+id/loadfen_cancel" android:id="@+id/loadfen_cancel"
android:text="@string/cancel"
android:layout_weight="1"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent"
</Button> android:layout_weight="1"
android:text="@string/cancel" />
<Button <Button
android:id="@+id/loadfen_ok" android:id="@+id/loadfen_ok"
android:text="@android:string/ok"
android:layout_weight="1"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent"
</Button> android:layout_weight="1"
android:text="@android:string/ok" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</layout>

49
DroidFishApp/src/main/res/layout/load_fen.xml
View File

@ -1,49 +1,58 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:baselineAligned="false"> android:baselineAligned="false"
android:orientation="horizontal">
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_weight="1"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
<view android:layout_weight="1"
class="org.petero.droidfish.ChessBoardPlay" android:orientation="vertical">
<org.petero.droidfish.ChessBoardPlay
android:id="@+id/loadfen_chessboard" android:id="@+id/loadfen_chessboard"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent"> android:layout_height="fill_parent" />
</view>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_weight="1"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="vertical">
<Button <Button
android:id="@+id/loadfen_cancel" android:id="@+id/loadfen_cancel"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/cancel"> android:text="@string/cancel" />
</Button>
<Button <Button
android:text="@android:string/ok"
android:id="@+id/loadfen_ok" android:id="@+id/loadfen_ok"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
</Button> android:text="@android:string/ok" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:focusable="false"> android:focusable="false" />
</ListView>
</LinearLayout> </LinearLayout>
</layout>

22
DroidFishApp/src/main/res/layout/select_game.xml
View File

@ -1,28 +1,32 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<layout xmlns:android="http://schemas.android.com/apk/res/android">
<LinearLayout <LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:orientation="vertical"> android:orientation="vertical">
<TextView <TextView
android:id="@+id/select_game_hint" android:id="@+id/select_game_hint"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:includeFontPadding="true"> android:includeFontPadding="true" />
</TextView>
<EditText <EditText
android:id="@+id/select_game_filter" android:id="@+id/select_game_filter"
android:hint="@string/filter_text"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="1" android:layout_margin="10dp"
android:hint="@string/filter_text"
android:inputType="text" android:inputType="text"
android:layout_margin="10dp"> android:maxLines="1" />
</EditText>
<ListView <ListView
android:id="@android:id/list" android:id="@android:id/list"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:focusable="false"> android:focusable="false" />
</ListView>
</LinearLayout> </LinearLayout>
</layout>

1
DroidFishApp/src/main/res/layout/tooltip.xml
View File

@ -37,6 +37,7 @@
android:gravity="center" android:gravity="center"
android:text="Default Description" android:text="Default Description"
android:textColor="@color/White" /> android:textColor="@color/White" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>