diff --git a/app/src/main/java/tu_darmstadt/sudoku/controller/Symbol.java b/app/src/main/java/tu_darmstadt/sudoku/controller/Symbol.java index 253d182..08c99c8 100644 --- a/app/src/main/java/tu_darmstadt/sudoku/controller/Symbol.java +++ b/app/src/main/java/tu_darmstadt/sudoku/controller/Symbol.java @@ -29,4 +29,5 @@ public enum Symbol { } return -1; } + } diff --git a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuKeyboardLayout.java b/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuKeyboardLayout.java index 2974d3f..64531b8 100644 --- a/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuKeyboardLayout.java +++ b/app/src/main/java/tu_darmstadt/sudoku/ui/view/SudokuKeyboardLayout.java @@ -3,6 +3,7 @@ package tu_darmstadt.sudoku.ui.view; import android.content.Context; import android.graphics.Canvas; import android.util.AttributeSet; +import android.util.TypedValue; import android.view.Gravity; import android.view.View; import android.widget.GridLayout; @@ -22,6 +23,7 @@ public class SudokuKeyboardLayout extends GridLayout { GameController gameController; boolean notesEnabled=false; Symbol symbolsToUse = Symbol.Default; + float normalTextSize = 0; OnClickListener listener = new OnClickListener() { @Override @@ -83,17 +85,18 @@ public class SudokuKeyboardLayout extends GridLayout { public void toggleNotesEnabled() { notesEnabled = !notesEnabled; + if (normalTextSize == 0) {normalTextSize = buttons[0].getTextSize();} if(notesEnabled) { - setTextSize(buttons[0].getPaint().getTextSize()/2); + setTextSize(normalTextSize*0.6f); }else { - setTextSize(buttons[0].getPaint().getTextSize()*2); + setTextSize(normalTextSize); } } private void setTextSize(float size){ for (SudokuButton b : buttons){ //b.setTextSize(size); - b.getPaint().setTextSize(size); + b.setTextSize(TypedValue.COMPLEX_UNIT_PX,size); } } diff --git a/app/src/main/res/layout/app_bar_game_view.xml b/app/src/main/res/layout/app_bar_game_view.xml index 35419fd..1b75db0 100644 --- a/app/src/main/res/layout/app_bar_game_view.xml +++ b/app/src/main/res/layout/app_bar_game_view.xml @@ -17,7 +17,22 @@ android:layout_width="match_parent" android:layout_height="?attr/actionBarSize" android:background="?attr/colorPrimary" - app:popupTheme="@style/AppTheme.PopupOverlay" /> + app:popupTheme="@style/AppTheme.PopupOverlay" > + + + +