diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 681f41a..0000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,116 +0,0 @@ - - - - - - - -
- - - - xmlns:android - - ^$ - - - -
-
- - - - xmlns:.* - - ^$ - - - BY_NAME - -
-
- - - - .*:id - - http://schemas.android.com/apk/res/android - - - -
-
- - - - .*:name - - http://schemas.android.com/apk/res/android - - - -
-
- - - - name - - ^$ - - - -
-
- - - - style - - ^$ - - - -
-
- - - - .* - - ^$ - - - BY_NAME - -
-
- - - - .* - - http://schemas.android.com/apk/res/android - - - ANDROID_ATTRIBUTE_ORDER - -
-
- - - - .* - - .* - - - BY_NAME - -
-
-
-
-
-
\ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 37a7509..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml deleted file mode 100644 index 7f68460..0000000 --- a/.idea/runConfigurations.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/content_answer_view.xml b/app/src/main/res/layout/content_answer_view.xml index 970907e..cfeceec 100644 --- a/app/src/main/res/layout/content_answer_view.xml +++ b/app/src/main/res/layout/content_answer_view.xml @@ -11,7 +11,7 @@ android:layout_marginTop="16dp" android:gravity="end" android:textSize="24sp" - android:text="Total Calculation" + android:text="@string/total_calculation" android:textColor="#757575" android:layout_width="match_parent" android:layout_height="wrap_content"/> @@ -24,7 +24,7 @@ android:layout_marginEnd="16dp" android:gravity="end" android:textSize="32sp" - android:text="Current Calculation" + android:text="@string/current_calculation" android:textColor="#757575" android:layout_width="match_parent" android:layout_height="wrap_content"/> diff --git a/app/src/main/res/layout/content_number_board.xml b/app/src/main/res/layout/content_number_board.xml index d98056e..e6a81d6 100644 --- a/app/src/main/res/layout/content_number_board.xml +++ b/app/src/main/res/layout/content_number_board.xml @@ -8,7 +8,7 @@ Calci + Total Calculation + Current Calculation + C + ( + ) + / + 7 + 8 + 9 + X + 4 + 5 + 6 + - + 1 + 2 + 3 + + + 0 + . + =