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 @@ - 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 @@ - + + + \ 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 @@ + + + + + + + + + + + + + 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" /> - -