diff --git a/app/app.iml b/app/app.iml index 8b0c423..a16956c 100644 --- a/app/app.iml +++ b/app/app.iml @@ -66,14 +66,6 @@ - - - - - - - - @@ -82,6 +74,14 @@ + + + + + + + + diff --git a/app/src/main/java/ru/defend/defdevteam/tstu/CabinetActivity.java b/app/src/main/java/ru/defend/defdevteam/tstu/CabinetActivity.java index 7ab544e..2d4a9a7 100644 --- a/app/src/main/java/ru/defend/defdevteam/tstu/CabinetActivity.java +++ b/app/src/main/java/ru/defend/defdevteam/tstu/CabinetActivity.java @@ -293,11 +293,11 @@ public class CabinetActivity extends AppCompatActivity Log.e("Error", e.getMessage()); e.printStackTrace(); } - if(mIcon11.getWidth() > 4096 || mIcon11.getHeight() > 4096) { + if(mIcon11.getWidth() > 3000 || mIcon11.getHeight() > 3000) { mIcon11 = Bitmap.createScaledBitmap( mIcon11, - mIcon11.getWidth()/2, - mIcon11.getHeight()/2, + mIcon11.getWidth()/4, + mIcon11.getHeight()/4, false ); }