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

region setting is finished

Browse source
This commit is contained in:
Kevin Hester 2021-03-04 11:20:51 +08:00
parent bd1885aaf2
commit d15ff7ed36
3 changed files with 40 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
app/src/main/res/layout/settings_fragment.xml
View file

@ -56,17 +56,29 @@
android:singleLine="true" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.textview.MaterialTextView
android:id="@+id/regionLabel"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="@string/region"
app:layout_constraintEnd_toEndOf="@+id/regionSpinner"
app:layout_constraintTop_toTopOf="parent"
tools:text="Region" />
<Spinner
android:id="@+id/regionSpinner"
android:layout_width="120dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginEnd="16dp"
android:entries="@array/regions"
android:theme="@style/AppTheme.Spinner"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toBottomOf="@id/regionLabel"
app:layout_constraintStart_toEndOf="@+id/usernameView"
android:entries="@array/regions"
app:layout_constraintTop_toTopOf="parent" />
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<com.google.android.material.textview.MaterialTextView

2
app/src/main/res/values/strings.xml
View file

@ -92,4 +92,6 @@
<string name="firmware_too_old">Firmware update required</string>
<string name="firmware_old">The radio firmware is too old to talk to this application, please go to the settings pane and choose "Update Firmware". For more information on this see <a href="https://www.meshtastic.org/software/firmware-too-old.html">our wiki</a>.</string>
<string name="okay">Okay</string>
<string name="must_set_region">You must set a region!</string>
<string name="region">Region</string>
</resources>