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

Group strings and remove unused resources

Browse Source 
Closes #342
This commit is contained in:
Torsten Grote
2016-08-09 15:06:11 -03:00
parent b17fbcb135
commit 72906acaee
52 changed files with 230 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/res/layout/activity_nav_drawer.xml
View File

@@ -11,7 +11,6 @@
<!-- The second child is the menu -->
<include
android:id="@+id/navigation_menu_drawer"
layout="@layout/navigation_menu"
android:layout_width="wrap_content"
android:layout_height="match_parent"

1
briar-android/res/layout/activity_startup_failure.xml
View File

@@ -7,7 +7,6 @@
android:padding="@dimen/margin_activity_horizontal">
<TextView
android:id="@+id/headlineView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/BriarTextTitle"

1
briar-android/res/layout/fragment_forum_list.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
android:id="@+id/coordinatorLayout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"

3
briar-android/res/layout/fragment_keyagreement_id.xml
View File

@@ -16,7 +16,6 @@
android:paddingTop="@dimen/margin_activity_vertical">
<TextView
android:id="@+id/yourNicknameView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -52,7 +51,6 @@
android:padding="@dimen/margin_large">
<ImageView
android:id="@+id/explanationView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
@@ -60,7 +58,6 @@
android:src="@drawable/qr_code_explanation"/>
<TextView
android:id="@+id/faceToFaceView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"

2
briar-android/res/layout/introduction_message.xml
View File

@@ -17,7 +17,6 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/layoutContact1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/introductionIcon"
@@ -56,7 +55,6 @@
tools:ignore="ContentDescription"/>
<LinearLayout
android:id="@+id/layoutContact2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/introductionIcon"

2
briar-android/res/layout/invitation_bluetooth_start.xml
View File

@@ -16,7 +16,6 @@
android:paddingTop="@dimen/margin_activity_vertical">
<TextView
android:id="@+id/yourNicknameView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -42,7 +41,6 @@
android:src="@drawable/bluetooth"/>
<TextView
android:id="@+id/faceToFaceView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"

1
briar-android/res/layout/list_item_contact.xml
View File

@@ -49,7 +49,6 @@
</FrameLayout>
<LinearLayout
android:id="@+id/textViews"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"

5
briar-android/res/layout/list_item_introduction_in.xml
View File

@@ -11,7 +11,6 @@
layout="@layout/list_item_msg_in"/>
<RelativeLayout
android:id="@+id/introductionLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|start"
@@ -50,7 +49,7 @@
android:layout_alignEnd="@+id/introductionText"
android:layout_alignRight="@+id/introductionText"
android:layout_below="@+id/introductionText"
android:text="@string/dialog_button_accept"/>
android:text="@string/accept"/>
<Button
android:id="@+id/declineButton"
@@ -61,7 +60,7 @@
android:layout_below="@+id/introductionText"
android:layout_toLeftOf="@+id/acceptButton"
android:layout_toStartOf="@+id/acceptButton"
android:text="@string/dialog_button_decline"/>
android:text="@string/decline"/>
</RelativeLayout>

4
briar-android/res/layout/list_item_invitations.xml
View File

@@ -67,7 +67,7 @@
android:layout_alignParentRight="true"
android:layout_below="@+id/forumSubscribedView"
android:layout_marginTop="-8dp"
android:text="@string/dialog_button_accept"/>
android:text="@string/accept"/>
<Button
android:id="@+id/declineButton"
@@ -78,7 +78,7 @@
android:layout_marginTop="-8dp"
android:layout_toLeftOf="@+id/acceptButton"
android:layout_toStartOf="@+id/acceptButton"
android:text="@string/dialog_button_decline"/>
android:text="@string/decline"/>
<View
style="@style/Divider.ForumList"

1
briar-android/res/layout/list_item_msg_notice_out.xml
View File

@@ -11,7 +11,6 @@
layout="@layout/list_item_msg_out"/>
<RelativeLayout
android:id="@+id/introductionLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|end"

1
briar-android/res/layout/list_item_notice_in.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/noticeLayout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"

1
briar-android/res/layout/list_item_notice_out.xml
View File

@@ -7,7 +7,6 @@
android:orientation="vertical">
<RelativeLayout
android:id="@+id/noticeLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|end"

2
briar-android/res/layout/list_item_rss_feed.xml
View File

@@ -27,7 +27,7 @@
android:layout_alignParentTop="true"
android:layout_marginEnd="@dimen/listitem_horizontal_margin"
android:layout_marginRight="@dimen/listitem_horizontal_margin"
android:contentDescription="@string/delete_button"
android:contentDescription="@string/delete"
android:src="@drawable/action_delete_black"/>
<TextView

1
briar-android/res/layout/list_item_shareable_invitation_in.xml
View File

@@ -11,7 +11,6 @@
layout="@layout/list_item_msg_in"/>
<RelativeLayout
android:id="@+id/introductionLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|start"

1
briar-android/res/layout/navigation_header.xml
View File

@@ -7,7 +7,6 @@
tools:showIn="@layout/navigation_menu">
<ImageView
android:id="@+id/imageView2"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="top|center_horizontal"