| 1 |
211b48f2
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 2 |
|
|
// Copyright 2020 Leszek Koltunski //
|
| 3 |
|
|
// //
|
| 4 |
|
|
// This file is part of Magic Cube. //
|
| 5 |
|
|
// //
|
| 6 |
|
|
// Magic Cube is free software: you can redistribute it and/or modify //
|
| 7 |
|
|
// it under the terms of the GNU General Public License as published by //
|
| 8 |
|
|
// the Free Software Foundation, either version 2 of the License, or //
|
| 9 |
|
|
// (at your option) any later version. //
|
| 10 |
|
|
// //
|
| 11 |
|
|
// Magic Cube is distributed in the hope that it will be useful, //
|
| 12 |
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of //
|
| 13 |
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the //
|
| 14 |
|
|
// GNU General Public License for more details. //
|
| 15 |
|
|
// //
|
| 16 |
|
|
// You should have received a copy of the GNU General Public License //
|
| 17 |
|
|
// along with Magic Cube. If not, see <http://www.gnu.org/licenses/>. //
|
| 18 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 19 |
|
|
|
| 20 |
fcd5b990
|
Leszek Koltunski
|
package org.distorted.screens;
|
| 21 |
211b48f2
|
Leszek Koltunski
|
|
| 22 |
4c0cd600
|
Leszek Koltunski
|
import android.content.Context;
|
| 23 |
211b48f2
|
Leszek Koltunski
|
import android.content.SharedPreferences;
|
| 24 |
4c0cd600
|
Leszek Koltunski
|
import android.graphics.drawable.BitmapDrawable;
|
| 25 |
255492a0
|
Leszek Koltunski
|
import android.os.Build;
|
| 26 |
e03e0352
|
Leszek Koltunski
|
import android.os.Bundle;
|
| 27 |
e3c74c0f
|
Leszek Koltunski
|
import android.util.TypedValue;
|
| 28 |
255492a0
|
Leszek Koltunski
|
import android.view.Gravity;
|
| 29 |
211b48f2
|
Leszek Koltunski
|
import android.view.LayoutInflater;
|
| 30 |
|
|
import android.view.View;
|
| 31 |
|
|
import android.widget.Button;
|
| 32 |
e07c48a2
|
Leszek Koltunski
|
import android.widget.GridLayout;
|
| 33 |
211b48f2
|
Leszek Koltunski
|
import android.widget.ImageButton;
|
| 34 |
|
|
import android.widget.LinearLayout;
|
| 35 |
4c0cd600
|
Leszek Koltunski
|
import android.widget.PopupWindow;
|
| 36 |
598de3ee
|
Leszek Koltunski
|
import android.widget.ScrollView;
|
| 37 |
211b48f2
|
Leszek Koltunski
|
|
| 38 |
2afc6754
|
Leszek Koltunski
|
import org.distorted.objectlib.main.ObjectControl;
|
| 39 |
318c0a7d
|
Leszek Koltunski
|
import org.distorted.objectlib.main.ObjectType;
|
| 40 |
3f7a4363
|
Leszek Koltunski
|
|
| 41 |
|
|
import org.distorted.main.R;
|
| 42 |
|
|
import org.distorted.main.RubikActivity;
|
| 43 |
e03e0352
|
Leszek Koltunski
|
import org.distorted.dialogs.RubikDialogAbout;
|
| 44 |
a8576d91
|
Leszek Koltunski
|
import org.distorted.dialogs.RubikDialogPattern;
|
| 45 |
e03e0352
|
Leszek Koltunski
|
import org.distorted.dialogs.RubikDialogScores;
|
| 46 |
234a7582
|
Leszek Koltunski
|
import org.distorted.dialogs.RubikDialogTutorial;
|
| 47 |
55e6be1d
|
Leszek Koltunski
|
import org.distorted.helpers.TransparentButton;
|
| 48 |
|
|
import org.distorted.helpers.TransparentImageButton;
|
| 49 |
6a083c6a
|
Leszek Koltunski
|
import org.distorted.network.RubikScores;
|
| 50 |
211b48f2
|
Leszek Koltunski
|
|
| 51 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 52 |
|
|
|
| 53 |
fcd5b990
|
Leszek Koltunski
|
public class RubikScreenPlay extends RubikScreenBase
|
| 54 |
211b48f2
|
Leszek Koltunski
|
{
|
| 55 |
287e91a6
|
Leszek Koltunski
|
public static final int NUM_COLUMNS = 4;
|
| 56 |
00af5060
|
Leszek Koltunski
|
public static final int LEVELS_SHOWN = 10;
|
| 57 |
8ab435b9
|
Leszek Koltunski
|
public static int MAX_LEVEL;
|
| 58 |
|
|
public static final ObjectType DEF_OBJECT= ObjectType.CUBE_3;
|
| 59 |
211b48f2
|
Leszek Koltunski
|
|
| 60 |
7cf2637d
|
Leszek Koltunski
|
private static final int[] BUTTON_LABELS = { R.string.scores,
|
| 61 |
|
|
R.string.patterns,
|
| 62 |
|
|
R.string.solver,
|
| 63 |
|
|
R.string.tutorials,
|
| 64 |
|
|
R.string.about };
|
| 65 |
|
|
|
| 66 |
e03e0352
|
Leszek Koltunski
|
private static final int NUM_BUTTONS = BUTTON_LABELS.length;
|
| 67 |
de62316a
|
Leszek Koltunski
|
private static final float LAST_BUTTON = 1.5f;
|
| 68 |
dc78f395
|
Leszek Koltunski
|
private static final int[] mLocation = new int[2];
|
| 69 |
e03e0352
|
Leszek Koltunski
|
|
| 70 |
a8576d91
|
Leszek Koltunski
|
private ImageButton mObjButton, mMenuButton, mSolveButton;
|
| 71 |
15846fe4
|
Leszek Koltunski
|
private Button mPlayButton;
|
| 72 |
0254cfd7
|
Leszek Koltunski
|
private PopupWindow mObjectPopup, mMenuPopup, mPlayPopup;
|
| 73 |
8ab435b9
|
Leszek Koltunski
|
private ObjectType mObject = DEF_OBJECT;
|
| 74 |
0254cfd7
|
Leszek Koltunski
|
private int mObjectSize, mMenuLayoutWidth, mMenuLayoutHeight, mPlayLayoutWidth;
|
| 75 |
85b09df4
|
Leszek Koltunski
|
private int mLevelValue;
|
| 76 |
e07c48a2
|
Leszek Koltunski
|
private float mButtonSize, mMenuItemSize, mMenuTextSize;
|
| 77 |
598de3ee
|
Leszek Koltunski
|
private int mColCount, mRowCount, mMaxRowCount;
|
| 78 |
0254cfd7
|
Leszek Koltunski
|
private LinearLayout mPlayLayout;
|
| 79 |
255492a0
|
Leszek Koltunski
|
private int mUpperBarHeight;
|
| 80 |
|
|
|
| 81 |
8ab435b9
|
Leszek Koltunski
|
static
|
| 82 |
|
|
{
|
| 83 |
|
|
ObjectType[] types = ObjectType.values();
|
| 84 |
|
|
int max = Integer.MIN_VALUE;
|
| 85 |
|
|
|
| 86 |
|
|
for (ObjectType type : types)
|
| 87 |
|
|
{
|
| 88 |
|
|
int cur = getDBLevel(type);
|
| 89 |
|
|
if( cur>max ) max = cur;
|
| 90 |
|
|
}
|
| 91 |
|
|
|
| 92 |
|
|
MAX_LEVEL = max;
|
| 93 |
|
|
}
|
| 94 |
|
|
|
| 95 |
211b48f2
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 96 |
|
|
|
| 97 |
f5da732a
|
Leszek Koltunski
|
void leaveScreen(RubikActivity act)
|
| 98 |
211b48f2
|
Leszek Koltunski
|
{
|
| 99 |
85b09df4
|
Leszek Koltunski
|
|
| 100 |
211b48f2
|
Leszek Koltunski
|
}
|
| 101 |
|
|
|
| 102 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 103 |
|
|
|
| 104 |
f5da732a
|
Leszek Koltunski
|
void enterScreen(final RubikActivity act)
|
| 105 |
211b48f2
|
Leszek Koltunski
|
{
|
| 106 |
e3c74c0f
|
Leszek Koltunski
|
float width = act.getScreenWidthInPixels();
|
| 107 |
598de3ee
|
Leszek Koltunski
|
float height= act.getScreenHeightInPixels();
|
| 108 |
255492a0
|
Leszek Koltunski
|
mUpperBarHeight = act.getHeightUpperBar();
|
| 109 |
a8576d91
|
Leszek Koltunski
|
|
| 110 |
eb376d3a
|
Leszek Koltunski
|
mMenuTextSize = width*RubikActivity.MENU_MED_TEXT_SIZE;
|
| 111 |
88fb92ba
|
Leszek Koltunski
|
mButtonSize = width*RubikActivity.BUTTON_TEXT_SIZE;
|
| 112 |
|
|
mMenuItemSize = width*RubikActivity.MENU_ITEM_SIZE;
|
| 113 |
e3c74c0f
|
Leszek Koltunski
|
|
| 114 |
287e91a6
|
Leszek Koltunski
|
mRowCount = (ObjectType.NUM_OBJECTS + NUM_COLUMNS-1) / NUM_COLUMNS;
|
| 115 |
|
|
mColCount = NUM_COLUMNS;
|
| 116 |
e07c48a2
|
Leszek Koltunski
|
|
| 117 |
211b48f2
|
Leszek Koltunski
|
// TOP ////////////////////////////
|
| 118 |
7289fd6c
|
Leszek Koltunski
|
LinearLayout layoutTop = act.findViewById(R.id.upperBar);
|
| 119 |
211b48f2
|
Leszek Koltunski
|
layoutTop.removeAllViews();
|
| 120 |
85b09df4
|
Leszek Koltunski
|
|
| 121 |
598de3ee
|
Leszek Koltunski
|
setupObjectWindow(act,width,height);
|
| 122 |
ad0c8e0e
|
Leszek Koltunski
|
setupObjectButton(act,width);
|
| 123 |
85b09df4
|
Leszek Koltunski
|
layoutTop.addView(mObjButton);
|
| 124 |
0254cfd7
|
Leszek Koltunski
|
|
| 125 |
|
|
setupMenuWindow(act,width);
|
| 126 |
|
|
setupMenuButton(act,width);
|
| 127 |
|
|
layoutTop.addView(mMenuButton);
|
| 128 |
|
|
|
| 129 |
|
|
setupPlayWindow(act,width);
|
| 130 |
d90c55cc
|
Leszek Koltunski
|
setupPlayButton(act,width,height);
|
| 131 |
85b09df4
|
Leszek Koltunski
|
layoutTop.addView(mPlayButton);
|
| 132 |
211b48f2
|
Leszek Koltunski
|
|
| 133 |
ad0c8e0e
|
Leszek Koltunski
|
setupSolveButton(act,width);
|
| 134 |
a8576d91
|
Leszek Koltunski
|
createBottomPane(act,width,mSolveButton);
|
| 135 |
769d7b9f
|
Leszek Koltunski
|
}
|
| 136 |
211b48f2
|
Leszek Koltunski
|
|
| 137 |
8ab435b9
|
Leszek Koltunski
|
//////////////////////////////////////////////////////////////////////////////////////////////////
|
| 138 |
4c0cd600
|
Leszek Koltunski
|
|
| 139 |
ad0c8e0e
|
Leszek Koltunski
|
private void setupObjectButton(final RubikActivity act, final float width)
|
| 140 |
769d7b9f
|
Leszek Koltunski
|
{
|
| 141 |
e07c48a2
|
Leszek Koltunski
|
final int margin = (int)(width*RubikActivity.MARGIN);
|
| 142 |
|
|
final int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_menu,R.drawable.ui_medium_cube_menu, R.drawable.ui_big_cube_menu, R.drawable.ui_huge_cube_menu);
|
| 143 |
dc78f395
|
Leszek Koltunski
|
|
| 144 |
da768c35
|
Leszek Koltunski
|
mObjButton = new TransparentImageButton(act, icon, width,LinearLayout.LayoutParams.MATCH_PARENT);
|
| 145 |
769d7b9f
|
Leszek Koltunski
|
|
| 146 |
|
|
mObjButton.setOnClickListener( new View.OnClickListener()
|
| 147 |
|
|
{
|
| 148 |
|
|
@Override
|
| 149 |
|
|
public void onClick(View view)
|
| 150 |
4c0cd600
|
Leszek Koltunski
|
{
|
| 151 |
2afc6754
|
Leszek Koltunski
|
if( mObjectPopup!=null && act.getControl().isUINotBlocked())
|
| 152 |
a42e25a6
|
Leszek Koltunski
|
{
|
| 153 |
598de3ee
|
Leszek Koltunski
|
int rowCount = Math.min(mMaxRowCount,mRowCount);
|
| 154 |
c5b4af4a
|
Leszek Koltunski
|
View popupView = mObjectPopup.getContentView();
|
| 155 |
|
|
popupView.setSystemUiVisibility(RubikActivity.FLAGS);
|
| 156 |
255492a0
|
Leszek Koltunski
|
displayPopup(act,view,mObjectPopup,mObjectSize*mColCount,mObjectSize*rowCount,margin,margin);
|
| 157 |
c5b4af4a
|
Leszek Koltunski
|
}
|
| 158 |
769d7b9f
|
Leszek Koltunski
|
}
|
| 159 |
|
|
});
|
| 160 |
|
|
}
|
| 161 |
4c0cd600
|
Leszek Koltunski
|
|
| 162 |
85b09df4
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 163 |
|
|
|
| 164 |
d90c55cc
|
Leszek Koltunski
|
private void setupPlayButton(final RubikActivity act, final float width, final float height)
|
| 165 |
85b09df4
|
Leszek Koltunski
|
{
|
| 166 |
d90c55cc
|
Leszek Koltunski
|
final int margin = (int)(width*RubikActivity.MARGIN);
|
| 167 |
255492a0
|
Leszek Koltunski
|
final int maxHeight= (int)(0.9f*(height-mUpperBarHeight) );
|
| 168 |
d90c55cc
|
Leszek Koltunski
|
|
| 169 |
da768c35
|
Leszek Koltunski
|
mPlayButton = new TransparentButton(act, R.string.play, mButtonSize, width);
|
| 170 |
85b09df4
|
Leszek Koltunski
|
|
| 171 |
|
|
mPlayButton.setOnClickListener( new View.OnClickListener()
|
| 172 |
|
|
{
|
| 173 |
|
|
@Override
|
| 174 |
0254cfd7
|
Leszek Koltunski
|
public void onClick(View view)
|
| 175 |
85b09df4
|
Leszek Koltunski
|
{
|
| 176 |
2afc6754
|
Leszek Koltunski
|
if( mPlayPopup!=null && act.getControl().isUINotBlocked())
|
| 177 |
6e194411
|
Leszek Koltunski
|
{
|
| 178 |
c5b4af4a
|
Leszek Koltunski
|
View popupView = mPlayPopup.getContentView();
|
| 179 |
|
|
popupView.setSystemUiVisibility(RubikActivity.FLAGS);
|
| 180 |
8ab435b9
|
Leszek Koltunski
|
final int dbLevel = getDBLevel(mObject);
|
| 181 |
0a7aa15b
|
Leszek Koltunski
|
final int levelsShown = Math.min(dbLevel,LEVELS_SHOWN);
|
| 182 |
d90c55cc
|
Leszek Koltunski
|
final int popupHeight = (int)(levelsShown*(mMenuItemSize+margin)+3*margin+mMenuItemSize*(LAST_BUTTON-1.0f));
|
| 183 |
255492a0
|
Leszek Koltunski
|
final int realHeight = Math.min(popupHeight,maxHeight);
|
| 184 |
|
|
displayPopup(act,view,mPlayPopup,mPlayLayoutWidth,realHeight,margin,margin);
|
| 185 |
6fad862b
|
Leszek Koltunski
|
}
|
| 186 |
85b09df4
|
Leszek Koltunski
|
}
|
| 187 |
|
|
});
|
| 188 |
|
|
}
|
| 189 |
|
|
|
| 190 |
e31abc1e
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 191 |
|
|
|
| 192 |
ad0c8e0e
|
Leszek Koltunski
|
private void setupMenuButton(final RubikActivity act, final float width)
|
| 193 |
e31abc1e
|
Leszek Koltunski
|
{
|
| 194 |
0254cfd7
|
Leszek Koltunski
|
final int margin = (int)(width*RubikActivity.MARGIN);
|
| 195 |
|
|
final int icon = RubikActivity.getDrawable(R.drawable.ui_small_menu,R.drawable.ui_medium_menu, R.drawable.ui_big_menu, R.drawable.ui_huge_menu);
|
| 196 |
dc78f395
|
Leszek Koltunski
|
|
| 197 |
da768c35
|
Leszek Koltunski
|
mMenuButton = new TransparentImageButton(act, icon, width,LinearLayout.LayoutParams.MATCH_PARENT);
|
| 198 |
e31abc1e
|
Leszek Koltunski
|
|
| 199 |
e03e0352
|
Leszek Koltunski
|
mMenuButton.setOnClickListener( new View.OnClickListener()
|
| 200 |
e31abc1e
|
Leszek Koltunski
|
{
|
| 201 |
|
|
@Override
|
| 202 |
|
|
public void onClick(View view)
|
| 203 |
|
|
{
|
| 204 |
2afc6754
|
Leszek Koltunski
|
if( mMenuPopup!=null && act.getControl().isUINotBlocked())
|
| 205 |
e03e0352
|
Leszek Koltunski
|
{
|
| 206 |
c5b4af4a
|
Leszek Koltunski
|
View popupView = mMenuPopup.getContentView();
|
| 207 |
|
|
popupView.setSystemUiVisibility(RubikActivity.FLAGS);
|
| 208 |
255492a0
|
Leszek Koltunski
|
displayPopup(act,view,mMenuPopup,mMenuLayoutWidth,mMenuLayoutHeight,(int)(-width/12),margin);
|
| 209 |
6fad862b
|
Leszek Koltunski
|
}
|
| 210 |
e31abc1e
|
Leszek Koltunski
|
}
|
| 211 |
|
|
});
|
| 212 |
|
|
}
|
| 213 |
|
|
|
| 214 |
4c0cd600
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 215 |
|
|
|
| 216 |
598de3ee
|
Leszek Koltunski
|
private void setupObjectWindow(final RubikActivity act, final float width, final float height)
|
| 217 |
4c0cd600
|
Leszek Koltunski
|
{
|
| 218 |
8c93c0b1
|
Leszek Koltunski
|
int icon = RubikActivity.getDrawable(R.drawable.s_cube_2,R.drawable.m_cube_2, R.drawable.b_cube_2, R.drawable.h_cube_2);
|
| 219 |
598de3ee
|
Leszek Koltunski
|
|
| 220 |
|
|
BitmapDrawable bd = (BitmapDrawable) act.getResources().getDrawable(icon);
|
| 221 |
|
|
int cubeWidth = bd.getIntrinsicWidth();
|
| 222 |
|
|
int margin = (int)(width*RubikActivity.LARGE_MARGIN);
|
| 223 |
|
|
mObjectSize = (int)(cubeWidth + 2*margin + 0.5f);
|
| 224 |
255492a0
|
Leszek Koltunski
|
mMaxRowCount = (int)(0.9f*(height-mUpperBarHeight)/mObjectSize);
|
| 225 |
598de3ee
|
Leszek Koltunski
|
GridLayout objectGrid = new GridLayout(act);
|
| 226 |
|
|
mObjectPopup = new PopupWindow(act);
|
| 227 |
|
|
mObjectPopup.setFocusable(true);
|
| 228 |
|
|
|
| 229 |
|
|
if( mMaxRowCount<mRowCount )
|
| 230 |
|
|
{
|
| 231 |
|
|
ScrollView scrollView = new ScrollView(act);
|
| 232 |
|
|
scrollView.addView(objectGrid);
|
| 233 |
|
|
mObjectPopup.setContentView(scrollView);
|
| 234 |
|
|
}
|
| 235 |
|
|
else
|
| 236 |
|
|
{
|
| 237 |
|
|
mObjectPopup.setContentView(objectGrid);
|
| 238 |
|
|
}
|
| 239 |
e07c48a2
|
Leszek Koltunski
|
|
| 240 |
|
|
GridLayout.Spec[] rowSpecs = new GridLayout.Spec[mRowCount];
|
| 241 |
|
|
GridLayout.Spec[] colSpecs = new GridLayout.Spec[mColCount];
|
| 242 |
|
|
|
| 243 |
92843d3b
|
Leszek Koltunski
|
objectGrid.setColumnCount(mColCount);
|
| 244 |
|
|
objectGrid.setRowCount(mRowCount);
|
| 245 |
e07c48a2
|
Leszek Koltunski
|
|
| 246 |
0501a4b8
|
Leszek Koltunski
|
int[] nextInRow = new int[mRowCount];
|
| 247 |
fa679111
|
Leszek Koltunski
|
|
| 248 |
e07c48a2
|
Leszek Koltunski
|
for(int row=0; row<mRowCount; row++)
|
| 249 |
|
|
{
|
| 250 |
|
|
rowSpecs[row] = GridLayout.spec(row);
|
| 251 |
0501a4b8
|
Leszek Koltunski
|
nextInRow[row]= 0;
|
| 252 |
e07c48a2
|
Leszek Koltunski
|
}
|
| 253 |
|
|
for(int col=0; col<mColCount; col++)
|
| 254 |
|
|
{
|
| 255 |
|
|
colSpecs[col] = GridLayout.spec(col);
|
| 256 |
|
|
}
|
| 257 |
769d7b9f
|
Leszek Koltunski
|
|
| 258 |
318c0a7d
|
Leszek Koltunski
|
for(int object = 0; object< ObjectType.NUM_OBJECTS; object++)
|
| 259 |
769d7b9f
|
Leszek Koltunski
|
{
|
| 260 |
318c0a7d
|
Leszek Koltunski
|
final ObjectType list = ObjectType.getObject(object);
|
| 261 |
588ace55
|
Leszek Koltunski
|
int iconSize = RubikActivity.getDrawableSize();
|
| 262 |
7ac0ee88
|
Leszek Koltunski
|
int icons = list.getIconID(iconSize);
|
| 263 |
769d7b9f
|
Leszek Koltunski
|
final int obj = object;
|
| 264 |
287e91a6
|
Leszek Koltunski
|
int row = object/NUM_COLUMNS;
|
| 265 |
769d7b9f
|
Leszek Koltunski
|
|
| 266 |
7ac0ee88
|
Leszek Koltunski
|
ImageButton button = new ImageButton(act);
|
| 267 |
|
|
button.setBackgroundResource(icons);
|
| 268 |
|
|
button.setOnClickListener( new View.OnClickListener()
|
| 269 |
769d7b9f
|
Leszek Koltunski
|
{
|
| 270 |
7ac0ee88
|
Leszek Koltunski
|
@Override
|
| 271 |
|
|
public void onClick(View v)
|
| 272 |
769d7b9f
|
Leszek Koltunski
|
{
|
| 273 |
2afc6754
|
Leszek Koltunski
|
if( act.getControl().isUINotBlocked() && ScreenList.getCurrentScreen()== ScreenList.PLAY )
|
| 274 |
769d7b9f
|
Leszek Koltunski
|
{
|
| 275 |
8ab435b9
|
Leszek Koltunski
|
mObject = ObjectType.getObject(obj);
|
| 276 |
7ac0ee88
|
Leszek Koltunski
|
act.changeObject(list, true);
|
| 277 |
|
|
adjustLevels(act);
|
| 278 |
dd1a65c1
|
Leszek Koltunski
|
mMovesController.clearMoves(act);
|
| 279 |
769d7b9f
|
Leszek Koltunski
|
}
|
| 280 |
|
|
|
| 281 |
7ac0ee88
|
Leszek Koltunski
|
mObjectPopup.dismiss();
|
| 282 |
|
|
}
|
| 283 |
|
|
});
|
| 284 |
e07c48a2
|
Leszek Koltunski
|
|
| 285 |
7ac0ee88
|
Leszek Koltunski
|
GridLayout.LayoutParams params = new GridLayout.LayoutParams(rowSpecs[row],colSpecs[nextInRow[row]]);
|
| 286 |
|
|
params.bottomMargin = margin;
|
| 287 |
|
|
params.topMargin = margin;
|
| 288 |
|
|
params.leftMargin = margin;
|
| 289 |
|
|
params.rightMargin = margin;
|
| 290 |
fa679111
|
Leszek Koltunski
|
|
| 291 |
7ac0ee88
|
Leszek Koltunski
|
nextInRow[row]++;
|
| 292 |
|
|
|
| 293 |
|
|
objectGrid.addView(button, params);
|
| 294 |
769d7b9f
|
Leszek Koltunski
|
}
|
| 295 |
4c0cd600
|
Leszek Koltunski
|
}
|
| 296 |
|
|
|
| 297 |
e03e0352
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 298 |
|
|
|
| 299 |
ad0c8e0e
|
Leszek Koltunski
|
private void setupMenuWindow(final RubikActivity act, final float width)
|
| 300 |
e03e0352
|
Leszek Koltunski
|
{
|
| 301 |
|
|
LayoutInflater layoutInflater = (LayoutInflater)act.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
| 302 |
e07c48a2
|
Leszek Koltunski
|
final View layout = layoutInflater.inflate(R.layout.popup_menu, null);
|
| 303 |
|
|
LinearLayout menuLayout = layout.findViewById(R.id.menuGrid);
|
| 304 |
e03e0352
|
Leszek Koltunski
|
|
| 305 |
|
|
mMenuPopup = new PopupWindow(act);
|
| 306 |
|
|
mMenuPopup.setContentView(layout);
|
| 307 |
|
|
mMenuPopup.setFocusable(true);
|
| 308 |
ad0c8e0e
|
Leszek Koltunski
|
int margin = (int)(width*RubikActivity.MARGIN);
|
| 309 |
|
|
int padding = (int)(width*RubikActivity.PADDING);
|
| 310 |
e03e0352
|
Leszek Koltunski
|
|
| 311 |
0254cfd7
|
Leszek Koltunski
|
mMenuLayoutWidth = (int)(width/2);
|
| 312 |
|
|
mMenuLayoutHeight= (int)(2*margin + NUM_BUTTONS*(mMenuItemSize+margin));
|
| 313 |
|
|
|
| 314 |
43162dfb
|
Leszek Koltunski
|
LinearLayout.LayoutParams p = new LinearLayout.LayoutParams( mMenuLayoutWidth - 2*padding, (int)mMenuItemSize);
|
| 315 |
e03e0352
|
Leszek Koltunski
|
|
| 316 |
|
|
for(int i=0; i<NUM_BUTTONS; i++)
|
| 317 |
|
|
{
|
| 318 |
|
|
final int but = i;
|
| 319 |
|
|
Button button = new Button(act);
|
| 320 |
43162dfb
|
Leszek Koltunski
|
button.setLayoutParams(p);
|
| 321 |
e03e0352
|
Leszek Koltunski
|
button.setText(BUTTON_LABELS[i]);
|
| 322 |
88fb92ba
|
Leszek Koltunski
|
button.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
|
| 323 |
e03e0352
|
Leszek Koltunski
|
|
| 324 |
|
|
button.setOnClickListener( new View.OnClickListener()
|
| 325 |
|
|
{
|
| 326 |
|
|
@Override
|
| 327 |
|
|
public void onClick(View v)
|
| 328 |
|
|
{
|
| 329 |
|
|
mMenuPopup.dismiss();
|
| 330 |
0254cfd7
|
Leszek Koltunski
|
MenuAction(act,but);
|
| 331 |
e03e0352
|
Leszek Koltunski
|
}
|
| 332 |
|
|
});
|
| 333 |
|
|
|
| 334 |
e07c48a2
|
Leszek Koltunski
|
menuLayout.addView(button);
|
| 335 |
e03e0352
|
Leszek Koltunski
|
}
|
| 336 |
0254cfd7
|
Leszek Koltunski
|
}
|
| 337 |
e03e0352
|
Leszek Koltunski
|
|
| 338 |
0254cfd7
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 339 |
|
|
|
| 340 |
|
|
private void setupPlayWindow(final RubikActivity act, final float width)
|
| 341 |
|
|
{
|
| 342 |
|
|
LayoutInflater layoutInflater = (LayoutInflater)act.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
|
| 343 |
|
|
final View layout = layoutInflater.inflate(R.layout.popup_play, null);
|
| 344 |
|
|
mPlayLayout = layout.findViewById(R.id.playGrid);
|
| 345 |
|
|
|
| 346 |
|
|
mPlayLayoutWidth = (int)(width*0.4f);
|
| 347 |
|
|
|
| 348 |
|
|
mPlayPopup = new PopupWindow(act);
|
| 349 |
|
|
mPlayPopup.setContentView(layout);
|
| 350 |
|
|
mPlayPopup.setFocusable(true);
|
| 351 |
|
|
|
| 352 |
|
|
adjustLevels(act);
|
| 353 |
e03e0352
|
Leszek Koltunski
|
}
|
| 354 |
|
|
|
| 355 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 356 |
|
|
|
| 357 |
0254cfd7
|
Leszek Koltunski
|
private void MenuAction(RubikActivity act, int button)
|
| 358 |
e03e0352
|
Leszek Koltunski
|
{
|
| 359 |
|
|
switch(button)
|
| 360 |
|
|
{
|
| 361 |
8ab435b9
|
Leszek Koltunski
|
case 0: Bundle sBundle = new Bundle();
|
| 362 |
|
|
sBundle.putInt("tab", mObject.ordinal() );
|
| 363 |
a8576d91
|
Leszek Koltunski
|
sBundle.putBoolean("submitting", false);
|
| 364 |
e03e0352
|
Leszek Koltunski
|
RubikDialogScores scores = new RubikDialogScores();
|
| 365 |
a8576d91
|
Leszek Koltunski
|
scores.setArguments(sBundle);
|
| 366 |
e03e0352
|
Leszek Koltunski
|
scores.show(act.getSupportFragmentManager(), null);
|
| 367 |
|
|
break;
|
| 368 |
234a7582
|
Leszek Koltunski
|
case 1: RubikDialogPattern pDiag = new RubikDialogPattern();
|
| 369 |
|
|
pDiag.show( act.getSupportFragmentManager(), RubikDialogPattern.getDialogTag() );
|
| 370 |
e03e0352
|
Leszek Koltunski
|
break;
|
| 371 |
b2a92941
|
Leszek Koltunski
|
case 2: ScreenList.switchScreen(act, ScreenList.SVER);
|
| 372 |
e03e0352
|
Leszek Koltunski
|
break;
|
| 373 |
b2a92941
|
Leszek Koltunski
|
case 3: RubikDialogTutorial tDiag = new RubikDialogTutorial();
|
| 374 |
234a7582
|
Leszek Koltunski
|
tDiag.show( act.getSupportFragmentManager(), RubikDialogTutorial.getDialogTag() );
|
| 375 |
2971588c
|
Leszek Koltunski
|
break;
|
| 376 |
b2a92941
|
Leszek Koltunski
|
case 4: RubikDialogAbout aDiag = new RubikDialogAbout();
|
| 377 |
a8576d91
|
Leszek Koltunski
|
aDiag.show(act.getSupportFragmentManager(), null);
|
| 378 |
e03e0352
|
Leszek Koltunski
|
break;
|
| 379 |
|
|
}
|
| 380 |
|
|
}
|
| 381 |
|
|
|
| 382 |
46405bb4
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 383 |
|
|
|
| 384 |
a8576d91
|
Leszek Koltunski
|
void setupSolveButton(final RubikActivity act, final float width)
|
| 385 |
46405bb4
|
Leszek Koltunski
|
{
|
| 386 |
a8576d91
|
Leszek Koltunski
|
int icon = RubikActivity.getDrawable(R.drawable.ui_small_cube_solve,R.drawable.ui_medium_cube_solve, R.drawable.ui_big_cube_solve, R.drawable.ui_huge_cube_solve);
|
| 387 |
|
|
mSolveButton = new TransparentImageButton(act, icon, width,LinearLayout.LayoutParams.MATCH_PARENT);
|
| 388 |
46405bb4
|
Leszek Koltunski
|
|
| 389 |
a8576d91
|
Leszek Koltunski
|
mSolveButton.setOnClickListener( new View.OnClickListener()
|
| 390 |
46405bb4
|
Leszek Koltunski
|
{
|
| 391 |
a8576d91
|
Leszek Koltunski
|
@Override
|
| 392 |
|
|
public void onClick(View v)
|
| 393 |
|
|
{
|
| 394 |
2afc6754
|
Leszek Koltunski
|
act.getControl().solveObject();
|
| 395 |
dd1a65c1
|
Leszek Koltunski
|
mMovesController.clearMoves(act);
|
| 396 |
a8576d91
|
Leszek Koltunski
|
}
|
| 397 |
|
|
});
|
| 398 |
46405bb4
|
Leszek Koltunski
|
}
|
| 399 |
|
|
|
| 400 |
211b48f2
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 401 |
|
|
|
| 402 |
|
|
public void savePreferences(SharedPreferences.Editor editor)
|
| 403 |
|
|
{
|
| 404 |
8ab435b9
|
Leszek Koltunski
|
editor.putString("statePlay_objName", mObject.name() );
|
| 405 |
4c0cd600
|
Leszek Koltunski
|
|
| 406 |
e03e0352
|
Leszek Koltunski
|
if( mObjectPopup!=null )
|
| 407 |
|
|
{
|
| 408 |
|
|
mObjectPopup.dismiss();
|
| 409 |
|
|
mObjectPopup = null;
|
| 410 |
|
|
}
|
| 411 |
|
|
|
| 412 |
|
|
if( mMenuPopup!=null )
|
| 413 |
4c0cd600
|
Leszek Koltunski
|
{
|
| 414 |
e03e0352
|
Leszek Koltunski
|
mMenuPopup.dismiss();
|
| 415 |
|
|
mMenuPopup = null;
|
| 416 |
4c0cd600
|
Leszek Koltunski
|
}
|
| 417 |
0254cfd7
|
Leszek Koltunski
|
|
| 418 |
|
|
if( mPlayPopup!=null )
|
| 419 |
|
|
{
|
| 420 |
|
|
mPlayPopup.dismiss();
|
| 421 |
|
|
mPlayPopup = null;
|
| 422 |
|
|
}
|
| 423 |
211b48f2
|
Leszek Koltunski
|
}
|
| 424 |
|
|
|
| 425 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 426 |
|
|
|
| 427 |
|
|
public void restorePreferences(SharedPreferences preferences)
|
| 428 |
|
|
{
|
| 429 |
8ab435b9
|
Leszek Koltunski
|
String objName= preferences.getString("statePlay_objName", DEF_OBJECT.name() );
|
| 430 |
|
|
int ordinal = ObjectType.getOrdinal(objName);
|
| 431 |
|
|
mObject = ordinal>=0 ? ObjectType.values()[ordinal] : DEF_OBJECT;
|
| 432 |
211b48f2
|
Leszek Koltunski
|
}
|
| 433 |
|
|
|
| 434 |
53f23b64
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 435 |
|
|
|
| 436 |
318c0a7d
|
Leszek Koltunski
|
public boolean setObject(RubikActivity act, ObjectType obj)
|
| 437 |
53f23b64
|
Leszek Koltunski
|
{
|
| 438 |
8ab435b9
|
Leszek Koltunski
|
if( mObject!=obj )
|
| 439 |
7b7d65ce
|
Leszek Koltunski
|
{
|
| 440 |
8ab435b9
|
Leszek Koltunski
|
mObject = obj;
|
| 441 |
7ac0ee88
|
Leszek Koltunski
|
if( mPlayLayout!=null ) adjustLevels(act);
|
| 442 |
|
|
return true;
|
| 443 |
7b7d65ce
|
Leszek Koltunski
|
}
|
| 444 |
|
|
|
| 445 |
7ac0ee88
|
Leszek Koltunski
|
return false;
|
| 446 |
7b7d65ce
|
Leszek Koltunski
|
}
|
| 447 |
|
|
|
| 448 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 449 |
255492a0
|
Leszek Koltunski
|
// work around lame bugs in Android's version <= 10 pop-up and split-screen modes
|
| 450 |
|
|
|
| 451 |
|
|
private void displayPopup(RubikActivity act, View view, PopupWindow window, int w, int h, int xoff, int yoff)
|
| 452 |
|
|
{
|
| 453 |
|
|
View topLayout = act.findViewById(R.id.relativeLayout);
|
| 454 |
7ac0ee88
|
Leszek Koltunski
|
boolean isFullScreen;
|
| 455 |
00aa398a
|
Leszek Koltunski
|
|
| 456 |
|
|
if( topLayout!=null )
|
| 457 |
|
|
{
|
| 458 |
|
|
topLayout.getLocationOnScreen(mLocation);
|
| 459 |
7ac0ee88
|
Leszek Koltunski
|
isFullScreen = (mLocation[1]==0);
|
| 460 |
00aa398a
|
Leszek Koltunski
|
}
|
| 461 |
|
|
else
|
| 462 |
|
|
{
|
| 463 |
7ac0ee88
|
Leszek Koltunski
|
isFullScreen = true;
|
| 464 |
00aa398a
|
Leszek Koltunski
|
}
|
| 465 |
255492a0
|
Leszek Koltunski
|
|
| 466 |
|
|
// if on Android 11 or we are fullscreen
|
| 467 |
7ac0ee88
|
Leszek Koltunski
|
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R || isFullScreen )
|
| 468 |
255492a0
|
Leszek Koltunski
|
{
|
| 469 |
|
|
window.showAsDropDown(view, xoff, yoff, Gravity.CENTER);
|
| 470 |
|
|
window.update(view, w, h);
|
| 471 |
|
|
}
|
| 472 |
|
|
else // Android 10 or below in pop-up mode or split-screen mode
|
| 473 |
|
|
{
|
| 474 |
|
|
view.getLocationOnScreen(mLocation);
|
| 475 |
|
|
int width = view.getWidth();
|
| 476 |
|
|
int height = view.getHeight();
|
| 477 |
|
|
int x = mLocation[0]+(width-w)/2;
|
| 478 |
|
|
int y = mLocation[1]+height+yoff;
|
| 479 |
|
|
|
| 480 |
|
|
window.showAsDropDown(view);
|
| 481 |
|
|
window.update(x,y,w,h);
|
| 482 |
|
|
}
|
| 483 |
|
|
}
|
| 484 |
|
|
|
| 485 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 486 |
7b7d65ce
|
Leszek Koltunski
|
|
| 487 |
0254cfd7
|
Leszek Koltunski
|
private void adjustLevels(final RubikActivity act)
|
| 488 |
7b7d65ce
|
Leszek Koltunski
|
{
|
| 489 |
8ab435b9
|
Leszek Koltunski
|
int dbLevel = getDBLevel(mObject);
|
| 490 |
|
|
int numScrambles = ObjectType.getNumScramble(mObject.ordinal());
|
| 491 |
0a7aa15b
|
Leszek Koltunski
|
int numLevel = Math.min(dbLevel, LEVELS_SHOWN);
|
| 492 |
00af5060
|
Leszek Koltunski
|
String[] levels = new String[numLevel];
|
| 493 |
7b7d65ce
|
Leszek Koltunski
|
|
| 494 |
00af5060
|
Leszek Koltunski
|
for(int i=0; i<numLevel-1; i++)
|
| 495 |
53f23b64
|
Leszek Koltunski
|
{
|
| 496 |
7b7d65ce
|
Leszek Koltunski
|
levels[i] = act.getString(R.string.lv_placeholder,i+1);
|
| 497 |
53f23b64
|
Leszek Koltunski
|
}
|
| 498 |
|
|
|
| 499 |
4fc7b1e6
|
Leszek Koltunski
|
if( numLevel>0 )
|
| 500 |
|
|
{
|
| 501 |
|
|
levels[numLevel-1] = act.getString(R.string.level_full);
|
| 502 |
|
|
}
|
| 503 |
00af5060
|
Leszek Koltunski
|
|
| 504 |
0a7aa15b
|
Leszek Koltunski
|
if( mLevelValue>dbLevel || mLevelValue<1 ||
|
| 505 |
|
|
(mLevelValue<dbLevel || mLevelValue>LEVELS_SHOWN ) )
|
| 506 |
00af5060
|
Leszek Koltunski
|
{
|
| 507 |
|
|
mLevelValue=1;
|
| 508 |
|
|
}
|
| 509 |
0254cfd7
|
Leszek Koltunski
|
|
| 510 |
de62316a
|
Leszek Koltunski
|
float width = act.getScreenWidthInPixels();
|
| 511 |
|
|
int margin = (int)(width*RubikActivity.MARGIN);
|
| 512 |
|
|
int padding = (int)(width*RubikActivity.PADDING);
|
| 513 |
|
|
int butWidth = mPlayLayoutWidth - 2*padding;
|
| 514 |
|
|
int butHeight= (int)mMenuItemSize;
|
| 515 |
|
|
int lastButH = (int)(mMenuItemSize*LAST_BUTTON) ;
|
| 516 |
0254cfd7
|
Leszek Koltunski
|
|
| 517 |
de62316a
|
Leszek Koltunski
|
LinearLayout.LayoutParams pM = new LinearLayout.LayoutParams( butWidth, butHeight );
|
| 518 |
0254cfd7
|
Leszek Koltunski
|
pM.setMargins(margin, 0, margin, margin);
|
| 519 |
de62316a
|
Leszek Koltunski
|
LinearLayout.LayoutParams pT = new LinearLayout.LayoutParams( butWidth, butHeight );
|
| 520 |
0254cfd7
|
Leszek Koltunski
|
pT.setMargins(margin, margin, margin, margin);
|
| 521 |
de62316a
|
Leszek Koltunski
|
LinearLayout.LayoutParams pB = new LinearLayout.LayoutParams( butWidth, lastButH );
|
| 522 |
0254cfd7
|
Leszek Koltunski
|
pB.setMargins(margin, margin, margin, 2*margin);
|
| 523 |
|
|
|
| 524 |
|
|
mPlayLayout.removeAllViews();
|
| 525 |
|
|
|
| 526 |
d7e539d0
|
Leszek Koltunski
|
RubikScores scores = RubikScores.getInstance();
|
| 527 |
|
|
|
| 528 |
00af5060
|
Leszek Koltunski
|
for(int i=0; i<numLevel; i++)
|
| 529 |
011fcfe0
|
Leszek Koltunski
|
{
|
| 530 |
0a7aa15b
|
Leszek Koltunski
|
final int level = i<numLevel-1 ? i+1 : dbLevel;
|
| 531 |
|
|
final int scrambles = i<numLevel-1 ? i+1 : numScrambles;
|
| 532 |
0254cfd7
|
Leszek Koltunski
|
Button button = new Button(act);
|
| 533 |
00af5060
|
Leszek Koltunski
|
button.setLayoutParams(i==0 ? pT : (i==numLevel-1 ? pB : pM));
|
| 534 |
0254cfd7
|
Leszek Koltunski
|
button.setText(levels[i]);
|
| 535 |
|
|
button.setTextSize(TypedValue.COMPLEX_UNIT_PX, mMenuTextSize);
|
| 536 |
|
|
|
| 537 |
8ab435b9
|
Leszek Koltunski
|
int icon = scores.isSolved(mObject.ordinal(), level-1) ? R.drawable.ui_solved : R.drawable.ui_notsolved;
|
| 538 |
d7e539d0
|
Leszek Koltunski
|
button.setCompoundDrawablesWithIntrinsicBounds(icon,0,0,0);
|
| 539 |
|
|
|
| 540 |
0254cfd7
|
Leszek Koltunski
|
button.setOnClickListener( new View.OnClickListener()
|
| 541 |
011fcfe0
|
Leszek Koltunski
|
{
|
| 542 |
0254cfd7
|
Leszek Koltunski
|
@Override
|
| 543 |
|
|
public void onClick(View v)
|
| 544 |
|
|
{
|
| 545 |
2afc6754
|
Leszek Koltunski
|
ObjectControl control = act.getControl();
|
| 546 |
6fad862b
|
Leszek Koltunski
|
|
| 547 |
2afc6754
|
Leszek Koltunski
|
if(control.isUINotBlocked())
|
| 548 |
6fad862b
|
Leszek Koltunski
|
{
|
| 549 |
598de3ee
|
Leszek Koltunski
|
if( mPlayPopup!=null ) mPlayPopup.dismiss();
|
| 550 |
0a7aa15b
|
Leszek Koltunski
|
mLevelValue = level;
|
| 551 |
2afc6754
|
Leszek Koltunski
|
control.scrambleObject(scrambles);
|
| 552 |
6fad862b
|
Leszek Koltunski
|
}
|
| 553 |
0254cfd7
|
Leszek Koltunski
|
}
|
| 554 |
|
|
});
|
| 555 |
011fcfe0
|
Leszek Koltunski
|
|
| 556 |
0254cfd7
|
Leszek Koltunski
|
mPlayLayout.addView(button);
|
| 557 |
|
|
}
|
| 558 |
53f23b64
|
Leszek Koltunski
|
}
|
| 559 |
|
|
|
| 560 |
8ab435b9
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 561 |
|
|
// historically older versions of the app had lower 'maxScrambles' in case of several objects and
|
| 562 |
|
|
// those got remembered in the server-side DB already, so we need to keep using them. This function
|
| 563 |
|
|
// provides a map between 'maxScramble' of an object and its 'dbLevel'. All new objects will have
|
| 564 |
|
|
// those two values the same.
|
| 565 |
|
|
|
| 566 |
|
|
public static int getDBLevel(ObjectType object)
|
| 567 |
|
|
{
|
| 568 |
|
|
switch(object)
|
| 569 |
|
|
{
|
| 570 |
|
|
case CUBE_3: return 16;
|
| 571 |
|
|
case CUBE_4: return 20;
|
| 572 |
|
|
case CUBE_5: return 24;
|
| 573 |
|
|
case PYRA_4: return 14;
|
| 574 |
|
|
case PYRA_5: return 20;
|
| 575 |
|
|
case MEGA_5: return 35;
|
| 576 |
|
|
case DIAM_2: return 10;
|
| 577 |
|
|
case DIAM_3: return 18;
|
| 578 |
|
|
case REDI_3: return 14;
|
| 579 |
|
|
case HELI_3: return 18;
|
| 580 |
|
|
case SKEW_3: return 17;
|
| 581 |
|
|
case REX_3 : return 16;
|
| 582 |
|
|
case MIRR_3: return 16;
|
| 583 |
|
|
default : return ObjectType.getNumScramble(object.ordinal());
|
| 584 |
|
|
}
|
| 585 |
|
|
}
|
| 586 |
|
|
|
| 587 |
211b48f2
|
Leszek Koltunski
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 588 |
|
|
|
| 589 |
dca3888a
|
Leszek Koltunski
|
public int getLevel()
|
| 590 |
211b48f2
|
Leszek Koltunski
|
{
|
| 591 |
85b09df4
|
Leszek Koltunski
|
return mLevelValue;
|
| 592 |
211b48f2
|
Leszek Koltunski
|
}
|
| 593 |
|
|
|
| 594 |
|
|
///////////////////////////////////////////////////////////////////////////////////////////////////
|
| 595 |
|
|
|
| 596 |
8ab435b9
|
Leszek Koltunski
|
public ObjectType getObject()
|
| 597 |
211b48f2
|
Leszek Koltunski
|
{
|
| 598 |
4888e97c
|
Leszek Koltunski
|
return mObject;
|
| 599 |
211b48f2
|
Leszek Koltunski
|
}
|
| 600 |
|
|
}
|