diff options
| author | cyberta <cyberta@riseup.net> | 2021-11-24 09:26:40 +0000 |
|---|---|---|
| committer | cyberta <cyberta@riseup.net> | 2021-11-24 09:26:40 +0000 |
| commit | 68ca9c827da3c3fad9e70c74960f113560fd6711 (patch) | |
| tree | dda6f99c2ef2b222d4f07d0ef80d5d0cc373604e /app/src/main/res/layout/allowed_application_layout.xml | |
| parent | 9b2b57d8617e60c0b69713e1e5f14dbb8e57c70a (diff) | |
| parent | e3cd28aa6ef16d9bde179a3e1117cdfa585939a4 (diff) | |
Merge branch 'simply_secure_UI_changes' into 'master'
Gateway selection UI overhaul
Closes #9047
See merge request leap/bitmask_android!140
Diffstat (limited to 'app/src/main/res/layout/allowed_application_layout.xml')
| -rw-r--r-- | app/src/main/res/layout/allowed_application_layout.xml | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/app/src/main/res/layout/allowed_application_layout.xml b/app/src/main/res/layout/allowed_application_layout.xml index d8d846f9..61fc12c3 100644 --- a/app/src/main/res/layout/allowed_application_layout.xml +++ b/app/src/main/res/layout/allowed_application_layout.xml @@ -23,11 +23,11 @@ android:layout_rowSpan="1" android:layout_marginEnd="8dip" android:scaleType="centerInside" - tools:background="@drawable/icon" + tools:background="@drawable/ic_btn_on_connecting" android:contentDescription="@null" /> - <TextView - tools:text="@string/app" + <androidx.appcompat.widget.AppCompatTextView + tools:text="@string/app_name" android:id="@+id/app_name" android:layout_width="0dip" android:layout_columnSpan="2" @@ -39,23 +39,12 @@ android:textAppearance="?android:attr/textAppearanceMedium" android:textAlignment="viewStart" /> - <CheckBox android:id="@+id/app_selected" - android:layout_marginStart="8dip" + <se.leap.bitmaskclient.base.views.SimpleCheckBox + android:id="@+id/app_selected" + android:layout_height="32dp" + android:layout_width="32dp" android:layout_gravity="center_vertical" android:layout_rowSpan="1" android:visibility="visible" /> -<!-- <TextView - android:id="@+id/app_size" - android:layout_width="0dip" - android:layout_gravity="fill_horizontal|top" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textAlignment="viewStart" /> --> - - <!-- <TextView - android:id="@+id/app_disabled" - android:layout_marginStart="8dip" - android:layout_gravity="top" - android:textAppearance="?android:attr/textAppearanceSmall" /> --> - </GridLayout>
\ No newline at end of file |