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

Merge branch '477-private-messaging-text-bubble-and-header-overlap' into 'master'

Browse Source 
Bring back the toolbar shadow

![device-2016-11-21-180111](/uploads/7cd5e6a1e7a4b79b6d7cf81377b148a0/device-2016-11-21-180111.png)

Closes #477

See merge request !431
This commit is contained in:
Ernir Erlingsson
2016-11-27 21:55:24 +00:00
parent 8c7a532e2e e69139bc24
commit 6436e6688d
7 changed files with 60 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
briar-android/res/layout/activity_conversation.xml
View File

@@ -8,35 +8,37 @@
android:orientation="vertical"
tools:context=".android.contact.ConversationActivity">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light">
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="match_parent">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<include layout="@layout/contact_avatar_status"/>
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/contactName"
style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
<LinearLayout
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"
tools:text="Contact Name"/>
android:layout_height="match_parent">
</LinearLayout>
<include layout="@layout/contact_avatar_status"/>
</android.support.v7.widget.Toolbar>
<org.thoughtcrime.securesms.components.emoji.EmojiTextView
android:id="@+id/contactName"
style="@style/TextAppearance.AppCompat.Widget.ActionBar.Title.Inverse"
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"
tools:text="Contact Name"/>
</LinearLayout>
</android.support.v7.widget.Toolbar>
</android.support.design.widget.AppBarLayout>
<org.briarproject.android.view.BriarRecyclerView
android:id="@+id/conversationView"

14
briar-android/res/layout/activity_dev_report.xml
View File

@@ -11,11 +11,17 @@
android:orientation="vertical"
tools:context=".android.report.DevReportActivity">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</android.support.design.widget.AppBarLayout>
<RelativeLayout
android:layout_width="match_parent"

30
briar-android/res/layout/activity_plain.xml
View File

@@ -1,30 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:minHeight="?attr/actionBarSize"
/>
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</android.support.design.widget.AppBarLayout>
<FrameLayout
android:id="@+id/content_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent">
<FrameLayout
android:id="@+id/content_fragment"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/window_background"/>
</FrameLayout>
android:layout_height="match_parent"
android:background="@color/window_background"/>
</LinearLayout>

17
briar-android/res/layout/activity_with_loading.xml
View File

@@ -6,14 +6,17 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
<android.support.design.widget.AppBarLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/colorPrimary"
android:minHeight="?attr/actionBarSize"
/>
android:layout_height="wrap_content">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
style="@style/BriarToolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
</android.support.design.widget.AppBarLayout>
<FrameLayout
android:layout_width="match_parent"

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

@@ -10,6 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_margin="@dimen/margin_xxlarge" />
android:layout_margin="@dimen/margin_xxlarge"
android:contentDescription="@string/app_name"/>
</RelativeLayout>

4
briar-android/res/values/styles.xml
View File

@@ -18,10 +18,6 @@
<item name="android:textColor">@color/briar_text_primary_inverse</item>
</style>
<style name="BriarActionBar" parent="Base.Widget.AppCompat.Light.ActionBar.Solid">
<item name="elevation">1dp</item>
</style>
<style name="BriarButton.Default">
<item name="android:textAllCaps">true</item>
</style>

1
briar-android/res/values/themes.xml
View File

@@ -2,7 +2,6 @@
<resources>
<style name="BriarBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="actionBarStyle">@style/BriarActionBar</item>
<item name="colorPrimary">@color/briar_primary</item>
<item name="colorPrimaryDark">@color/briar_primary_dark</item>
<item name="colorAccent">@color/briar_accent</item>