diff --git a/.idea/misc.xml b/.idea/misc.xml
index 74dd639..b2c751a 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="jbr-21" project-jdk-type="JavaSDK">
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index d843f34..35eb1dd 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="VcsDirectoryMappings" defaultProject="true" />
+ <component name="VcsDirectoryMappings">
+ <mapping directory="" vcs="Git" />
+ </component>
</project>
\ No newline at end of file
diff --git a/app/src/main/java/com/example/clicker/Click.java b/app/src/main/java/com/example/clicker/Click.java
index ad40569..66df2f8 100644
--- a/app/src/main/java/com/example/clicker/Click.java
+++ b/app/src/main/java/com/example/clicker/Click.java
@@ -7,13 +7,11 @@ import android.widget.TextView;
public class Click implements View.OnClickListener {
TextView mainText;
- EditText ETPrimerTxt;
String letter;
long score = 0;
- public Click(TextView mainTxt, EditText ETPrimer){
+ public Click(TextView mainTxt){
this.mainText=mainTxt;
- this.ETPrimerTxt=ETPrimer;
}
String primer="";
@Override
@@ -67,48 +65,6 @@ public class Click implements View.OnClickListener {
score=0;
String s = "Кнопка нажата " + score + " раз";
mainText.setText(s);
- } else if (id==R.id.btn0) {
- primer += "dfgdfg";
- ETPrimerTxt.setText(primer);
- }
- else if (id==R.id.btn1) {
-
- }
- else if (id==R.id.btn2) {
-
- }
- else if (id==R.id.btn3) {
-
- }
- else if (id==R.id.btn4) {
-
- }
- else if (id==R.id.btn5) {
-
- }
- else if (id==R.id.btn6) {
-
- }
- else if (id==R.id.btn7) {
-
- }
- else if (id==R.id.btn8) {
-
- }
- else if (id==R.id.btn9) {
-
- }
- else if (id==R.id.btnPlus) {
-
- }
- else if (id==R.id.btnMinus) {
-
- }
- else if (id==R.id.btnDiv) {
-
- }
- else if (id==R.id.btnMulti) {
-
}
}
diff --git a/app/src/main/java/com/example/clicker/MainActivity.java b/app/src/main/java/com/example/clicker/MainActivity.java
index 7941bd9..f639875 100644
--- a/app/src/main/java/com/example/clicker/MainActivity.java
+++ b/app/src/main/java/com/example/clicker/MainActivity.java
@@ -16,8 +16,7 @@ import androidx.core.view.WindowInsetsCompat;
public class MainActivity extends AppCompatActivity {
TextView mainText;
- EditText ETPrimer;
- Button minus_btn, drop_btn, btn1, btn2, btn3, btn4, btn5, btn6, btn7, btn8, btn9, btn0, btnMulti, btnDiv, btnMinus, btnPlus, btnTransfer;
+ Button drop_btn, minus_btn;
ImageView mainBtn;
@Override
@@ -33,45 +32,12 @@ public class MainActivity extends AppCompatActivity {
mainText = findViewById(R.id.mainText);
mainBtn = findViewById(R.id.main_btn);
- minus_btn = findViewById(R.id.minus_btn);
drop_btn = findViewById(R.id.drop_btn);
- ETPrimer=findViewById(R.id.ETPrimer);
- btn1=findViewById(R.id.btn1);
- btn2=findViewById(R.id.btn2);
- btn3=findViewById(R.id.btn3);
- btn4=findViewById(R.id.btn4);
- btn5=findViewById(R.id.btn5);
- btn6=findViewById(R.id.btn6);
- btn7=findViewById(R.id.btn7);
- btn8=findViewById(R.id.btn8);
- btn9=findViewById(R.id.btn9);
- btn0=findViewById(R.id.btn0);
- btnMulti=findViewById(R.id.btnMulti);
- btnDiv=findViewById(R.id.btnDiv);
- btnMinus=findViewById(R.id.btnMinus);
- btnPlus=findViewById(R.id.btnPlus);
- btnTransfer=findViewById(R.id.btnTransfer);
+ minus_btn = findViewById(R.id.minus_btn);
- Click clickListener = new Click(mainText,ETPrimer);
+ Click clickListener = new Click(mainText);
mainBtn.setOnClickListener(clickListener);
- minus_btn.setOnClickListener(clickListener);
drop_btn.setOnClickListener(clickListener);
-
- btn1.setOnClickListener(clickListener);
- btn2.setOnClickListener(clickListener);
- btn3.setOnClickListener(clickListener);
- btn4.setOnClickListener(clickListener);
- btn5.setOnClickListener(clickListener);
- btn6.setOnClickListener(clickListener);
- btn7.setOnClickListener(clickListener);
- btn8.setOnClickListener(clickListener);
- btn9.setOnClickListener(clickListener);
- btn0.setOnClickListener(clickListener);
- btnPlus.setOnClickListener(clickListener);
- btnMinus.setOnClickListener(clickListener);
- btnDiv.setOnClickListener(clickListener);
- btnMulti.setOnClickListener(clickListener);
- btnTransfer.setOnClickListener(clickListener);
-
+ minus_btn.setOnClickListener(clickListener);
}
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/piratik.png b/app/src/main/res/drawable/piratik.png
deleted file mode 100644
index b1e1ceb..0000000
Binary files a/app/src/main/res/drawable/piratik.png and /dev/null differ
diff --git a/app/src/main/res/drawable/skeleton.xml b/app/src/main/res/drawable/skeleton.xml
new file mode 100644
index 0000000..11bf93a
--- /dev/null
+++ b/app/src/main/res/drawable/skeleton.xml
@@ -0,0 +1,50 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+ android:width="324dp"
+ android:height="388dp"
+ android:viewportWidth="324"
+ android:viewportHeight="388">
+ <path
+ android:pathData="M143,1c-25.9,3.2 -50.2,10.7 -76.5,23.6 -23.6,11.5 -33.5,20.4 -33.5,29.9 0,2.9 10.8,46.3 12.9,51.8 0.8,2 1.6,2.7 2.9,2.3 1.3,-0.4 71.1,-16.8 91.2,-21.4 3.3,-0.7 3.5,-1 3.2,-4.4l-0.3,-3.5 11,-4.1c11.8,-4.4 26.7,-8 29.3,-7 0.9,0.4 1.9,2 2.3,3.7 0.4,1.9 1.3,3.1 2.3,3.1 3.1,-0 20.2,-7.2 20.2,-8.5 0,-1.8 -13.5,-41.4 -17.2,-50.3 -3.4,-8.2 -6.9,-11.5 -14.5,-13.8 -6.1,-1.9 -23.5,-2.6 -33.3,-1.4zM127.7,22.4c2.2,1.9 3.3,2.2 5.2,1.4 5.7,-2.1 11.1,1.7 11.1,7.9 0,4.1 -3.1,7.6 -9.2,10.6l-4.8,2.2 8,-0.3c7.4,-0.4 8.1,-0.2 10.4,2.2 4.3,4.2 3.1,10.2 -2.4,13.1 -1.7,0.9 -3,2.4 -3,3.4 0,3.5 -3.9,7.1 -7.6,7.1 -5.7,-0 -10.4,-6.7 -10.4,-14.8 0,-1.3 -0.4,-2 -1,-1.7 -1.5,0.9 -1.2,9.5 0.6,15.5 1.5,5.1 1.5,5.5 -0.2,6.7 -2.3,1.6 -3.3,0.6 -4.4,-4.3 -0.9,-3.7 0.2,-16.1 1.6,-18.8 0.3,-0.6 -1.1,0.7 -3.2,2.9 -7.6,8.1 -11.7,9.3 -16.1,4.9 -2.2,-2.2 -2.5,-3.2 -2,-6.7 0.4,-3.1 0.1,-4.6 -1.4,-6.5 -2.7,-3.5 -2.4,-6.9 1.1,-10.4 2.7,-2.6 3.6,-3 6.8,-2.4 2,0.3 5.6,1.9 7.9,3.6 4.7,3.3 5.2,3.1 2.4,-0.8 -4.1,-5.9 -4.3,-13 -0.4,-16 2.7,-2 7.9,-1.4 11,1.2z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M197.8,75.4c-4.8,1.2 -9,2.4 -9.3,2.8 -0.6,0.6 5,20.7 6.7,24.1 0.8,1.6 1.8,1.3 10.8,-3.4 5.5,-2.8 10,-5.6 10,-6.2 0,-0.7 -1.3,-5.3 -2.9,-10.2 -2.2,-7 -3.2,-9 -4.7,-9.2 -1,-0 -5.8,0.9 -10.6,2.1z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M226.3,77.7c-10.4,1.7 -10.5,1.8 -7.8,9.3 0.8,2.3 1.5,5.1 1.5,6.1 0,2 -6.8,6.8 -17,11.9 -5.4,2.7 -6,3.3 -5.4,5.5 0.6,2.3 0.1,2.8 -6,5.5 -9.2,4.2 -19.9,7.7 -28,9.1 -7,1.2 -7.7,1 -8.9,-2.6 -0.2,-0.6 -3.6,-0.3 -9.1,0.8 -4.7,1 -12.6,2 -17.4,2.3 -4.8,0.2 -18.1,0.9 -29.7,1.5 -53.2,2.6 -77.9,9.4 -92,25.1 -7.2,8.1 -8.3,16.3 -3,22.6 5.4,6.4 20.4,9.8 39.2,9 6.9,-0.3 10.6,-0.1 11.1,0.6 0.3,0.6 1.4,4.1 2.3,7.7 5.3,20.7 20.4,36.7 39.6,41.8 4.5,1.2 5.3,3 5.3,12 0.1,8.5 2.9,26 5,30.8 3,6.8 5.2,8.9 26,24.4 25.6,19.2 35.2,23.9 49.1,23.9 16.5,-0 26.7,-9.1 27.7,-24.6 0.4,-5.9 0.9,-7.7 2.3,-8.4 1,-0.6 2.1,-1.9 2.4,-3.1 0.4,-1.1 1,-1.8 1.3,-1.4 0.3,0.3 9.2,22 19.7,48.2 15.6,39.1 19.6,48 21.9,49.7 2.3,1.8 4.2,2.1 12.4,2.1 12.3,-0 23.3,-2.8 36.2,-9.2 12.3,-6.1 19,-12.5 19,-18 0,-2.1 -2.5,-14.8 -5.5,-28.3 -3.1,-13.5 -7.9,-34.9 -10.7,-47.7l-5.2,-23.2 1.8,-5.7c3.5,-11.2 -1.1,-20.7 -11.5,-23.8 -2.7,-0.8 -6.4,-2.6 -8.2,-4 -8.2,-6.3 -14.8,-7 -23.2,-2.6 -4.3,2.3 -7,3 -11.1,3 -5.8,-0 -10.9,1.7 -15.1,5 -1.4,1.1 -2.9,1.7 -3.4,1.5 -0.4,-0.3 -2.4,-0.6 -4.4,-0.7 -4.1,-0.1 -4.9,-1 -4.1,-4.2 0.4,-1.8 1.7,-2.5 6,-3.5 6.5,-1.4 13.5,-5.7 16.7,-10.2 2,-2.8 2.4,-4.6 2.4,-10 0,-6 -0.4,-7.1 -3.9,-12.4 -4.1,-6.2 -4,-5.5 -1.7,-18 2.5,-12.8 0.9,-24 -5,-36 -2.1,-4.5 -3.9,-8.5 -3.9,-9 0,-0.6 3.4,-2.7 7.5,-4.8 13.8,-7.1 26.7,-17.8 31.6,-26.2 5.9,-10.3 2.6,-18.4 -9.1,-21.9 -6.8,-2 -24.9,-2 -37.7,0.1zM226.4,133.7c3.2,3.5 8.2,13.5 9.5,19.3 2,8.5 1.1,21.1 -2.4,33.5 -0.4,1.3 0.9,4.3 4,8.9 2.5,3.9 4.8,8.1 5.2,9.4 1.6,6.3 -6.3,13.3 -17.3,15.3 -3.2,0.6 -6.2,1.6 -6.6,2.2 -0.4,0.7 -1,3.8 -1.4,6.9 -0.4,3.1 -1.4,6.8 -2.3,8.1 -0.9,1.3 -2.9,4.3 -4.4,6.7 -2.3,3.4 -3.2,4.1 -5,3.5 -5.3,-1.7 -7.2,-1.6 -9.3,0.4 -1.2,1.1 -2.4,2.5 -2.6,3.2 -0.3,0.8 -1.4,0.2 -3.1,-1.4 -3.4,-3.5 -5.2,-3.4 -9.3,0.7l-3.4,3.4 -1.5,-2.8c-2.3,-4.4 -6.9,-5.4 -10,-2 -2.1,2.4 -3.5,2.6 -3.5,0.6 0,-0.8 -1.1,-2.7 -2.4,-4.2 -2.2,-2.6 -2.5,-2.7 -5.4,-1.5 -1.8,0.8 -4.2,3 -5.4,5 -2.9,4.8 -2.8,4.7 -3.8,3.1 -0.6,-0.8 -1,-5.2 -1,-9.8 0,-8.1 0,-8.2 2.5,-8.2 2.4,-0 10.2,-2.6 11.7,-3.9 0.5,-0.4 -3.1,-0.7 -8,-0.7 -10.6,-0 -16.6,-1.4 -30.2,-7.2 -5.7,-2.4 -12.7,-5.1 -15.5,-5.9 -8.5,-2.6 -14.2,-6 -17.9,-10.9 -2.9,-3.8 -3.6,-4.3 -3.6,-2.5 0,2.9 3.2,9.1 6.2,11.7 1.2,1.2 4.2,3.3 6.5,4.8 3.7,2.2 4.1,2.9 3.4,4.8 -1.2,3.4 -3.3,3.3 -10.8,-0.3 -9.9,-4.7 -19,-14.2 -23.1,-24.1 -4.5,-10.9 -5.6,-16.7 -5.7,-30.6l0,-12.4 2.9,-2.3c8.1,-6.4 24.4,-8.5 89.6,-11.5 34.5,-1.6 41.7,-2.5 53.7,-6.5 5.8,-1.9 11.2,-3.9 12.1,-4.5 2.8,-1.6 5,-1.1 7.6,1.7zM110.4,226.2c0.2,0.7 1.1,5.3 2,10.3 1.8,9.2 3.5,12.5 6.7,12.5 2.4,-0 4.4,-3 6.6,-10.1 1.5,-4.9 2.2,-5.9 3.8,-5.7 1.5,0.2 1.9,1 1.8,2.8 -1.3,12.5 -1.4,24.1 -0.4,27.2 1.9,5.9 6.8,12.6 11.1,15.3 2.2,1.4 4,3 4,3.7 0,3.7 5.9,6 10,3.8 1.6,-0.8 2.1,-0.5 3.2,1.7 0.7,1.5 2.5,3.4 4.1,4.3 2.5,1.4 3,1.3 6.6,-0.6l3.9,-2.1 2.1,2.8c2.5,3.4 7.2,3.9 10.9,1.3 2.1,-1.4 2.5,-1.4 4.9,0.1 2.5,1.7 5.8,1.6 9.7,-0 1.7,-0.8 1.8,-0.4 1.4,5.3 -0.5,7.8 -4.3,13.7 -10.8,17 -3.9,2 -5.6,2.3 -13,2 -12.7,-0.6 -17.3,-3 -45.5,-23.6 -7.1,-5.3 -14.3,-10.7 -15.8,-12.1 -6.7,-6.1 -9.3,-16.5 -10.4,-41.4 -0.6,-14.3 -0.5,-15.7 1.1,-15.7 0.9,-0 1.8,0.6 2,1.2zM276.8,229.4c1.5,0.8 4,2.8 5.6,4.5 2.3,2.4 3.8,3.1 6.8,3.1 5.5,-0 9.8,4.1 10.5,10.1 0.7,5.7 -1.2,9.5 -6.8,14 -7.4,5.8 -8,10.9 -3,23.6 4.6,11.7 2,21.3 -5.8,21.3 -4.2,-0 -6.2,-3.4 -6.8,-11.8 -0.6,-9.3 -1.7,-11.6 -6.5,-13.8 -4.8,-2.1 -6.4,-4.4 -7.3,-10.3 -1,-6.1 -5,-10.1 -10.1,-10.1 -2.1,-0 -6.8,1 -10.6,2.2 -6.3,2 -7,2.1 -10,0.6 -3.2,-1.5 -3.4,-1.4 -7.1,1.6 -5.4,4.3 -11.8,4.4 -15.3,0.3 -3.6,-4.2 -3.2,-8 1.4,-12.6 2,-2.1 4.6,-5.4 5.7,-7.2 3.1,-5.1 6.3,-6.3 13.1,-4.8 5.4,1.2 5.5,1.2 8.7,-1.8 3.9,-3.8 9.3,-5.4 15.6,-4.6 4,0.4 5.1,0.2 7.6,-1.9 4.9,-4.1 9.5,-4.9 14.3,-2.4zM160,246.9c1.2,2.4 1.3,10.1 0.1,12.1 -0.8,1.2 -1.7,1 -6,-1 -2.8,-1.3 -5.1,-2.8 -5.1,-3.4 0,-1.6 3.3,-6.4 5.6,-8.1 2.6,-2 4.1,-1.9 5.4,0.4zM174.6,251.6c0.8,2 1.4,5.5 1.2,7.7l-0.3,4.2 -5.3,-0.1c-6.7,-0.2 -7.8,-1.2 -6.3,-5.6 3.3,-9.9 8,-12.6 10.7,-6.2zM202.4,250.6c0.3,0.9 0.6,4.4 0.6,7.9 0,5.8 -0.2,6.3 -2.4,6.9 -4.3,1.1 -5.6,-0.2 -5.6,-5.3 0,-7.3 5.5,-14.4 7.4,-9.5zM189.7,254c0.7,1.9 1.2,5.5 1.2,7.9l0.1,4.3 -5.5,-0.4c-3,-0.3 -5.8,-0.7 -6.1,-1 -0.8,-0.9 1.3,-7.9 3.6,-11.6 2.6,-4.2 5.1,-3.9 6.7,0.8zM153.1,268.7c4.5,2.4 4.9,2.9 4.9,6.3 0,7 -7.3,12.1 -10,7.1 -1.1,-2.1 -1.4,-16.1 -0.4,-16.1 0.4,-0 2.8,1.2 5.5,2.7zM256.8,267.2c1.6,1.6 1.5,6.3 0,7.6 -0.7,0.6 -8.3,3.4 -16.8,6.2 -8.5,2.9 -15.7,5.4 -15.9,5.6 -0.3,0.3 3.5,9.5 27.9,66.8 3.7,8.7 7.5,16.7 8.3,17.7 5.7,6.6 29.1,3.6 42.4,-5.4 6.9,-4.7 8.8,-7.7 8.6,-14 0,-2.9 -2.1,-16.2 -4.6,-29.7 -7.2,-38.2 -7.1,-37.8 -10.6,-41 -3.5,-3.2 -4.8,-7.2 -3.5,-10.8 0.9,-2.5 3.9,-5.1 4.8,-4.1 0.5,0.5 3.2,11.9 15.7,67.2 6.9,30.5 7,28.7 -1.9,35.2 -14.2,10.4 -44.3,17.1 -51.5,11.5 -1.8,-1.5 -4.6,-7.2 -9.7,-20.3 -4,-10 -13,-32.9 -20.1,-50.8 -7.1,-17.9 -12.9,-33 -12.9,-33.7 0,-0.6 1.9,-1.6 4.2,-2.3 2.3,-0.6 5.1,-1.7 6.2,-2.5 1.2,-0.8 4.7,-1.4 8.6,-1.5 3.6,-0 8.1,-0.7 10,-1.4 4.4,-1.7 9.3,-1.8 10.8,-0.3zM169.4,275.6c4.4,1.5 4.7,1.8 4.1,4.3 -1,4 -4.3,8.8 -6.5,9.4 -2.7,0.7 -4.9,-2.2 -5.6,-7.6 -1.1,-8 -0.1,-8.8 8,-6.1zM211.8,278.7c1.9,3.7 -2.3,12.1 -5.4,10.9 -1.4,-0.5 -1.5,-1.5 -1,-5.8 0.4,-2.9 1.3,-5.6 1.9,-6 2,-1.3 3.6,-0.9 4.5,0.9zM186.8,279c2.9,-0 2.9,2.9 0,8.1 -4.3,7.7 -9.8,5.3 -9.8,-4.3l0,-5.1 3.8,0.7c2,0.3 4.7,0.6 6,0.6zM201.5,283.7c-0.8,2.7 -2.4,5.6 -3.6,6.6 -2,1.6 -2.3,1.6 -4,0.1 -2.1,-1.9 -2.5,-6.4 -0.9,-9.5 0.8,-1.4 2.1,-1.9 5.5,-1.9l4.4,-0 -1.4,4.7z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M208.4,142.2c-2.3,0.5 -5.3,2.1 -6.9,3.8l-2.8,2.9 4.9,-1.5c5.9,-1.9 14.1,-1.3 21.3,1.5 4.8,1.8 5,1.8 4.1,0.1 -1.3,-2.5 -6,-5.7 -9.3,-6.4 -5.8,-1.2 -7.3,-1.3 -11.3,-0.4z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M148.3,148.4c-6.1,1.5 -11.6,5.4 -13.9,9.7 -2.2,4.3 -1.2,4.6 3.3,1 6,-4.8 13,-7.4 21.2,-7.9 6.9,-0.4 7.2,-0.6 4.9,-1.8 -3.9,-2.1 -9.8,-2.4 -15.5,-1z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M103.4,154.6c-1.8,1.5 -1.8,1.5 1,1.1 4.7,-0.8 9.5,1.1 11.7,4.6 2.9,4.7 2.3,16.1 -1.3,23.8 -5,10.8 -14.6,18.2 -21.4,16.5 -3.7,-1 -2.7,1.2 1.6,3.6 7.7,4.1 17.4,1.2 23.7,-7 7.7,-10.2 8.5,-27.9 1.6,-37 -4.9,-6.6 -12.6,-9.1 -16.9,-5.6z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M206,156.8c-12.8,12.8 -6.5,44.1 9.3,45.9 3.9,0.5 4.8,0.1 8,-2.6 5.7,-5.1 8.1,-11.2 8.2,-20.6 0,-15.4 -7.6,-26.5 -18.1,-26.5 -2.9,-0 -4.4,0.8 -7.4,3.8z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M148.7,160.3c-7.5,2.4 -12.7,9.7 -14.7,20.7 -5.1,28.3 20.5,47.1 34.8,25.5 5.7,-8.6 6.6,-21.2 2.3,-32.6 -4.2,-11 -13.1,-16.5 -22.4,-13.6z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M188.3,201.8c-5.8,5.8 -8.3,19.2 -4.3,23.2 1.1,1.1 2.5,2 3,2 1.3,-0 5.5,-4.1 6.2,-6 0.3,-1 1.1,-0.8 3.5,1 9.9,7.2 14.5,-10.6 5.2,-20 -4.2,-4.1 -9.6,-4.2 -13.6,-0.2z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M166,83.1c-5.2,1.6 -9.8,3.3 -10.3,3.8 -0.6,0.6 0.9,6.4 3.5,14.3l4.5,13.3 4.6,-0.2c4.1,-0.2 15.2,-3.6 16.9,-5.2 0.7,-0.6 -5,-21.8 -7.2,-26.9 -1.1,-2.6 -0.2,-2.7 -12,0.9z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+ <path
+ android:pathData="M96,100.1c-25.6,6 -47,11.1 -47.7,11.4 -0.9,0.3 -0.6,2.3 0.9,7.7 1.1,4 2.4,7.7 2.8,8.1 0.4,0.5 5,0.1 10.1,-0.9 7.2,-1.3 15.7,-1.8 36.9,-2 23.4,-0.2 28.9,-0.5 36.6,-2.2 19.3,-4.3 18.3,-3.6 16,-11.2 -0.8,-2.5 -2.6,-8.4 -4,-13.3 -1.5,-4.8 -3.2,-8.6 -3.9,-8.6 -0.7,0.1 -22.1,5 -47.7,11z"
+ android:fillColor="#000000"
+ android:strokeColor="#00000000"/>
+</vector>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 9ae5ad5..19a9dfb 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -47,207 +47,14 @@
android:layout_width="259dp"
android:layout_height="193dp"
- android:scaleType="fitCenter"
+ android:scaleType="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.503"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.11"
- tools:ignore="MissingConstraints"
- tools:srcCompat="@drawable/piratik" />
-
- <Button
- android:id="@+id/btnPlus"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="+"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.981"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.636" />
-
- <Button
- android:id="@+id/btn8"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="8"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.377"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.838" />
-
- <Button
- android:id="@+id/btn4"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="4"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.065"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.739" />
-
- <Button
- android:id="@+id/btnDiv"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="/"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.987"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.929" />
-
- <Button
- android:id="@+id/btn7"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="7"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.068"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.838" />
-
- <Button
- android:id="@+id/btnTransfer"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="="
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.068"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.929" />
-
- <Button
- android:id="@+id/btn9"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="9"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.674"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.838" />
-
- <Button
- android:id="@+id/btn5"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="5"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.371"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.739" />
-
- <Button
- android:id="@+id/btn3"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="3"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.674"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.636" />
-
- <Button
- android:id="@+id/btn6"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="6"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.674"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.739" />
-
- <Button
- android:id="@+id/btn2"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="2"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.371"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.636" />
-
- <Button
- android:id="@+id/btn0"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="0"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.377"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.929" />
-
- <Button
- android:id="@+id/btnMulti"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="*"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.981"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.838" />
-
- <Button
- android:id="@+id/btn1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="1"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.065"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.636" />
-
- <Button
- android:id="@+id/btnMinus"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="-"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.981"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.739" />
-
- <EditText
- android:id="@+id/ETPrimer"
- android:layout_width="208dp"
- android:layout_height="55dp"
- android:ems="10"
- android:inputType="text"
- app:layout_constraintBottom_toBottomOf="parent"
- app:layout_constraintEnd_toEndOf="parent"
- app:layout_constraintHorizontal_bias="0.536"
- app:layout_constraintStart_toStartOf="parent"
- app:layout_constraintTop_toTopOf="parent"
- app:layout_constraintVertical_bias="0.542" />
+ tools:ignore="ContentDescription,MissingConstraints"
+ tools:srcCompat="@drawable/skeleton" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file