joel/privacy-friendly-sudoku-fork
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source 
# Conflicts:
#	app/src/main/java/tu_darmstadt/sudoku/ui/GameActivity.java
This commit is contained in:
Gongxter 2015-11-15 13:15:37 +01:00
commit 08a16160e0
4 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/tu_darmstadt/sudoku/controller/GameController.java
View file

@ -310,7 +310,7 @@ public class GameController {
}
public void deleteSelectedValue() {
if(isCellSelected()) setValue(selectedRow, selectedCol, 0);
if(isCellSelected()) deleteValue(selectedRow, selectedCol);
}
public void toggleSelectedNote(int value) {

3
app/src/main/java/tu_darmstadt/sudoku/ui/GameActivity.java
View file

@ -68,6 +68,7 @@ public class GameActivity extends AppCompatActivity implements NavigationView.On
keyboard.setColumnCount(Math.max(((gameController.getSize() / 2) + 1),keyboard.fixedButtonsCount));
keyboard.setRowCount(3);
Point p = new Point();
getWindowManager().getDefaultDisplay().getSize(p);
//int width = p.x;
keyboard.setKeyBoard(gameController.getSize(), p.x);
/*
@ -114,7 +115,7 @@ public class GameActivity extends AppCompatActivity implements NavigationView.On
if (id == R.id.nav_newgame) {
//create new game
intent = new Intent(this, GameActivity.class);
intent = new Intent(this, NewGameActivity.class);
startActivity(intent);
} else if (id == R.id.nav_mainmenu) {

1
app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuKeyboardLayout.java
View file

@ -73,7 +73,6 @@ public class SudokuKeyboardLayout extends GridLayout {
public SudokuKeyboardLayout(Context context, AttributeSet attrs) {
super(context, attrs);
this.attrs = attrs;
}

6
app/src/main/res/layout/content_game_view.xml
View file

@ -21,11 +21,11 @@
<tu_darmstadt.sudoku.ui.view.SudokuKeyboardLayout
android:layout_width="fill_parent"
android:layout_height="200dp"
android:layout_alignParentBottom="true"
android:layout_height="fill_parent"
android:layout_below="@+id/sudokuLayout"
android:id="@+id/sudokuKeyboardLayout"
android:layout_centerVertical="true"
>
android:layout_centerVertical="true">
<!-- <tu_darmstadt.sudoku.ui.view.SudokuButton
android:id="@+id/button2"
android:layout_width="50dp"