Skip to content

Commit

Permalink
Light fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexey Utovka committed Apr 11, 2019
1 parent 1b7795d commit 5fd8199
Show file tree
Hide file tree
Showing 10 changed files with 359 additions and 2 deletions.
1 change: 0 additions & 1 deletion app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ android {

dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'com.android.support:appcompat-v7:28.0.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.2'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
Expand Down
Binary file modified app/src/main/app_icon-web.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 3 additions & 1 deletion app/src/main/java/ru/neurospb/calculator/ui/presenters/calculator/ExpressionPresenter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,11 @@ public void saveState(Bundle state) {
}
@Override
public void loadState(Bundle state) {
if (state != null)
if (state != null) {
expression.update(state.getString(RAW_EXPRESSION_KEY),
state.getBooleanArray(EXPRESSION_FLAGS_KEY));
view.showExpression(expression.getRaw().toString());
}
}

//ИМПЛЕМЕНТАЦИЯ: ICalculator.ExpressionPresenter
Expand Down
1 change: 1 addition & 0 deletions app/src/main/java/ru/neurospb/calculator/ui/views/base/StartPointActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ protected void onCreate(Bundle savedInstanceState) {
//OnPause
//OnStop
//OnDestroy
@Override
protected void onDestroy() {
singletonActivity = null;
calculatorExpressionPresenter = null;
Expand Down
355 changes: 355 additions & 0 deletions app/src/main/res/layout-land/calculator.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,355 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/colorBackground"
android:padding="15dp">

<ScrollView
android:id="@+id/expressionWrapper"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="30dp"
android:isScrollContainer="false"
android:scrollbarAlwaysDrawHorizontalTrack="false"
android:scrollbarAlwaysDrawVerticalTrack="false"
app:layout_constraintBottom_toTopOf="@id/button9"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">

<HorizontalScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorDisplayBlue"
android:isScrollContainer="false"
android:scrollbarAlwaysDrawHorizontalTrack="false"
android:scrollbarAlwaysDrawVerticalTrack="false"
android:scrollbars="none">

<android.support.v7.widget.AppCompatTextView
android:id="@+id/expressionText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:cursorVisible="false"
android:isScrollContainer="true"
android:padding="5dp"
android:scrollbarAlwaysDrawHorizontalTrack="false"
android:scrollbarAlwaysDrawVerticalTrack="false"
android:scrollHorizontally="true"
android:singleLine="true"
android:textColor="@color/colorAccent"
android:textIsSelectable="false"
android:textSize="48sp"
android:textStyle="bold"
tools:text="0" />

</HorizontalScrollView>
</ScrollView>

<Button
android:id="@+id/button7"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginBottom="2dp"
android:background="@color/colorPrimary"
android:text="@string/number_seven"
android:textColor="@color/colorAccent"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/button4"
app:layout_constraintEnd_toStartOf="@id/button8"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@+id/button9" />

<Button
android:id="@+id/button8"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginBottom="2dp"
android:background="@color/colorPrimary"
android:text="@string/number_eight"
android:textColor="@color/colorAccent"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/button5"
app:layout_constraintEnd_toStartOf="@id/button9"
app:layout_constraintStart_toEndOf="@id/button7"
app:layout_constraintTop_toTopOf="@+id/button9" />

<Button
android:id="@+id/button9"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimary"
android:text="@string/number_nine"
android:textColor="@color/colorAccent"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/button6"
app:layout_constraintEnd_toStartOf="@id/buttonDivide"
app:layout_constraintStart_toEndOf="@id/button8"
app:layout_constraintTop_toBottomOf="@+id/expressionWrapper" />

<Button
android:id="@+id/buttonDivide"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginBottom="2dp"
android:background="@color/colorPrimaryDark"
android:text="@string/symbol_divide"
android:textColor="@color/colorAccent"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/buttonMultiply"
app:layout_constraintEnd_toStartOf="@id/buttonDelete"
app:layout_constraintStart_toEndOf="@id/button9"
app:layout_constraintTop_toTopOf="@+id/button9" />

<Button
android:id="@+id/buttonDelete"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="2dp"
android:layout_marginRight="2dp"
android:layout_marginBottom="2dp"
android:background="@color/colorPrimaryDark"
android:text="@string/symbol_delete"
android:textColor="@color/colorAccent"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@+id/buttonOpenBracket"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/buttonDivide"
app:layout_constraintTop_toTopOf="@+id/button9" />

<Button
android:id="@+id/button4"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimary"
android:text="@string/number_four"
android:textSize="30sp"
android:textStyle="bold"
android:textColor="@color/colorAccent"
app:layout_constraintBottom_toTopOf="@id/button1"
app:layout_constraintEnd_toStartOf="@id/button5"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button7" />

<Button
android:id="@+id/button5"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimary"
android:text="@string/number_five"
android:textSize="30sp"
android:textStyle="bold"
android:textColor="@color/colorAccent"
app:layout_constraintBottom_toTopOf="@id/button2"
app:layout_constraintEnd_toStartOf="@id/button6"
app:layout_constraintStart_toEndOf="@id/button4"
app:layout_constraintTop_toBottomOf="@+id/button8" />

<Button
android:id="@+id/button6"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimary"
android:text="@string/number_six"
android:textSize="30sp"
android:textStyle="bold"
android:textColor="@color/colorAccent"
app:layout_constraintBottom_toTopOf="@id/button3"
app:layout_constraintEnd_toStartOf="@id/buttonMultiply"
app:layout_constraintStart_toEndOf="@id/button5"
app:layout_constraintTop_toBottomOf="@+id/button9" />

<Button
android:id="@+id/buttonMultiply"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimaryDark"
android:text="@string/symbol_multiply"
android:textColor="@color/colorAccent"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/buttonSubtract"
app:layout_constraintEnd_toStartOf="@id/buttonOpenBracket"
app:layout_constraintStart_toEndOf="@id/button6"
app:layout_constraintTop_toBottomOf="@+id/buttonDivide" />

<Button
android:id="@+id/buttonOpenBracket"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimaryDark"
android:text="@string/symbol_openbracket"
android:textSize="30sp"
android:textStyle="bold"
android:textColor="@color/colorAccent"
app:layout_constraintBottom_toTopOf="@id/buttonCloseBracket"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/buttonMultiply"
app:layout_constraintTop_toBottomOf="@id/buttonDelete" />

<Button
android:id="@+id/button1"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimary"
android:text="@string/number_one"
android:textSize="30sp"
android:textStyle="bold"
android:textColor="@color/colorAccent"
app:layout_constraintBottom_toTopOf="@id/button0"
app:layout_constraintEnd_toStartOf="@id/button2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/button4" />

<Button
android:id="@+id/button2"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="2dp"
android:layout_marginTop="2dp"
android:layout_marginRight="2dp"
android:background="@color/colorPrimary"
android:text="@string/number_two"
android:textColor="@color/colorAccent"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="@+id/button1"
app:layout_constraintEnd_toStartOf="@id/button3"
app:layout_constraintStart_toEndOf="@id/button1"
app:layout_constraintTop_toBottomOf="@+id/button5" />

<Button
android:id="@+id/button3"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimary"
android:text="@string/number_three"
android:textSize="30sp"
android:textStyle="bold"
android:textColor="@color/colorAccent"
app:layout_constraintBottom_toTopOf="@id/buttonPoint"
app:layout_constraintEnd_toStartOf="@id/buttonSubtract"
app:layout_constraintStart_toEndOf="@id/button2"
app:layout_constraintTop_toBottomOf="@+id/button6" />

<Button
android:id="@+id/buttonSubtract"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimaryDark"
android:text="@string/symbol_subtract"
android:textColor="@color/colorAccent"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toTopOf="@id/buttonAdd"
app:layout_constraintEnd_toStartOf="@id/buttonCloseBracket"
app:layout_constraintStart_toEndOf="@id/button3"
app:layout_constraintTop_toBottomOf="@id/buttonMultiply" />

<Button
android:id="@+id/buttonCloseBracket"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimaryDark"
android:text="@string/symbol_closebracket"
android:textSize="30sp"
android:textStyle="bold"
android:textColor="@color/colorAccent"
app:layout_constraintBottom_toTopOf="@id/buttonEqual"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/buttonSubtract"
app:layout_constraintTop_toBottomOf="@id/buttonOpenBracket" />

<Button
android:id="@+id/button0"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="2dp"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:background="@color/colorPrimary"
android:text="@string/number_zero"
android:textColor="@color/colorAccent"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="@id/button2"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/button1"
android:layout_marginStart="2dp" />

<Button
android:id="@+id/buttonPoint"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginTop="2dp"
android:layout_marginRight="2dp"
android:layout_marginBottom="2dp"
android:background="@color/colorPrimary"
android:text="@string/symbol_point"
android:textColor="@color/colorAccent"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/buttonAdd"
app:layout_constraintStart_toStartOf="@id/button3"
app:layout_constraintTop_toBottomOf="@+id/button3"
android:layout_marginEnd="2dp" />

<Button
android:id="@+id/buttonAdd"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimaryDark"
android:text="@string/symbol_add"
android:textColor="@color/colorAccent"
android:textSize="30sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@id/buttonEqual"
app:layout_constraintStart_toEndOf="@id/buttonPoint"
app:layout_constraintTop_toBottomOf="@id/buttonSubtract" />

<Button
android:id="@+id/buttonEqual"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_margin="2dp"
android:background="@color/colorPrimaryDark"
android:text="@string/symbol_equal"
android:textSize="30sp"
android:textStyle="bold"
android:textColor="@color/colorAccent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/buttonAdd"
app:layout_constraintTop_toBottomOf="@id/buttonCloseBracket" />

</android.support.constraint.ConstraintLayout>
Binary file modified app/src/main/res/mipmap-hdpi/app_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-mdpi/app_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xhdpi/app_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxhdpi/app_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/mipmap-xxxhdpi/app_icon.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 5fd8199

Please sign in to comment.