#241 fix letter caption position on big screens

braille-systems · Sep 23, 2020 · 585f4d0 · 585f4d0
1 parent 3065832
commit 585f4d0
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 15 deletions.
diff --git a/app/src/main/res/values-sw320dp/dimens.xml b/app/src/main/res/values-sw320dp/dimens.xml
@@ -9,7 +9,6 @@
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1.1</dimen>
 
-    <dimen name="letter_practice_scale_of_view">0.8</dimen>
     <dimen name="practice_dots_vertical_bias">0.85</dimen>
     <dimen name="practice_buttons_vertical_bias">0.9</dimen>
 
@@ -30,8 +29,7 @@
     <dimen name="lessons_dots_info_width">394dp</dimen>
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
-    <dimen name="big_letter_text_size">170sp</dimen>
-    <dimen name="big_letter_caption_padding">2dp</dimen>
+    <dimen name="big_letter_text_size">136sp</dimen>
 
     <dimen name="big_buttons_border_radius">30dp</dimen>
 

diff --git a/app/src/main/res/values-sw400dp/dimens.xml b/app/src/main/res/values-sw400dp/dimens.xml
@@ -9,7 +9,6 @@
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1.5</dimen>
 
-    <dimen name="letter_practice_scale_of_view">1</dimen>
     <dimen name="practice_dots_vertical_bias">0.85</dimen>
     <dimen name="practice_buttons_vertical_bias">0.9</dimen>
 
@@ -31,7 +30,6 @@
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
     <dimen name="big_letter_text_size">170sp</dimen>
-    <dimen name="big_letter_caption_padding">8dp</dimen>
 
     <dimen name="big_buttons_border_radius">40dp</dimen>
 

diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
@@ -8,7 +8,6 @@
     <dimen name="braille_dots_inner_vertical_margin">25dp</dimen>
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1.8</dimen>
-    <dimen name="letter_practice_scale_of_view">1.9</dimen>
 
     <dimen name="side_buttons_extended_width">80dp</dimen>
     <dimen name="side_buttons_width">65dp</dimen>
@@ -27,8 +26,7 @@
     <dimen name="lessons_dots_info_width">394dp</dimen>
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
-    <dimen name="big_letter_text_size">150sp</dimen>
-    <dimen name="big_letter_caption_padding">11dp</dimen>
+    <dimen name="big_letter_text_size">285sp</dimen>
 
     <dimen name="big_buttons_border_radius">30dp</dimen>
 

diff --git a/app/src/main/res/values-sw720dp/dimens.xml b/app/src/main/res/values-sw720dp/dimens.xml
@@ -8,7 +8,6 @@
     <dimen name="braille_dots_inner_vertical_margin">25dp</dimen>
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">2.1</dimen>
-    <dimen name="letter_practice_scale_of_view">2.2</dimen>
 
     <dimen name="side_buttons_extended_width">90dp</dimen>
     <dimen name="side_buttons_width">75dp</dimen>
@@ -27,8 +26,7 @@
     <dimen name="lessons_dots_info_width">394dp</dimen>
     <dimen name="lessons_dots_info_height">175dp</dimen>
 
-    <dimen name="big_letter_text_size">150sp</dimen>
-    <dimen name="big_letter_caption_padding">15dp</dimen>
+    <dimen name="big_letter_text_size">330sp</dimen>
 
     <dimen name="big_buttons_border_radius">30dp</dimen>
 

diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
@@ -9,7 +9,6 @@
     <dimen name="braille_dots_scale_of_one_dot">2.6</dimen>
     <dimen name="braille_dots_scale_of_view">1</dimen>
 
-    <dimen name="letter_practice_scale_of_view">0.8</dimen>
     <dimen name="practice_dots_vertical_bias">0.85</dimen>
     <dimen name="practice_buttons_vertical_bias">0.9</dimen>
 

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -47,11 +47,8 @@
     <style name="bigLetterStyle">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:scaleX">@dimen/letter_practice_scale_of_view</item>
-        <item name="android:scaleY">@dimen/letter_practice_scale_of_view</item>
         <item name="android:textSize">@dimen/big_letter_text_size</item>
         <item name="android:textStyle">bold</item>
-        <item name="android:paddingTop">@dimen/big_letter_caption_padding</item>
     </style>
 
     <style name="bigLetterCaptionStyle">
@@ -60,6 +57,7 @@
         <item name="android:importantForAccessibility">no</item>
         <item name="android:textAlignment">center</item>
         <item name="android:textSize">@dimen/lessons_title_text_size</item>
+        <item name="android:paddingTop">@dimen/big_letter_caption_padding</item>
     </style>
 
     <style name="SwitchPreferenceButton" parent="Theme.AppCompat.Light">