|
1 | 1 | /*
|
2 | 2 | * Catroid: An on-device visual programming system for Android devices
|
3 |
| - * Copyright (C) 2010-2021 The Catrobat Team |
| 3 | + * Copyright (C) 2010-2022 The Catrobat Team |
4 | 4 | * (<http://developer.catrobat.org/credits>)
|
5 | 5 | *
|
6 | 6 | * This program is free software: you can redistribute it and/or modify
|
|
37 | 37 | import android.graphics.drawable.BitmapDrawable;
|
38 | 38 | import android.graphics.drawable.Drawable;
|
39 | 39 | import android.os.Bundle;
|
| 40 | +import android.util.DisplayMetrics; |
40 | 41 | import android.view.Gravity;
|
41 | 42 | import android.view.Menu;
|
42 | 43 | import android.view.MenuItem;
|
|
50 | 51 |
|
51 | 52 | import org.catrobat.catroid.ProjectManager;
|
52 | 53 | import org.catrobat.catroid.R;
|
53 |
| -import org.catrobat.catroid.common.ScreenValues; |
54 | 54 | import org.catrobat.catroid.content.Project;
|
55 | 55 | import org.catrobat.catroid.content.Sprite;
|
56 | 56 | import org.catrobat.catroid.ui.BaseCastActivity;
|
@@ -149,7 +149,11 @@ public boolean onOptionsItemSelected(MenuItem item) {
|
149 | 149 |
|
150 | 150 | @Override
|
151 | 151 | protected void onCreate(@Nullable Bundle savedInstanceState) {
|
152 |
| - super.onCreate(savedInstanceState); |
| 152 | + super.onCreate(null); |
| 153 | + DisplayMetrics displayMetrics = new DisplayMetrics(); |
| 154 | + getWindowManager().getDefaultDisplay().getMetrics(displayMetrics); |
| 155 | + int height = displayMetrics.heightPixels; |
| 156 | + int width = displayMetrics.widthPixels; |
153 | 157 |
|
154 | 158 | if (isFinishing()) {
|
155 | 159 | return;
|
@@ -189,13 +193,13 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
|
189 | 193 |
|
190 | 194 | frameLayout = findViewById(R.id.frame_container);
|
191 | 195 |
|
192 |
| - int screenWidth = ScreenValues.SCREEN_WIDTH; |
193 |
| - int screenHeight = ScreenValues.SCREEN_HEIGHT; |
| 196 | + int screenWidth = width; |
| 197 | + int screenHeight = height; |
194 | 198 | int virtualScreenWidth = currentProject.getXmlHeader().virtualScreenWidth;
|
195 | 199 | int virtualScreenHeight = currentProject.getXmlHeader().virtualScreenHeight;
|
196 | 200 |
|
197 | 201 | float aspectRatio = (float) virtualScreenWidth / (float) virtualScreenHeight;
|
198 |
| - float screenAspectRatio = ScreenValues.getAspectRatio(); |
| 202 | + float screenAspectRatio = (float) width / (float) height; |
199 | 203 |
|
200 | 204 | float scale;
|
201 | 205 | float ratioHeight = (float) screenHeight / (float) virtualScreenHeight;
|
|
0 commit comments