Skip to content

Commit

Permalink
Remove more unused resources
Browse files Browse the repository at this point in the history
  • Loading branch information
@lefterisgar
lefterisgar committed Jun 25, 2023
1 parent 4ffa20d commit ad31e51
Show file tree
Hide file tree
Showing 8 changed files with 56 additions and 106 deletions.
11 changes: 0 additions & 11 deletions app/src/main/res/drawable/divide.xml
View file

This file was deleted.

12 changes: 0 additions & 12 deletions app/src/main/res/drawable/equals.xml
View file

This file was deleted.

11 changes: 0 additions & 11 deletions app/src/main/res/drawable/exponent.xml
View file

This file was deleted.

11 changes: 0 additions & 11 deletions app/src/main/res/drawable/subtract.xml
View file

This file was deleted.

88 changes: 42 additions & 46 deletions app/src/main/res/layout-land/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
android:id="@+id/mainConstraintLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity"
android:animateLayoutChanges="true">
android:animateLayoutChanges="true"
tools:context=".MainActivity">

<com.sothree.slidinguppanel.SlidingUpPanelLayout
android:id="@+id/sliding_layout"
Expand All @@ -23,16 +23,15 @@
android:id="@+id/constraintLayout2"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity"
>
tools:context=".MainActivity">

<TableLayout
android:id="@+id/tableLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:padding="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:padding="8dp">
app:layout_constraintTop_toTopOf="parent">

<TableRow
android:layout_width="match_parent"
Expand Down Expand Up @@ -93,15 +92,15 @@
android:onClick="keyDigitPadMappingToDisplay"
android:text="@string/nine" />

<ImageButton
<Button
android:id="@+id/divideButton"
style="@style/CalculatorButton.Small"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:backgroundTint="?attr/button_symbol_color"
android:onClick="divideButton"
app:srcCompat="@drawable/divide" />
android:text="@string/divide" />

<Button
android:id="@+id/clearButton"
Expand All @@ -111,9 +110,8 @@
android:layout_weight="1"
android:backgroundTint="?attr/button_clear_color"
android:onClick="clearButton"
android:textSize="18sp"
android:text="@string/clear"
/>
android:textSize="18sp" />

</TableRow>

Expand Down Expand Up @@ -195,7 +193,7 @@
android:layout_weight="1"
android:backgroundTint="?attr/button_symbol_color"
android:onClick="parenthesesButton"
android:text= "@string/parentheses" />
android:text="@string/parentheses" />

</TableRow>

Expand Down Expand Up @@ -258,27 +256,27 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:onClick="keyDigitPadMappingToDisplay"
android:text="@string/three"/>
android:text="@string/three" />

<ImageButton
<Button
android:id="@+id/subtractButton"
style="@style/CalculatorButton.Small"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:backgroundTint="?attr/button_symbol_color"
android:onClick="subtractButton"
app:srcCompat="@drawable/subtract" />
android:text="@string/subtract" />

<ImageButton
<Button
android:id="@+id/exponentButton"
style="@style/CalculatorButton.Small"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="0dp"
android:layout_weight="1"
android:backgroundTint="?attr/button_symbol_color"
android:onClick="exponentButton"
app:srcCompat="@drawable/exponent" />
android:text="@string/exponent" />

</TableRow>

Expand Down Expand Up @@ -352,18 +350,16 @@
android:onClick="addButton"
app:srcCompat="@drawable/add" />

<ImageButton
<Button
android:id="@+id/equalsButton"
style="@style/CalculatorButton.Small"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:backgroundTint="?attr/button_equals_color"
android:onClick="equalsButton"
app:srcCompat="@drawable/equals"/>

android:text="@string/equals" />
</TableRow>

</TableLayout>

</androidx.constraintlayout.widget.ConstraintLayout>
Expand All @@ -372,26 +368,26 @@
android:id="@+id/constraintLayout3"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity"
android:background="@drawable/display_background">
android:background="@drawable/display_background"
tools:context=".MainActivity">

<androidx.recyclerview.widget.RecyclerView
android:id="@+id/history_recylcle_view"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginBottom="15dp"
android:background="?attr/history_background_color"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@+id/sliding_layout_button"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="@+id/sliding_layout_button"/>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<View
android:id="@+id/sliding_layout_button"
android:layout_width="30dp"
android:layout_height="4dp"
android:layout_marginBottom="12dp"
android:layout_marginTop="18dp"
android:layout_marginBottom="12dp"
android:background="?attr/text_color"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
Expand All @@ -406,11 +402,11 @@
android:id="@+id/inputHorizontalScrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/guideline1"
app:layout_constraintTop_toTopOf="parent"
android:background="?attr/foreground_color"
android:overScrollMode="never"
android:scrollbars="none"
android:overScrollMode="never">
app:layout_constraintBottom_toTopOf="@+id/guideline1"
app:layout_constraintTop_toTopOf="parent">

