update V2.5

woheller69 · Aug 19, 2023 · 438c9b8 · 438c9b8
1 parent 1cd5a11
commit 438c9b8
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,8 +9,8 @@ android {
         applicationId "org.woheller69.level"
         minSdkVersion 16
         targetSdkVersion 33
-        versionCode 24
-        versionName "2.4"
+        versionCode 25
+        versionName "2.5"
         vectorDrawables.useSupportLibrary true
     }
 

diff --git a/app/src/main/java/org/woheller69/level/Level.java b/app/src/main/java/org/woheller69/level/Level.java
@@ -144,7 +144,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
             } else {
                 SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
                 int progress = sp.getInt("pref_rulercal",100);
-                int coarseprogress = sp.getInt("pref_rulercoarsecal",4000);
+                int coarseprogress = sp.getInt("pref_rulercoarsecal",2000);
                 RelativeLayout rulerLayout = (RelativeLayout) findViewById(R.id.main_layout);
                 if (rulerCalView == null){
                     Toast.makeText(this,getString(R.string.calibrate)+" \u25b2\u25bc", Toast.LENGTH_LONG).show();
@@ -157,10 +157,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
                     layoutParams.setMargins(rulerLayout.getWidth()*3/8,0,0,0);
                     rulerCalView.setLayoutParams(layoutParams);
                     rulerCoarseCalView = new VerticalSeekBar(this);
-                    rulerCoarseCalView.setMax(8000);
-                    if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-                        rulerCoarseCalView.setMin(2000);
-                    }
+                    rulerCoarseCalView.setMax(6000);
                     rulerCoarseCalView.setProgress(coarseprogress);
                     rulerCoarseCalView.setThumb(ContextCompat.getDrawable(context, R.drawable.ic_coarse));
                     rulerCoarseCalView.getThumb().setColorFilter(getThemeColor(context,R.attr.colorAccent), PorterDuff.Mode.MULTIPLY);
@@ -225,7 +222,7 @@ private void showRuler(boolean ruler) {
             SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(this);
             RelativeLayout rulerLayout = (RelativeLayout) findViewById(R.id.main_layout);
             int progress = sp.getInt("pref_rulercal",100);
-            int coarseProgress = sp.getInt("pref_rulercoarsecal",4000);
+            int coarseProgress = sp.getInt("pref_rulercoarsecal",2000);
             float dpmm =  getDpmmCal(progress,coarseProgress);
 
             rulerView = new RulerView(this, dpmm, dpmm*25.4/32);
@@ -311,7 +308,7 @@ public void onCalibrationSaved(boolean success) {
 
     public float getDpmmCal(int progress, int coarseProgress){
         float dpmm =  (float) (getResources().getDisplayMetrics().ydpi/25.4);
-        return dpmm*(1+(progress+coarseProgress-100f-4000f)/5000f);
+        return dpmm*(1+(progress+coarseProgress-100f-2000f)/5000f);
     }
 
     public static int getThemeColor(Context context, int colorResId) {
@@ -330,12 +327,6 @@ private void setFullscreenMode() {
                             View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY|
                             View.SYSTEM_UI_FLAG_HIDE_NAVIGATION|
                             View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
-        } else {
-            getWindow().getDecorView().setSystemUiVisibility(
-                    View.SYSTEM_UI_FLAG_LOW_PROFILE|
-                            View.SYSTEM_UI_FLAG_FULLSCREEN|
-                            View.SYSTEM_UI_FLAG_HIDE_NAVIGATION|
-                            View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION);
         }
     }
 }
diff --git a/fastlane/metadata/android/de-DE/changelogs/25.txt b/fastlane/metadata/android/de-DE/changelogs/25.txt
@@ -0,0 +1 @@
+Verbesserte Kalibrierung für Lineal
diff --git a/fastlane/metadata/android/en-US/changelogs/25.txt b/fastlane/metadata/android/en-US/changelogs/25.txt
@@ -0,0 +1 @@
+Improved calibration for ruler