Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-18 13:49:53 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'ssid-password-white-background' into 'master'

Browse Source 
Use white background for hotspot name and password

See merge request briar/briar!1519
This commit is contained in:
Torsten Grote
2021-08-10 11:24:47 +00:00
parent b7d46b9340 adb6b4fba5
commit ebaa3271dd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
briar-android/src/main/java/org/briarproject/briar/android/contact/add/remote/LinkExchangeFragment.java
View File

@@ -59,7 +59,7 @@ public class LinkExchangeFragment extends BaseFragment
@Override @Override
public void injectFragment(ActivityComponent component) { public void injectFragment(ActivityComponent component) {
component.inject(this); component.inject(this);
viewModel = new ViewModelProvider(getActivity(), viewModelFactory) viewModel = new ViewModelProvider(requireActivity(), viewModelFactory)
.get(AddContactViewModel.class); .get(AddContactViewModel.class);
} }

8
briar-android/src/main/res/layout/fragment_hotspot_manual.xml
View File

@@ -39,9 +39,9 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:background="@color/briar_primary" android:background="@android:color/white"
android:padding="8dp" android:padding="8dp"
android:textColor="@color/briar_text_primary_inverse" android:textColor="@color/briar_primary"
android:typeface="monospace" android:typeface="monospace"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -71,9 +71,9 @@
android:layout_marginTop="6dp" android:layout_marginTop="6dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginRight="16dp" android:layout_marginRight="16dp"
android:background="@color/briar_primary" android:background="@android:color/white"
android:padding="8dp" android:padding="8dp"
android:textColor="@color/briar_text_primary_inverse" android:textColor="@color/briar_primary"
android:typeface="monospace" android:typeface="monospace"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"