mirror
/
meshtastic-android
kopia lustrzana https://github.com/meshtastic/Meshtastic-Android
1
0
Forkuj 1
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix #140 - make QR code larger (by making layout agnostic to display size)

pull/148/head
geeksville 2020-08-29 17:03:33 -07:00
rodzic 4af74e2006
commit a985f1f2c5
1 zmienionych plików z 30 dodań i 26 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

56
app/src/main/res/layout/channel_fragment.xml
Wyświetl plik

@ -31,11 +31,13 @@
<ImageView <ImageView
android:id="@+id/qrView" android:id="@+id/qrView"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="200dp" android:layout_height="0dp"
android:layout_marginStart="96dp" android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="96dp" android:layout_marginEnd="16dp"
android:layout_marginBottom="16dp"
android:contentDescription="@string/qr_code" android:contentDescription="@string/qr_code"
app:layout_constraintBottom_toTopOf="@+id/channelOptions"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/channelNameView" app:layout_constraintTop_toBottomOf="@+id/channelNameView"
@ -73,15 +75,37 @@
app:icon="@drawable/ic_twotone_lock_open_24" /> app:icon="@drawable/ic_twotone_lock_open_24" />
</com.google.android.material.button.MaterialButtonToggleGroup> </com.google.android.material.button.MaterialButtonToggleGroup>
--> -->
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/channelOptions"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="64dp"
android:layout_marginEnd="64dp"
android:layout_marginBottom="16dp"
android:hint="@string/channel_options"
app:layout_constraintBottom_toTopOf="@+id/editableCheckbox"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent">
<AutoCompleteTextView
android:id="@+id/filled_exposed_dropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/channel_options" />
</com.google.android.material.textfield.TextInputLayout>
<CheckBox <CheckBox
android:id="@+id/editableCheckbox" android:id="@+id/editableCheckbox"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="96dp" android:layout_marginStart="96dp"
android:layout_marginTop="16dp" android:layout_marginEnd="32dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginBottom="16dp"
android:button="@drawable/sl_lock_24dp" android:button="@drawable/sl_lock_24dp"
app:layout_constraintTop_toBottomOf="@+id/channelOptions"></CheckBox> app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/shareButton"
app:layout_constraintStart_toStartOf="parent"></CheckBox>
<ImageButton <ImageButton
android:id="@+id/shareButton" android:id="@+id/shareButton"
@ -94,24 +118,4 @@
app:layout_constraintTop_toTopOf="@+id/editableCheckbox" app:layout_constraintTop_toTopOf="@+id/editableCheckbox"
app:srcCompat="@drawable/ic_twotone_share_24" /> app:srcCompat="@drawable/ic_twotone_share_24" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/channelOptions"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="64dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="64dp"
android:hint="@string/channel_options"
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox.ExposedDropdownMenu"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/qrView">
<AutoCompleteTextView
android:id="@+id/filled_exposed_dropdown"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/channel_options" />
</com.google.android.material.textfield.TextInputLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>