Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
briar
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Julian Dehm
briar
Commits
90db4581
Verified
Commit
90db4581
authored
Sep 10, 2018
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add RTL language support to all activities and fragments
parent
81863b9d
Changes
26
Hide whitespace changes
Inline
Side-by-side
Showing
26 changed files
with
461 additions
and
391 deletions
+461
-391
briar-android/build.gradle
briar-android/build.gradle
+1
-1
briar-android/src/main/AndroidManifest.xml
briar-android/src/main/AndroidManifest.xml
+1
-0
briar-android/src/main/java/org/briarproject/briar/android/login/StrengthMeter.java
...a/org/briarproject/briar/android/login/StrengthMeter.java
+5
-2
briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
...va/org/briarproject/briar/android/view/TextInputView.java
+5
-3
briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java
...briarproject/briar/android/widget/LinkDialogFragment.java
+3
-2
briar-android/src/main/res/drawable/qr_code_explanation.xml
briar-android/src/main/res/drawable/qr_code_explanation.xml
+1
-0
briar-android/src/main/res/layout/activity_change_password.xml
...-android/src/main/res/layout/activity_change_password.xml
+28
-20
briar-android/src/main/res/layout/activity_conversation.xml
briar-android/src/main/res/layout/activity_conversation.xml
+3
-2
briar-android/src/main/res/layout/activity_dev_report.xml
briar-android/src/main/res/layout/activity_dev_report.xml
+136
-108
briar-android/src/main/res/layout/activity_nav_drawer.xml
briar-android/src/main/res/layout/activity_nav_drawer.xml
+35
-17
briar-android/src/main/res/layout/activity_panic_preferences.xml
...ndroid/src/main/res/layout/activity_panic_preferences.xml
+0
-1
briar-android/src/main/res/layout/activity_password.xml
briar-android/src/main/res/layout/activity_password.xml
+19
-18
briar-android/src/main/res/layout/activity_rss_feed_import.xml
...-android/src/main/res/layout/activity_rss_feed_import.xml
+5
-3
briar-android/src/main/res/layout/activity_settings.xml
briar-android/src/main/res/layout/activity_settings.xml
+0
-1
briar-android/src/main/res/layout/activity_test_data.xml
briar-android/src/main/res/layout/activity_test_data.xml
+170
-169
briar-android/src/main/res/layout/activity_threaded_conversation.xml
...id/src/main/res/layout/activity_threaded_conversation.xml
+2
-2
briar-android/src/main/res/layout/activity_write_blog_post.xml
...-android/src/main/res/layout/activity_write_blog_post.xml
+2
-2
briar-android/src/main/res/layout/author_view.xml
briar-android/src/main/res/layout/author_view.xml
+4
-0
briar-android/src/main/res/layout/briar_recycler_view.xml
briar-android/src/main/res/layout/briar_recycler_view.xml
+0
-4
briar-android/src/main/res/layout/contact_avatar_status.xml
briar-android/src/main/res/layout/contact_avatar_status.xml
+1
-1
briar-android/src/main/res/layout/dialog_screen_filter.xml
briar-android/src/main/res/layout/dialog_screen_filter.xml
+10
-7
briar-android/src/main/res/layout/fragment_keyagreement_qr.xml
...-android/src/main/res/layout/fragment_keyagreement_qr.xml
+5
-2
briar-android/src/main/res/layout/fragment_link_dialog.xml
briar-android/src/main/res/layout/fragment_link_dialog.xml
+12
-10
briar-android/src/main/res/layout/fragment_setup_doze.xml
briar-android/src/main/res/layout/fragment_setup_doze.xml
+8
-14
briar-android/src/main/res/layout/list_item_blog_post.xml
briar-android/src/main/res/layout/list_item_blog_post.xml
+3
-0
briar-android/witness.gradle
briar-android/witness.gradle
+2
-2
No files found.
briar-android/build.gradle
View file @
90db4581
...
...
@@ -21,7 +21,7 @@ dependencies {
}
implementation
"com.android.support:cardview-v7:$supportVersion"
implementation
"com.android.support:support-annotations:$supportVersion"
implementation
'com.android.support.constraint:constraint-layout:1.1.
0
'
implementation
'com.android.support.constraint:constraint-layout:1.1.
3
'
implementation
(
'ch.acra:acra:4.9.1'
)
{
exclude
module:
'support-v4'
...
...
briar-android/src/main/AndroidManifest.xml
View file @
90db4581
...
...
@@ -26,6 +26,7 @@
android:icon=
"@mipmap/ic_launcher_round"
android:label=
"@string/app_name"
android:logo=
"@mipmap/ic_launcher_round"
android:supportsRtl=
"true"
android:theme=
"@style/BriarTheme"
>
<receiver
...
...
briar-android/src/main/java/org/briarproject/briar/android/login/StrengthMeter.java
View file @
90db4581
...
...
@@ -7,6 +7,7 @@ import android.graphics.drawable.ClipDrawable;
import
android.graphics.drawable.Drawable
;
import
android.graphics.drawable.LayerDrawable
;
import
android.graphics.drawable.ShapeDrawable
;
import
android.support.annotation.Nullable
;
import
android.util.AttributeSet
;
import
android.widget.ProgressBar
;
...
...
@@ -15,6 +16,7 @@ import static android.graphics.Paint.Style.FILL;
import
static
android
.
graphics
.
Paint
.
Style
.
STROKE
;
import
static
android
.
graphics
.
drawable
.
ClipDrawable
.
HORIZONTAL
;
import
static
android
.
view
.
Gravity
.
LEFT
;
import
static
android
.
view
.
Gravity
.
START
;
import
static
org
.
briarproject
.
bramble
.
api
.
crypto
.
PasswordStrengthEstimator
.
QUITE_STRONG
;
import
static
org
.
briarproject
.
bramble
.
api
.
crypto
.
PasswordStrengthEstimator
.
QUITE_WEAK
;
import
static
org
.
briarproject
.
bramble
.
api
.
crypto
.
PasswordStrengthEstimator
.
STRONG
;
...
...
@@ -35,11 +37,11 @@ public class StrengthMeter extends ProgressBar {
this
(
context
,
null
);
}
public
StrengthMeter
(
Context
context
,
AttributeSet
attrs
)
{
public
StrengthMeter
(
Context
context
,
@Nullable
AttributeSet
attrs
)
{
super
(
context
,
attrs
,
android
.
R
.
attr
.
progressBarStyleHorizontal
);
bar
=
new
ShapeDrawable
();
bar
.
getPaint
().
setColor
(
RED
);
ClipDrawable
clip
=
new
ClipDrawable
(
bar
,
LEFT
,
HORIZONTAL
);
ClipDrawable
clip
=
new
ClipDrawable
(
bar
,
LEFT
&
START
,
HORIZONTAL
);
ShapeDrawable
background
=
new
ShapeDrawable
();
Paint
p
=
background
.
getPaint
();
p
.
setStyle
(
FILL
);
...
...
@@ -50,6 +52,7 @@ public class StrengthMeter extends ProgressBar {
Drawable
[]
layers
=
new
Drawable
[]
{
clip
,
background
};
setProgressDrawable
(
new
LayerDrawable
(
layers
));
setIndeterminate
(
false
);
if
(
isInEditMode
())
setStrength
(
STRONG
);
}
@Override
...
...
briar-android/src/main/java/org/briarproject/briar/android/view/TextInputView.java
View file @
90db4581
...
...
@@ -61,9 +61,11 @@ public class TextInputView extends KeyboardAwareLinearLayout {
public
TextInputView
(
Context
context
,
@Nullable
AttributeSet
attrs
,
int
defStyleAttr
)
{
super
(
context
,
attrs
,
defStyleAttr
);
BriarApplication
app
=
(
BriarApplication
)
context
.
getApplicationContext
();
app
.
getApplicationComponent
().
inject
(
this
);
if
(!
isInEditMode
())
{
BriarApplication
app
=
(
BriarApplication
)
context
.
getApplicationContext
();
app
.
getApplicationComponent
().
inject
(
this
);
}
setOrientation
(
VERTICAL
);
setLayoutTransition
(
new
LayoutTransition
());
inflateLayout
(
context
);
...
...
briar-android/src/main/java/org/briarproject/briar/android/widget/LinkDialogFragment.java
View file @
90db4581
...
...
@@ -5,6 +5,7 @@ import android.content.Intent;
import
android.content.pm.PackageManager
;
import
android.net.Uri
;
import
android.os.Bundle
;
import
android.support.annotation.NonNull
;
import
android.support.v4.app.DialogFragment
;
import
android.view.LayoutInflater
;
import
android.view.View
;
...
...
@@ -42,8 +43,8 @@ public class LinkDialogFragment extends DialogFragment {
}
@Override
public
View
onCreateView
(
LayoutInflater
inflater
,
ViewGroup
contain
er
,
Bundle
savedInstanceState
)
{
public
View
onCreateView
(
@NonNull
LayoutInflater
inflat
er
,
ViewGroup
container
,
Bundle
savedInstanceState
)
{
View
v
=
inflater
.
inflate
(
R
.
layout
.
fragment_link_dialog
,
container
,
false
);
...
...
briar-android/src/main/res/drawable/qr_code_explanation.xml
View file @
90db4581
...
...
@@ -2,6 +2,7 @@
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"400dp"
android:height=
"100dp"
android:autoMirrored=
"true"
android:viewportHeight=
"49.5"
android:viewportWidth=
"194.8"
>
<path
...
...
briar-android/src/main/res/layout/activity_change_password.xml
View file @
90db4581
...
...
@@ -7,7 +7,7 @@
android:layout_height=
"match_parent"
tools:context=
".android.login.ChangePasswordActivity"
>
<
Relative
Layout
<
android.support.constraint.Constraint
Layout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
...
...
@@ -16,16 +16,19 @@
android:paddingLeft=
"@dimen/margin_activity_horizontal"
android:paddingRight=
"@dimen/margin_activity_horizontal"
android:paddingStart=
"@dimen/margin_activity_horizontal"
android:paddingTop=
"@dimen/margin_activity_vertical"
>
android:paddingTop=
"@dimen/margin_activity_vertical"
android:id=
"@+id/relativeLayout2"
>
<android.support.design.widget.TextInputLayout
android:id=
"@+id/current_password_entry_wrapper"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_centerHorizontal=
"true"
app:errorEnabled=
"true"
app:hintEnabled=
"false"
app:passwordToggleEnabled=
"true"
>
app:passwordToggleEnabled=
"true"
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
>
<EditText
android:id=
"@+id/current_password_entry"
...
...
@@ -40,11 +43,12 @@
android:id=
"@+id/new_password_entry_wrapper"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/current_password_entry_wrapper"
android:layout_centerHorizontal=
"true"
app:errorEnabled=
"true"
app:hintEnabled=
"false"
app:passwordToggleEnabled=
"true"
>
app:passwordToggleEnabled=
"true"
app:layout_constraintTop_toBottomOf=
"@id/current_password_entry_wrapper"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
>
<EditText
android:id=
"@+id/new_password_entry"
...
...
@@ -59,11 +63,12 @@
android:id=
"@+id/new_password_confirm_wrapper"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/new_password_entry_wrapper"
android:layout_centerHorizontal=
"true"
app:errorEnabled=
"true"
app:hintEnabled=
"false"
app:passwordToggleEnabled=
"true"
>
app:passwordToggleEnabled=
"true"
app:layout_constraintTop_toBottomOf=
"@id/new_password_entry_wrapper"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
>
<EditText
android:id=
"@+id/new_password_confirm"
...
...
@@ -79,30 +84,33 @@
android:id=
"@+id/strength_meter"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/new_password_confirm_wrapper"
android:layout_centerHorizontal=
"true"
android:visibility=
"invisible"
/>
android:visibility=
"invisible"
app:layout_constraintTop_toBottomOf=
"@id/new_password_confirm_wrapper"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
/>
<Button
android:id=
"@+id/change_password"
style=
"@style/BriarButton"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/strength_meter"
android:layout_centerHorizontal=
"true"
android:layout_marginTop=
"@dimen/margin_medium"
android:enabled=
"false"
android:text=
"@string/change_password"
tools:enabled=
"true"
/>
tools:enabled=
"true"
app:layout_constraintTop_toBottomOf=
"@id/strength_meter"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
/>
<ProgressBar
android:id=
"@+id/progress_wheel"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignTop=
"@id/change_password"
android:layout_centerHorizontal=
"true"
android:visibility=
"invisible"
/>
android:visibility=
"invisible"
app:layout_constraintTop_toTopOf=
"@id/change_password"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
/>
</
Relative
Layout>
</
android.support.constraint.Constraint
Layout>
</ScrollView>
\ No newline at end of file
briar-android/src/main/res/layout/activity_conversation.xml
View file @
90db4581
...
...
@@ -20,19 +20,20 @@
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
>
android:layout_height=
"match_parent"
android:orientation=
"horizontal"
>
<include
layout=
"@layout/contact_avatar_status"
/>
<com.vanniktech.emoji.EmojiTextView
android:id=
"@+id/contactName"
style=
"@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
android:textColor=
"@color/action_bar_text"
android:layout_width=
"wrap_content"
android:layout_height=
"match_parent"
android:layout_marginLeft=
"@dimen/margin_medium"
android:layout_marginStart=
"@dimen/margin_medium"
android:gravity=
"center"
android:textColor=
"@color/action_bar_text"
tools:text=
"Contact Name"
/>
</LinearLayout>
...
...
briar-android/src/main/res/layout/activity_dev_report.xml
View file @
90db4581
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
>
<
Linear
Layout
<
android.support.constraint.Constraint
Layout
android:id=
"@+id/report_form"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
android:visibility=
"visible"
tools:context=
".android.reporting.DevReportActivity"
>
tools:context=
".android.reporting.DevReportActivity"
tools:visibility=
"invisible"
>
<include
layout=
"@layout/toolbar"
/>
<include
android:id=
"@+id/appBar"
layout=
"@layout/toolbar"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
<android.support.design.widget.TextInputLayout
android:id=
"@+id/user_comment_layout"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/margin_large"
android:layout_marginLeft=
"@dimen/margin_large"
android:layout_marginRight=
"@dimen/margin_large"
android:layout_marginStart=
"@dimen/margin_large"
>
android:layout_marginStart=
"@dimen/margin_large"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/appBar"
>
<android.support.design.widget.TextInput
Layou
t
android:id=
"@+id/user_comment
_layout
"
<android.support.design.widget.TextInput
EditTex
t
android:id=
"@+id/user_comment"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
android:inputType=
"textMultiLine|textCapSentences"
tools:hint=
"@string/describe_crash"
/>
<android.support.design.widget.TextInputEditText
android:id=
"@+id/user_comment"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:inputType=
"textMultiLine|textCapSentences"
tools:hint=
"@string/describe_crash"
/>
</android.support.design.widget.TextInputLayout>
</android.support.design.widget.TextInputLayout>
<android.support.design.widget.TextInputLayout
android:id=
"@+id/user_email_layout"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginEnd=
"@dimen/margin_large"
android:layout_marginStart=
"@dimen/margin_large"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/user_comment_layout"
>
<android.support.design.widget.TextInput
Layou
t
android:id=
"@+id/user_email
_layout
"
<android.support.design.widget.TextInput
EditTex
t
android:id=
"@+id/user_email"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/user_comment_layout"
android:layout_marginTop=
"@dimen/margin_small"
>
<android.support.design.widget.TextInputEditText
android:id=
"@+id/user_email"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:hint=
"@string/optional_contact_email"
android:inputType=
"textEmailAddress"
android:maxLines=
"1"
/>
</android.support.design.widget.TextInputLayout>
<CheckBox
android:id=
"@+id/include_debug_report"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:layout_below=
"@+id/user_email_layout"
android:layout_marginTop=
"@dimen/margin_small"
android:layout_toLeftOf=
"@+id/chevron"
android:checked=
"false"
android:text=
"@string/include_debug_report_crash"
/>
<Button
android:id=
"@+id/chevron"
style=
"@style/BriarButtonFlat.Positive"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_alignTop=
"@+id/include_debug_report"
android:text=
"@string/show"
/>
android:hint=
"@string/optional_contact_email"
android:inputType=
"textEmailAddress"
android:maxLines=
"1"
/>
</android.support.design.widget.TextInputLayout>
<CheckBox
android:id=
"@+id/include_debug_report"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_marginLeft=
"@dimen/margin_large"
android:layout_marginStart=
"@dimen/margin_large"
android:checked=
"false"
android:text=
"@string/include_debug_report_crash"
app:layout_constraintBottom_toBottomOf=
"@+id/chevron"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toLeftOf=
"@+id/chevron"
app:layout_constraintTop_toTopOf=
"@+id/chevron"
/>
<Button
android:id=
"@+id/chevron"
style=
"@style/BriarButtonFlat.Positive"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:text=
"@string/show"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/user_email_layout"
/>
<ScrollView
android:id=
"@+id/report_scroll"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/include_debug_report"
>
<ScrollView
<LinearLayout
android:id=
"@+id/report_content"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@id/include_debug_report"
android:layout_marginTop=
"@dimen/margin_small"
>
<LinearLayout
android:id=
"@+id/report_content"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:gravity=
"center_horizontal"
android:orientation=
"vertical"
android:paddingBottom=
"@dimen/listitem_height_one_line_avatar"
android:paddingEnd=
"@dimen/margin_large"
android:paddingLeft=
"@dimen/margin_large"
android:paddingRight=
"@dimen/margin_large"
android:paddingStart=
"@dimen/margin_large"
android:paddingTop=
"@dimen/margin_small"
android:visibility=
"gone"
/>
</ScrollView>
<ProgressBar
android:id=
"@+id/progress_wheel"
style=
"?android:attr/progressBarStyleLarge"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentBottom=
"true"
android:layout_below=
"@+id/include_debug_report"
android:layout_centerHorizontal=
"true"
android:indeterminate=
"true"
android:gravity=
"center_horizontal"
android:orientation=
"vertical"
android:paddingBottom=
"@dimen/listitem_height_one_line_avatar"
android:paddingEnd=
"@dimen/margin_large"
android:paddingLeft=
"@dimen/margin_large"
android:paddingRight=
"@dimen/margin_large"
android:paddingStart=
"@dimen/margin_large"
android:paddingTop=
"@dimen/margin_small"
android:visibility=
"gone"
/>
</RelativeLayout>
</LinearLayout>
</ScrollView>
<ProgressBar
android:id=
"@+id/progress_wheel"
style=
"?android:attr/progressBarStyleLarge"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:indeterminate=
"true"
android:visibility=
"gone"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintLeft_toLeftOf=
"parent"
app:layout_constraintRight_toRightOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/include_debug_report"
/>
</android.support.constraint.ConstraintLayout>
<
Relative
Layout
<
android.support.constraint.Constraint
Layout
android:id=
"@+id/request_report"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:clickable=
"true"
android:gravity=
"center"
android:padding=
"@dimen/margin_large"
android:visibility=
"invisible"
>
android:visibility=
"invisible"
tools:visibility=
"visible"
>
<TextView
android:id=
"@+id/crashed"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginTop=
"@dimen/margin_large"
android:gravity=
"center"
android:text=
"@string/briar_crashed"
android:textColor=
"?android:attr/textColorSecondary"
android:textSize=
"@dimen/text_size_large"
/>
android:textSize=
"@dimen/text_size_large"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:layout_editor_absoluteY=
"8dp"
/>
<TextView
android:id=
"@+id/fault"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/crashed"
android:layout_marginTop=
"@dimen/margin_large"
android:gravity=
"center"
android:text=
"@string/not_your_fault"
android:textColor=
"?android:attr/textColorSecondary"
android:textSize=
"@dimen/text_size_large"
/>
android:textSize=
"@dimen/text_size_large"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/crashed"
/>
<TextView
android:id=
"@+id/pleaseSend"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/fault"
android:layout_marginTop=
"@dimen/margin_large"
android:gravity=
"center"
android:text=
"@string/please_send_report"
android:textColor=
"?android:attr/textColorSecondary"
android:textSize=
"@dimen/text_size_large"
/>
android:textSize=
"@dimen/text_size_large"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/fault"
/>
<TextView
android:id=
"@+id/encrypted"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_below=
"@+id/pleaseSend"
android:layout_marginBottom=
"@dimen/margin_large"
android:layout_marginTop=
"@dimen/margin_large"
android:gravity=
"center"
android:text=
"@string/report_is_encrypted"
android:textColor=
"?android:attr/textColorSecondary"
android:textSize=
"@dimen/text_size_large"
/>
android:textSize=
"@dimen/text_size_large"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/pleaseSend"
/>
<Button
android:id=
"@+id/declineButton"
style=
"@style/BriarButtonFlat.Negative"
android:layout_width=
"
wrap_content
"
android:layout_width=
"
0dp
"
android:layout_height=
"wrap_content"
android:layout_alignParentLeft=
"true"
android:layout_below=
"@+id/encrypted"
android:text=
"@string/close"
/>
android:layout_marginTop=
"@dimen/margin_large"
android:text=
"@string/close"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toStartOf=
"@+id/acceptButton"
app:layout_constraintHorizontal_weight=
"1"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/encrypted"
app:layout_constraintVertical_bias=
"1.0"
/>
<Button
android:id=
"@+id/acceptButton"
style=
"@style/BriarButtonFlat.Positive"
android:layout_width=
"
wrap_content
"
android:layout_width=
"
0dp
"
android:layout_height=
"wrap_content"
android:layout_alignParentRight=
"true"
android:layout_below=
"@+id/encrypted"
android:text=
"@string/send_report"
/>
</RelativeLayout>
android:layout_marginTop=
"@dimen/margin_large"
android:text=
"@string/send_report"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintHorizontal_weight=
"1"
app:layout_constraintStart_toEndOf=
"@+id/declineButton"
app:layout_constraintTop_toBottomOf=
"@+id/encrypted"
app:layout_constraintVertical_bias=
"1.0"
/>
</android.support.constraint.ConstraintLayout>
</FrameLayout>
\ No newline at end of file
briar-android/src/main/res/layout/activity_nav_drawer.xml
View file @
90db4581
...
...
@@ -2,57 +2,75 @@
<android.support.v4.widget.DrawerLayout
android:id=
"@+id/drawer_layout"
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
tools:context=
".android.navdrawer.NavDrawerActivity"
>
<!-- The first child(root) is the content view -->
<LinearLayout
<android.support.constraint.ConstraintLayout
android:id=
"@+id/constraintLayout"
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:orientation=
"vertical"
>
android:layout_height=
"match_parent"
>
<include
layout=
"@layout/toolbar"
/>
<include
android:id=
"@+id/appBar"
layout=
"@layout/toolbar"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<
Relative
Layout
<
android.support.constraint.Constraint
Layout
android:id=
"@+id/expiryWarning"
android:layout_width=
"
match_parent
"
android:layout_width=
"
0dp
"
android:layout_height=
"wrap_content"
android:background=
"@color/briar_warning_background"
android:orientation=
"horizontal"
android:padding=
"@dimen/margin_medium"
android:visibility=
"gone"
app:layout_constraintEnd_toEndOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/appBar"
tools:visibility=
"visible"
>
<TextView
android:id=
"@+id/expiryWarningText"
android:layout_width=
"
wrap_content
"
android:layout_width=
"
0dp
"
android:layout_height=
"wrap_content"
android:layout_toLeftOf=
"@+id/expiryWarningClose"
android:text=
"@plurals/expiry_warning"
android:textColor=
"@color/briar_text_primary_inverse"
android:textSize=
"@dimen/text_size_small"
/>
android:textSize=
"@dimen/text_size_small"
app:layout_constraintEnd_toStartOf=
"@+id/expiryWarningClose"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
/>
<ImageView
android:id=
"@+id/expiryWarningClose"
android:layout_width=
"24dp"
android:layout_height=
"24dp"
android:layout_alignParentRight=
"true"
android:layout_centerInParent=
"true"
android:layout_height=
"0dp"
android:contentDescription=
"@string/close"
android:scaleType=
"center"
android:src=
"@drawable/ic_close"
android:tint=
"@color/briar_text_tertiary_inverse"
/>
android:tint=
"@color/briar_text_tertiary_inverse"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintEnd_toEndOf=
"parent"