mirror of
https://github.com/TwidereProject/Twidere-Android
synced 2025-01-31 17:04:59 +01:00
improved quoted status style
This commit is contained in:
Mariotaku Lee
parent
680b7319f4
commit
af98770435
@ -27,7 +27,7 @@ class GooglePlayExtraFeaturesService : ExtraFeaturesService() {
|
||||
bp.release()
|
||||
}
|
||||
|
||||
override fun isSupported(): Boolean = true
|
||||
override fun isSupported(): Boolean = BillingProcessor.isIabServiceAvailable(context)
|
||||
|
||||
override fun isEnabled(feature: String): Boolean {
|
||||
if (bp.hasValidTransaction(PRODUCT_ID_EXTRA_FEATURES_PACK)) return true
|
||||
|
||||
@ -840,29 +840,33 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
|
||||
itemView.quotedText.visibility = View.VISIBLE
|
||||
}
|
||||
|
||||
itemView.quoteIndicator.color = colorNameManager.getUserColor(status.quoted_user_key!!)
|
||||
val quotedUserColor = colorNameManager.getUserColor(status.quoted_user_key!!)
|
||||
if (quotedUserColor != 0) {
|
||||
itemView.quotedView.drawStart(quotedUserColor)
|
||||
} else {
|
||||
itemView.quotedView.drawStart(ThemeUtils.getColorFromAttribute(context,
|
||||
R.attr.quoteIndicatorBackgroundColor, 0))
|
||||
}
|
||||
|
||||
val quotedMedia = status.quoted_media
|
||||
|
||||
if (quotedMedia?.isEmpty() ?: true) {
|
||||
itemView.quotedMediaPreviewContainer.visibility = View.GONE
|
||||
itemView.quotedMediaLabel.visibility = View.GONE
|
||||
itemView.quotedMediaPreview.visibility = View.GONE
|
||||
itemView.quotedMediaPreviewPlaceholder.visibility = View.GONE
|
||||
} else if (adapter.isDetailMediaExpanded) {
|
||||
itemView.quotedMediaPreviewContainer.visibility = View.VISIBLE
|
||||
itemView.quotedMediaLabel.visibility = View.GONE
|
||||
itemView.quotedMediaPreview.visibility = View.VISIBLE
|
||||
itemView.quotedMediaPreviewPlaceholder.visibility = View.GONE
|
||||
itemView.quotedMediaPreview.displayMedia(quotedMedia, loader, status.account_key, -1,
|
||||
adapter.fragment, null)
|
||||
} else {
|
||||
itemView.quotedMediaPreviewContainer.visibility = View.VISIBLE
|
||||
itemView.quotedMediaLabel.visibility = View.VISIBLE
|
||||
itemView.quotedMediaPreview.visibility = View.GONE
|
||||
itemView.quotedMediaPreviewPlaceholder.visibility = View.VISIBLE
|
||||
}
|
||||
} else {
|
||||
itemView.quotedName.visibility = View.GONE
|
||||
itemView.quotedText.visibility = View.VISIBLE
|
||||
itemView.quotedMediaPreviewContainer.visibility = View.GONE
|
||||
itemView.quotedMediaLabel.visibility = View.GONE
|
||||
itemView.quotedMediaPreview.visibility = View.GONE
|
||||
|
||||
// Not available
|
||||
val string = SpannableString.valueOf(context.getString(R.string.status_not_available_text))
|
||||
@ -871,7 +875,8 @@ class StatusFragment : BaseFragment(), LoaderCallbacks<SingleResponse<Parcelable
|
||||
string.length, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
|
||||
itemView.quotedText.text = string
|
||||
|
||||
itemView.quoteIndicator.color = 0
|
||||
itemView.quotedView.drawStart(ThemeUtils.getColorFromAttribute(context,
|
||||
R.attr.quoteIndicatorBackgroundColor, 0))
|
||||
}
|
||||
} else {
|
||||
itemView.quotedView.visibility = View.GONE
|
||||
|
||||
@ -16,11 +16,10 @@
|
||||
~ You should have received a copy of the GNU General Public License
|
||||
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<RelativeLayout
|
||||
android:id="@+id/cardContent"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/cardContent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?selectableItemBackground"
|
||||
@ -39,13 +38,13 @@
|
||||
android:drawablePadding="4dp"
|
||||
android:drawableStart="@drawable/ic_indicator_retweet"
|
||||
android:gravity="center_vertical"
|
||||
android:maxLines="1"
|
||||
android:minHeight="@dimen/element_size_small"
|
||||
android:padding="@dimen/element_spacing_normal"
|
||||
android:tag="font_family|user"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:textColorSecondary"
|
||||
tools:text="Retweeted by Mariotaku"
|
||||
android:maxLines="1"/>
|
||||
tools:text="Retweeted by Mariotaku" />
|
||||
|
||||
<org.mariotaku.twidere.view.ColorLabelRelativeLayout
|
||||
android:id="@+id/profileContainer"
|
||||
@ -69,7 +68,7 @@
|
||||
android:scaleType="centerCrop"
|
||||
app:sivBorder="true"
|
||||
app:sivBorderWidth="1dp"
|
||||
tools:src="@drawable/ic_profile_image_twidere"/>
|
||||
tools:src="@drawable/ic_profile_image_twidere" />
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/profileType"
|
||||
@ -82,7 +81,7 @@
|
||||
android:layout_marginEnd="@dimen/element_spacing_minus_small"
|
||||
android:layout_marginRight="@dimen/element_spacing_minus_small"
|
||||
android:scaleType="fitCenter"
|
||||
tools:ignore="ContentDescription"/>
|
||||
tools:ignore="ContentDescription" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
@ -108,7 +107,7 @@
|
||||
android:tag="font_family|user"
|
||||
app:nv_primaryTextColor="?android:textColorPrimary"
|
||||
app:nv_secondaryTextColor="?android:textColorSecondary"
|
||||
app:nv_twoLine="false"/>
|
||||
app:nv_twoLine="false" />
|
||||
|
||||
<org.mariotaku.twidere.view.TimelineContentTextView
|
||||
android:id="@+id/timeSource"
|
||||
@ -118,7 +117,7 @@
|
||||
android:gravity="center_vertical"
|
||||
android:tag="font_family|user"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
tools:text="Jan 1 2015 0:00 · Twidere"/>
|
||||
tools:text="Jan 1 2015 0:00 · Twidere" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -136,7 +135,7 @@
|
||||
style="?android:attr/buttonStyleSmall"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/action_follow"/>
|
||||
android:text="@string/action_follow" />
|
||||
|
||||
<ProgressBar
|
||||
android:id="@+id/followInfoProgress"
|
||||
@ -145,7 +144,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center"
|
||||
android:layout_marginLeft="8dp"
|
||||
android:layout_marginRight="8dp"/>
|
||||
android:layout_marginRight="8dp" />
|
||||
</FrameLayout>
|
||||
</org.mariotaku.twidere.view.ColorLabelRelativeLayout>
|
||||
|
||||
@ -166,7 +165,7 @@
|
||||
android:textColor="?android:textColorPrimary"
|
||||
android:visibility="visible"
|
||||
tools:text="@string/sample_status_text"
|
||||
tools:visibility="visible"/>
|
||||
tools:visibility="visible" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/translateContainer"
|
||||
@ -185,12 +184,12 @@
|
||||
android:drawablePadding="4dp"
|
||||
android:drawableStart="@drawable/ic_indicator_web"
|
||||
android:gravity="center_vertical"
|
||||
android:maxLines="1"
|
||||
android:padding="@dimen/element_spacing_normal"
|
||||
android:tag="font_family|user"
|
||||
android:text="@string/unknown_language"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:textColorSecondary"
|
||||
android:maxLines="1"/>
|
||||
android:textColor="?android:textColorSecondary" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/translateResult"
|
||||
@ -200,7 +199,7 @@
|
||||
android:tag="font_family|user"
|
||||
android:textColor="?android:textColorPrimary"
|
||||
android:visibility="gone"
|
||||
tools:text="@string/sample_status_text"/>
|
||||
tools:text="@string/sample_status_text" />
|
||||
</LinearLayout>
|
||||
|
||||
<FrameLayout
|
||||
@ -221,7 +220,7 @@
|
||||
|
||||
<include
|
||||
layout="@layout/layout_card_media_preview"
|
||||
tools:ignore="DuplicateIncludedIds"/>
|
||||
tools:ignore="DuplicateIncludedIds" />
|
||||
|
||||
</org.mariotaku.twidere.view.CardMediaContainer>
|
||||
|
||||
@ -246,7 +245,7 @@
|
||||
android:tag="font_family|user"
|
||||
android:text="@string/load_media"
|
||||
android:textAppearance="?android:attr/textAppearanceMedium"
|
||||
android:textStyle="bold"/>
|
||||
android:textStyle="bold" />
|
||||
</LinearLayout>
|
||||
|
||||
</FrameLayout>
|
||||
@ -256,103 +255,93 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/mediaPreviewContainer"
|
||||
android:visibility="gone"/>
|
||||
android:visibility="gone" />
|
||||
|
||||
<LinearLayout
|
||||
<org.mariotaku.twidere.view.ColorLabelLinearLayout
|
||||
android:id="@+id/quotedView"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/twitterCard"
|
||||
android:background="?selectableItemBackground"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="vertical"
|
||||
android:padding="@dimen/element_spacing_normal"
|
||||
app:ignorePadding="false">
|
||||
|
||||
<org.mariotaku.twidere.view.ForegroundColorView
|
||||
android:id="@+id/quoteIndicator"
|
||||
android:layout_width="@dimen/element_spacing_small"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_weight="0"
|
||||
android:background="?quoteIndicatorBackgroundColor"/>
|
||||
|
||||
<FrameLayout
|
||||
android:id="@+id/quotedMediaPreviewContainer"
|
||||
android:layout_width="96dp"
|
||||
android:layout_height="96dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:layout_marginBottom="@dimen/element_spacing_normal"
|
||||
android:layout_marginLeft="@dimen/element_spacing_normal"
|
||||
android:layout_marginStart="@dimen/element_spacing_normal"
|
||||
android:layout_marginTop="@dimen/element_spacing_normal"
|
||||
android:layout_weight="0"
|
||||
tools:visibility="visible">
|
||||
|
||||
<org.mariotaku.twidere.view.CardMediaContainer
|
||||
android:id="@+id/quotedMediaPreview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_gravity="center"
|
||||
android:horizontalSpacing="@dimen/element_spacing_xsmall"
|
||||
android:verticalSpacing="@dimen/element_spacing_xsmall"
|
||||
android:visibility="gone"
|
||||
tools:visibility="visible">
|
||||
|
||||
<include
|
||||
layout="@layout/layout_card_media_preview"
|
||||
tools:ignore="DuplicateIncludedIds"/>
|
||||
|
||||
</org.mariotaku.twidere.view.CardMediaContainer>
|
||||
|
||||
<org.mariotaku.twidere.view.IconActionView
|
||||
android:id="@+id/quotedMediaPreviewPlaceholder"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:scaleType="center"
|
||||
android:src="@drawable/ic_action_gallery"
|
||||
android:visibility="visible"
|
||||
app:iabColor="?android:textColorSecondary"
|
||||
tools:visibility="gone"/>
|
||||
</FrameLayout>
|
||||
|
||||
<LinearLayout
|
||||
<org.mariotaku.twidere.view.NameView
|
||||
android:id="@+id/quotedName"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_marginBottom="@dimen/element_spacing_normal"
|
||||
android:layout_marginLeft="@dimen/element_spacing_normal"
|
||||
android:layout_marginStart="@dimen/element_spacing_normal"
|
||||
android:layout_marginTop="@dimen/element_spacing_normal"
|
||||
android:layout_weight="1"
|
||||
android:orientation="vertical">
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/element_spacing_normal"
|
||||
android:paddingRight="@dimen/element_spacing_normal"
|
||||
android:tag="font_family|user"
|
||||
android:visibility="gone"
|
||||
app:nv_primaryTextColor="?android:textColorPrimary"
|
||||
app:nv_secondaryTextColor="?android:textColorSecondary"
|
||||
app:nv_twoLine="false"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<org.mariotaku.twidere.view.NameView
|
||||
android:id="@+id/quotedName"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
android:paddingLeft="@dimen/element_spacing_normal"
|
||||
android:paddingRight="@dimen/element_spacing_normal"
|
||||
android:tag="font_family|user"
|
||||
android:visibility="gone"
|
||||
app:nv_primaryTextColor="?android:textColorPrimary"
|
||||
app:nv_secondaryTextColor="?android:textColorSecondary"
|
||||
app:nv_twoLine="false"
|
||||
tools:visibility="visible"/>
|
||||
<org.mariotaku.twidere.view.TimelineContentTextView
|
||||
android:id="@+id/quotedText"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/element_spacing_normal"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="4"
|
||||
android:tag="font_family|user"
|
||||
android:textAppearance="?android:textAppearanceMedium"
|
||||
android:textColor="?android:textColorPrimary"
|
||||
android:visibility="gone"
|
||||
tools:text="@string/sample_status_text"
|
||||
tools:visibility="visible" />
|
||||
|
||||
<org.mariotaku.twidere.view.TimelineContentTextView
|
||||
android:id="@+id/quotedText"
|
||||
android:layout_width="match_parent"
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/quotedMediaLabel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/quotedText"
|
||||
android:layout_marginTop="@dimen/element_spacing_xsmall"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal"
|
||||
tools:visibility="gone">
|
||||
|
||||
<org.mariotaku.twidere.view.IconActionView
|
||||
android:layout_width="@dimen/element_size_small"
|
||||
android:layout_height="@dimen/element_size_small"
|
||||
android:layout_weight="0"
|
||||
android:color="?android:textColorSecondary"
|
||||
android:scaleType="centerInside"
|
||||
android:src="@drawable/ic_action_gallery"
|
||||
tools:tint="?android:textColorSecondary" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/quotedMediaLabelText"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_margin="@dimen/element_spacing_normal"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="4"
|
||||
android:tag="font_family|user"
|
||||
android:textAppearance="?android:textAppearanceMedium"
|
||||
android:textColor="?android:textColorPrimary"
|
||||
android:visibility="gone"
|
||||
tools:text="@string/sample_status_text"
|
||||
tools:visibility="visible"/>
|
||||
android:layout_weight="1"
|
||||
android:text="@string/media"
|
||||
android:textAppearance="?android:textAppearanceSmall"
|
||||
android:textStyle="bold" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
<org.mariotaku.twidere.view.CardMediaContainer
|
||||
android:id="@+id/quotedMediaPreview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/quotedMediaLabel"
|
||||
android:horizontalSpacing="@dimen/element_spacing_xsmall"
|
||||
android:verticalSpacing="@dimen/element_spacing_xsmall"
|
||||
tools:visibility="visible">
|
||||
|
||||
<!-- Child views will be inflated if media preview enabled in ViewHolder -->
|
||||
<include layout="@layout/layout_card_media_preview" />
|
||||
|
||||
</org.mariotaku.twidere.view.CardMediaContainer>
|
||||
|
||||
</org.mariotaku.twidere.view.ColorLabelLinearLayout>
|
||||
|
||||
<org.mariotaku.twidere.view.ActionIconThemedTextView
|
||||
android:id="@+id/locationView"
|
||||
@ -369,7 +358,7 @@
|
||||
android:tag="font_family|user"
|
||||
android:text="@string/action_view_map"
|
||||
android:textAppearance="?android:attr/textAppearanceSmall"
|
||||
android:textColor="?android:textColorSecondary"/>
|
||||
android:textColor="?android:textColorSecondary" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/countsUsersHeightHolder"
|
||||
@ -380,9 +369,9 @@
|
||||
android:visibility="invisible"
|
||||
tools:visibility="visible">
|
||||
|
||||
<include layout="@layout/adapter_item_status_count_label"/>
|
||||
<include layout="@layout/adapter_item_status_count_label" />
|
||||
|
||||
<include layout="@layout/adapter_item_status_interact_user"/>
|
||||
<include layout="@layout/adapter_item_status_interact_user" />
|
||||
</LinearLayout>
|
||||
|
||||
<android.support.v7.widget.RecyclerView
|
||||
@ -395,7 +384,7 @@
|
||||
android:layout_marginRight="@dimen/element_spacing_small"
|
||||
android:overScrollMode="never"
|
||||
android:splitMotionEvents="false"
|
||||
tools:visibility="invisible"/>
|
||||
tools:visibility="invisible" />
|
||||
|
||||
<android.support.v7.widget.TwidereActionMenuView
|
||||
android:id="@+id/menuBar"
|
||||
@ -403,6 +392,6 @@
|
||||
android:layout_height="?android:actionBarSize"
|
||||
android:layout_below="@+id/countsUsersHeightHolder"
|
||||
android:clipChildren="false"
|
||||
android:tag="ate_ignore"/>
|
||||
android:tag="ate_ignore" />
|
||||
|
||||
</RelativeLayout>
|
||||
@ -16,11 +16,10 @@
|
||||
~ You should have received a copy of the GNU General Public License
|
||||
~ along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
-->
|
||||
<org.mariotaku.twidere.view.ColorLabelRelativeLayout
|
||||
android:id="@+id/itemContent"
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<org.mariotaku.twidere.view.ColorLabelRelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/itemContent"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="?selectableItemBackground"
|
||||
@ -46,7 +45,7 @@
|
||||
android:visibility="gone"
|
||||
tools:src="@drawable/ic_activity_action_retweet"
|
||||
tools:tint="?android:textColorSecondary"
|
||||
tools:visibility="visible"/>
|
||||
tools:visibility="visible" />
|
||||
|
||||
<org.mariotaku.twidere.view.ActionIconThemedTextView
|
||||
android:id="@+id/statusInfoLabel"
|
||||
@ -65,7 +64,7 @@
|
||||
android:visibility="gone"
|
||||
tools:text="Retweeted by Mariotaku"
|
||||
tools:textSize="@dimen/text_size_extra_small"
|
||||
tools:visibility="visible"/>
|
||||
tools:visibility="visible" />
|
||||
|
||||
<org.mariotaku.twidere.view.ProfileImageView
|
||||
android:id="@+id/profileImage"
|
||||
@ -83,7 +82,7 @@
|
||||
android:contentDescription="@string/profile_image"
|
||||
android:scaleType="centerCrop"
|
||||
tools:src="@drawable/ic_profile_image_twidere"
|
||||
tools:visibility="visible"/>
|
||||
tools:visibility="visible" />
|
||||
|
||||
<org.mariotaku.twidere.view.BoundsImageView
|
||||
android:id="@+id/profileType"
|
||||
@ -96,14 +95,14 @@
|
||||
android:layout_marginEnd="@dimen/element_spacing_minus_small"
|
||||
android:layout_marginRight="@dimen/element_spacing_minus_small"
|
||||
android:scaleType="fitCenter"
|
||||
tools:visibility="visible"/>
|
||||
tools:visibility="visible" />
|
||||
|
||||
<Space
|
||||
android:id="@+id/statusContentUpperSpace"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/element_spacing_normal"
|
||||
android:layout_below="@+id/statusInfoLabel"
|
||||
android:visibility="gone"/>
|
||||
android:visibility="gone" />
|
||||
|
||||
<RelativeLayout
|
||||
android:id="@+id/statusContent"
|
||||
@ -128,7 +127,7 @@
|
||||
android:layout_weight="1"
|
||||
app:nv_primaryTextColor="?android:textColorPrimary"
|
||||
app:nv_primaryTextStyle="bold"
|
||||
app:nv_secondaryTextColor="?android:textColorSecondary"/>
|
||||
app:nv_secondaryTextColor="?android:textColorSecondary" />
|
||||
|
||||
<org.mariotaku.twidere.view.ShortTimeView
|
||||
android:id="@+id/time"
|
||||
@ -137,7 +136,7 @@
|
||||
android:layout_weight="0"
|
||||
android:textAppearance="?android:textAppearanceSmall"
|
||||
tools:text="42 mins ago"
|
||||
tools:textSize="@dimen/text_size_extra_small"/>
|
||||
tools:textSize="@dimen/text_size_extra_small" />
|
||||
|
||||
<org.mariotaku.twidere.view.IconActionView
|
||||
android:id="@+id/extraType"
|
||||
@ -146,7 +145,7 @@
|
||||
android:layout_weight="0"
|
||||
android:color="?android:textColorSecondary"
|
||||
tools:src="@drawable/ic_action_gallery"
|
||||
tools:tint="?android:textColorSecondary"/>
|
||||
tools:tint="?android:textColorSecondary" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -162,7 +161,7 @@
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:visibility="visible"
|
||||
tools:text="@string/sample_status_text"
|
||||
tools:visibility="visible"/>
|
||||
tools:visibility="visible" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/mediaLabel"
|
||||
@ -185,7 +184,7 @@
|
||||
android:color="?android:textColorSecondary"
|
||||
android:scaleType="centerInside"
|
||||
android:src="@drawable/ic_action_gallery"
|
||||
tools:tint="?android:textColorSecondary"/>
|
||||
tools:tint="?android:textColorSecondary" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/mediaLabelText"
|
||||
@ -194,7 +193,7 @@
|
||||
android:layout_weight="1"
|
||||
android:text="@string/media"
|
||||
android:textAppearance="?android:textAppearanceSmall"
|
||||
android:textStyle="bold"/>
|
||||
android:textStyle="bold" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -210,7 +209,7 @@
|
||||
android:layout_marginTop="@dimen/element_spacing_xsmall"
|
||||
android:horizontalSpacing="@dimen/element_spacing_xsmall"
|
||||
android:verticalSpacing="@dimen/element_spacing_xsmall"
|
||||
tools:visibility="visible">
|
||||
tools:visibility="gone">
|
||||
|
||||
<!-- Child views will be inflated if media preview enabled in ViewHolder -->
|
||||
<!--<include layout="@layout/layout_card_media_preview"/>-->
|
||||
@ -231,23 +230,9 @@
|
||||
android:paddingRight="@dimen/element_spacing_small"
|
||||
android:paddingStart="@dimen/element_spacing_normal"
|
||||
android:paddingTop="@dimen/element_spacing_small"
|
||||
app:ignorePadding="true">
|
||||
|
||||
<org.mariotaku.twidere.view.CardMediaContainer
|
||||
android:id="@+id/quotedMediaPreview"
|
||||
android:layout_width="112dp"
|
||||
android:layout_height="112dp"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_toEndOf="@+id/quoteIndicator"
|
||||
android:layout_toRightOf="@+id/quoteIndicator"
|
||||
android:horizontalSpacing="@dimen/element_spacing_xsmall"
|
||||
android:verticalSpacing="@dimen/element_spacing_xsmall"
|
||||
tools:visibility="visible">
|
||||
|
||||
<!-- Child views will be inflated if media preview enabled in ViewHolder -->
|
||||
<include layout="@layout/layout_card_media_preview"/>
|
||||
|
||||
</org.mariotaku.twidere.view.CardMediaContainer>
|
||||
android:visibility="gone"
|
||||
app:ignorePadding="true"
|
||||
tools:visibility="visible">
|
||||
|
||||
|
||||
<org.mariotaku.twidere.view.NameView
|
||||
@ -255,10 +240,10 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignTop="@+id/quotedMediaPreview"
|
||||
android:layout_toEndOf="@+id/quotedMediaPreview"
|
||||
android:layout_toRightOf="@+id/quotedMediaPreview"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_alignParentTop="true"
|
||||
android:gravity="center_vertical|start"
|
||||
android:orientation="horizontal"
|
||||
android:paddingBottom="0dp"
|
||||
@ -271,16 +256,16 @@
|
||||
app:nv_primaryTextColor="?android:textColorPrimary"
|
||||
app:nv_primaryTextStyle="bold"
|
||||
app:nv_secondaryTextColor="?android:textColorSecondary"
|
||||
tools:visibility="visible"/>
|
||||
tools:visibility="visible" />
|
||||
|
||||
<org.mariotaku.twidere.view.TimelineContentTextView
|
||||
android:id="@+id/quotedText"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignEnd="@+id/quotedName"
|
||||
android:layout_alignLeft="@+id/quotedName"
|
||||
android:layout_alignRight="@+id/quotedName"
|
||||
android:layout_alignStart="@+id/quotedName"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_below="@+id/quotedName"
|
||||
android:paddingBottom="@dimen/element_spacing_small"
|
||||
android:paddingEnd="0dp"
|
||||
@ -292,20 +277,21 @@
|
||||
android:textColor="?android:attr/textColorPrimary"
|
||||
android:visibility="gone"
|
||||
tools:text="@string/sample_status_text"
|
||||
tools:visibility="visible"/>
|
||||
tools:visibility="visible" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/quotedMediaLabel"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignEnd="@+id/quotedName"
|
||||
android:layout_alignLeft="@+id/quotedName"
|
||||
android:layout_alignRight="@+id/quotedName"
|
||||
android:layout_alignStart="@+id/quotedName"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_below="@+id/quotedText"
|
||||
android:layout_marginTop="@dimen/element_spacing_xsmall"
|
||||
android:gravity="center_vertical"
|
||||
android:orientation="horizontal">
|
||||
android:orientation="horizontal"
|
||||
tools:visibility="gone">
|
||||
|
||||
<org.mariotaku.twidere.view.IconActionView
|
||||
android:layout_width="@dimen/element_size_small"
|
||||
@ -314,7 +300,7 @@
|
||||
android:color="?android:textColorSecondary"
|
||||
android:scaleType="centerInside"
|
||||
android:src="@drawable/ic_action_gallery"
|
||||
tools:tint="?android:textColorSecondary"/>
|
||||
tools:tint="?android:textColorSecondary" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/quotedMediaLabelText"
|
||||
@ -323,9 +309,27 @@
|
||||
android:layout_weight="1"
|
||||
android:text="@string/media"
|
||||
android:textAppearance="?android:textAppearanceSmall"
|
||||
android:textStyle="bold"/>
|
||||
android:textStyle="bold" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<org.mariotaku.twidere.view.CardMediaContainer
|
||||
android:id="@+id/quotedMediaPreview"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_alignParentLeft="true"
|
||||
android:layout_alignParentRight="true"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_below="@+id/quotedMediaLabel"
|
||||
android:horizontalSpacing="@dimen/element_spacing_xsmall"
|
||||
android:verticalSpacing="@dimen/element_spacing_xsmall"
|
||||
tools:visibility="visible">
|
||||
|
||||
<!-- Child views will be inflated if media preview enabled in ViewHolder -->
|
||||
<include layout="@layout/layout_card_media_preview" />
|
||||
|
||||
</org.mariotaku.twidere.view.CardMediaContainer>
|
||||
</org.mariotaku.twidere.view.ColorLabelRelativeLayout>
|
||||
|
||||
</RelativeLayout>
|
||||
@ -335,7 +339,7 @@
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/element_spacing_normal"
|
||||
android:layout_below="@+id/statusContent"
|
||||
android:visibility="gone"/>
|
||||
android:visibility="gone" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/actionButtons"
|
||||
@ -371,7 +375,7 @@
|
||||
android:src="@drawable/ic_action_reply"
|
||||
app:iabActivatedColor="@color/highlight_reply"
|
||||
app:iabColor="?android:textColorTertiary"
|
||||
tools:tint="?android:textColorSecondary"/>
|
||||
tools:tint="?android:textColorSecondary" />
|
||||
|
||||
<org.mariotaku.twidere.view.ActionIconThemedTextView
|
||||
android:id="@+id/replyCount"
|
||||
@ -385,7 +389,7 @@
|
||||
android:maxLines="1"
|
||||
android:minHeight="@dimen/button_size_content_card_action"
|
||||
android:textAppearance="?android:textAppearanceSmall"
|
||||
tools:text="255"/>
|
||||
tools:text="255" />
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
@ -410,7 +414,7 @@
|
||||
android:src="@drawable/ic_action_retweet"
|
||||
app:iabActivatedColor="@color/highlight_retweet"
|
||||
app:iabColor="?android:textColorTertiary"
|
||||
tools:tint="?android:textColorSecondary"/>
|
||||
tools:tint="?android:textColorSecondary" />
|
||||
|
||||
<org.mariotaku.twidere.view.ActionIconThemedTextView
|
||||
android:id="@+id/retweetCount"
|
||||
@ -424,7 +428,7 @@
|
||||
android:maxLines="1"
|
||||
android:minHeight="@dimen/button_size_content_card_action"
|
||||
android:textAppearance="?android:textAppearanceSmall"
|
||||
tools:text="255"/>
|
||||
tools:text="255" />
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
@ -450,7 +454,7 @@
|
||||
android:src="@drawable/ic_action_heart"
|
||||
app:iabActivatedColor="@color/highlight_like"
|
||||
app:iabColor="?android:textColorTertiary"
|
||||
tools:tint="?android:textColorSecondary"/>
|
||||
tools:tint="?android:textColorSecondary" />
|
||||
|
||||
<org.mariotaku.twidere.view.ActionIconThemedTextView
|
||||
android:id="@+id/favoriteCount"
|
||||
@ -464,7 +468,7 @@
|
||||
android:maxLines="1"
|
||||
android:minHeight="@dimen/button_size_content_card_action"
|
||||
android:textAppearance="?android:textAppearanceSmall"
|
||||
tools:text="255"/>
|
||||
tools:text="255" />
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
|
||||
@ -480,6 +484,6 @@
|
||||
android:focusable="false"
|
||||
android:src="@drawable/ic_action_more_horizontal"
|
||||
tools:tint="?android:textColorSecondary"
|
||||
tools:visibility="visible"/>
|
||||
tools:visibility="visible" />
|
||||
|
||||
</org.mariotaku.twidere.view.ColorLabelRelativeLayout>
|
||||
Loading…
x
Reference in New Issue
Block a user