commit 8d1da3f1798a67d4d74f0ec9769de64cd92bc10b Author: Leszek Koltunski Date: Tue Nov 23 01:06:34 2021 +0100 progress with UI. diff --git a/build.gradle b/build.gradle index e8052264..91bd75ed 100644 --- a/build.gradle +++ b/build.gradle @@ -9,7 +9,7 @@ android { keyAlias = 'distorted' } } - compileSdkVersion 30 + compileSdkVersion 31 defaultConfig { applicationId "org.distorted.magic" @@ -40,7 +40,7 @@ dependencies { implementation 'com.google.firebase:firebase-analytics:20.0.0' implementation 'com.google.firebase:firebase-crashlytics:18.2.4' implementation 'com.google.android.play:core:1.10.2' - implementation 'androidx.appcompat:appcompat:1.3.1' + implementation 'androidx.appcompat:appcompat:1.4.0' implementation 'com.google.android.material:material:1.4.0' implementation project(path: ':distorted-puzzle-jsons') implementation project(path: ':distorted-puzzle-dmesh') diff --git a/src/main/java/org/distorted/helpers/TransparentImageButton.java b/src/main/java/org/distorted/helpers/TransparentImageButton.java index ed27e7d1..bf20e588 100644 --- a/src/main/java/org/distorted/helpers/TransparentImageButton.java +++ b/src/main/java/org/distorted/helpers/TransparentImageButton.java @@ -38,23 +38,23 @@ public class TransparentImageButton extends MaterialButton /////////////////////////////////////////////////////////////////////////////////////////////////// public TransparentImageButton(Context context, int icon, int gravity, LinearLayout.LayoutParams params) + { + super(context); + + setLayoutParams(params); + setPadding(0,0,0,0); + setIconResource(icon); + setIconTint(null); + + switch(gravity) { - super(context); - - setLayoutParams(params); - setPadding(0,0,0,0); - setIconResource(icon); - setIconTint(null); - - switch(gravity) - { - case GRAVITY_START : setIconGravity(MaterialButton.ICON_GRAVITY_START ); break; - case GRAVITY_MIDDLE: setIconGravity(MaterialButton.ICON_GRAVITY_TEXT_START); break; - case GRAVITY_END : setIconGravity(MaterialButton.ICON_GRAVITY_END ); break; - } - - TypedValue outValue = new TypedValue(); - context.getTheme().resolveAttribute(android.R.attr.selectableItemBackgroundBorderless, outValue, true); - setBackgroundResource(outValue.resourceId); + case GRAVITY_START : setIconGravity(MaterialButton.ICON_GRAVITY_START ); break; + case GRAVITY_MIDDLE: setIconGravity(MaterialButton.ICON_GRAVITY_TEXT_START); break; + case GRAVITY_END : setIconGravity(MaterialButton.ICON_GRAVITY_END ); break; } + + TypedValue outValue = new TypedValue(); + context.getTheme().resolveAttribute(android.R.attr.selectableItemBackgroundBorderless, outValue, true); + setBackgroundResource(outValue.resourceId); + } } diff --git a/src/main/java/org/distorted/screens/RubikScreenPlay.java b/src/main/java/org/distorted/screens/RubikScreenPlay.java index 3c7544e5..bb1954ba 100644 --- a/src/main/java/org/distorted/screens/RubikScreenPlay.java +++ b/src/main/java/org/distorted/screens/RubikScreenPlay.java @@ -245,10 +245,8 @@ public class RubikScreenPlay extends RubikScreenBase int margin = (int)(width*RubikActivity.LARGE_MARGIN); mObjectSize = (int)(cubeWidth + 2*margin + 0.5f); mMaxRowCount = (int)((height-1.8f*mUpperBarHeight)/mObjectSize); - int layoutH = (int)(1.5f*mObjectSize); - int viewID = R.layout.popup_object; - LinearLayout view = (LinearLayout)inflate( act, viewID, null); + LinearLayout view = (LinearLayout)inflate( act, R.layout.popup_object, null); GridLayout objectGrid = view.findViewById(R.id.objectGrid); GridLayout.Spec[] rowSpecs = new GridLayout.Spec[mRowCount]; @@ -258,11 +256,7 @@ public class RubikScreenPlay extends RubikScreenBase objectGrid.setRowCount(mRowCount); LinearLayout bottomLayout = view.findViewById(R.id.bottomLayout); - setupBottomLayout(act,bottomLayout,layoutH); - - ViewGroup.LayoutParams paramsB = bottomLayout.getLayoutParams(); - paramsB.height = layoutH; - bottomLayout.setLayoutParams(paramsB); + setupBottomLayout(act,bottomLayout,2*mObjectSize,mObjectSize); mObjectPopup = new PopupWindow(act); mObjectPopup.setFocusable(true); @@ -318,6 +312,49 @@ public class RubikScreenPlay extends RubikScreenBase } } +/////////////////////////////////////////////////////////////////////////////////////////////////// + + private void setupBottomLayout(final RubikActivity act, final LinearLayout layout, int width, int height) + { + int iconD = RubikActivity.getDrawable(R.drawable.ui_small_info,R.drawable.ui_medium_info, R.drawable.ui_big_info, R.drawable.ui_huge_info); + int iconT = RubikActivity.getDrawable(R.drawable.ui_small_tutorial,R.drawable.ui_medium_tutorial, R.drawable.ui_big_tutorial, R.drawable.ui_huge_tutorial); + + ImageButton buttonTut = layout.findViewById(R.id.buttonTut); + Button buttonNul = layout.findViewById(R.id.buttonNul); + ImageButton buttonDet = layout.findViewById(R.id.buttonDet); + + buttonTut.setImageResource(iconT); + buttonDet.setImageResource(iconD); + buttonNul.setVisibility(View.INVISIBLE); + + buttonNul.setWidth(width); + + TypedValue outValue = new TypedValue(); + act.getTheme().resolveAttribute(android.R.attr.selectableItemBackgroundBorderless, outValue, true); + buttonTut.setBackgroundResource(outValue.resourceId); + buttonDet.setBackgroundResource(outValue.resourceId); + + buttonTut.setOnClickListener( new View.OnClickListener() + { + @Override + public void onClick(View v) + { + if( mObjectPopup!=null ) mObjectPopup.dismiss(); + RubikDialogTutorial tDiag = new RubikDialogTutorial(); + tDiag.show( act.getSupportFragmentManager(), RubikDialogTutorial.getDialogTag() ); + } + }); + + buttonDet.setOnClickListener( new View.OnClickListener() + { + @Override + public void onClick(View v) + { + android.util.Log.e("D", "BUTTON DET CLICKED!!"); + } + }); + } + /////////////////////////////////////////////////////////////////////////////////////////////////// private void setupMenuWindow(final RubikActivity act, final float width) @@ -403,48 +440,6 @@ public class RubikScreenPlay extends RubikScreenBase } } -/////////////////////////////////////////////////////////////////////////////////////////////////// - - void setupBottomLayout(final RubikActivity act, final LinearLayout layout, int width) - { - int iconT = RubikActivity.getDrawable(R.drawable.ui_small_tutorial,R.drawable.ui_medium_tutorial, R.drawable.ui_big_tutorial, R.drawable.ui_huge_tutorial); - LinearLayout.LayoutParams paramsT = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f); - TransparentImageButton buttonTut = new TransparentImageButton(act, iconT, TransparentImageButton.GRAVITY_MIDDLE, paramsT); - - int iconD = RubikActivity.getDrawable(R.drawable.ui_small_info,R.drawable.ui_medium_info, R.drawable.ui_big_info, R.drawable.ui_huge_info); - LinearLayout.LayoutParams paramsD = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.WRAP_CONTENT,LinearLayout.LayoutParams.MATCH_PARENT,1.0f); - TransparentImageButton buttonDet = new TransparentImageButton(act, iconD, TransparentImageButton.GRAVITY_MIDDLE, paramsD); - - buttonTut.setOnClickListener( new View.OnClickListener() - { - @Override - public void onClick(View v) - { - if( mObjectPopup!=null ) mObjectPopup.dismiss(); - RubikDialogTutorial tDiag = new RubikDialogTutorial(); - tDiag.show( act.getSupportFragmentManager(), RubikDialogTutorial.getDialogTag() ); - } - }); - - buttonDet.setOnClickListener( new View.OnClickListener() - { - @Override - public void onClick(View v) - { - android.util.Log.e("D", "BUTTON DET CLICKED!!"); - } - }); - - LinearLayout.LayoutParams paramsNul = new LinearLayout.LayoutParams(width,LinearLayout.LayoutParams.MATCH_PARENT,2.0f); - Button buttonNul = new Button(act); - buttonNul.setLayoutParams(paramsNul); - buttonNul.setVisibility(View.INVISIBLE); - - layout.addView(buttonTut); - layout.addView(buttonNul); - layout.addView(buttonDet); - } - /////////////////////////////////////////////////////////////////////////////////////////////////// void setupSolveButton(final RubikActivity act) diff --git a/src/main/res/layout/dialog_tabbed.xml b/src/main/res/layout/dialog_tabbed.xml index fd9ba887..7fd29289 100644 --- a/src/main/res/layout/dialog_tabbed.xml +++ b/src/main/res/layout/dialog_tabbed.xml @@ -13,11 +13,10 @@ android:id="@+id/sliding_tabs" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:theme="@style/Theme.AppCompat.NoActionBar" + app:tabBackground="@drawable/tab_background" app:tabMode="scrollable" - app:tabMinWidth="20dp" - app:tabGravity="fill" - > + app:tabMinWidth="25dp" + app:tabGravity="fill"> + + +