Revision 7bb30586
Added by Leszek Koltunski 7 months ago
| src/main/java/org/distorted/objects/RubikObject.java | ||
|---|---|---|
| 26 | 26 |
import org.distorted.external.RubikFiles; |
| 27 | 27 |
import org.distorted.jsons.ObjectJson; |
| 28 | 28 |
import org.distorted.main.R; |
| 29 |
import org.distorted.main_old.RubikActivity; |
|
| 30 | 29 |
import org.distorted.objectlib.main.ObjectType; |
| 31 | 30 |
import org.distorted.objectlib.patterns.RubikPatternList; |
| 32 | 31 |
import org.distorted.solvers.ImplementedSolversList; |
| 33 | 32 |
|
| 34 |
import static org.distorted.main_old.RubikActivity.SHOW_DOWNLOADED_DEBUG; |
|
| 35 |
|
|
| 36 | 33 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 37 | 34 |
|
| 38 | 35 |
public class RubikObject |
| ... | ... | |
| 84 | 81 |
|
| 85 | 82 |
RubikObject(RubikObjectList.DownloadedObject object) |
| 86 | 83 |
{
|
| 87 |
if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "new downloaded RubikObject "+object.shortName+" added");
|
|
| 84 |
if( RubikObjectList.SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "new downloaded RubikObject "+object.shortName+" added");
|
|
| 88 | 85 |
|
| 89 | 86 |
mLowerName = object.shortName; |
| 90 | 87 |
mUpperName = object.shortName.toUpperCase(Locale.ENGLISH); |
| ... | ... | |
| 114 | 111 |
|
| 115 | 112 |
if( object.objectVersion>mObjectVersion ) |
| 116 | 113 |
{
|
| 117 |
if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "Updating RubikObject's "+object.shortName+" main JSON");
|
|
| 114 |
if( RubikObjectList.SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "Updating RubikObject's "+object.shortName+" main JSON");
|
|
| 118 | 115 |
|
| 119 | 116 |
mObjectVersion= object.objectVersion; |
| 120 | 117 |
mNumScramble = object.numScrambles; |
| ... | ... | |
| 125 | 122 |
|
| 126 | 123 |
if( object.extrasVersion>mExtrasVersion ) |
| 127 | 124 |
{
|
| 128 |
if( SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "Updating RubikObject's "+object.shortName+" extras JSON");
|
|
| 125 |
if( RubikObjectList.SHOW_DOWNLOADED_DEBUG ) android.util.Log.e("D", "Updating RubikObject's "+object.shortName+" extras JSON");
|
|
| 129 | 126 |
|
| 130 | 127 |
mExtrasVersion = object.extrasVersion; |
| 131 | 128 |
mExtrasID = -1; |
| ... | ... | |
| 199 | 196 |
|
| 200 | 197 |
public boolean isFree() |
| 201 | 198 |
{
|
| 202 |
return (!RubikActivity.USE_IAP || mIsFree);
|
|
| 199 |
return (!RubikObjectList.USE_IAP || mIsFree);
|
|
| 203 | 200 |
} |
| 204 | 201 |
|
| 205 | 202 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
Also available in: Unified diff
Remove all old UI 1.0 classes