empathicqubit/Signal-Android
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #992 from veeti/overdraw

Browse source 
Fix overdraw issues in the conversation view
This commit is contained in:
Jake McGinty 2014-03-05 00:10:06 -08:00
commit d121d9531e
7 changed files with 18 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
res/layout/conversation_activity.xml
View file

@ -3,6 +3,7 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="?conversation_background"
android:orientation="vertical"> android:orientation="vertical">
<org.thoughtcrime.securesms.components.RecipientsPanel <org.thoughtcrime.securesms.components.RecipientsPanel
@ -17,7 +18,6 @@
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:layout_weight="1" android:layout_weight="1"
android:orientation="vertical" android:orientation="vertical"
android:background="?conversation_background"
android:gravity="bottom"> android:gravity="bottom">
<fragment <fragment
@ -33,8 +33,7 @@
android:id="@id/bottom_container" android:id="@id/bottom_container"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical">
android:background="?conversation_background">
<ScrollView android:layout_width="fill_parent" <ScrollView android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

3
res/layout/conversation_fragment.xml
View file

@ -18,6 +18,7 @@
android:fadingEdge="none" android:fadingEdge="none"
android:divider="@android:color/transparent" android:divider="@android:color/transparent"
android:dividerHeight="0dp" android:dividerHeight="0dp"
android:layout_marginBottom="1dip"/> android:layout_marginBottom="1dip"
android:cacheColorHint="?conversation_background" />
</LinearLayout> </LinearLayout>

1
res/layout/conversation_item_activity.xml
View file

@ -5,7 +5,6 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:background="?conversation_background"
android:padding="8dp"> android:padding="8dp">
<TextView android:id="@+id/conversation_item_body" <TextView android:id="@+id/conversation_item_body"

1
res/layout/conversation_item_received.xml
View file

@ -4,7 +4,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingRight="10dip" android:paddingRight="10dip"
android:orientation="vertical" android:orientation="vertical"
android:background="?conversation_background"
xmlns:android="http://schemas.android.com/apk/res/android"> xmlns:android="http://schemas.android.com/apk/res/android">
<TextView android:id="@+id/group_message_status" <TextView android:id="@+id/group_message_status"

3
res/layout/conversation_item_sent.xml
View file

@ -4,8 +4,7 @@
android:id="@+id/conversation_item" android:id="@+id/conversation_item"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal">
android:background="?conversation_background">
<RelativeLayout android:layout_width="match_parent" <RelativeLayout android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"

10
res/values/themes.xml
View file

@ -145,6 +145,16 @@
<item name="navigation_drawer_shadow">@drawable/drawer_shadow_dark</item> <item name="navigation_drawer_shadow">@drawable/drawer_shadow_dark</item>
</style> </style>
<style name="TextSecure.LightTheme.ConversationActivity"
parent="@style/TextSecure.LightTheme">
<item name="android:windowBackground">@null</item>
</style>
<style name="TextSecure.DarkTheme.ConversationActivity"
parent="@style/TextSecure.DarkTheme">
<item name="android:windowBackground">@null</item>
</style>
<style name="TextSecure.Light.Dialog" <style name="TextSecure.Light.Dialog"
parent="@android:style/Theme.Dialog" parent="@android:style/Theme.Dialog"
tools:ignore="NewApi"> tools:ignore="NewApi">

3
src/org/thoughtcrime/securesms/util/DynamicTheme.java
View file

@ -6,6 +6,7 @@ import android.os.Build;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import org.thoughtcrime.securesms.ApplicationPreferencesActivity; import org.thoughtcrime.securesms.ApplicationPreferencesActivity;
import org.thoughtcrime.securesms.ConversationActivity;
import org.thoughtcrime.securesms.ConversationListActivity; import org.thoughtcrime.securesms.ConversationListActivity;
import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.R;
@ -41,9 +42,11 @@ public class DynamicTheme {
if (theme.equals("light")) { if (theme.equals("light")) {
if (activity instanceof ConversationListActivity) return R.style.TextSecure_LightTheme_NavigationDrawer; if (activity instanceof ConversationListActivity) return R.style.TextSecure_LightTheme_NavigationDrawer;
else if (activity instanceof ConversationActivity) return R.style.TextSecure_LightTheme_ConversationActivity;
else return R.style.TextSecure_LightTheme; else return R.style.TextSecure_LightTheme;
} else if (theme.equals("dark")) { } else if (theme.equals("dark")) {
if (activity instanceof ConversationListActivity) return R.style.TextSecure_DarkTheme_NavigationDrawer; if (activity instanceof ConversationListActivity) return R.style.TextSecure_DarkTheme_NavigationDrawer;
else if (activity instanceof ConversationActivity) return R.style.TextSecure_DarkTheme_ConversationActivity;
else return R.style.TextSecure_DarkTheme; else return R.style.TextSecure_DarkTheme;
} }