kopia lustrzana https://github.com/ryukoposting/Signal-Android
allow scroll on message details view of long messages
Fixes #2686 Closes #2771 // FREEBIEfork-5.53.8
rodzic
28232fc2a5
commit
dbc28746c0
|
@ -6,19 +6,9 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<FrameLayout android:id="@+id/item_container"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:background="?conversation_background"
|
|
||||||
android:paddingTop="15dp"
|
|
||||||
android:paddingBottom="15dp"
|
|
||||||
android:elevation="2dp" />
|
|
||||||
|
|
||||||
<ListView android:id="@+id/recipients_list"
|
<ListView android:id="@+id/recipients_list"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:paddingLeft="10dp"
|
|
||||||
android:paddingRight="10dp"
|
|
||||||
tools:listitem="@layout/message_recipient_list_item" />
|
tools:listitem="@layout/message_recipient_list_item" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -6,89 +6,105 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
<TextView android:id="@+id/error_text"
|
<FrameLayout android:id="@+id/item_container"
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:visibility="gone"
|
|
||||||
android:textSize="16sp"
|
|
||||||
android:padding="5dp"
|
|
||||||
tools:visibility="visible"
|
|
||||||
android:text="@string/message_details_header__issues_need_your_attention"
|
|
||||||
android:drawableLeft="@drawable/ic_info_outline_light"
|
|
||||||
android:drawableStart="@drawable/ic_info_outline_light"
|
|
||||||
android:gravity="center_vertical" />
|
|
||||||
|
|
||||||
<TableLayout android:id="@+id/metadata_container"
|
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent">
|
android:layout_height="wrap_content"
|
||||||
|
android:background="?conversation_background"
|
||||||
|
android:paddingTop="15dp"
|
||||||
|
android:paddingBottom="15dp"
|
||||||
|
android:elevation="2dp" />
|
||||||
|
|
||||||
<TableRow android:id="@+id/sent_container"
|
<LinearLayout
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:paddingLeft="10dp"
|
||||||
|
android:paddingRight="10dp">
|
||||||
|
|
||||||
|
<TextView android:id="@+id/error_text"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:padding="@dimen/message_details_table_row_pad">
|
android:visibility="gone"
|
||||||
|
android:textSize="16sp"
|
||||||
|
android:padding="5dp"
|
||||||
|
tools:visibility="visible"
|
||||||
|
android:text="@string/message_details_header__issues_need_your_attention"
|
||||||
|
android:drawableLeft="@drawable/ic_info_outline_light"
|
||||||
|
android:drawableStart="@drawable/ic_info_outline_light"
|
||||||
|
android:gravity="center_vertical" />
|
||||||
|
|
||||||
<TextView android:layout_width="wrap_content"
|
<TableLayout android:id="@+id/metadata_container"
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="match_parent">
|
||||||
|
|
||||||
|
<TableRow android:id="@+id/sent_container"
|
||||||
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/message_details_header__sent"
|
android:padding="@dimen/message_details_table_row_pad">
|
||||||
android:gravity="right"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
<TextView android:id="@+id/sent_time"
|
<TextView android:layout_width="wrap_content"
|
||||||
android:layout_width="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/message_details_header__sent"
|
||||||
|
android:gravity="right"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<TextView android:id="@+id/sent_time"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="@dimen/message_details_table_row_pad"
|
||||||
|
tools:text="Jan 18, 9:29AM" />
|
||||||
|
|
||||||
|
</TableRow>
|
||||||
|
|
||||||
|
<TableRow android:id="@+id/received_container"
|
||||||
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginLeft="@dimen/message_details_table_row_pad"
|
android:padding="@dimen/message_details_table_row_pad">
|
||||||
tools:text="Jan 18, 9:29AM" />
|
|
||||||
|
|
||||||
</TableRow>
|
<TextView android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/message_details_header__received"
|
||||||
|
android:gravity="right"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<TableRow android:id="@+id/received_container"
|
<TextView android:id="@+id/received_time"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:padding="@dimen/message_details_table_row_pad">
|
android:layout_marginLeft="@dimen/message_details_table_row_pad"
|
||||||
|
tools:text="Jan 18, 9:31AM" />
|
||||||
|
|
||||||
<TextView android:layout_width="wrap_content"
|
</TableRow>
|
||||||
|
|
||||||
|
<TableRow android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/message_details_header__received"
|
android:padding="@dimen/message_details_table_row_pad">
|
||||||
android:gravity="right"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
<TextView android:id="@+id/received_time"
|
<TextView android:layout_width="wrap_content"
|
||||||
android:layout_width="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:text="@string/message_details_header__via"
|
||||||
|
android:gravity="right"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
<TextView android:id="@+id/transport"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_marginLeft="@dimen/message_details_table_row_pad"
|
||||||
|
tools:text="Push (TextSecure)" />
|
||||||
|
|
||||||
|
</TableRow>
|
||||||
|
|
||||||
|
<TableRow android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginLeft="@dimen/message_details_table_row_pad"
|
android:padding="@dimen/message_details_table_row_pad">
|
||||||
tools:text="Jan 18, 9:31AM" />
|
|
||||||
|
|
||||||
</TableRow>
|
<TextView android:id="@+id/tofrom"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
tools:text="@string/message_details_header__to"
|
||||||
|
android:textStyle="bold" />
|
||||||
|
|
||||||
<TableRow android:layout_width="wrap_content"
|
</TableRow>
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="@dimen/message_details_table_row_pad">
|
|
||||||
|
|
||||||
<TextView android:layout_width="wrap_content"
|
</TableLayout>
|
||||||
android:layout_height="wrap_content"
|
</LinearLayout>
|
||||||
android:text="@string/message_details_header__via"
|
</LinearLayout>
|
||||||
android:gravity="right"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
<TextView android:id="@+id/transport"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginLeft="@dimen/message_details_table_row_pad"
|
|
||||||
tools:text="Push (TextSecure)" />
|
|
||||||
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
<TableRow android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:padding="@dimen/message_details_table_row_pad">
|
|
||||||
|
|
||||||
<TextView android:id="@+id/tofrom"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
tools:text="@string/message_details_header__to"
|
|
||||||
android:textStyle="bold" />
|
|
||||||
|
|
||||||
</TableRow>
|
|
||||||
|
|
||||||
</TableLayout>
|
|
||||||
</LinearLayout>
|
|
||||||
|
|
|
@ -5,7 +5,9 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content"
|
||||||
|
android:paddingLeft="10dp"
|
||||||
|
android:paddingRight="10dp">
|
||||||
|
|
||||||
<com.makeramen.RoundedImageView
|
<com.makeramen.RoundedImageView
|
||||||
android:id="@+id/contact_photo_image"
|
android:id="@+id/contact_photo_image"
|
||||||
|
|
|
@ -112,7 +112,7 @@ public class MessageDetailsActivity extends PassphraseRequiredActionBarActivity
|
||||||
|
|
||||||
masterSecret = getIntent().getParcelableExtra(MASTER_SECRET_EXTRA);
|
masterSecret = getIntent().getParcelableExtra(MASTER_SECRET_EXTRA);
|
||||||
isPushGroup = getIntent().getBooleanExtra(IS_PUSH_GROUP_EXTRA, false);
|
isPushGroup = getIntent().getBooleanExtra(IS_PUSH_GROUP_EXTRA, false);
|
||||||
itemParent = (ViewGroup) findViewById(R.id.item_container );
|
itemParent = (ViewGroup) header.findViewById(R.id.item_container);
|
||||||
recipientsList = (ListView ) findViewById(R.id.recipients_list);
|
recipientsList = (ListView ) findViewById(R.id.recipients_list);
|
||||||
metadataContainer = header.findViewById(R.id.metadata_container);
|
metadataContainer = header.findViewById(R.id.metadata_container);
|
||||||
errorText = (TextView ) header.findViewById(R.id.error_text);
|
errorText = (TextView ) header.findViewById(R.id.error_text);
|
||||||
|
|
Ładowanie…
Reference in New Issue