diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt index 4966611d75..6c4593b685 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/ShareVoiceCmdReceiver.kt @@ -41,6 +41,9 @@ class ShareVoiceCmdReceiver : BroadcastReceiver() { "交通事故"->{ UploadHelper.upload(context, TYPE_ACCIDENT) } + "施工"->{ + UploadHelper.upload(context, TYPE_ROAD_CONSTRUCTION) + } } } VOICE_CMD_PUB_ROAD_CONDITION->{ diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/adapter/ShareBtnAdapter.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/adapter/ShareBtnAdapter.kt deleted file mode 100644 index 6422eb7f07..0000000000 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/adapter/ShareBtnAdapter.kt +++ /dev/null @@ -1,52 +0,0 @@ -package com.mogo.module.share.adapter - -import android.content.Context -import android.view.LayoutInflater -import android.view.View -import android.view.ViewGroup -import androidx.recyclerview.widget.RecyclerView -import com.mogo.module.share.R -import com.mogo.module.share.bean.ShareBtn -import com.mogo.module.share.listener.OnShareBtnClickListener -import com.mogo.utils.glide.GlideApp -import com.mogo.utils.logger.Logger -import kotlinx.android.synthetic.main.item_share_btn.view.* - -class ShareBtnAdapter(val context: Context): RecyclerView.Adapter() { - private val TAG = "ShareBtnAdapter" - - private val btnList = ArrayList() - - var onShareBtnClickListener:OnShareBtnClickListener? = null - - override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ShareViewHolder { - return ShareViewHolder(LayoutInflater.from(context).inflate(R.layout.item_share_btn, parent, false)) - } - - override fun getItemCount(): Int { - return btnList.size - } - - override fun onBindViewHolder(holder: ShareViewHolder, position: Int) { - holder.bindData(btnList[position]) - } - - fun setShareBtnList(btns:List){ - btnList.clear() - btnList.addAll(btns) - Logger.d(TAG, "setShareBtnList: $btnList") - notifyDataSetChanged() - } - - inner class ShareViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView){ - init { - itemView.setOnClickListener { - onShareBtnClickListener?.onShareBtnClick(btnList[adapterPosition]) - } - } - fun bindData(shareBtn: ShareBtn) = with(itemView) { - tvShareContent.text = shareBtn.content - GlideApp.with(context).load(shareBtn.iconRes).into(ivShareIcon) - } - } -} \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/ShareBtn.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/ShareBtn.kt deleted file mode 100644 index bbadda8f06..0000000000 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/ShareBtn.kt +++ /dev/null @@ -1,9 +0,0 @@ -package com.mogo.module.share.bean - -/** - * 分享按钮内容封装 - * - * @param icon 分享按钮图标资源，暂时用不到，默认为空，以后如果引入服务端配置按钮，图片资源可以用这个参数 - * @param iconRes 分享按钮图标本地资源id，默认是-1 - */ -data class ShareBtn(var type: String, var icon: String = "", var iconRes: Int = -1, var content: String) diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java index 8a676c9061..36fd5aeb72 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/constant/ShareConstants.java @@ -37,4 +37,5 @@ public class ShareConstants { public static final String TYPE_STAGNANT_WATER = "10008"; public static final String TYPE_ROAD_ICY = "10011"; public static final String TYPE_DENSE_FOG = "10010"; + public static final String TYPE_ROAD_CONSTRUCTION = "10006"; } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java index 4e167b9c92..1e19c2da2f 100644 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java +++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/dialog/LaucherShareDialog.java @@ -12,17 +12,12 @@ import android.view.WindowManager; import android.widget.TextView; import androidx.annotation.NonNull; -import androidx.recyclerview.widget.LinearLayoutManager; -import androidx.recyclerview.widget.RecyclerView; import com.alibaba.android.arouter.launcher.ARouter; import com.mogo.module.common.utils.CarSeries; import com.mogo.module.share.R; import com.mogo.module.share.ShareControl; -import com.mogo.module.share.adapter.ShareBtnAdapter; -import com.mogo.module.share.bean.ShareBtn; import com.mogo.module.share.constant.ShareConstants; -import com.mogo.module.share.listener.OnShareBtnClickListener; import com.mogo.module.share.manager.ISeekHelpListener; import com.mogo.module.share.manager.SeekHelpManager; import com.mogo.module.share.manager.UploadHelper; @@ -33,11 +28,7 @@ import com.mogo.service.statusmanager.IMogoStatusManager; import com.mogo.utils.WindowUtils; import com.mogo.utils.logger.Logger; -import org.jetbrains.annotations.NotNull; - -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import java.util.Map; @@ -53,24 +44,22 @@ public class LaucherShareDialog implements View.OnClickListener { private boolean isShown = false; -// private TextView tvBlock; -// private TextView tvTrafficCheck; -// private TextView tvClosure; -// private TextView tvNeedHelp; -// -// private TextView tvAccident; -// private TextView tvRealTimeTraffic; -// private TextView tvStagnantWater; -// private TextView tvRoadIcy; -// private TextView tvDenseFog; + private TextView tvBlock; + private TextView tvTrafficCheck; + private TextView tvClosure; + private TextView tvNeedHelp; + + private TextView tvAccident; + private TextView tvRealTimeTraffic; + private TextView tvStagnantWater; + private TextView tvRoadIcy; + private TextView tvDenseFog; + private TextView tvConstruction; private Context mContext; private IMogoAnalytics mAnalytics; private IMogoStatusManager mStatusManager; private IMogoServiceApis mApis; - private RecyclerView rvShareBtnContainer; - private ShareBtnAdapter adapter; - private WindowManager windowManager; @@ -93,101 +82,86 @@ public class LaucherShareDialog implements View.OnClickListener { }); - rvShareBtnContainer = body.findViewById(R.id.rvShareBtnContainer); - LinearLayoutManager linearLayoutManager = new LinearLayoutManager(mContext,RecyclerView.HORIZONTAL,false); - rvShareBtnContainer.setLayoutManager(linearLayoutManager); - adapter = new ShareBtnAdapter(mContext); - rvShareBtnContainer.setAdapter(adapter); + tvBlock = body.findViewById(R.id.tvBlock); + tvTrafficCheck = body.findViewById(R.id.tvTrafficCheck); + tvClosure = body.findViewById(R.id.tvClosure); + tvNeedHelp = body.findViewById(R.id.tvSeekHelp); -// tvBlock = body.findViewById(R.id.tvBlock); -// tvTrafficCheck = body.findViewById(R.id.tvTrafficCheck); -// tvClosure = body.findViewById(R.id.tvClosure); -// tvNeedHelp = body.findViewById(R.id.tvNeedHelp); + tvAccident = body.findViewById(R.id.tvAccident); + tvRealTimeTraffic = body.findViewById(R.id.tvRealTimeTraffic); + tvStagnantWater = body.findViewById(R.id.tvStagnantWater); + tvRoadIcy = body.findViewById(R.id.tvRoadIcy); + tvDenseFog = body.findViewById(R.id.tvDenseFog); + tvConstruction = body.findViewById(R.id.tvConstruction); } private void initListener() { - adapter.setOnShareBtnClickListener(new OnShareBtnClickListener() { - @Override - public void onShareBtnClick(@NotNull ShareBtn shareBtn) { - Logger.d(TAG,"分享按钮点击: "+shareBtn); - traceData("1"); - if (ShareConstants.TYPE_SEEK_HELP.equalsIgnoreCase(shareBtn.getType())) { - // 点击发起求助 - SeekHelpManager.INSTANCE.seekHelp(mContext,seekListener,true); - }else{ - sendShareReceiver(shareBtn.getType()); - dismiss(); - } - } - }); + tvBlock.setOnClickListener(this); + tvNeedHelp.setOnClickListener(this); + tvTrafficCheck.setOnClickListener(this); + tvClosure.setOnClickListener(this); -// tvBlock.setOnClickListener(this); -// tvNeedHelp.setOnClickListener(this); -// tvTrafficCheck.setOnClickListener(this); -// tvClosure.setOnClickListener(this); - } - - /** - * 初始化默认的分享按钮 - */ - private void initShareBtn(){ - List btns = new ArrayList<>(); - ShareBtn btn = new ShareBtn(ShareConstants.TYPE_BLOCK, "", R.drawable.share_block_up, "上报拥堵"); - btns.add(btn); - btn = new ShareBtn(ShareConstants.TYPE_TRAFFIC_CHECK, "", R.drawable.share_traffic_check, "上报交通检查"); - btns.add(btn); - btn = new ShareBtn(ShareConstants.TYPE_CLOSURE, "", R.drawable.share_road_closure, "上报封路"); - btns.add(btn); - btn = new ShareBtn(ShareConstants.TYPE_ACCIDENT, "", R.drawable.share_seek_help, "上报事故"); - btns.add(btn); - btn = new ShareBtn(ShareConstants.TYPE_REAL_TIME_TRAFFIC, "", R.drawable.share_seek_help, "实时路况"); - btns.add(btn); - btn = new ShareBtn(ShareConstants.TYPE_SEEK_HELP, "", R.drawable.share_seek_help, "发起求助"); - btns.add(btn); - btn = new ShareBtn(ShareConstants.TYPE_STAGNANT_WATER, "", R.drawable.share_seek_help, "道路积水"); - btns.add(btn); - btn = new ShareBtn(ShareConstants.TYPE_ROAD_ICY, "", R.drawable.share_seek_help, "道路结冰"); - btns.add(btn); - btn = new ShareBtn(ShareConstants.TYPE_DENSE_FOG, "", R.drawable.share_seek_help, "浓雾"); - btns.add(btn); - adapter.setShareBtnList(btns); + tvAccident.setOnClickListener(this); + tvRealTimeTraffic.setOnClickListener(this); + tvStagnantWater.setOnClickListener(this); + tvRoadIcy.setOnClickListener(this); + tvDenseFog.setOnClickListener(this); + tvConstruction.setOnClickListener(this); } @Override public void onClick(View view) { int id = view.getId(); Logger.d(TAG, "onClick: " + id); -// if (id == R.id.tvBlock) { -// //拥堵 -// traceTanluData("1"); -// sendShareReceiver("1"); -// traceTypeData("1"); -// dismiss(); -// } else if (id == R.id.oil_price_layout) { -// // 分享油价，入口被屏蔽了 -// traceData("1"); -// Intent intent = new Intent(); -// intent.setData(Uri.parse("freshthing://com.zhidao.fresh.things/shareOilPrice")); -// mContext.startActivity(intent); -// traceTypeData("2"); -// dismiss(); -// } else if (id == R.id.tvTrafficCheck) { -// //交通检查 -// traceData("1"); -// sendShareReceiver("2"); -// traceTypeData("3"); -// dismiss(); -// } else if (id == R.id.tvClosure) { -// //封路 -// traceData("1"); -// sendShareReceiver("3"); -// traceTypeData("4"); -// dismiss(); -// } else if (id == R.id.tvNeedHelp) { -// // 故障求助 -// SeekHelpManager.INSTANCE.seekHelp(mContext,seekListener,true); -// } + if (id == R.id.tvBlock) { + //拥堵 + traceTanluData("1"); + sendShareReceiver("1"); + traceTypeData("1"); + dismiss(); + } else if (id == R.id.oil_price_layout) { + // 分享油价，入口被屏蔽了 + traceData("1"); + Intent intent = new Intent(); + intent.setData(Uri.parse("freshthing://com.zhidao.fresh.things/shareOilPrice")); + mContext.startActivity(intent); + traceTypeData("2"); + dismiss(); + } else if (id == R.id.tvTrafficCheck) { + //交通检查 + traceData("1"); + sendShareReceiver("2"); + traceTypeData("3"); + dismiss(); + } else if (id == R.id.tvClosure) { + //封路 + traceData("1"); + sendShareReceiver("3"); + traceTypeData("4"); + dismiss(); + } else if (id == R.id.tvSeekHelp) { + // 故障求助 + SeekHelpManager.INSTANCE.seekHelp(mContext,seekListener,true); + } else if (id == R.id.tvAccident) { + // 事故 + sendShareReceiver(ShareConstants.TYPE_ACCIDENT); + } else if (id == R.id.tvConstruction) { + // 道路施工 + sendShareReceiver(ShareConstants.TYPE_ROAD_CONSTRUCTION); + } else if (id == R.id.tvRealTimeTraffic) { + // 实时路况 + sendShareReceiver(ShareConstants.TYPE_REAL_TIME_TRAFFIC); + } else if (id == R.id.tvStagnantWater) { + // 道路积水 + sendShareReceiver(ShareConstants.TYPE_STAGNANT_WATER); + } else if (id == R.id.tvRoadIcy) { + // 道路结冰 + sendShareReceiver(ShareConstants.TYPE_ROAD_ICY); + } else if (id == R.id.tvDenseFog) { + // 浓雾 + sendShareReceiver(ShareConstants.TYPE_DENSE_FOG); + } } @@ -273,7 +247,6 @@ public class LaucherShareDialog implements View.OnClickListener { layoutParams.y = 0; initView(); initListener(); - initShareBtn(); windowManager.addView(body, layoutParams); isShown = true; } diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/listener/OnShareBtnClickListener.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/listener/OnShareBtnClickListener.kt deleted file mode 100644 index e4c2eaf762..0000000000 --- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/listener/OnShareBtnClickListener.kt +++ /dev/null @@ -1,7 +0,0 @@ -package com.mogo.module.share.listener - -import com.mogo.module.share.bean.ShareBtn - -interface OnShareBtnClickListener { - fun onShareBtnClick(shareBtn: ShareBtn) -} \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png new file mode 100644 index 0000000000..9dd6d425c9 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_accident.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png index d2f7197cce..b504cffe87 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png new file mode 100644 index 0000000000..6a16103d0e Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_dense_fog.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png new file mode 100644 index 0000000000..7defe6986d Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_real_time_traffic.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png index f6e8d2b499..d20dacee3a 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png new file mode 100644 index 0000000000..3c2ba1225c Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_construction.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png new file mode 100644 index 0000000000..53585d40d1 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_road_icy.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png index c87f75fd0d..30f26921aa 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png new file mode 100644 index 0000000000..f125b9f22e Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_stagnant_water.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png index 737a4c75a8..1b5af5fe54 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png and b/modules/mogo-module-share/src/main/res/drawable-ldpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png new file mode 100644 index 0000000000..cfcb9eb87f Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_accident.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png index 0d33d14d6c..0a54b48bad 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_block_up.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png new file mode 100644 index 0000000000..160cdee6a6 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_dense_fog.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png new file mode 100644 index 0000000000..d9434fe5f1 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_real_time_traffic.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png index 0356075b5d..a050e2b61c 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_closure.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png new file mode 100644 index 0000000000..4b82b87aa7 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_construction.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png new file mode 100644 index 0000000000..9edf8ac119 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_road_icy.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png index 018f787003..6ac62048b6 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_seek_help.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png new file mode 100644 index 0000000000..de26656f73 Binary files /dev/null and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_stagnant_water.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png index d9139b14e3..a4660d5e0b 100644 Binary files a/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png and b/modules/mogo-module-share/src/main/res/drawable-xhdpi/share_traffic_check.png differ diff --git a/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml b/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml index 0fa61ad26e..1b1f5226d5 100644 --- a/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml +++ b/modules/mogo-module-share/src/main/res/drawable/shape_bg_222533_20px.xml @@ -1,5 +1,8 @@ - - + + \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml index b5403c8507..d88e11d825 100644 --- a/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml +++ b/modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml @@ -31,25 +31,138 @@ app:layout_constraintStart_toStartOf="@+id/vBg" app:layout_constraintTop_toTopOf="@+id/vBg" /> - - - + android:drawableTop="@drawable/share_block_up" + android:text="拥堵" + android:textSize="@dimen/dp_32" + android:textColor="#fff" + app:layout_constraintHorizontal_chainStyle="spread_inside" + android:gravity="center" + app:layout_constraintTop_toBottomOf="@+id/btn_share_title" + app:layout_constraintRight_toLeftOf="@+id/tvTrafficCheck" + app:layout_constraintLeft_toLeftOf="@+id/vBg" + android:layout_marginStart="@dimen/dp_116" + android:layout_marginTop="@dimen/dp_78" + android:drawablePadding="@dimen/dp_30" /> + + + + + + + + + \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml index d28bf549bd..e74470a9b8 100644 --- a/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-share/src/main/res/values-ldpi/dimens.xml @@ -1,8 +1,8 @@ - 693px - 320px + 776px + 428px 34px 43px 100px diff --git a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml index ba3a919930..c50ed40d1e 100644 --- a/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-share/src/main/res/values-xhdpi/dimens.xml @@ -1,7 +1,7 @@ - 1300px - 600px + 1464px + 808px 64px 80px 200px