Merge branch 'hh' into qa_1.1.8
This commit is contained in:
@@ -189,13 +189,13 @@ public class V2XShareEventAdapter extends RecyclerView.Adapter<RecyclerView.View
|
||||
public shareEmptyViewHolder(@NonNull View itemView) {
|
||||
super(itemView);
|
||||
|
||||
Button shareBtn = itemView.findViewById(R.id.share_event_button);
|
||||
shareBtn.setOnClickListener(view -> {
|
||||
TextView share = itemView.findViewById(R.id.share_event_button);
|
||||
share.setOnClickListener(view -> {
|
||||
V2XEventPanelFragment.Companion.getInstance().hidePanel();
|
||||
mApis.getShareManager().showShareDialog();
|
||||
});
|
||||
|
||||
Button refresh = itemView.findViewById(R.id.refresh_button);
|
||||
TextView refresh = itemView.findViewById(R.id.refresh_button);
|
||||
refresh.setOnClickListener(new View.OnClickListener() {
|
||||
@Override
|
||||
public void onClick(View v) {
|
||||
|
||||
@@ -21,8 +21,8 @@ public class V2XListEmptyView extends LinearLayout {
|
||||
|
||||
private ImageView mIvEmptyView;
|
||||
private TextView mTvTrip;
|
||||
private Button mBtnShear;
|
||||
private Button mBtnRefresh;
|
||||
private TextView mBtnShear;
|
||||
private TextView mBtnRefresh;
|
||||
|
||||
private OnControlListener mOnControlListener;
|
||||
|
||||
|
||||
@@ -31,7 +31,7 @@
|
||||
android:layout_marginTop="@dimen/share_empty_btn_padding"
|
||||
android:paddingBottom="@dimen/dp_10">
|
||||
|
||||
<Button
|
||||
<TextView
|
||||
android:id="@+id/share_event_button"
|
||||
android:layout_width="@dimen/v2x_share_btn_width"
|
||||
android:layout_height="@dimen/v2x_share_btn_height"
|
||||
@@ -51,7 +51,7 @@
|
||||
android:layout_height="@dimen/share_btn_middle_padding"
|
||||
android:layout_centerInParent="true" />
|
||||
|
||||
<Button
|
||||
<TextView
|
||||
android:id="@+id/refresh_button"
|
||||
android:layout_width="@dimen/v2x_share_btn_width"
|
||||
android:layout_height="@dimen/v2x_share_btn_height"
|
||||
|
||||
@@ -30,7 +30,7 @@
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
app:layout_constraintTop_toBottomOf="@+id/ivEmptyView" />
|
||||
|
||||
<Button
|
||||
<TextView
|
||||
android:id="@+id/btnShear"
|
||||
android:layout_width="@dimen/v2x_share_btn_width"
|
||||
android:layout_height="@dimen/v2x_share_btn_height"
|
||||
@@ -38,13 +38,13 @@
|
||||
android:background="@drawable/bg_v2x_go_to_share"
|
||||
android:gravity="center"
|
||||
android:text="去分享"
|
||||
android:textColor="#FFFFFF"
|
||||
android:textColor="@color/v2x_FFF_333"
|
||||
android:textSize="@dimen/dp_36"
|
||||
app:layout_constraintEnd_toStartOf="@+id/btnRefresh"
|
||||
app:layout_constraintStart_toStartOf="@+id/ivEmptyView"
|
||||
app:layout_constraintTop_toBottomOf="@+id/tvTrip" />
|
||||
|
||||
<Button
|
||||
<TextView
|
||||
android:id="@+id/btnRefresh"
|
||||
android:layout_width="@dimen/v2x_share_btn_width"
|
||||
android:layout_height="@dimen/v2x_share_btn_height"
|
||||
|
||||
Reference in New Issue
Block a user