<EditText
android:id="@+id/input"
Expand All @@ -419,14 +415,14 @@
android:layout_height="match_parent"
android:layout_gravity="right"
android:autofillHints="false"
android:background="?attr/foreground_color"
android:inputType="textNoSuggestions"
android:paddingHorizontal="30sp"
android:singleLine="true"
android:text=""
android:textAlignment="textEnd"
android:textColor="?attr/text_color"
android:textSize="55sp"
android:background="?attr/foreground_color"
tools:ignore="RtlCompat" />

</HorizontalScrollView>
Expand Down Expand Up @@ -457,34 +453,34 @@
android:id="@+id/resultDisplayHorizontalScrollView"
android:layout_width="match_parent"
android:layout_height="0dp"
app:layout_constraintBottom_toTopOf="@+id/guideline2"
app:layout_constraintTop_toTopOf="@+id/guideline1"
android:background="?attr/foreground_color"
android:scrollbars="none"
android:fillViewport="true"
android:overScrollMode="never"
android:fillViewport="true">
android:scrollbars="none"
app:layout_constraintBottom_toTopOf="@+id/guideline2"
app:layout_constraintTop_toTopOf="@+id/guideline1">

<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:orientation="horizontal"
android:gravity="end">
android:gravity="end"
android:orientation="horizontal">

<TextView
android:id="@+id/resultDisplay"
style="@style/RobotoFontCondensedMedium"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:background="?attr/foreground_color"
android:paddingStart="18dp"
android:paddingEnd="30sp"
android:scrollHorizontally="true"
android:textIsSelectable="true"
android:singleLine="true"
android:background="?attr/foreground_color"
android:text=""
android:textColor="?attr/text_second_color"
android:textAlignment="textEnd"
android:textSize="30sp"
android:paddingStart="18dp"
android:paddingEnd="30sp"/>
android:textColor="?attr/text_second_color"
android:textIsSelectable="true"
android:textSize="30sp" />

</LinearLayout>

Expand Down Expand Up @@ -518,15 +514,15 @@

<TextView
android:id="@+id/degreeTextView"
style="@style/RobotoFontCondensedMedium"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
android:layout_marginStart="12dp"
android:layout_marginTop="8dp"
style="@style/RobotoFontCondensedMedium"
android:textSize="25sp"
android:text="DEG"
android:textColor="?attr/text_third_color"
android:textSize="25sp"
android:visibility="visible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

Expand Down
20 changes: 9 additions & 11 deletions app/src/main/res/layout-sw720dp-land/activity_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -344,25 +344,25 @@
android:onClick="parenthesesButton"
android:text= "@string/parentheses" />

<ImageButton
<Button
android:id="@+id/exponentButton"
style="@style/CalculatorButton.Small"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_margin="0dp"
android:layout_weight="1"
android:backgroundTint="?attr/button_symbol_color"
android:onClick="exponentButton"
app:srcCompat="@drawable/exponent" />
android:text="@string/exponent" />

<ImageButton
<Button
android:id="@+id/divideButton"
style="@style/CalculatorButton.Small"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:backgroundTint="?attr/button_symbol_color"
android:onClick="divideButton"
app:srcCompat="@drawable/divide" />
android:text="@string/divide" />
</TableRow>

<TableRow
Expand Down Expand Up @@ -447,15 +447,15 @@
android:text="@string/six"
android:textSize="@dimen/button_text_size"/>

<ImageButton
<Button
android:id="@+id/subtractButton"
style="@style/CalculatorButton.Small"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:backgroundTint="?attr/button_symbol_color"
android:onClick="subtractButton"
app:srcCompat="@drawable/subtract" />
android:text="@string/subtract" />
</TableRow>

<TableRow
Expand Down Expand Up @@ -540,19 +540,17 @@
app:srcCompat="@drawable/backspace_720dp"
tools:ignore="SpeakableTextPresentCheck" />

<ImageButton
<Button
android:id="@+id/equalsButton"
style="@style/CalculatorButton.Small"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:backgroundTint="?attr/button_equals_color"
android:onClick="equalsButton"
app:srcCompat="@drawable/equals" />
android:text="@string/equals" />
</TableRow>
</TableLayout>


</androidx.constraintlayout.widget.ConstraintLayout>

<androidx.constraintlayout.widget.ConstraintLayout
Expand Down
Loading

0 comments on commit ad31e51

Please sign in to comment.