From 2d0cfd547f8701298fc9bbe7eec81b605cd0265c Mon Sep 17 00:00:00 2001 From: KorolevaYana Date: Tue, 26 Apr 2016 12:49:20 +0300 Subject: [PATCH] Calculator done. --- Calculator/.gitignore | 8 + Calculator/.idea/.name | 1 + Calculator/.idea/compiler.xml | 22 ++ .../.idea/copyright/profiles_settings.xml | 3 + Calculator/.idea/dictionaries/.xml | 3 + Calculator/.idea/encodings.xml | 6 + Calculator/.idea/gradle.xml | 24 ++ .../inspectionProfiles/Project_Default.xml | 13 + .../inspectionProfiles/profiles_settings.xml | 7 + Calculator/.idea/misc.xml | 105 +++++++++ Calculator/.idea/modules.xml | 9 + Calculator/.idea/runConfigurations.xml | 12 + Calculator/app/.gitignore | 1 + Calculator/app/build.gradle | 26 ++ .../example/calculator/ApplicationTest.java | 13 + Calculator/app/src/main/AndroidManifest.xml | 20 ++ .../com/example/calculator/MainActivity.java | 112 +++++++++ .../main/res/layout-land/activity_main.xml | 223 ++++++++++++++++++ .../app/src/main/res/layout/activity_main.xml | 211 +++++++++++++++++ .../src/main/res/mipmap-hdpi/ic_launcher.png | Bin 0 -> 3418 bytes .../src/main/res/mipmap-mdpi/ic_launcher.png | Bin 0 -> 2206 bytes .../src/main/res/mipmap-xhdpi/ic_launcher.png | Bin 0 -> 4842 bytes .../main/res/mipmap-xxhdpi/ic_launcher.png | Bin 0 -> 7718 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.png | Bin 0 -> 10486 bytes .../app/src/main/res/values-w820dp/dimens.xml | 6 + Calculator/app/src/main/res/values/colors.xml | 6 + Calculator/app/src/main/res/values/dimens.xml | 5 + .../app/src/main/res/values/strings.xml | 8 + Calculator/app/src/main/res/values/styles.xml | 11 + .../example/calculator/ExampleUnitTest.java | 15 ++ Calculator/build.gradle | 23 ++ Calculator/gradle.properties | 18 ++ Calculator/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 53636 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + Calculator/gradlew | 160 +++++++++++++ Calculator/gradlew.bat | 90 +++++++ Calculator/settings.gradle | 1 + 37 files changed, 1168 insertions(+) create mode 100644 Calculator/.gitignore create mode 100644 Calculator/.idea/.name create mode 100644 Calculator/.idea/compiler.xml create mode 100644 Calculator/.idea/copyright/profiles_settings.xml create mode 100644 Calculator/.idea/dictionaries/.xml create mode 100644 Calculator/.idea/encodings.xml create mode 100644 Calculator/.idea/gradle.xml create mode 100644 Calculator/.idea/inspectionProfiles/Project_Default.xml create mode 100644 Calculator/.idea/inspectionProfiles/profiles_settings.xml create mode 100644 Calculator/.idea/misc.xml create mode 100644 Calculator/.idea/modules.xml create mode 100644 Calculator/.idea/runConfigurations.xml create mode 100644 Calculator/app/.gitignore create mode 100644 Calculator/app/build.gradle create mode 100644 Calculator/app/src/androidTest/java/com/example/calculator/ApplicationTest.java create mode 100644 Calculator/app/src/main/AndroidManifest.xml create mode 100644 Calculator/app/src/main/java/com/example/calculator/MainActivity.java create mode 100644 Calculator/app/src/main/res/layout-land/activity_main.xml create mode 100644 Calculator/app/src/main/res/layout/activity_main.xml create mode 100644 Calculator/app/src/main/res/mipmap-hdpi/ic_launcher.png create mode 100644 Calculator/app/src/main/res/mipmap-mdpi/ic_launcher.png create mode 100644 Calculator/app/src/main/res/mipmap-xhdpi/ic_launcher.png create mode 100644 Calculator/app/src/main/res/mipmap-xxhdpi/ic_launcher.png create mode 100644 Calculator/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png create mode 100644 Calculator/app/src/main/res/values-w820dp/dimens.xml create mode 100644 Calculator/app/src/main/res/values/colors.xml create mode 100644 Calculator/app/src/main/res/values/dimens.xml create mode 100644 Calculator/app/src/main/res/values/strings.xml create mode 100644 Calculator/app/src/main/res/values/styles.xml create mode 100644 Calculator/app/src/test/java/com/example/calculator/ExampleUnitTest.java create mode 100644 Calculator/build.gradle create mode 100644 Calculator/gradle.properties create mode 100644 Calculator/gradle/wrapper/gradle-wrapper.jar create mode 100644 Calculator/gradle/wrapper/gradle-wrapper.properties create mode 100644 Calculator/gradlew create mode 100644 Calculator/gradlew.bat create mode 100644 Calculator/settings.gradle diff --git a/Calculator/.gitignore b/Calculator/.gitignore new file mode 100644 index 0000000..c6cbe56 --- /dev/null +++ b/Calculator/.gitignore @@ -0,0 +1,8 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures diff --git a/Calculator/.idea/.name b/Calculator/.idea/.name new file mode 100644 index 0000000..ca34746 --- /dev/null +++ b/Calculator/.idea/.name @@ -0,0 +1 @@ +Calculator \ No newline at end of file diff --git a/Calculator/.idea/compiler.xml b/Calculator/.idea/compiler.xml new file mode 100644 index 0000000..9a8b7e5 --- /dev/null +++ b/Calculator/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/Calculator/.idea/copyright/profiles_settings.xml b/Calculator/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/Calculator/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Calculator/.idea/dictionaries/.xml b/Calculator/.idea/dictionaries/.xml new file mode 100644 index 0000000..711e9ed --- /dev/null +++ b/Calculator/.idea/dictionaries/.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/Calculator/.idea/encodings.xml b/Calculator/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/Calculator/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Calculator/.idea/gradle.xml b/Calculator/.idea/gradle.xml new file mode 100644 index 0000000..ee6ddd0 --- /dev/null +++ b/Calculator/.idea/gradle.xml @@ -0,0 +1,24 @@ + + + + + + \ No newline at end of file diff --git a/Calculator/.idea/inspectionProfiles/Project_Default.xml b/Calculator/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..22b8312 --- /dev/null +++ b/Calculator/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,13 @@ + + + + \ No newline at end of file diff --git a/Calculator/.idea/inspectionProfiles/profiles_settings.xml b/Calculator/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 0000000..3b31283 --- /dev/null +++ b/Calculator/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/Calculator/.idea/misc.xml b/Calculator/.idea/misc.xml new file mode 100644 index 0000000..f603d38 --- /dev/null +++ b/Calculator/.idea/misc.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + Android Lint + + + Class structure + + + Data flow issues + + + Declaration redundancy + + + Dependency issues + + + Imports + + + Modularization issues + + + Packaging issues + + + Pattern Validation + + + + + Android Lint + + + + + + + + + + + + + + + + + + + + + + + + + 1.7 + + + + + + + + \ No newline at end of file diff --git a/Calculator/.idea/modules.xml b/Calculator/.idea/modules.xml new file mode 100644 index 0000000..dcdca1a --- /dev/null +++ b/Calculator/.idea/modules.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/Calculator/.idea/runConfigurations.xml b/Calculator/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/Calculator/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/Calculator/app/.gitignore b/Calculator/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/Calculator/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/Calculator/app/build.gradle b/Calculator/app/build.gradle new file mode 100644 index 0000000..0eb5210 --- /dev/null +++ b/Calculator/app/build.gradle @@ -0,0 +1,26 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 23 + buildToolsVersion "21.1.2" + + defaultConfig { + applicationId "com.example.calculator" + minSdkVersion 21 + targetSdkVersion 23 + versionCode 1 + versionName "1.0" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + testCompile 'junit:junit:4.12' + compile 'com.android.support:appcompat-v7:23.3.0' +} diff --git a/Calculator/app/src/androidTest/java/com/example/calculator/ApplicationTest.java b/Calculator/app/src/androidTest/java/com/example/calculator/ApplicationTest.java new file mode 100644 index 0000000..62a5760 --- /dev/null +++ b/Calculator/app/src/androidTest/java/com/example/calculator/ApplicationTest.java @@ -0,0 +1,13 @@ +package com.example.calculator; + +import android.app.Application; +import android.test.ApplicationTestCase; + +/** + * Testing Fundamentals + */ +public class ApplicationTest extends ApplicationTestCase { + public ApplicationTest() { + super(Application.class); + } +} \ No newline at end of file diff --git a/Calculator/app/src/main/AndroidManifest.xml b/Calculator/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..1f9f0a9 --- /dev/null +++ b/Calculator/app/src/main/AndroidManifest.xml @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Calculator/app/src/main/java/com/example/calculator/MainActivity.java b/Calculator/app/src/main/java/com/example/calculator/MainActivity.java new file mode 100644 index 0000000..a52e93c --- /dev/null +++ b/Calculator/app/src/main/java/com/example/calculator/MainActivity.java @@ -0,0 +1,112 @@ +package com.example.calculator; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.view.View; +import android.widget.Button; +import android.widget.TextView; + +import static com.example.calculator.R.string.*; + +public class MainActivity extends AppCompatActivity { + + private final int DIGIT = 0; + private final int OPERATION = 1; + + private final int NO_OP = 0; + private final int ADD = 1; + private final int SUB = 2; + private final int MUL = 3; + private final int DIV = 4; + + String current; + int state; + int operation; + double currentRes; + TextView expression; + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + expression = (TextView)findViewById(R.id.textView); + current = "0"; + currentRes = 0; + operation = NO_OP; + state = OPERATION; + if (expression != null) { + expression.setText(current); + } + } + + public void onClickDigit(View view){ + Button button = (Button)view; + if (state == OPERATION) { + current = ""; + } + current += button.getText().toString(); + expression.setText(current); + state = DIGIT; + } + + public void onClickOperation(View view){ + Button button = (Button)view; + makePrevOperation(); + switch(button.getText().toString()) { + case "+": + operation = ADD; + break; + case "-": + operation = SUB; + break; + case "*": + operation = MUL; + break; + case "/": + operation = DIV; + break; + } + state = OPERATION; + } + + public void onClickC(View view) { + current = "0"; + currentRes = 0; + operation = NO_OP; + state = OPERATION; + expression.setText(current); + } + + public void onClickEquals(View view) { + makePrevOperation(); + expression.setText(current); + currentRes = 0; + state = OPERATION; + operation = NO_OP; + } + + private void makePrevOperation() { + double tmp = Double.parseDouble(current); + switch(operation) { + case ADD: + currentRes += tmp; + break; + case SUB: + currentRes -= tmp; + break; + case MUL: + currentRes *= tmp; + break; + case DIV: + currentRes /= tmp; + break; + case NO_OP: + currentRes = tmp; + break; + } + current = String.valueOf(currentRes); + expression.setText(current); + } +} diff --git a/Calculator/app/src/main/res/layout-land/activity_main.xml b/Calculator/app/src/main/res/layout-land/activity_main.xml new file mode 100644 index 0000000..d5ec477 --- /dev/null +++ b/Calculator/app/src/main/res/layout-land/activity_main.xml @@ -0,0 +1,223 @@ + + + + + + + +