Migrate from ConstraintLayout to other layouts

kawan-kawan · Feb 15, 2024 · a05b908 · a05b908
1 parent bbd2374
commit a05b908
Show file tree

Hide file tree

Showing 7 changed files with 299 additions and 336 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,7 +10,7 @@ android {
         applicationId "ru.karamoff.kawan_kawan.arithmaster"
         minSdk 21
         targetSdk 34
-        versionCode 48
+        versionCode 49
         versionName "1.1.0"
     }
 
@@ -37,5 +37,4 @@ android {
 }
 
 dependencies {
-    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
 }
diff --git a/app/src/main/java/ru/karamoff/kawan_kawan/arithmaster/GameActivity.java b/app/src/main/java/ru/karamoff/kawan_kawan/arithmaster/GameActivity.java
@@ -6,10 +6,9 @@
 import android.os.Bundle;
 import android.view.WindowManager;
 import android.widget.Button;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import androidx.constraintlayout.widget.ConstraintLayout;
-
 import java.util.Date;
 import java.util.Timer;
 import java.util.TimerTask;
@@ -42,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_game);
 
         // получение объектов для изменения в дальнейшем
-        ConstraintLayout parent = findViewById(R.id.parentLayout); // "родитель" разметки
+        LinearLayout parent = findViewById(R.id.parentLayout); // "родитель" разметки
         TextView modeTitle = findViewById(R.id.modeTitle); // заголовок окна
 
         operationField = findViewById(R.id.operation); // операция