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

merge with 1872-key-agreement

Browse Source
This commit is contained in:
ameba23
2021-03-25 14:55:15 +01:00
parent 265d1da566 1d44305e34
commit 9d23c876ae
93 changed files with 2161 additions and 1811 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
briar-android/src/main/res/anim/fade_in.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<alpha
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@android:integer/config_longAnimTime"
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@integer/animationSpeed"
android:fromAlpha="0.0"
android:interpolator="@android:interpolator/decelerate_quad"
android:toAlpha="1.0"/>
android:toAlpha="1.0" />

7
briar-android/src/main/res/anim/fade_out.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<alpha
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@android:integer/config_mediumAnimTime"
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@integer/animationSpeed"
android:fromAlpha="1.0"
android:interpolator="@android:interpolator/accelerate_quad"
android:toAlpha="0.0"/>
android:toAlpha="0.0" />

7
briar-android/src/main/res/anim/screen_new_in.xml
View File

@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:android="http://schemas.android.com/apk/res/android">
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!-- slide in from right -->
<translate
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/animationSpeed"
android:fromXDelta="100%p"
android:interpolator="@android:interpolator/decelerate_quad"
android:toXDelta="0"/>
android:toXDelta="0" />
</set>

7
briar-android/src/main/res/anim/screen_new_out.xml
View File

@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:android="http://schemas.android.com/apk/res/android">
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!-- slide out to right -->
<translate
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/animationSpeed"
android:fromXDelta="0"
android:interpolator="@android:interpolator/accelerate_quad"
android:toXDelta="100%p"/>
android:toXDelta="100%p" />
</set>

7
briar-android/src/main/res/anim/screen_old_in.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<alpha
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@android:integer/config_mediumAnimTime"
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@integer/animationSpeed"
android:fromAlpha="0.0"
android:interpolator="@android:interpolator/decelerate_quad"
android:toAlpha="1.0"/>
android:toAlpha="1.0" />

7
briar-android/src/main/res/anim/screen_old_out.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<alpha
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@android:integer/config_mediumAnimTime"
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@integer/animationSpeed"
android:fromAlpha="1.0"
android:interpolator="@android:interpolator/accelerate_quad"
android:toAlpha="0.0"/>
android:toAlpha="0.0" />

2
briar-android/src/main/res/anim/step_next_in.xml
View File

@@ -4,7 +4,7 @@
<!-- slide in from right -->
<translate
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/animationSpeed"
android:fromXDelta="100%p"
android:interpolator="@android:interpolator/decelerate_quad"
android:toXDelta="0"/>

7
briar-android/src/main/res/anim/step_next_out.xml
View File

@@ -1,12 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<set
xmlns:android="http://schemas.android.com/apk/res/android">
<set xmlns:android="http://schemas.android.com/apk/res/android">
<!-- slide out to right -->
<translate
android:duration="@android:integer/config_mediumAnimTime"
android:duration="@integer/animationSpeed"
android:fromXDelta="0"
android:interpolator="@android:interpolator/accelerate_quad"
android:toXDelta="100%p"/>
android:toXDelta="100%p" />
</set>

7
briar-android/src/main/res/anim/step_previous_in.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<alpha
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@android:integer/config_mediumAnimTime"
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@integer/animationSpeed"
android:fromAlpha="0.0"
android:interpolator="@android:interpolator/decelerate_quad"
android:toAlpha="1.0"/>
android:toAlpha="1.0" />

7
briar-android/src/main/res/anim/step_previous_out.xml
View File

@@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<alpha
xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@android:integer/config_mediumAnimTime"
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="@integer/animationSpeed"
android:fromAlpha="1.0"
android:interpolator="@android:interpolator/accelerate_quad"
android:toAlpha="0.0"/>
android:toAlpha="0.0" />

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" />

5
briar-android/src/main/res/layout/activity_nav_drawer.xml
View File

@@ -52,16 +52,17 @@
android:layout_height="0dp"
android:contentDescription="@string/close"
android:scaleType="center"
app:srcCompat="@drawable/ic_close"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:srcCompat="@drawable/ic_close"
app:tint="@color/briar_text_tertiary_inverse" />
</androidx.constraintlayout.widget.ConstraintLayout>
<FrameLayout
<androidx.fragment.app.FragmentContainerView
android:id="@+id/fragmentContainer"
android:name="org.briarproject.briar.android.contact.ContactListFragment"
android:layout_width="0dp"
android:layout_height="0dp"
app:layout_constraintBottom_toBottomOf="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" />

13
briar-android/src/main/res/menu/navigation_drawer.xml
View File

@@ -5,27 +5,28 @@
<group android:checkableBehavior="single">
<item
android:id="@+id/nav_btn_contacts"
android:checked="true"
android:icon="@drawable/ic_contacts"
android:title="@string/contact_list_button"/>
android:title="@string/contact_list_button" />
<item
android:id="@+id/nav_btn_groups"
android:icon="@drawable/ic_group"
android:title="@string/groups_button"/>
android:title="@string/groups_button" />
<item
android:id="@+id/nav_btn_forums"
android:icon="@drawable/ic_forums_black_24dp"
android:title="@string/forums_button"/>
android:title="@string/forums_button" />
<item
android:id="@+id/nav_btn_blogs"
android:icon="@drawable/blogs"
android:title="@string/blogs_button"/>
android:title="@string/blogs_button" />
</group>
<group android:checkableBehavior="single">
<item
android:id="@+id/nav_btn_settings"
android:icon="@drawable/ic_settings_black"
android:title="@string/settings_button"/>
android:title="@string/settings_button" />
<item
android:id="@+id/nav_btn_lock"
android:icon="@drawable/startup_lock"
@@ -35,7 +36,7 @@
<item
android:id="@+id/nav_btn_signout"
android:icon="@drawable/ic_signout"
android:title="@string/sign_out_button"/>
android:title="@string/sign_out_button" />
</group>
</menu>

2
briar-android/src/main/res/values/attrs.xml
View File

@@ -1,6 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<integer name="animationSpeed">@android:integer/config_mediumAnimTime</integer>
<declare-styleable name="BriarRecyclerView">
<attr name="scrollToEnd" format="boolean" />
<attr name="emptyImage" format="integer" />

18
briar-android/src/main/res/xml/backup_rules.xml Normal file
View File

@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<full-backup-content>
<!-- docs: https://developer.android.com/guide/topics/data/autobackup#XMLSyntax -->
<exclude
domain="root"
path="." />
<!-- the previous entry should exclude things recursively, but we add more just to be sure -->
<exclude
domain="root"
path="app_db" />
<exclude
domain="root"
path="app_key" />
<!-- we don't use domain=file (getFilesDir()), but ApplicationInfo#dataDir -->
<exclude
domain="sharedpref"
path="." />
</full-backup-content>