meshtastic/Meshtastic-Android
1
0
Fork 0
mirror of https://github.com/meshtastic/Meshtastic-Android.git synced 2026-04-20 22:23:37 +00:00
Code Issues Projects Releases Packages Wiki Activity

Removed duplicate method and cleaned up some code

Browse source
This commit is contained in:
PWRxPSYCHO 2022-10-06 13:16:51 -04:00
parent 6bb2a59977
commit 63bee8a3d8
2 changed files with 107 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

75
app/src/main/res/layout/map_view.xml
View file

@ -33,37 +33,46 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:textColor="@color/colourGrey"
android:text="Select download region"
android:textAppearance="?android:attr/textAppearanceLarge"
app:layout_constraintBottom_toTopOf="@id/box10miles" />
android:textColor="@color/colourGrey"
app:layout_constraintBottom_toTopOf="@id/toggleButton" />
<Button
android:id="@+id/box5miles"
android:layout_width="wrap_content"
<com.google.android.material.button.MaterialButtonToggleGroup
android:id="@+id/toggleButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="5 Miles"
app:layout_constraintBottom_toTopOf="@id/cache_estimate"
app:layout_constraintEnd_toStartOf="@id/box10miles"
app:layout_constraintStart_toStartOf="parent" />
android:gravity="center"
style="?attr/materialButtonToggleGroupStyle"
app:layout_constraintBottom_toTopOf="@id/cache_estimate">
<Button
android:id="@+id/box10miles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="10 miles"
app:layout_constraintBottom_toTopOf="@id/cache_estimate"
app:layout_constraintEnd_toStartOf="@id/box15miles"
app:layout_constraintStart_toEndOf="@id/box5miles" />
<Button
android:id="@+id/box5miles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="5 Miles"
app:layout_constraintBottom_toTopOf="@id/cache_estimate"
app:layout_constraintEnd_toStartOf="@id/box10miles"
app:layout_constraintStart_toStartOf="parent" />
<Button
android:id="@+id/box15miles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="15 miles"
app:layout_constraintBottom_toTopOf="@id/cache_estimate"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/box10miles" />
<Button
android:id="@+id/box10miles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="10 miles"
app:layout_constraintBottom_toTopOf="@id/cache_estimate"
app:layout_constraintEnd_toStartOf="@id/box15miles"
app:layout_constraintStart_toEndOf="@id/box5miles" />
<Button
android:id="@+id/box15miles"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="15 miles"
app:layout_constraintBottom_toTopOf="@id/cache_estimate"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/box10miles" />
</com.google.android.material.button.MaterialButtonToggleGroup>
<TextView
android:id="@+id/cache_estimate"
@ -84,14 +93,14 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
<!-- <Button-->
<!-- android:id="@+id/cancelDownload"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="Cancel"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- />-->
<!-- <Button-->
<!-- android:id="@+id/cancelDownload"-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:text="Cancel"-->
<!-- app:layout_constraintBottom_toBottomOf="parent"-->
<!-- app:layout_constraintEnd_toEndOf="parent"-->
<!-- />-->
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.floatingactionbutton.FloatingActionButton