TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-04-19 21:01:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for colorization bug affecting groups.

Browse Source 
// FREEBIE
This commit is contained in:
Moxie Marlinspike 2015-06-29 16:03:02 -07:00
parent 78289ded8f
commit 900cbce84f
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
res/layout/conversation_item_sent.xml
View File

@ -137,6 +137,7 @@
android:textColor="?conversation_item_sent_text_secondary_color" android:textColor="?conversation_item_sent_text_secondary_color"
android:textSize="@dimen/conversation_item_date_text_size" android:textSize="@dimen/conversation_item_date_text_size"
android:paddingTop="1dip" android:paddingTop="1dip"
android:paddingBottom="2dp"
tools:text="30 mins" /> tools:text="30 mins" />
<FrameLayout android:id="@+id/pending_indicator_stub" <FrameLayout android:id="@+id/pending_indicator_stub"
@ -193,7 +194,7 @@
android:paddingBottom="3dp" android:paddingBottom="3dp"
android:layout_marginLeft="50dp" android:layout_marginLeft="50dp"
android:layout_marginRight="22dp" android:layout_marginRight="22dp"
android:layout_marginTop="-1dp" android:layout_marginTop="-3dp"
android:textSize="12sp" android:textSize="12sp"
android:textColor="?conversation_item_sent_text_indicator_tab_color" android:textColor="?conversation_item_sent_text_indicator_tab_color"
android:background="?conversation_item_sent_indicator_text_background" android:background="?conversation_item_sent_indicator_text_background"

4
src/org/thoughtcrime/securesms/ConversationItem.java
View File

@ -119,10 +119,12 @@ public class ConversationItem extends LinearLayout {
super.onFinishInflate(); super.onFinishInflate();
ViewGroup pendingIndicatorStub = (ViewGroup) findViewById(R.id.pending_indicator_stub); ViewGroup pendingIndicatorStub = (ViewGroup) findViewById(R.id.pending_indicator_stub);
LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
if (pendingIndicatorStub != null) {
LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
if (Build.VERSION.SDK_INT >= 11) inflater.inflate(R.layout.conversation_item_pending_v11, pendingIndicatorStub, true); if (Build.VERSION.SDK_INT >= 11) inflater.inflate(R.layout.conversation_item_pending_v11, pendingIndicatorStub, true);
else inflater.inflate(R.layout.conversation_item_pending, pendingIndicatorStub, true); else inflater.inflate(R.layout.conversation_item_pending, pendingIndicatorStub, true);
}
this.bodyText = (TextView) findViewById(R.id.conversation_item_body); this.bodyText = (TextView) findViewById(R.id.conversation_item_body);
this.dateText = (TextView) findViewById(R.id.conversation_item_date); this.dateText = (TextView) findViewById(R.id.conversation_item_date);