Fix translator button issue
This commit is contained in:
parent
bada9e36f8
commit
49f3bb0452
|
@ -297,6 +297,8 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
TextView status_toot_app;
|
TextView status_toot_app;
|
||||||
RelativeLayout webview_preview;
|
RelativeLayout webview_preview;
|
||||||
ImageView webview_preview_card;
|
ImageView webview_preview_card;
|
||||||
|
LinearLayout left_buttons;
|
||||||
|
|
||||||
public View getView(){
|
public View getView(){
|
||||||
return itemView;
|
return itemView;
|
||||||
}
|
}
|
||||||
|
@ -375,6 +377,7 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
conversation_pp_2_container = itemView.findViewById(R.id.conversation_pp_2_container);
|
conversation_pp_2_container = itemView.findViewById(R.id.conversation_pp_2_container);
|
||||||
conversation_pp_3_container = itemView.findViewById(R.id.conversation_pp_3_container);
|
conversation_pp_3_container = itemView.findViewById(R.id.conversation_pp_3_container);
|
||||||
vertical_content = itemView.findViewById(R.id.vertical_content);
|
vertical_content = itemView.findViewById(R.id.vertical_content);
|
||||||
|
left_buttons = itemView.findViewById(R.id.left_buttons);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -608,14 +611,22 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
holder.status_account_displayname.setCompoundDrawables( null, null, null, null);
|
holder.status_account_displayname.setCompoundDrawables( null, null, null, null);
|
||||||
}
|
}
|
||||||
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
|
LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, LinearLayout.LayoutParams.WRAP_CONTENT);
|
||||||
|
LinearLayout.LayoutParams paramsB = new LinearLayout.LayoutParams((int)Helper.convertDpToPixel(60, context), LinearLayout.LayoutParams.WRAP_CONTENT);
|
||||||
if( status.getReblog() == null && !isCompactMode && getItemViewType(position) != FOCUSED_STATUS){
|
if( status.getReblog() == null && !isCompactMode && getItemViewType(position) != FOCUSED_STATUS){
|
||||||
params.setMargins((int)Helper.convertDpToPixel(60, context),-(int)Helper.convertDpToPixel(10, context),0,0);
|
params.setMargins(0,-(int)Helper.convertDpToPixel(10, context),0,0);
|
||||||
|
if (status.getSpoiler_text() != null && status.getSpoiler_text().trim().length() > 0 )
|
||||||
|
paramsB.setMargins(0,0,0,0);
|
||||||
|
else
|
||||||
|
paramsB.setMargins(0,(int)Helper.convertDpToPixel(10, context),0,0);
|
||||||
}else if( !isCompactMode && getItemViewType(position) != FOCUSED_STATUS){
|
}else if( !isCompactMode && getItemViewType(position) != FOCUSED_STATUS){
|
||||||
params.setMargins((int)Helper.convertDpToPixel(60, context),0,0,0);
|
params.setMargins(0,0,0,0);
|
||||||
|
paramsB.setMargins(0,0,0,0);
|
||||||
}
|
}
|
||||||
|
|
||||||
holder.vertical_content.setLayoutParams(params);
|
|
||||||
|
|
||||||
|
|
||||||
|
holder.vertical_content.setLayoutParams(params);
|
||||||
|
holder.left_buttons.setLayoutParams(paramsB);
|
||||||
if( !status.isClickable())
|
if( !status.isClickable())
|
||||||
status.makeClickable(context);
|
status.makeClickable(context);
|
||||||
if( !status.isEmojiFound())
|
if( !status.isEmojiFound())
|
||||||
|
@ -893,10 +904,14 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct
|
||||||
}
|
}
|
||||||
holder.status_action_container.setVisibility(View.VISIBLE);
|
holder.status_action_container.setVisibility(View.VISIBLE);
|
||||||
if( ( getItemViewType(position) != COMPACT_STATUS ) && (trans_forced || (translator != Helper.TRANS_NONE && currentLocale != null && status.getLanguage() != null && !status.getLanguage().trim().equals(currentLocale)))){
|
if( ( getItemViewType(position) != COMPACT_STATUS ) && (trans_forced || (translator != Helper.TRANS_NONE && currentLocale != null && status.getLanguage() != null && !status.getLanguage().trim().equals(currentLocale)))){
|
||||||
|
if( status.isSpoilerShown() || getItemViewType(position) == FOCUSED_STATUS){
|
||||||
holder.status_translate.setVisibility(View.VISIBLE);
|
holder.status_translate.setVisibility(View.VISIBLE);
|
||||||
}else {
|
}else {
|
||||||
holder.status_translate.setVisibility(View.GONE);
|
holder.status_translate.setVisibility(View.GONE);
|
||||||
}
|
}
|
||||||
|
}else {
|
||||||
|
holder.status_translate.setVisibility(View.GONE);
|
||||||
|
}
|
||||||
if( expand_cw)
|
if( expand_cw)
|
||||||
holder.status_spoiler_button.setVisibility(View.GONE);
|
holder.status_spoiler_button.setVisibility(View.GONE);
|
||||||
if( status.getReblog() == null) {
|
if( status.getReblog() == null) {
|
||||||
|
|
|
@ -182,13 +182,14 @@
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_marginStart="60dp"
|
|
||||||
android:layout_marginLeft="60dp"
|
|
||||||
android:id="@+id/vertical_content"
|
android:id="@+id/vertical_content"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:layout_marginStart="60dp"
|
||||||
|
android:layout_marginLeft="60dp"
|
||||||
android:id="@+id/status_spoiler_container"
|
android:id="@+id/status_spoiler_container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
|
@ -219,13 +220,12 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
<RelativeLayout
|
<LinearLayout
|
||||||
android:layout_marginLeft="-60dp"
|
android:id="@+id/left_buttons"
|
||||||
android:layout_marginStart="-60dp"
|
android:orientation="vertical"
|
||||||
android:layout_width="60dp"
|
android:layout_width="60dp"
|
||||||
android:layout_height="wrap_content">
|
android:layout_height="wrap_content">
|
||||||
<ImageView
|
<ImageView
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
android:id="@+id/new_element"
|
android:id="@+id/new_element"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
@ -234,7 +234,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
tools:ignore="ContentDescription" />
|
tools:ignore="ContentDescription" />
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
android:id="@+id/status_translate"
|
android:id="@+id/status_translate"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
style="?attr/borderless"
|
style="?attr/borderless"
|
||||||
|
@ -244,7 +244,7 @@
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
/>
|
/>
|
||||||
<ImageButton
|
<ImageButton
|
||||||
android:layout_centerHorizontal="true"
|
|
||||||
android:id="@+id/status_bookmark"
|
android:id="@+id/status_bookmark"
|
||||||
android:gravity="center"
|
android:gravity="center"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
@ -256,7 +256,7 @@
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
/>
|
/>
|
||||||
</RelativeLayout>
|
</LinearLayout>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/status_content_container"
|
android:id="@+id/status_content_container"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
|
@ -654,6 +654,8 @@
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:layout_marginStart="60dp"
|
||||||
|
android:layout_marginLeft="60dp"
|
||||||
android:id="@+id/status_spoiler_mention_container"
|
android:id="@+id/status_spoiler_mention_container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
|
@ -666,6 +668,8 @@
|
||||||
android:layout_height="wrap_content" />
|
android:layout_height="wrap_content" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
android:layout_marginStart="60dp"
|
||||||
|
android:layout_marginLeft="60dp"
|
||||||
android:id="@+id/status_action_container"
|
android:id="@+id/status_action_container"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
|
|
@ -135,6 +135,12 @@
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"/>
|
android:layout_height="wrap_content"/>
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/left_buttons"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:visibility="gone"/>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginLeft="10dp"
|
android:layout_marginLeft="10dp"
|
||||||
|
|
|
@ -87,6 +87,12 @@
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"/>
|
android:layout_height="wrap_content"/>
|
||||||
|
<LinearLayout
|
||||||
|
android:id="@+id/left_buttons"
|
||||||
|
android:orientation="vertical"
|
||||||
|
android:layout_width="wrap_content"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:visibility="gone"/>
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_marginStart="10dp"
|
android:layout_marginStart="10dp"
|
||||||
android:layout_marginLeft="10dp"
|
android:layout_marginLeft="10dp"
|
||||||
|
|
Loading…
Reference in New Issue