TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-22 08:58:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Debug

Browse Source
This commit is contained in:
nielsandriesse 2020-07-16 10:14:25 +10:00
parent 3df78a00c5
commit af5a37c601
4 changed files with 274 additions and 259 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
res/layout/conversation_item_received.xml
View File

@ -45,15 +45,22 @@
</RelativeLayout> </RelativeLayout>
<LinearLayout <LinearLayout
android:id="@+id/body_bubble"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_toStartOf="@+id/indicators_parent"
android:layout_alignWithParentIfMissing="true"
android:clipToPadding="false"
android:clipChildren="false">
<LinearLayout
android:id="@+id/body_bubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/massive_spacing" android:layout_marginEnd="@dimen/massive_spacing"
android:layout_marginStart="12dp" android:layout_marginStart="12dp"
android:paddingTop="@dimen/medium_spacing" android:paddingTop="@dimen/medium_spacing"
android:paddingBottom="@dimen/medium_spacing" android:paddingBottom="@dimen/medium_spacing"
android:layout_toStartOf="@+id/indicators_parent"
android:layout_alignWithParentIfMissing="true"
android:orientation="vertical" android:orientation="vertical"
android:clipToPadding="false" android:clipToPadding="false"
android:clipChildren="false" android:clipChildren="false"
@ -201,6 +208,8 @@
</LinearLayout> </LinearLayout>
</LinearLayout>
<org.thoughtcrime.securesms.components.AlertView <org.thoughtcrime.securesms.components.AlertView
android:id="@+id/indicators_parent" android:id="@+id/indicators_parent"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -210,4 +219,5 @@
android:gravity="center_vertical"/> android:gravity="center_vertical"/>
</RelativeLayout> </RelativeLayout>
</org.thoughtcrime.securesms.conversation.ConversationItem> </org.thoughtcrime.securesms.conversation.ConversationItem>

15
res/layout/conversation_item_sent.xml
View File

@ -23,15 +23,22 @@
android:clipChildren="false"> android:clipChildren="false">
<LinearLayout <LinearLayout
android:id="@+id/body_bubble"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_toStartOf="@+id/indicators_parent"
android:layout_alignWithParentIfMissing="true"
android:clipToPadding="false"
android:clipChildren="false">
<LinearLayout
android:id="@+id/body_bubble"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_marginStart="@dimen/massive_spacing" android:layout_marginStart="@dimen/massive_spacing"
android:paddingTop="@dimen/medium_spacing" android:paddingTop="@dimen/medium_spacing"
android:paddingBottom="@dimen/medium_spacing" android:paddingBottom="@dimen/medium_spacing"
android:layout_toStartOf="@+id/indicators_parent"
android:layout_alignWithParentIfMissing="true"
android:layout_gravity="end" android:layout_gravity="end"
android:clipToPadding="false" android:clipToPadding="false"
android:clipChildren="false" android:clipChildren="false"
@ -154,6 +161,8 @@
</LinearLayout> </LinearLayout>
</LinearLayout>
<org.thoughtcrime.securesms.components.AlertView <org.thoughtcrime.securesms.components.AlertView
android:id="@+id/indicators_parent" android:id="@+id/indicators_parent"
android:layout_width="wrap_content" android:layout_width="wrap_content"

2
src/org/thoughtcrime/securesms/conversation/ConversationActivity.java
View File

@ -547,6 +547,8 @@ public class ConversationActivity extends PassphraseRequiredActionBarActivity
DatabaseFactory.getLokiThreadDatabase(this).setDelegate(this); DatabaseFactory.getLokiThreadDatabase(this).setDelegate(this);
inputPanel.setHint("Message");
updateSessionRestoreBanner(); updateSessionRestoreBanner();
Log.i(TAG, "onResume() Finished: " + (System.currentTimeMillis() - getIntent().getLongExtra(TIMING_EXTRA, 0))); Log.i(TAG, "onResume() Finished: " + (System.currentTimeMillis() - getIntent().getLongExtra(TIMING_EXTRA, 0)));

6
src/org/thoughtcrime/securesms/conversation/ConversationItem.java
View File

@ -1053,12 +1053,6 @@ public class ConversationItem extends LinearLayout
int spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_collapse); int spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_collapse);
int spacingBottom = spacingTop; int spacingBottom = spacingTop;
boolean isOutgoingStack = current.isOutgoing() && previous.orNull() != null && previous.get().isOutgoing();
if (isOutgoingStack) {
spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_default);
}
if (isStartOfMessageCluster(current, previous, isGroupThread)) { if (isStartOfMessageCluster(current, previous, isGroupThread)) {
spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_default); spacingTop = readDimen(context, R.dimen.conversation_vertical_message_spacing_default);
} }