Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
Julian Dehm
briar
Commits
bbc4ac99
Verified
Commit
bbc4ac99
authored
Apr 28, 2016
by
Torsten Grote
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
This changes the window background system-wide
Closes
#307
parent
3bfef877
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
11 additions
and
14 deletions
+11
-14
briar-android/res/layout/activity_conversation.xml
briar-android/res/layout/activity_conversation.xml
+1
-2
briar-android/res/layout/activity_create_forum.xml
briar-android/res/layout/activity_create_forum.xml
+0
-1
briar-android/res/layout/list_item_selectable_contact.xml
briar-android/res/layout/list_item_selectable_contact.xml
+4
-8
briar-android/res/values/color.xml
briar-android/res/values/color.xml
+1
-2
briar-android/res/values/dimens.xml
briar-android/res/values/dimens.xml
+2
-0
briar-android/res/values/styles.xml
briar-android/res/values/styles.xml
+3
-1
No files found.
briar-android/res/layout/activity_conversation.xml
View file @
bbc4ac99
...
...
@@ -42,8 +42,7 @@
android:id=
"@+id/conversationView"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_weight=
"1"
android:background=
"@color/conversation_background"
/>
android:layout_weight=
"1"
/>
<View
style=
"@style/Divider.Horizontal"
/>
...
...
briar-android/res/layout/activity_create_forum.xml
View file @
bbc4ac99
...
...
@@ -5,7 +5,6 @@
android:layout_width=
"match_parent"
android:layout_height=
"match_parent"
android:gravity=
"center_horizontal"
android:background=
"@color/conversation_background"
android:padding=
"20dp"
>
<TextView
...
...
briar-android/res/layout/list_item_selectable_contact.xml
View file @
bbc4ac99
...
...
@@ -9,16 +9,13 @@
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:paddingTop=
"@dimen/listitem_horizontal_margin"
android:paddingBottom=
"@dimen/listitem_horizontal_margin"
android:background=
"?attr/selectableItemBackground"
>
android:layout_height=
"@dimen/listitem_height_contact_selector"
android:background=
"?attr/selectableItemBackground"
>
<de.hdodenhof.circleimageview.CircleImageView
android:id=
"@+id/avatarView"
android:layout_width=
"@dimen/listitem_picture_size"
android:layout_height=
"@dimen/listitem_picture_size"
android:layout_width=
"@dimen/listitem_
selectable_
picture_size"
android:layout_height=
"@dimen/listitem_
selectable_
picture_size"
android:layout_alignParentLeft=
"true"
android:layout_alignParentStart=
"true"
android:layout_centerVertical=
"true"
...
...
@@ -40,7 +37,6 @@
android:layout_toLeftOf=
"@+id/checkBox"
android:layout_toRightOf=
"@+id/avatarView"
android:maxLines=
"2"
android:textColor=
"@android:color/primary_text_light"
android:textSize=
"@dimen/text_size_large"
tools:text=
"This is a name of a contact"
/>
...
...
briar-android/res/values/color.xml
View file @
bbc4ac99
...
...
@@ -7,8 +7,7 @@
<color
name=
"briar_green_dark"
>
#87C214
</color>
<color
name=
"briar_red"
>
#C1392B
</color>
<color
name=
"window_background"
>
#EEEEEE
</color>
<color
name=
"conversation_background"
>
#efebe9
</color>
<color
name=
"window_background"
>
#eceff1
</color>
<color
name=
"action_bar_text"
>
#FFFFFF
</color>
<color
name=
"action_bar_background"
>
@color/briar_blue
</color>
<color
name=
"button_bar_background"
>
#FFFFFF
</color>
...
...
briar-android/res/values/dimens.xml
View file @
bbc4ac99
...
...
@@ -24,7 +24,9 @@
<dimen
name=
"listitem_horizontal_margin"
>
16dp
</dimen>
<dimen
name=
"listitem_text_left_margin"
>
72dp
</dimen>
<dimen
name=
"listitem_height_one_line_avatar"
>
56dp
</dimen>
<dimen
name=
"listitem_height_contact_selector"
>
68dp
</dimen>
<dimen
name=
"listitem_picture_size"
>
48dp
</dimen>
<dimen
name=
"listitem_selectable_picture_size"
>
40dp
</dimen>
<dimen
name=
"dropdown_picture_size"
>
32dp
</dimen>
<dimen
name=
"avatar_border_width"
>
1dp
</dimen>
...
...
briar-android/res/values/styles.xml
View file @
bbc4ac99
...
...
@@ -6,6 +6,7 @@
<item
name=
"colorPrimary"
>
@color/briar_primary
</item>
<item
name=
"colorPrimaryDark"
>
@color/briar_primary_dark
</item>
<item
name=
"colorAccent"
>
@color/briar_accent
</item>
<item
name=
"android:windowBackground"
>
@color/window_background
</item>
<item
name=
"android:textColorPrimary"
>
@color/briar_text_primary
</item>
<item
name=
"android:textColorPrimaryInverse"
>
@color/briar_text_primary_inverse
</item>
<item
name=
"android:textColorSecondary"
>
@color/briar_text_primary
</item>
...
...
@@ -17,6 +18,7 @@
<item
name=
"colorPrimary"
>
@color/briar_primary
</item>
<item
name=
"colorPrimaryDark"
>
@color/briar_primary_dark
</item>
<item
name=
"colorAccent"
>
@color/briar_primary
</item>
<item
name=
"android:windowBackground"
>
@color/window_background
</item>
<item
name=
"android:textColorPrimary"
>
@color/briar_text_primary
</item>
<item
name=
"android:textColorPrimaryInverse"
>
@color/briar_text_primary_inverse
</item>
<item
name=
"android:textColorSecondary"
>
@color/briar_text_primary
</item>
...
...
@@ -101,7 +103,7 @@
<style
name=
"Divider.ContactList"
parent=
"Divider"
>
<item
name=
"android:layout_width"
>
match_parent
</item>
<item
name=
"android:layout_height"
>
2
dp
</item>
<item
name=
"android:layout_height"
>
1
dp
</item>
<item
name=
"android:layout_marginLeft"
>
@dimen/margin_large
</item>
</style>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment