Skip to content

Niyaz Validov M3228 #54

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Firezi wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Niyaz Validov M3228 #54

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c18f355
Update activity_calculator.xml
Firezi Nov 6, 2016
40b1087
Update CalculatorActivity.java
Firezi Nov 6, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
145 changes: 139 additions & 6 deletions Calc/app/src/main/java/ru/ifmo/android_2016/calc/CalculatorActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,150 @@
package ru.ifmo.android_2016.calc;

import android.app.Activity;
import android.support.v7.app.AppCompatActivity;
import android.os.Bundle;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;

import java.util.Arrays;

public class MainActivity extends AppCompatActivity {

Button numbers[], operations[], lastButton;
String token = "", operation = "calc";
Double res = null;
TextView textView;

/**
* Created by alexey.nikitin on 13.09.16.
*/

public final class CalculatorActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);

@HighFlyer13 HighFlyer13 Nov 23, 2016

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Этот файл отсутствует, проект не собирается.


textView = (TextView)findViewById(R.id.textView);

numbers = new Button[] {
(Button)findViewById(R.id.zero),
(Button)findViewById(R.id.one),
(Button)findViewById(R.id.two),
(Button)findViewById(R.id.three),
(Button)findViewById(R.id.four),
(Button)findViewById(R.id.five),
(Button)findViewById(R.id.six),
(Button)findViewById(R.id.seven),
(Button)findViewById(R.id.eight),
(Button)findViewById(R.id.nine),
(Button)findViewById(R.id.point)
};
operations = new Button[] {
(Button)findViewById(R.id.add),
(Button)findViewById(R.id.subtract),
(Button)findViewById(R.id.multiply),
(Button)findViewById(R.id.divide),
(Button)findViewById(R.id.calc)
};

for (final Button button : numbers) {
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (!Arrays.asList(numbers).contains(lastButton)) {
if (!token.equals("")) {
res = Double.valueOf(token);
}
token = "";
}
token = token + button.getText();
textView.setText(token);
lastButton = button;
}
});
}

setContentView(R.layout.activity_calculator);
for (final Button button : operations) {
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (Arrays.asList(numbers).contains(lastButton) && !token.equals("")) {
Double result = null;
switch (operation) {
case "add":
result = res + Double.valueOf(token);
break;
case "subtract":
result = res - Double.valueOf(token);
break;
case "multiply":
result = res * Double.valueOf(token);
break;
case "divide":
result = res / Double.valueOf(token);
break;
}
if (result != null) {
if (result.longValue() == result) {
token = Long.toString(result.longValue());
} else {
token = Double.toString(result);
}
textView.setText(token);
}
operation = getResources().getResourceEntryName(button.getId());
lastButton = button;
}
}
});
}

((Button)findViewById(R.id.clear)).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (token.length() > 0) {
token = token.substring(0, token.length() - 1);
textView.setText(token);
}
}
});

final Button button = (Button)findViewById(R.id.point);
button.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
if (!Arrays.asList(numbers).contains(lastButton)) {
if (!token.equals("")) {
res = Double.valueOf(token);
}
token = "";
}
if (token.contains(button.getText())) return;
if (token.equals("")) token = "0";
token = token + button.getText();
textView.setText(token);
lastButton = button;
}
});

if (savedInstanceState != null) {
token = savedInstanceState.getString("token");
operation = savedInstanceState.getString("operation");
if (savedInstanceState.getInt("lastButton") != 0) {
lastButton = (Button)findViewById(savedInstanceState.getInt("lastButton"));
}
res = savedInstanceState.getDouble("res");
textView.setText(token);
}
}

@Override
public void onSaveInstanceState(Bundle outState) {
super.onSaveInstanceState(outState);
outState.putString("token", token);
outState.putString("operation", operation);
if (lastButton != null) {
outState.putInt("lastButton", lastButton.getId());
}
if (res != null) {
outState.putDouble("res", res);
}
}
}
197 changes: 193 additions & 4 deletions Calc/app/src/main/res/layout/activity_calculator.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,196 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin" tools:context=".MainActivity"
android:orientation="vertical"
android:background="#f6eaf8ee">

</LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:background="#f6eaf8ee">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:id="@+id/textView"
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/clear" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="&lt;"
android:id="@+id/clear"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true" />
</RelativeLayout>

<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">

<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="7"
android:id="@+id/seven"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="8"
android:id="@+id/eight"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="9"
android:id="@+id/nine"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="+"
android:id="@+id/add"
android:background="#f9f8df" />
</LinearLayout>

<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="4"
android:id="@+id/four"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="5"
android:id="@+id/five"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="6"
android:id="@+id/six"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="−"
android:id="@+id/subtract"
android:background="#f9f8df" />
</LinearLayout>

<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="1"
android:id="@+id/one"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="2"
android:id="@+id/two"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="3"
android:id="@+id/three"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="×"
android:id="@+id/multiply"
android:background="#f9f8df" />
</LinearLayout>

<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1">

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="."
android:id="@+id/point"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="0"
android:id="@+id/zero"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="="
android:id="@+id/calc"
android:background="#ceccf8" />

<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="÷"
android:id="@+id/divide"
android:background="#f9f8df" />
</LinearLayout>
</LinearLayout>

</LinearLayout>