Team4388/RidgeScout
1
0
Fork 0
mirror of https://github.com/Team4388/RidgeScout.git synced 2026-06-09 08:38:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make scanner better, format layout better.

Browse Source
This commit is contained in:
Astatin3
2024-03-31 15:13:53 -06:00
parent 9ef0b75c2c
commit b9273bd4f8
17 changed files with 844 additions and 574 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/res/drawable/transfer_icon.xml
+16
View File
@@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="800dp"
android:height="800dp"
android:viewportWidth="25"
android:viewportHeight="25">
<path
android:pathData="M19.5,16.5H6M5.5,8.5L19,8.5"
android:strokeWidth="1.2"
android:fillColor="#00000000"
android:strokeColor="#121923"/>
<path
android:pathData="M16,13L19.5,16.5L16,20M9,12L5.5,8.5L9,5"
android:strokeWidth="1.2"
android:fillColor="#00000000"
android:strokeColor="#121923"/>
</vector>
app/src/main/res/layout/fragment_home.xml
-79
View File
@@ -10,84 +10,5 @@
android:focusableInTouchMode="false"
tools:context=".MainActivity">
<SeekBar
android:id="@+id/qrSizeSlider"
android:layout_width="412dp"
android:layout_height="48dp"
android:layout_marginStart="34dp"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.971"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/qrImage"
app:layout_constraintVertical_bias="0.838" />
<SeekBar
android:id="@+id/qrSpeedSlider"
android:layout_width="412dp"
android:layout_height="48dp"
android:layout_marginStart="34dp"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toTopOf="@+id/qrSizeSlider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.971"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/qrImage"
app:layout_constraintVertical_bias="0.93" />
<ImageView
android:id="@+id/qrImage"
android:layout_width="300dp"
android:layout_height="300dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/qrSpeedText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="QR Speed"
app:layout_constraintBottom_toTopOf="@+id/qrSpeedSlider"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/qrSizeText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="QR Size"
app:layout_constraintBottom_toTopOf="@+id/qrSizeSlider"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/qrIndexSlash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="202dp"
android:layout_marginEnd="203dp"
android:text="/"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/qrImage" />
<TextView
android:id="@+id/qrIndexN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
app:layout_constraintEnd_toStartOf="@+id/qrIndexSlash"
app:layout_constraintTop_toBottomOf="@+id/qrImage" />
<TextView
android:id="@+id/qrIndexD"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
app:layout_constraintStart_toEndOf="@+id/qrIndexSlash"
app:layout_constraintTop_toBottomOf="@+id/qrImage" />
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_notifications.xml
-35
View File
@@ -1,35 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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"
tools:context=".ui.notifications.NotificationsFragment">
<FrameLayout
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">
<com.budiyev.android.codescanner.CodeScannerView
android:id="@+id/scanner_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:autoFocusButtonColor="@android:color/white"
app:autoFocusButtonVisible="true"
app:flashButtonColor="@android:color/white"
app:flashButtonVisible="true"
app:frameColor="@android:color/white"
app:frameCornersSize="50dp"
app:frameCornersRadius="0dp"
app:frameAspectRatioWidth="1"
app:frameAspectRatioHeight="1"
app:frameSize="0.75"
app:frameThickness="2dp"
app:frameVerticalBias="0.5"
app:maskColor="#77000000"/>
</FrameLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/fragment_transfer.xml
+171
View File
@@ -0,0 +1,171 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout 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"
tools:context=".ui.transfer.TransferFragment">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/selectLayout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<Button
android:id="@+id/uploadButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Upload"
android:textSize="34sp"
app:layout_constraintBottom_toTopOf="@+id/downloadButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/downloadButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Download"
android:textSize="34sp"
app:layout_constraintBottom_toBottomOf="@+id/TBAButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/uploadButton" />
<Button
android:id="@+id/TBAButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="TBA"
android:textSize="34sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/downloadButton" />
</androidx.constraintlayout.widget.ConstraintLayout>
<com.astatin3.scoutingapp2025.ui.transfer.generatorView
android:id="@+id/generatorLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
tools:visibility="gone">
<SeekBar
android:id="@+id/qrSizeSlider"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/qrImage" />
<SeekBar
android:id="@+id/qrSpeedSlider"
android:layout_width="match_parent"
android:layout_height="48dp"
android:layout_marginBottom="60dp"
app:layout_constraintBottom_toTopOf="@+id/qrSizeSlider"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.971"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/qrImage"
app:layout_constraintVertical_bias="0.93" />
<ImageView
android:id="@+id/qrImage"
android:layout_width="300dp"
android:layout_height="300dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/qrSpeedText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="QR Speed"
app:layout_constraintBottom_toTopOf="@+id/qrSpeedSlider"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/qrSizeText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:text="QR Size"
app:layout_constraintBottom_toTopOf="@+id/qrSizeSlider"
app:layout_constraintStart_toStartOf="parent" />
<TextView
android:id="@+id/qrIndexN"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
app:layout_constraintEnd_toStartOf="@+id/qrIndexSlash"
app:layout_constraintTop_toBottomOf="@+id/qrImage" />
<TextView
android:id="@+id/qrIndexSlash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="/"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/qrImage" />
<TextView
android:id="@+id/qrIndexD"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0"
app:layout_constraintStart_toEndOf="@+id/qrIndexSlash"
app:layout_constraintTop_toBottomOf="@+id/qrImage" />
</com.astatin3.scoutingapp2025.ui.transfer.generatorView>
<com.astatin3.scoutingapp2025.ui.transfer.scannerView
android:id="@+id/scannerLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:visibility="gone"
tools:visibility="gone">
<com.astatin3.scoutingapp2025.qrPointsOverlayView
android:id="@+id/qrPointsOverlayView"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</com.astatin3.scoutingapp2025.ui.transfer.scannerView>
<com.astatin3.scoutingapp2025.ui.transfer.TBAView
android:id="@+id/TBAView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginBottom="57dp"
android:fillViewport="true"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="gone">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TableLayout
android:id="@+id/matchTable"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</LinearLayout>
</com.astatin3.scoutingapp2025.ui.transfer.TBAView>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/menu/bottom_nav_menu.xml
+2 -2
View File
@@ -8,8 +8,8 @@
<item
android:id="@+id/navigation_notifications"
android:icon="@drawable/ic_notifications_black_24dp"
android:title="@string/title_notifications" />
android:icon="@drawable/transfer_icon"
android:title="@string/title_transfer" />
<item
android:id="@+id/navigation_tba"
android:icon="@drawable/ic_dashboard_black_24dp"
app/src/main/res/navigation/mobile_navigation.xml
+3 -3
View File
@@ -36,7 +36,7 @@
<fragment
android:id="@+id/navigation_notifications"
android:name="com.astatin3.scoutingapp2025.ui.notifications.NotificationsFragment"
android:label="@string/title_notifications"
tools:layout="@layout/fragment_notifications" />
android:name="com.astatin3.scoutingapp2025.ui.transfer.TransferFragment"
android:label="@string/title_transfer"
tools:layout="@layout/fragment_transfer" />
</navigation>
app/src/main/res/values/strings.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<resources>
<string name="app_name">ScoutingApp2025</string>
<string name="title_home">Home</string>
<string name="title_notifications">Notifications</string>
<string name="title_transfer">Transfer</string>
<string name="title_tba">TBA</string>
</resources>