2018-02-03 22:45:14 +01:00
|
|
|
<?xml version="1.0" encoding="utf-8"?><!--This applies only to favourite and rebnotificationsEnabledions.-->
|
2017-07-14 07:06:32 +02:00
|
|
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
2017-10-18 00:20:26 +02:00
|
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
|
|
|
android:id="@+id/notification_container"
|
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:orientation="vertical"
|
2017-11-30 20:12:09 +01:00
|
|
|
android:paddingLeft="14dp"
|
|
|
|
|
android:paddingRight="14dp">
|
|
|
|
|
|
2018-07-01 15:57:26 +02:00
|
|
|
<android.support.text.emoji.widget.EmojiTextView
|
2017-11-30 20:12:09 +01:00
|
|
|
android:id="@+id/notification_top_text"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_alignParentTop="true"
|
2018-03-01 21:10:10 +01:00
|
|
|
android:layout_marginBottom="6dp"
|
2017-11-30 20:12:09 +01:00
|
|
|
android:layout_marginTop="8dp"
|
|
|
|
|
android:drawablePadding="10dp"
|
|
|
|
|
android:ellipsize="end"
|
|
|
|
|
android:gravity="center_vertical"
|
|
|
|
|
android:maxLines="1"
|
|
|
|
|
android:paddingStart="28dp"
|
|
|
|
|
android:textColor="?android:textColorSecondary"
|
2017-12-01 21:52:10 +01:00
|
|
|
android:textSize="?attr/status_text_medium"
|
2017-11-30 20:12:09 +01:00
|
|
|
tools:text="Someone favourited your status" />
|
2017-01-23 06:19:30 +01:00
|
|
|
|
|
|
|
|
<RelativeLayout
|
2017-11-30 20:12:09 +01:00
|
|
|
android:id="@+id/status_name_bar"
|
2017-02-13 06:18:17 +01:00
|
|
|
android:layout_width="match_parent"
|
2017-01-23 06:19:30 +01:00
|
|
|
android:layout_height="wrap_content"
|
2017-11-30 20:12:09 +01:00
|
|
|
android:layout_below="@+id/notification_top_text"
|
|
|
|
|
android:layout_toEndOf="@+id/notification_status_avatar"
|
2018-03-01 21:10:10 +01:00
|
|
|
android:paddingBottom="4dp">
|
2017-01-23 06:19:30 +01:00
|
|
|
|
2018-05-10 11:16:56 +02:00
|
|
|
<android.support.text.emoji.widget.EmojiTextView
|
2017-11-30 20:12:09 +01:00
|
|
|
android:id="@+id/status_display_name"
|
2017-01-23 06:19:30 +01:00
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
2017-11-30 20:12:09 +01:00
|
|
|
android:layout_alignParentStart="true"
|
|
|
|
|
android:ellipsize="end"
|
|
|
|
|
android:maxLines="1"
|
2018-02-16 22:12:56 +01:00
|
|
|
android:paddingEnd="@dimen/status_display_name_padding_end"
|
2017-11-30 20:12:09 +01:00
|
|
|
android:paddingStart="0dp"
|
|
|
|
|
android:textAppearance="@android:style/TextAppearance.DeviceDefault.Small"
|
|
|
|
|
android:textColor="?android:textColorTertiary"
|
2017-12-01 21:52:10 +01:00
|
|
|
android:textSize="?attr/status_text_medium"
|
2017-11-30 20:12:09 +01:00
|
|
|
android:textStyle="normal|bold"
|
|
|
|
|
tools:text="Ente" />
|
2017-01-23 06:19:30 +01:00
|
|
|
|
2017-02-13 06:18:17 +01:00
|
|
|
<TextView
|
2017-11-30 20:12:09 +01:00
|
|
|
android:id="@+id/status_username"
|
2017-02-13 06:18:17 +01:00
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
2017-11-30 20:12:09 +01:00
|
|
|
android:layout_toEndOf="@id/status_display_name"
|
|
|
|
|
android:layout_toStartOf="@+id/status_timestamp_info"
|
2017-03-07 20:42:01 +01:00
|
|
|
android:ellipsize="end"
|
2017-07-14 07:06:32 +02:00
|
|
|
android:maxLines="1"
|
2017-11-30 20:12:09 +01:00
|
|
|
android:textColor="?android:textColorTertiary"
|
2017-12-01 21:52:10 +01:00
|
|
|
android:textSize="?attr/status_text_medium"
|
2017-11-30 20:12:09 +01:00
|
|
|
tools:text="\@Entenhausen" />
|
|
|
|
|
|
|
|
|
|
<TextView
|
|
|
|
|
android:id="@+id/status_timestamp_info"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_alignParentEnd="true"
|
|
|
|
|
android:layout_marginStart="4dp"
|
|
|
|
|
android:textColor="?android:textColorTertiary"
|
2017-12-01 21:52:10 +01:00
|
|
|
android:textSize="?attr/status_text_medium"
|
2017-11-30 20:12:09 +01:00
|
|
|
tools:text="13:37" />
|
2017-01-23 06:19:30 +01:00
|
|
|
|
2017-02-13 06:18:17 +01:00
|
|
|
</RelativeLayout>
|
2017-01-23 06:19:30 +01:00
|
|
|
|
2018-05-10 11:16:56 +02:00
|
|
|
<android.support.text.emoji.widget.EmojiTextView
|
2018-03-15 19:15:12 +01:00
|
|
|
android:id="@+id/notification_content_warning_description"
|
2017-11-07 21:31:44 +01:00
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
2018-03-15 19:15:12 +01:00
|
|
|
android:layout_below="@id/status_name_bar"
|
|
|
|
|
android:layout_toEndOf="@id/notification_status_avatar"
|
|
|
|
|
android:lineSpacingMultiplier="1.1"
|
|
|
|
|
android:textColor="?android:textColorTertiary"
|
|
|
|
|
android:textSize="?attr/status_text_medium"
|
|
|
|
|
tools:text="Example CW text" />
|
2017-11-07 21:31:44 +01:00
|
|
|
|
2017-12-01 21:52:10 +01:00
|
|
|
|
2018-03-15 19:15:12 +01:00
|
|
|
<ToggleButton
|
|
|
|
|
android:id="@+id/notification_content_warning_button"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_below="@+id/notification_content_warning_description"
|
2018-04-09 16:42:18 +02:00
|
|
|
android:layout_toEndOf="@id/notification_status_avatar"
|
2018-03-15 19:15:12 +01:00
|
|
|
android:background="?attr/content_warning_button"
|
|
|
|
|
android:minHeight="0dp"
|
|
|
|
|
android:minWidth="150dp"
|
2018-04-09 16:42:18 +02:00
|
|
|
android:paddingBottom="4dp"
|
2018-03-15 19:15:12 +01:00
|
|
|
android:paddingLeft="16dp"
|
|
|
|
|
android:paddingRight="16dp"
|
2018-04-09 16:42:18 +02:00
|
|
|
android:paddingTop="4dp"
|
2018-03-15 19:15:12 +01:00
|
|
|
android:layout_marginTop="4dp"
|
|
|
|
|
android:layout_marginBottom="4dp"
|
|
|
|
|
android:textAllCaps="true"
|
|
|
|
|
android:textOff="@string/status_content_warning_show_more"
|
|
|
|
|
android:textOn="@string/status_content_warning_show_less"
|
|
|
|
|
android:textSize="?attr/status_text_medium" />
|
2017-11-07 21:31:44 +01:00
|
|
|
|
2018-05-10 11:16:56 +02:00
|
|
|
<android.support.text.emoji.widget.EmojiTextView
|
2017-07-14 07:06:32 +02:00
|
|
|
android:id="@+id/notification_content"
|
2017-03-07 20:42:01 +01:00
|
|
|
android:layout_width="match_parent"
|
2017-01-23 06:19:30 +01:00
|
|
|
android:layout_height="wrap_content"
|
2018-03-15 19:15:12 +01:00
|
|
|
android:layout_below="@id/notification_content_warning_button"
|
2017-11-30 20:12:09 +01:00
|
|
|
android:layout_toEndOf="@+id/notification_status_avatar"
|
|
|
|
|
android:lineSpacingMultiplier="1.1"
|
2017-07-14 07:06:32 +02:00
|
|
|
android:paddingBottom="10dp"
|
|
|
|
|
android:textColor="?android:textColorTertiary"
|
2017-12-01 21:52:10 +01:00
|
|
|
android:textSize="?attr/status_text_medium"
|
2017-10-18 00:20:26 +02:00
|
|
|
tools:text="Example status here" />
|
2017-07-14 07:06:32 +02:00
|
|
|
|
Add support for collapsible statuses when they exceed 500 characters (#825)
* Update Gradle plugin to work with Android Studio 3.3 Canary
Android Studio 3.1.4 Stable doesn't render layout previews in this project
for whatever reason. Switching to the latest 3.3 Canary release fixes the
issue without affecting Gradle scripts but requires the new Android Gradle
plugin to match the new Android Studio release.
This commit will be reverted once development on the feature is done.
* Update gradle build script to allow installing debug builds alongside store version
This will allow developers, testers, etc to work on Tusky will not having to worry
about overwriting, uninstalling, fiddling with a preinstalled application which would
mean having to login again every time the development cycle starts/finishes and
manually reinstalling the app.
* Add UI changes to support collapsing statuses
The button uses subtle styling to not be distracting like the CW button on the timeline
The button is toggleable, full width to match the status textbox hitbox width and also
is shorter to not be too intrusive between the status text and images, or the post below
* Update status data model to store whether the message has been collapsed
* Update status action listener to notify of collapsed state changing
Provide stubs in all implementing classes and mark as TODO the stubs that
require a proper implementation for the feature to work.
* Add implementation code to handle status collapse/expand in timeline
Code has not been added elsewhere to simplify testing.
Once the code will be considered stable it will be also included in other
status action listener implementers.
* Add preferences so that users can toggle the collapsing of long posts
This is currently limited to a simple toggle, it would be nice to implement
a more advanced UI to offer the user more control over the feature.
* Update Gradle plugin to work with latest Android Studio 3.3 Canary 8
Just like the other commit, this will be reverted once the feature is working.
I simply don't want to deal with what changes in my installation of Android
Studio 3.1.4 Stable which breaks the layout preview rendering.
* Update data models and utils for statuses to better handle collapsing
I forgot that data isn't available from the API and can't really be built
from scratch using existing data due to preferences.
A new, extra boolean should fix the issue.
* Fix search breaking due to newly introduced variables in utils classes
* Fix timeline breaking due to newly introduced variables in utils classes
* Fix item status text for collapsed toggle being shown in the wrong state
* Update timeline fragment to refresh the list when collapsed settings change
* Add support for status content collapse in timeline viewholder
* Fix view holder truncating posts using temporary debug settings at 50 chars
* Add toggle support to notification layout as well
* Add support for collapsed statuses to search results
* Add support for expandable content to notifications too
* Update codebase with some suggested changes by @charlang
* Update more code with more suggestions and move null-safety into view data
* Update even more code with even more suggested code changes
* Revert a0a41ca and 0ee004d (Android Studio 3.1 to Android Studio 3.3 updates)
* Add an input filter utility class to reuse code for trimming statuses
* Update UI of statuses to show a taller collapsible button
* Update notification fragment logging to simplify null checks
* Add smartness to SmartLengthInputFilter such as word trimming and runway
* Fix posts with show more button even if bad ratio didn't collapse
* Fix thread view showing button but not collapsing by implementing the feature
* Fix spannable losing spans when collapsed and restore length to 500 characters
* Remove debug build suffix as per request
* Fix all the merging happened in f66d689, 623cad2 and 7056ba5
* Fix notification button spanning full width rather than content width
* Add a way to access a singleton to smart filter and use clearer code
* Update view holders using smart input filters to use more singletons
* Fix code style lacking spaces before boolean checks in ifs and others
* Remove all code related to collapsibility preferences, strings included
* Update style to match content warning toggle button
* Update strings to give cleaner differentiation between CW and collapse
* Update smart filter code to use fully qualified names to avoid confusion
2018-09-19 19:51:20 +02:00
|
|
|
|
|
|
|
|
<ToggleButton
|
|
|
|
|
android:id="@+id/button_toggle_notification_content"
|
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
|
android:layout_toEndOf="@id/notification_status_avatar"
|
|
|
|
|
android:layout_below="@id/notification_content"
|
|
|
|
|
android:textOff="@string/status_content_show_less"
|
|
|
|
|
android:textOn="@string/status_content_show_more"
|
|
|
|
|
android:background="?attr/content_warning_button"
|
|
|
|
|
android:minHeight="0dp"
|
|
|
|
|
android:minWidth="150dp"
|
|
|
|
|
android:paddingBottom="4dp"
|
|
|
|
|
android:paddingLeft="16dp"
|
|
|
|
|
android:paddingRight="16dp"
|
|
|
|
|
android:paddingTop="4dp"
|
|
|
|
|
android:layout_marginTop="4dp"
|
|
|
|
|
android:layout_marginBottom="4dp"
|
|
|
|
|
android:textAllCaps="true"
|
|
|
|
|
android:textSize="?attr/status_text_medium"
|
|
|
|
|
android:visibility="gone" />
|
|
|
|
|
|
2018-07-30 15:36:22 +02:00
|
|
|
<com.keylesspalace.tusky.view.RoundedImageView
|
2017-07-14 07:06:32 +02:00
|
|
|
android:id="@+id/notification_status_avatar"
|
|
|
|
|
android:layout_width="48dp"
|
|
|
|
|
android:layout_height="48dp"
|
2017-11-30 20:12:09 +01:00
|
|
|
android:layout_below="@id/notification_top_text"
|
|
|
|
|
android:layout_marginBottom="14dp"
|
|
|
|
|
android:layout_marginEnd="14dp"
|
|
|
|
|
android:layout_marginRight="14dp"
|
|
|
|
|
android:layout_marginTop="10dp"
|
2017-07-14 07:06:32 +02:00
|
|
|
android:contentDescription="@string/action_view_profile"
|
|
|
|
|
android:paddingBottom="12dp"
|
|
|
|
|
android:paddingRight="12dp"
|
2018-07-30 15:36:22 +02:00
|
|
|
android:scaleType="centerCrop"
|
2017-07-14 07:06:32 +02:00
|
|
|
tools:ignore="RtlHardcoded,RtlSymmetry"
|
2017-10-18 00:20:26 +02:00
|
|
|
tools:src="@drawable/avatar_default" />
|
2017-07-14 07:06:32 +02:00
|
|
|
|
2018-08-07 21:44:25 +02:00
|
|
|
<com.keylesspalace.tusky.view.RoundedImageView
|
2017-07-14 07:06:32 +02:00
|
|
|
android:id="@+id/notification_notification_avatar"
|
|
|
|
|
android:layout_width="24dp"
|
|
|
|
|
android:layout_height="24dp"
|
|
|
|
|
android:layout_alignBottom="@+id/notification_status_avatar"
|
2018-02-16 22:12:56 +01:00
|
|
|
android:layout_alignEnd="@id/notification_status_avatar" />
|
2017-01-23 06:19:30 +01:00
|
|
|
|
Add support for collapsible statuses when they exceed 500 characters (#825)
* Update Gradle plugin to work with Android Studio 3.3 Canary
Android Studio 3.1.4 Stable doesn't render layout previews in this project
for whatever reason. Switching to the latest 3.3 Canary release fixes the
issue without affecting Gradle scripts but requires the new Android Gradle
plugin to match the new Android Studio release.
This commit will be reverted once development on the feature is done.
* Update gradle build script to allow installing debug builds alongside store version
This will allow developers, testers, etc to work on Tusky will not having to worry
about overwriting, uninstalling, fiddling with a preinstalled application which would
mean having to login again every time the development cycle starts/finishes and
manually reinstalling the app.
* Add UI changes to support collapsing statuses
The button uses subtle styling to not be distracting like the CW button on the timeline
The button is toggleable, full width to match the status textbox hitbox width and also
is shorter to not be too intrusive between the status text and images, or the post below
* Update status data model to store whether the message has been collapsed
* Update status action listener to notify of collapsed state changing
Provide stubs in all implementing classes and mark as TODO the stubs that
require a proper implementation for the feature to work.
* Add implementation code to handle status collapse/expand in timeline
Code has not been added elsewhere to simplify testing.
Once the code will be considered stable it will be also included in other
status action listener implementers.
* Add preferences so that users can toggle the collapsing of long posts
This is currently limited to a simple toggle, it would be nice to implement
a more advanced UI to offer the user more control over the feature.
* Update Gradle plugin to work with latest Android Studio 3.3 Canary 8
Just like the other commit, this will be reverted once the feature is working.
I simply don't want to deal with what changes in my installation of Android
Studio 3.1.4 Stable which breaks the layout preview rendering.
* Update data models and utils for statuses to better handle collapsing
I forgot that data isn't available from the API and can't really be built
from scratch using existing data due to preferences.
A new, extra boolean should fix the issue.
* Fix search breaking due to newly introduced variables in utils classes
* Fix timeline breaking due to newly introduced variables in utils classes
* Fix item status text for collapsed toggle being shown in the wrong state
* Update timeline fragment to refresh the list when collapsed settings change
* Add support for status content collapse in timeline viewholder
* Fix view holder truncating posts using temporary debug settings at 50 chars
* Add toggle support to notification layout as well
* Add support for collapsed statuses to search results
* Add support for expandable content to notifications too
* Update codebase with some suggested changes by @charlang
* Update more code with more suggestions and move null-safety into view data
* Update even more code with even more suggested code changes
* Revert a0a41ca and 0ee004d (Android Studio 3.1 to Android Studio 3.3 updates)
* Add an input filter utility class to reuse code for trimming statuses
* Update UI of statuses to show a taller collapsible button
* Update notification fragment logging to simplify null checks
* Add smartness to SmartLengthInputFilter such as word trimming and runway
* Fix posts with show more button even if bad ratio didn't collapse
* Fix thread view showing button but not collapsing by implementing the feature
* Fix spannable losing spans when collapsed and restore length to 500 characters
* Remove debug build suffix as per request
* Fix all the merging happened in f66d689, 623cad2 and 7056ba5
* Fix notification button spanning full width rather than content width
* Add a way to access a singleton to smart filter and use clearer code
* Update view holders using smart input filters to use more singletons
* Fix code style lacking spaces before boolean checks in ifs and others
* Remove all code related to collapsibility preferences, strings included
* Update style to match content warning toggle button
* Update strings to give cleaner differentiation between CW and collapse
* Update smart filter code to use fully qualified names to avoid confusion
2018-09-19 19:51:20 +02:00
|
|
|
</RelativeLayout>
|
