Revision 18b0ae9c
Added by Leszek Koltunski 6 months ago
| src/main/java/org/distorted/playui/PlayActivity.java | ||
|---|---|---|
| 24 | 24 |
import androidx.appcompat.app.AppCompatActivity; |
| 25 | 25 |
import androidx.preference.PreferenceManager; |
| 26 | 26 |
|
| 27 |
import com.google.firebase.analytics.FirebaseAnalytics; |
|
| 28 |
|
|
| 27 | 29 |
import org.distorted.library.main.DistortedLibrary; |
| 28 | 30 |
import org.distorted.objectlib.main.InitAssets; |
| 29 | 31 |
import org.distorted.objectlib.main.ObjectControl; |
| ... | ... | |
| 57 | 59 |
private boolean mObjectLocal; |
| 58 | 60 |
private int mObjectOrdinal; |
| 59 | 61 |
private boolean mModeFree; |
| 62 |
private FirebaseAnalytics mFirebaseAnalytics; |
|
| 60 | 63 |
|
| 61 | 64 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 62 | 65 |
|
| ... | ... | |
| 68 | 71 |
setTheme(R.style.MaterialThemeNoActionBar); |
| 69 | 72 |
setContentView(R.layout.play); |
| 70 | 73 |
|
| 74 |
mFirebaseAnalytics = FirebaseAnalytics.getInstance(this); |
|
| 75 |
|
|
| 71 | 76 |
Bundle b = getIntent().getExtras(); |
| 72 | 77 |
|
| 73 | 78 |
if( b!=null ) |
| ... | ... | |
| 208 | 213 |
PlayView view = findViewById(R.id.playView); |
| 209 | 214 |
view.onResume(); |
| 210 | 215 |
|
| 211 |
ScreenList.switchScreen(this,ScreenList.FREE);
|
|
| 216 |
ScreenList.switchScreen(this, mModeFree ? ScreenList.FREE : ScreenList.SCRA );
|
|
| 212 | 217 |
|
| 213 | 218 |
SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this); |
| 214 | 219 |
restorePreferences(preferences); |
| ... | ... | |
| 218 | 223 |
{
|
| 219 | 224 |
changeIfDifferent(mObjectName,mObjectLocal,mObjectOrdinal,view.getObjectControl()); |
| 220 | 225 |
} |
| 226 |
|
|
| 227 |
if( !mModeFree ) |
|
| 228 |
{
|
|
| 229 |
android.util.Log.e("D", "scrambles: "+mNumScrambles);
|
|
| 230 |
ObjectControl control = getControl(); |
|
| 231 |
control.scrambleObject(mNumScrambles); |
|
| 232 |
} |
|
| 221 | 233 |
} |
| 222 | 234 |
|
| 223 | 235 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| ... | ... | |
| 325 | 337 |
|
| 326 | 338 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 327 | 339 |
// PUBLIC API |
| 340 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
|
| 341 |
|
|
| 342 |
public FirebaseAnalytics getAnalytics() |
|
| 343 |
{
|
|
| 344 |
return mFirebaseAnalytics; |
|
| 345 |
} |
|
| 346 |
|
|
| 328 | 347 |
/////////////////////////////////////////////////////////////////////////////////////////////////// |
| 329 | 348 |
|
| 330 | 349 |
public int getScreenWidthInPixels() |
Also available in: Unified diff
Progress with the generic PlayActivity.