tri11paragon
/
COSC-3P97-Assignment-1
mirror of https://github.com/tri11paragon/COSC-3P97-Assignment-1.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

converted silly things

main
Brett 2024-10-15 21:17:17 -04:00
parent 3dcf81b7e2
commit ee26f6b659
2 changed files with 272 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

470
app/src/main/res/layout-land/activity_main_calculator.xml
View File

@ -9,258 +9,298 @@
<com.google.android.material.appbar.MaterialToolbar <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/materialToolbar" android:id="@+id/materialToolbar"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1"
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
android:clickable="false" android:clickable="false"
android:minHeight="?attr/actionBarSize" android:minHeight="?attr/actionBarSize"
android:theme="?attr/actionBarTheme" android:theme="?attr/actionBarTheme"
app:layout_constraintEnd_toEndOf="parent" app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Large">
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:subtitleTextAppearance="@style/TextAppearance.AppCompat.Large" />
<TextView <TextView
android:id="@+id/titleText" android:id="@+id/titleText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_marginStart="8dp"
android:layout_marginTop="16dp" android:layout_marginTop="8dp"
android:layout_marginBottom="16dp" android:layout_marginBottom="8dp"
android:text="Balculator" android:text="Balculator"
android:textColor="#FBFBFB" android:textColor="#FBFBFB"
android:textSize="34sp" android:textSize="34sp" />
app:layout_constraintBottom_toBottomOf="@+id/materialToolbar" </com.google.android.material.appbar.MaterialToolbar>
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> <!--I know you can use a grid as shown in class but linear layout feels-->
<!--like the more modern solution, plus i just like it more :3-->
<!--it also feels more contained which i like-->
<LinearLayout
android:id="@+id/alignmentLayout"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_gravity="center"
android:orientation="vertical"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toBottomOf="@+id/materialToolbar">
<LinearLayout
android:id="@+id/calsbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="2"
android:orientation="vertical">
<View <View
android:id="@+id/divider" android:id="@+id/divider"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="4dp" android:layout_height="1dp"
android:layout_marginTop="4dp"
android:background="?android:attr/listDivider" android:background="?android:attr/listDivider"
app:layout_constraintEnd_toEndOf="parent" android:layout_weight="1"/>
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/materialToolbar" />
<TextView <TextView
android:id="@+id/output" android:id="@+id/output"
android:layout_width="0dp" style="@style/CalculatorButtonTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="16dp" android:layout_weight="10"
android:layout_marginTop="6dp" android:paddingEnd="8dp"
app:layout_constraintStart_toStartOf="parent" android:paddingStart="8dp"
app:layout_constraintTop_toBottomOf="@+id/divider" /> android:gravity="end"
android:text="" />
<View <View
android:id="@+id/divider2" android:id="@+id/divider2"
android:layout_width="0dp" android:layout_width="match_parent"
android:layout_height="4dp" android:layout_height="1dp"
android:layout_marginTop="6dp"
android:background="?android:attr/listDivider" android:background="?android:attr/listDivider"
app:layout_constraintEnd_toEndOf="parent" android:layout_weight="1"/>
app:layout_constraintStart_toStartOf="parent" </LinearLayout>
app:layout_constraintTop_toBottomOf="@+id/output" />
<GridLayout <LinearLayout
android:layout_width="0dp" android:id="@+id/row1"
android:layout_height="0dp" android:layout_width="match_parent"
android:layout_gravity="bottom"
android:columnCount="4"
android:rowCount="5"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/divider2">
<!-- Row 1 -->
<Button
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_rowWeight="1" android:layout_weight="1"
android:layout_columnWeight="1" android:orientation="horizontal">
android:text="7"
android:id="@+id/b7"
app:autoSizeTextType="uniform"/>
<Button <Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="8"
android:id="@+id/b8"
app:autoSizeTextType="uniform"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="9"
android:id="@+id/b9"
app:autoSizeTextType="uniform"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="÷"
android:id="@+id/bdiv"
app:autoSizeTextType="uniform"/>
<!-- Row 2 -->
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="4"
android:id="@+id/b4"
app:autoSizeTextType="uniform"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="5"
android:id="@+id/b5"
app:autoSizeTextType="uniform"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="6"
android:id="@+id/b6"
app:autoSizeTextType="uniform"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="*"
android:id="@+id/bmul"
app:autoSizeTextType="uniform"/>
<!-- Row 3 -->
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="1"
android:id="@+id/b1"
app:autoSizeTextType="uniform"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="2"
android:id="@+id/b2"
app:autoSizeTextType="uniform"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="3"
android:id="@+id/b3"
app:autoSizeTextType="uniform"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="-"
android:id="@+id/bminus"
app:autoSizeTextType="uniform"/>
<!-- Row 4 -->
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="C"
android:id="@+id/bc"
app:autoSizeTextType="uniform"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="0"
android:id="@+id/b0"
app:autoSizeTextType="uniform"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="."
android:id="@+id/bdot"
app:autoSizeTextType="uniform"/>
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="+"
android:id="@+id/bplus"
app:autoSizeTextType="uniform"/>
<!-- Row 5 -->
<Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="S"
android:id="@+id/bs" android:id="@+id/bs"
app:autoSizeTextType="uniform"/> style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="S" />
<Button <Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="R"
android:id="@+id/br" android:id="@+id/br"
app:autoSizeTextType="uniform"/> style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="R" />
<Button <Button
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_rowWeight="1"
android:layout_columnWeight="1"
android:text="A"
android:id="@+id/ba" android:id="@+id/ba"
app:autoSizeTextType="uniform"/> style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="A" />
<!-- i put equals last because it puts it close to the thumb-->
<Button <Button
android:layout_width="0dp" android:id="@+id/bc"
android:layout_height="wrap_content" style="@style/CalculatorButtonTextStyle"
android:layout_rowWeight="1" android:layout_width="wrap_content"
android:layout_columnWeight="1" android:layout_height="match_parent"
android:text="=" android:layout_margin="2dp"
android:id="@+id/bequals" android:layout_weight="1"
app:autoSizeTextType="uniform"/> android:text="C" />
</GridLayout> </LinearLayout>
<LinearLayout
android:id="@+id/row2"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<Button
android:id="@+id/b7"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="7" />
<Button
android:id="@+id/b8"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="8" />
<Button
android:id="@+id/b9"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="9" />
<Button
android:id="@+id/bdiv"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="÷" />
</LinearLayout>
<LinearLayout
android:id="@+id/row3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<Button
android:id="@+id/b4"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="4" />
<Button
android:id="@+id/b5"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="5" />
<Button
android:id="@+id/b6"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="6" />
<Button
android:id="@+id/bmul"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="*" />
</LinearLayout>
<LinearLayout
android:id="@+id/row4"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<Button
android:id="@+id/b1"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="1" />
<Button
android:id="@+id/b2"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="2" />
<Button
android:id="@+id/b3"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="3" />
<Button
android:id="@+id/bminus"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="-" />
</LinearLayout>
<LinearLayout
android:id="@+id/row5"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_weight="1"
android:orientation="horizontal">
<Button
android:id="@+id/bdot"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="." />
<Button
android:id="@+id/b0"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="0" />
<Button
android:id="@+id/bplus"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="+" />
<!-- i put equals last because it puts it close to the thumb-->
<Button
android:id="@+id/bequals"
style="@style/CalculatorButtonTextStyle"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_margin="2dp"
android:layout_weight="1"
android:text="=" />
</LinearLayout>
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>

13
app/src/main/res/values/styles.xml
View File

@ -1,10 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<!-- <style name="CalculatorButtonStyle">--> <style name="CalculatorButtonTextStyle">
<!-- <item name="android:autoSizeTextType">uniform</item>--> <item name="autoSizeTextType">uniform</item>
<!-- <item name="android:autoSizeMinTextSize">12sp</item>--> <item name="autoSizeMinTextSize">10sp</item>
<!-- <item name="android:autoSizeMaxTextSize">30sp</item>--> <item name="autoSizeMaxTextSize">256sp</item>
<!-- <item name="android:autoSizeStepGranularity">2sp</item>--> <item name="autoSizeStepGranularity">2sp</item>
<!-- <item name="android:textSize">18sp</item> &lt;!&ndash; Fallback default size &ndash;&gt;--> </style>
<!-- </style>-->
</resources> </resources>