Skip to content

Now can see the tables when browsing them #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kerryland wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Now can see the tables when browsing them #179

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 26 additions & 0 deletions app/src/main/java/com/dozingcatsoftware/bouncy/BouncyActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,6 +625,8 @@ public void doStartGame(View view) {
// synchronized because that can deadlock the FieldDriver thread.
// All of this concurrency is badly in need of refactoring.
synchronized (field) {
restoreMenuHeight();

buttonPanel.setVisibility(View.GONE);
highScorePanel.setVisibility(View.GONE);
resetFieldForCurrentLevel();
Expand Down Expand Up @@ -674,6 +676,8 @@ else if (!state.isGameInProgress()) {
}

void switchToTable(int tableNum) {
shrinkMenuToTableSelectionSize();

this.currentLevel = tableNum;
synchronized (field) {
resetFieldForCurrentLevel();
Expand All @@ -690,6 +694,28 @@ public void doSwitchTable(View view) {
doNextTable(view);
}


private int menuHeight;
private int tableSelectionHeight;

private void shrinkMenuToTableSelectionSize() {
// There must be a better place to obtain this information
if (menuHeight == 0) {
menuHeight = buttonPanel.getHeight();
tableSelectionHeight = previousTableButton.getHeight();
}

buttonPanel.getLayoutParams().height = tableSelectionHeight;
buttonPanel.setLayoutParams(buttonPanel.getLayoutParams());
}

private void restoreMenuHeight() {
if (menuHeight != 0) {
buttonPanel.getLayoutParams().height = menuHeight;
buttonPanel.setLayoutParams(buttonPanel.getLayoutParams());
}
}

public void doNextTable(View view) {
int nextTableNum = (currentLevel == numberOfLevels) ? 1 : currentLevel + 1;
switchToTable(nextTableNum);
Expand Down