Commit b2debf1d by 霍志良

feat:图标更换

parent ec8fffe0
...@@ -266,7 +266,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie ...@@ -266,7 +266,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
} else { } else {
adapter.notifyDataSetChanged(); adapter.notifyDataSetChanged();
} }
publish_trend_img_rcv.setLayoutManager(new GridLayoutManager(activity, 4)); publish_trend_img_rcv.setLayoutManager(new GridLayoutManager(activity, 3));
publish_trend_img_rcv.setAdapter(adapter); publish_trend_img_rcv.setAdapter(adapter);
adapter.setOnItemClickLister(new DynamicPublishImageAdapter.OnItemClickLister() { adapter.setOnItemClickLister(new DynamicPublishImageAdapter.OnItemClickLister() {
@Override @Override
......
...@@ -357,11 +357,11 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView, ...@@ -357,11 +357,11 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
vpContent.setCurrentItem(2); vpContent.setCurrentItem(2);
} else if (view.getId() == R.id.publish_trend_btn) { } else if (view.getId() == R.id.publish_trend_btn) {
ActionCountUtils.Companion.count(YDL_USER_ASK_QUESTIONS_BUTTON_CLICK); ActionCountUtils.Companion.count(YDL_USER_ASK_QUESTIONS_BUTTON_CLICK);
trendsAndQuestionDialog = new TrendsAndQuestionDialog(requireContext(), new TrendsQuestionListener() { if (DynamicIn.INSTANCE.loginByOneKeyLogin(getActivity(), true)) {
@Override trendsAndQuestionDialog = new TrendsAndQuestionDialog(requireContext(), new TrendsQuestionListener() {
public void publishTrends() { @Override
//发布动态 public void publishTrends() {
if (DynamicIn.INSTANCE.loginByOneKeyLogin(getActivity(), true)) { //发布动态
Intent intent = new Intent(getActivity().getApplicationContext(), PublishTrendActivity.class); Intent intent = new Intent(getActivity().getApplicationContext(), PublishTrendActivity.class);
//默认改为今日打卡 //默认改为今日打卡
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
...@@ -372,12 +372,10 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView, ...@@ -372,12 +372,10 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
startActivity(intent); startActivity(intent);
// PublishTrendActivityTrends.Companion.start(requireContext(),"44","今日打卡"); // PublishTrendActivityTrends.Companion.start(requireContext(),"44","今日打卡");
} }
}
@Override @Override
public void publishQuestion() { public void publishQuestion() {
//发布问题 //发布问题
if (DynamicIn.INSTANCE.loginByOneKeyLogin(getActivity(), true)) {
Intent intent = new Intent(getActivity().getApplicationContext(), PublishTrendActivity.class); Intent intent = new Intent(getActivity().getApplicationContext(), PublishTrendActivity.class);
//默认改为今日打卡 //默认改为今日打卡
Bundle bundle = new Bundle(); Bundle bundle = new Bundle();
...@@ -387,10 +385,9 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView, ...@@ -387,10 +385,9 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
intent.putExtra("bundle", bundle); intent.putExtra("bundle", bundle);
startActivity(intent); startActivity(intent);
} }
} });
}); trendsAndQuestionDialog.show();
trendsAndQuestionDialog.show(); }
} else if (view.getId() == R.id.trends_tv_mind_more) { } else if (view.getId() == R.id.trends_tv_mind_more) {
ActionCountUtils.Companion.count(YDL_USER_THOUGHTS_GROUP_MORE_CLICK); ActionCountUtils.Companion.count(YDL_USER_THOUGHTS_GROUP_MORE_CLICK);
Intent intent = new Intent(getActivity(), AllTopicActivity.class); Intent intent = new Intent(getActivity(), AllTopicActivity.class);
......
...@@ -33,137 +33,138 @@ ...@@ -33,137 +33,138 @@
android:textColorHint="#bfbfbf" android:textColorHint="#bfbfbf"
android:textSize="24sp" android:textSize="24sp"
tools:text="标题:说说你的标题:说说你的标题:说说你的困惑标题:说说你的困标题:说说你的困惑标题:说说你的困惑困惑标题:说说你的困惑" /> tools:text="标题:说说你的标题:说说你的标题:说说你的困惑标题:说说你的困标题:说说你的困惑标题:说说你的困惑困惑标题:说说你的困惑" />
<RelativeLayout <androidx.core.widget.NestedScrollView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:orientation="vertical" android:paddingBottom="50dp"
android:layout_below="@id/publish_trend_title_editext" >
> <RelativeLayout
android:layout_width="match_parent"
<EditText android:layout_height="wrap_content"
android:id="@+id/publish_trend_content_editext" android:orientation="vertical"
android:layout_width="match_parent" android:layout_below="@id/publish_trend_title_editext"
android:layout_height="wrap_content" >
android:background="@color/dynamic_white"
android:focusable="true" <EditText
android:focusableInTouchMode="true" android:id="@+id/publish_trend_content_editext"
android:gravity="left|top" android:layout_width="match_parent"
android:hint="1、清晰描述事情的背景及经过\n2、你想寻求哪方面的帮助\n这样更容易获得咨询师准确、专业的解答哦~" android:layout_height="wrap_content"
android:includeFontPadding="false" android:background="@color/dynamic_white"
android:minLines="6" android:focusable="true"
android:padding="15dp" android:focusableInTouchMode="true"
android:paddingLeft="15dp" android:gravity="left|top"
android:textColor="@color/dynamic_text_trend_title_black" android:hint="1、清晰描述事情的背景及经过\n2、你想寻求哪方面的帮助\n这样更容易获得咨询师准确、专业的解答哦~"
android:textColorHint="#bfbfbf" android:includeFontPadding="false"
android:textSize="17sp" /> android:minLines="6"
<androidx.recyclerview.widget.RecyclerView android:padding="15dp"
android:id="@+id/publish_trend_img_rcv" android:paddingLeft="15dp"
android:layout_width="match_parent" android:textColor="@color/dynamic_text_trend_title_black"
android:layout_height="wrap_content" android:textColorHint="#bfbfbf"
android:layout_below="@+id/publish_trend_content_editext" android:textSize="17sp" />
android:layout_marginTop="16dp" <androidx.recyclerview.widget.RecyclerView
android:paddingLeft="@dimen/platform_dp_12" android:id="@+id/publish_trend_img_rcv"
android:paddingRight="@dimen/platform_dp_12" android:layout_width="match_parent"
android:visibility="gone" /> android:layout_height="wrap_content"
<RelativeLayout android:layout_below="@+id/publish_trend_content_editext"
android:layout_width="match_parent" android:layout_marginTop="16dp"
android:layout_height="wrap_content" android:paddingLeft="@dimen/platform_dp_12"
android:layout_below="@+id/publish_trend_img_rcv" android:paddingRight="@dimen/platform_dp_12"
android:layout_margin="15dp"> android:visibility="gone" />
<RelativeLayout
<TextView android:layout_width="match_parent"
android:id="@+id/publish_trend_bottom_topic_tv" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_below="@+id/publish_trend_img_rcv"
android:layout_height="24dp" android:layout_margin="15dp">
android:background="@drawable/dynamic_bg_topic"
android:gravity="center_vertical" <TextView
android:paddingLeft="10dp" android:id="@+id/publish_trend_bottom_topic_tv"
android:paddingRight="10dp" android:layout_width="wrap_content"
android:text="# 选择话题" android:layout_height="24dp"
android:textColor="#999999" android:background="@drawable/dynamic_bg_topic"
android:textSize="11sp" /> android:gravity="center_vertical"
android:paddingLeft="10dp"
<TextView android:paddingRight="10dp"
android:id="@+id/publish_trend_content_num_tv" android:text="# 选择话题"
android:layout_width="wrap_content" android:textColor="#999999"
android:layout_height="24dp" android:textSize="11sp" />
android:layout_alignParentRight="true"
android:layout_marginRight="15dp" <TextView
android:gravity="center_vertical" android:id="@+id/publish_trend_content_num_tv"
android:includeFontPadding="false" android:layout_width="wrap_content"
android:text="0/1000" android:layout_height="24dp"
android:textColor="#b8b8b8" android:layout_alignParentRight="true"
android:textSize="11sp" /> android:layout_marginRight="15dp"
android:gravity="center_vertical"
<View android:includeFontPadding="false"
android:id="@+id/line" android:text="0/1000"
android:layout_width="match_parent" android:textColor="#b8b8b8"
android:layout_height="1dp" android:textSize="11sp" />
android:layout_below="@+id/publish_trend_content_num_tv"
android:layout_marginTop="15dp" <View
android:background="@color/platform_new_divide_color" /> android:id="@+id/line"
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@+id/publish_trend_content_num_tv"
android:layout_marginTop="15dp"
<androidx.cardview.widget.CardView android:background="@color/platform_new_divide_color" />
android:layout_width="match_parent"
android:layout_height="wrap_content" <androidx.cardview.widget.CardView
android:layout_below="@+id/line" android:layout_width="match_parent"
android:layout_marginLeft="1dp" android:layout_height="wrap_content"
android:layout_marginTop="15dp" android:layout_below="@+id/line"
android:layout_marginRight="1dp" android:layout_marginLeft="1dp"
android:layout_marginBottom="@dimen/platform_dp_1" android:layout_marginTop="15dp"
android:elevation="1dp" android:layout_marginRight="1dp"
app:cardCornerRadius="6dp"> android:layout_marginBottom="@dimen/platform_dp_1"
android:elevation="1dp"
<RelativeLayout app:cardCornerRadius="6dp">
android:id="@+id/publish_trend_ad_rel"
android:layout_width="match_parent" <RelativeLayout
android:layout_height="60dp" android:id="@+id/publish_trend_ad_rel"
android:background="@color/platform_color_F7F7F7" android:layout_width="match_parent"
android:visibility="gone" android:layout_height="60dp"
tools:visibility="visible"> android:background="@color/platform_color_F7F7F7"
android:visibility="gone"
<ImageView tools:visibility="visible">
android:id="@+id/publish_trend_ad_iv"
android:layout_width="60dp" <ImageView
android:layout_height="60dp" android:id="@+id/publish_trend_ad_iv"
android:layout_centerVertical="true" android:layout_width="60dp"
android:scaleType="fitXY" android:layout_height="60dp"
android:src="@drawable/dynamic_default_img" /> android:layout_centerVertical="true"
android:scaleType="fitXY"
<ImageView android:src="@drawable/dynamic_default_img" />
android:id="@+id/iv_fm"
android:layout_width="wrap_content" <ImageView
android:layout_height="wrap_content" android:id="@+id/iv_fm"
android:layout_centerVertical="true" android:layout_width="wrap_content"
android:layout_marginLeft="18dp" android:layout_height="wrap_content"
android:src="@drawable/dynamic_img_trend_fm_play" android:layout_centerVertical="true"
android:visibility="gone" android:layout_marginLeft="18dp"
tools:visibility="visible" /> android:src="@drawable/dynamic_img_trend_fm_play"
android:visibility="gone"
<TextView tools:visibility="visible" />
android:id="@+id/publish_trend_ad_tv"
android:layout_width="match_parent" <TextView
android:layout_height="wrap_content" android:id="@+id/publish_trend_ad_tv"
android:layout_centerVertical="true" android:layout_width="match_parent"
android:layout_marginLeft="15dp" android:layout_height="wrap_content"
android:layout_marginRight="15dp" android:layout_centerVertical="true"
android:layout_toRightOf="@+id/publish_trend_ad_iv" android:layout_marginLeft="15dp"
android:maxLines="2" android:layout_marginRight="15dp"
android:text="测测你的童年阴影" android:layout_toRightOf="@+id/publish_trend_ad_iv"
android:textColor="#333" android:maxLines="2"
android:textSize="15sp" /> android:text="测测你的童年阴影"
</RelativeLayout> android:textColor="#333"
</androidx.cardview.widget.CardView> android:textSize="15sp" />
</RelativeLayout>
</androidx.cardview.widget.CardView>
</RelativeLayout>
</RelativeLayout> </RelativeLayout>
</RelativeLayout>
</androidx.core.widget.NestedScrollView>
</RelativeLayout> </RelativeLayout>
<include <include
android:layout_width="match_parent" android:layout_width="match_parent"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment