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

Merge branch '1872-key-agreement' into 'master'

Browse Source 
Finish migrating KeyAgreementActivity to ViewModel

Closes #1982 and #1872

See merge request briar/briar!1357
This commit is contained in:
akwizgran
2021-04-12 13:19:51 +00:00
parent a066190c60 cdae8b35f5
commit 5305dd62d1
30 changed files with 1410 additions and 1230 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/res/layout/activity_fragment_container_toolbar.xml
View File

@@ -4,11 +4,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".android.keyagreement.KeyAgreementActivity">
tools:context=".android.contact.add.nearby.AddNearbyContactActivity">
<include layout="@layout/toolbar" />
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<FrameLayout
android:id="@+id/fragmentContainer"
android:layout_width="match_parent"
android:layout_height="match_parent" />

2
briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
View File

@@ -5,7 +5,7 @@
android:layout_height="match_parent"
android:keepScreenOn="true">
<org.briarproject.briar.android.keyagreement.CameraView
<org.briarproject.briar.android.contact.add.nearby.CameraView
android:id="@+id/camera_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />