commit 1db2a539572b7ba54c67fc48856f4ccbc8c68774 Author: Leszek Koltunski Date: Thu Jan 19 23:20:39 2023 +0100 More fixes for UI in case of extreme screen (w/h) ratios ( from 1.0 to 2.0 ). diff --git a/src/main/java/org/distorted/dialogs/RubikDialogPattern.java b/src/main/java/org/distorted/dialogs/RubikDialogPattern.java index adb6ce47..9fab0b75 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogPattern.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogPattern.java @@ -54,11 +54,11 @@ public class RubikDialogPattern extends AppCompatDialogFragment DisplayMetrics displaymetrics = new DisplayMetrics(); act.getWindowManager().getDefaultDisplay().getMetrics(displaymetrics); - int scrWidth = displaymetrics.widthPixels; - final float titleSize= scrWidth*RubikActivity.BIG_TEXT_SIZE; - final float okSize = scrWidth*RubikActivity.DIALOG_BUTTON_SIZE; - final int tabHeight= (int)(scrWidth*RubikActivity.TAB_HEIGHT); - final int tabWidth = (int)(scrWidth*RubikActivity.TAB_WIDTH); + int h = displaymetrics.heightPixels; + final float titleSize= h*RubikActivity.TAB_TEXT_SIZE; + final float okSize = h*RubikActivity.TAB_BUTTON_SIZE; + final int tabHeight= (int)(h*RubikActivity.TAB_HEIGHT); + final int tabWidth = (int)(h*RubikActivity.TAB_WIDTH); LayoutInflater layoutInflater = act.getLayoutInflater(); TextView tv = (TextView) layoutInflater.inflate(R.layout.dialog_title, null); diff --git a/src/main/java/org/distorted/dialogs/RubikDialogScores.java b/src/main/java/org/distorted/dialogs/RubikDialogScores.java index 0e5136df..e194e4a8 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogScores.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogScores.java @@ -52,11 +52,11 @@ public class RubikDialogScores extends AppCompatDialogFragment DisplayMetrics displaymetrics = new DisplayMetrics(); act.getWindowManager().getDefaultDisplay().getMetrics(displaymetrics); - int scrWidth = displaymetrics.widthPixels; - final float titleSize= scrWidth*RubikActivity.BIG_TEXT_SIZE; - final float okSize = scrWidth*RubikActivity.DIALOG_BUTTON_SIZE; - final int tabHeight= (int)(scrWidth*RubikActivity.TAB_HEIGHT); - final int tabWidth = (int)(scrWidth*RubikActivity.TAB_WIDTH); + int h = displaymetrics.heightPixels; + final float titleSize= h*RubikActivity.TAB_TEXT_SIZE; + final float okSize = h*RubikActivity.TAB_BUTTON_SIZE; + final int tabHeight= (int)(h*RubikActivity.TAB_HEIGHT); + final int tabWidth = (int)(h*RubikActivity.TAB_WIDTH); LayoutInflater layoutInflater = act.getLayoutInflater(); TextView tv = (TextView) layoutInflater.inflate(R.layout.dialog_title, null); diff --git a/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java b/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java index e4398e81..e5bac503 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogTutorial.java @@ -54,11 +54,12 @@ public class RubikDialogTutorial extends AppCompatDialogFragment DisplayMetrics displaymetrics = new DisplayMetrics(); act.getWindowManager().getDefaultDisplay().getMetrics(displaymetrics); - int scrWidth = displaymetrics.widthPixels; - final float titleSize= scrWidth*RubikActivity.BIG_TEXT_SIZE; - final float okSize = scrWidth*RubikActivity.DIALOG_BUTTON_SIZE; - final int tabHeight= (int)(scrWidth*RubikActivity.TAB_HEIGHT); - final int tabWidth = (int)(scrWidth*RubikActivity.TAB_WIDTH); + + int h = displaymetrics.heightPixels; + final float titleSize= h*RubikActivity.TAB_TEXT_SIZE; + final float okSize = h*RubikActivity.TAB_BUTTON_SIZE; + final int tabHeight= (int)(h*RubikActivity.TAB_HEIGHT); + final int tabWidth = (int)(h*RubikActivity.TAB_WIDTH); LayoutInflater layoutInflater = act.getLayoutInflater(); TextView tv = (TextView) layoutInflater.inflate(R.layout.dialog_title, null); diff --git a/src/main/java/org/distorted/dialogs/RubikDialogTutorialPagerAdapter.java b/src/main/java/org/distorted/dialogs/RubikDialogTutorialPagerAdapter.java index 4e5c666d..5202e254 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogTutorialPagerAdapter.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogTutorialPagerAdapter.java @@ -61,7 +61,7 @@ class RubikDialogTutorialPagerAdapter extends PagerAdapter { DisplayMetrics metrics = mAct.getResources().getDisplayMetrics(); - mViews[position] = new RubikDialogTutorialView(mAct, metrics.widthPixels, position); + mViews[position] = new RubikDialogTutorialView(mAct, metrics.heightPixels, position); collection.addView(mViews[position]); return mViews[position]; diff --git a/src/main/java/org/distorted/dialogs/RubikDialogTutorialView.java b/src/main/java/org/distorted/dialogs/RubikDialogTutorialView.java index bd4f7ef0..fef1bed6 100644 --- a/src/main/java/org/distorted/dialogs/RubikDialogTutorialView.java +++ b/src/main/java/org/distorted/dialogs/RubikDialogTutorialView.java @@ -38,6 +38,7 @@ import java.io.InputStream; public class RubikDialogTutorialView extends FrameLayout { + public static final float PANE_HEIGHT = 0.06f; private boolean mCanClick; /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -56,7 +57,7 @@ public class RubikDialogTutorialView extends FrameLayout /////////////////////////////////////////////////////////////////////////////////////////////////// - public RubikDialogTutorialView(FragmentActivity act, int width, int position) + public RubikDialogTutorialView(FragmentActivity act, int height, int position) { super(act); @@ -79,7 +80,7 @@ public class RubikDialogTutorialView extends FrameLayout if( tutorials!=null ) { clickPossible(true); - int widthT = (int)(width* RubikActivity.TUTORIAL_ITEM_TEXT); + int size = (int)(height*PANE_HEIGHT); RubikActivity ract = (RubikActivity)getContext(); Resources res = act.getResources(); @@ -100,7 +101,7 @@ public class RubikDialogTutorialView extends FrameLayout int countryID = res.getIdentifier(coun, "drawable", packageName); - View row = createRow(ract, countryID, desc, url, auth, widthT, objectOrdinal, colorB, colorT); + View row = createRow(ract, countryID, desc, url, auth, size, objectOrdinal, colorB, colorT); layout.addView(row); } diff --git a/src/main/java/org/distorted/main/RubikActivity.java b/src/main/java/org/distorted/main/RubikActivity.java index 175ea3aa..f34dcfd3 100644 --- a/src/main/java/org/distorted/main/RubikActivity.java +++ b/src/main/java/org/distorted/main/RubikActivity.java @@ -68,7 +68,6 @@ public class RubikActivity extends AppCompatActivity public static final float PADDING = 0.01f; public static final float SMALL_MARGIN = 0.004f; - public static final float MEDIUM_MARGIN = 0.015f; public static final float BUTTON_TEXT_SIZE = 0.05f; public static final float TITLE_TEXT_SIZE = 0.06f; public static final float SOLVER_BMP_H_SIZE = 0.11f; @@ -77,12 +76,13 @@ public class RubikActivity extends AppCompatActivity public static final float PATTERN_CHILD_TEXT = 0.02f; public static final float SCORES_LEVEL_TEXT = 0.035f; public static final float SCORES_ITEM_TEXT = 0.030f; - public static final float TUTORIAL_ITEM_TEXT = 0.100f; public static final float DIALOG_BUTTON_SIZE = 0.06f; public static final float BIG_TEXT_SIZE = 0.05f; public static final float SMALL_TEXT_SIZE = 0.035f; - public static final float TAB_WIDTH = 0.100f; - public static final float TAB_HEIGHT = 0.100f; + public static final float TAB_WIDTH = 0.066f; + public static final float TAB_HEIGHT = 0.066f; + public static final float TAB_TEXT_SIZE = 0.033f; + public static final float TAB_BUTTON_SIZE = 0.040f; public static final float POPUP_PADDING = 0.028f; public static final float POPUP_MARGIN = 0.016f;