Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
aayush262
commit
f3f0daf7e7
17 changed files with 634 additions and 23 deletions
390
app/src/main/res/layout-land/activity_calc.xml
Normal file
390
app/src/main/res/layout-land/activity_calc.xml
Normal file
|
|
@ -0,0 +1,390 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:background="@color/bg">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/mainContainer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:background="@color/bg"
|
||||
android:baselineAligned="false"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/displayContainer"
|
||||
android:layout_width="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top"
|
||||
android:layout_marginTop="16dp"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/display"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:background="@drawable/rounded_top_corners"
|
||||
android:gravity="end"
|
||||
android:maxLines="2"
|
||||
app:autoSizeMaxTextSize="48sp"
|
||||
app:autoSizeMinTextSize="10sp"
|
||||
app:autoSizeStepGranularity="2sp"
|
||||
app:autoSizeTextType="uniform"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
android:textSize="48sp"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/displayBinary"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="2dp"
|
||||
android:background="?attr/colorSurfaceVariant"
|
||||
android:gravity="end"
|
||||
android:maxLines="2"
|
||||
app:autoSizeMaxTextSize="48sp"
|
||||
app:autoSizeMinTextSize="10sp"
|
||||
app:autoSizeStepGranularity="2sp"
|
||||
app:autoSizeTextType="uniform"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
android:textSize="28sp"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/displayHex"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:layout_marginTop="2dp"
|
||||
android:background="@drawable/rounded_bottom_corners"
|
||||
android:gravity="end"
|
||||
android:maxLines="2"
|
||||
app:autoSizeMaxTextSize="48sp"
|
||||
app:autoSizeMinTextSize="10sp"
|
||||
app:autoSizeStepGranularity="2sp"
|
||||
app:autoSizeTextType="uniform"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
android:textSize="28sp"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/buttonContainer"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
android:id="@+id/button7"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="7"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button8"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="8"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button9"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="9"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonDivide"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginStart="16dp"
|
||||
android:backgroundTint="?attr/colorPrimary"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="÷"
|
||||
android:textColor="?attr/colorOnPrimary"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
android:id="@+id/button4"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="4"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button5"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="5"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button6"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="6"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonMultiply"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginStart="16dp"
|
||||
android:backgroundTint="?attr/colorPrimary"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="×"
|
||||
android:textColor="?attr/colorOnPrimary"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
android:id="@+id/button1"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="1"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button2"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="2"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/button3"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="3"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonSubtract"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginStart="16dp"
|
||||
android:backgroundTint="?attr/colorPrimary"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="−"
|
||||
android:textColor="?attr/colorOnPrimary"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
android:id="@+id/button0"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="0"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonDot"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginStart="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="."
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonBackspace"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:backgroundTint="?attr/colorSurfaceVariant"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="⌫"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonAdd"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginStart="16dp"
|
||||
android:backgroundTint="?attr/colorPrimary"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="+"
|
||||
android:textColor="?attr/colorOnPrimary"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_marginTop="16dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonClear"
|
||||
android:layout_width="70dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginTop="16dp"
|
||||
android:layout_marginEnd="16dp"
|
||||
android:backgroundTint="?attr/colorPrimary"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="C"
|
||||
android:textColor="?attr/colorOnPrimary"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/buttonEquals"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="64dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginTop="16dp"
|
||||
android:backgroundTint="?attr/colorPrimary"
|
||||
android:elegantTextHeight="true"
|
||||
android:text="="
|
||||
android:textColor="?attr/colorOnPrimary"
|
||||
app:cornerRadius="16dp"
|
||||
android:textSize="20sp"
|
||||
android:textStyle="bold"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
</FrameLayout>
|
||||
|
|
@ -33,6 +33,10 @@
|
|||
android:background="@drawable/rounded_top_corners"
|
||||
android:gravity="end"
|
||||
android:maxLines="1"
|
||||
app:autoSizeMaxTextSize="48sp"
|
||||
app:autoSizeMinTextSize="10sp"
|
||||
app:autoSizeStepGranularity="2sp"
|
||||
app:autoSizeTextType="uniform"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
android:textSize="48sp"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
|
@ -46,7 +50,11 @@
|
|||
android:layout_marginEnd="32dp"
|
||||
android:background="?attr/colorSurfaceVariant"
|
||||
android:gravity="end"
|
||||
android:maxLines="1"
|
||||
android:maxLines="2"
|
||||
app:autoSizeMaxTextSize="48sp"
|
||||
app:autoSizeMinTextSize="10sp"
|
||||
app:autoSizeStepGranularity="2sp"
|
||||
app:autoSizeTextType="uniform"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
android:textSize="28sp"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
|
@ -60,7 +68,11 @@
|
|||
android:layout_marginEnd="32dp"
|
||||
android:background="@drawable/rounded_bottom_corners"
|
||||
android:gravity="end"
|
||||
android:maxLines="1"
|
||||
android:maxLines="2"
|
||||
app:autoSizeMaxTextSize="48sp"
|
||||
app:autoSizeMinTextSize="10sp"
|
||||
app:autoSizeStepGranularity="2sp"
|
||||
app:autoSizeTextType="uniform"
|
||||
android:textColor="?attr/colorOnSurfaceVariant"
|
||||
android:textSize="28sp"
|
||||
tools:ignore="ButtonStyle,HardcodedText" />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:layout_width="match_parent"
|
||||
|
|
@ -54,11 +54,14 @@
|
|||
<EditText
|
||||
android:id="@+id/editText"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_height="0dp"
|
||||
android:layout_weight="1"
|
||||
android:layout_margin="16dp"
|
||||
android:fontFamily="@font/poppins"
|
||||
android:inputType="textMultiLine"
|
||||
android:padding="16dp"
|
||||
android:nestedScrollingEnabled="true"
|
||||
android:gravity="top|start"
|
||||
android:textColor="?attr/colorOnBackground"
|
||||
android:textIsSelectable="true"
|
||||
android:textSize="12sp"
|
||||
|
|
@ -101,4 +104,4 @@
|
|||
|
||||
</LinearLayout>
|
||||
|
||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||
</LinearLayout>
|
||||
|
|
@ -10,16 +10,34 @@
|
|||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:hint="@string/enter_password"
|
||||
android:maxLength="32"
|
||||
android:inputType="numberPassword" />
|
||||
android:inputType="numberPassword"
|
||||
android:maxLength="32" />
|
||||
|
||||
<EditText
|
||||
android:id="@+id/confirmPasswordInput"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:hint="@string/confirm_password"
|
||||
android:inputType="numberPassword"
|
||||
android:maxLength="32"
|
||||
android:layout_marginTop="16dp" />
|
||||
android:maxLength="32" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/biometricCheckbox"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:fontFamily="@font/poppins"
|
||||
android:text="@string/enable_biometric"
|
||||
android:textSize="16sp" />
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/forgotPasswordCheckbox"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginTop="16dp"
|
||||
android:fontFamily="@font/poppins"
|
||||
android:text="@string/enable_forgot_password"
|
||||
android:textSize="16sp" />
|
||||
|
||||
</LinearLayout>
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@
|
|||
android:src="@drawable/linear_gradient_bg"
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<LinearLayout
|
||||
<androidx.core.widget.NestedScrollView
|
||||
android:id="@+id/textActivityContainer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
|
|
@ -47,7 +47,7 @@
|
|||
android:textSize="18sp"
|
||||
android:visibility="gone"
|
||||
tools:ignore="HardcodedText" />
|
||||
</LinearLayout>
|
||||
</androidx.core.widget.NestedScrollView>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/leftTouchPanel"
|
||||
|
|
|
|||
|
|
@ -1024,4 +1024,9 @@ Non quae tempore quo provident laudantium qui illo dolor vel quia dolor et exerc
|
|||
<string name="app_lock_desc">Lock the app with a password\n( ͡° ͜ʖ ͡°)</string>
|
||||
<string name="confirm_password">Confirm Password</string>
|
||||
<string name="password_mismatch">Passwords do not match or are empty!</string>
|
||||
<string name="enable_biometric">Enable Biometric</string>
|
||||
<string name="bio_prompt_info_title">Biometric Authentication</string>
|
||||
<string name="bio_prompt_info_desc">Use your fingerprint or face to unlock the app</string>
|
||||
<string name="enable_forgot_password">Enable Forgot Password (hold clear button for 10 seconds)</string>
|
||||
|
||||
</resources>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue