ben/brouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Move info and button to own views

Browse source
This commit is contained in:
Manuel Fuhr 2022-01-07 08:20:47 +01:00
parent 712bff8459
commit 31e7c4ebbd
5 changed files with 152 additions and 143 deletions
Download patch file Download diff file Expand all files Collapse all files

39
brouter-routing-app/src/main/res/layout/activity_binstaller.xml
View file

@ -1,13 +1,44 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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"
android:orientation="vertical">
<btools.routingapp.BInstallerView
android:id="@+id/BInstallerView"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/view_segments"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent">
<btools.routingapp.BInstallerView
android:id="@+id/BInstallerView"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<Button
android:id="@+id/buttonDownload"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp"
android:text="@string/action_select"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" />
<TextView
android:id="@+id/textViewSegmentSummary"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginBottom="8dp"
android:textColor="@android:color/primary_text_light"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
<LinearLayout
android:id="@+id/view_download_progress"
@ -21,7 +52,7 @@
android:id="@+id/textViewDownloadProgress"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="34sp" />
android:textSize="20sp" />
<Space
android:layout_width="match_parent"

9
brouter-routing-app/src/main/res/values/strings.xml
View file

@ -15,10 +15,19 @@
-->
<resources>
<plurals name="numberOfSegments">
<item quantity="one">%d segment</item>
<item quantity="other">%d segments</item>
</plurals>
<string name="app_name">BRouter</string>
<string name="cancel_download">Cancel Download</string>
<string name="import_profile">Import Profile</string>
<string name="profile_filename_example">filename.brf</string>
<string name="download_info_start">Starting download…</string>
<string name="download_info_cancel">Cancelling…</string>
<string name="action_download">Download %s</string>
<string name="action_delete">Delete %s</string>
<string name="action_update">Update %s</string>
<string name="action_select">Select segments</string>
<string name="summary_segments">Size=%s\nFree=%s</string>
</resources>