Skip to content

Y
YDL-Component-Medical
Commit 0e15c16c by konghaorui
Options

动态资源重命名

parent 19b956db
Showing with 993 additions and 996 deletions
m-dynamic/src/main/java/com/yidianling/dynamic/activity/MyTrendsActivity.kt
......@@ -9,7 +9,7 @@ import com.ydl.ydlcommon.base.BaseActivity
import com.yidianling.dynamic.R
import com.yidianling.dynamic.router.DynamicIn
import com.yidianling.dynamic.trendList.TrendsListFragment
import kotlinx.android.synthetic.main.activity_mytrends.*
import kotlinx.android.synthetic.main.dynamic_activity_mytrends.*
import java.util.*
......@@ -34,7 +34,7 @@ class MyTrendsActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_mytrends)
setContentView(R.layout.dynamic_activity_mytrends)
ButterKnife.bind(this)
sendFragment = TrendsListFragment.newInstance(
......@@ -104,20 +104,20 @@ class MyTrendsActivity : BaseActivity() {
//切换标签选中状态
private fun changeLabel(position: Int, isChangeFragment: Boolean) {
if (position == 0) {
item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.title_green))
item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.dynamic_title_green))
item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.title_green))
item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_title_green))
item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.text_gray))
item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.white))
item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.dynamic_text_gray))
item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_white))
} else if (position == 1) {
item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.text_gray))
item_topic_detail_new_tv!!.setTextColor(resources.getColor(R.color.dynamic_text_gray))
item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.white))
item_topic_detail_new_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_white))
item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.title_green))
item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.title_green))
item_topic_detail_hot_tv!!.setTextColor(resources.getColor(R.color.dynamic_title_green))
item_topic_detail_hot_hint_tv!!.setBackgroundColor(resources.getColor(R.color.dynamic_title_green))
}
if (isChangeFragment) {
......
m-dynamic/src/main/java/com/yidianling/dynamic/activity/TrendsReplyInfoActivity.kt
......@@ -32,7 +32,7 @@ import com.yidianling.dynamic.thank.ThankActivity
import com.yidianling.dynamic.trendsDetail.TrendsDetailActivity
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.activity_trends_reply_info.*
import kotlinx.android.synthetic.main.dynamic_activity_trends_reply_info.*
import java.util.*
/**
......@@ -53,7 +53,7 @@ class TrendsReplyInfoActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_trends_reply_info)
setContentView(R.layout.dynamic_activity_trends_reply_info)
ButterKnife.bind(this)
val bundle = intent.getBundleExtra(YDLConstants.BUNDLE)
......@@ -80,7 +80,7 @@ class TrendsReplyInfoActivity : BaseActivity() {
val colors = resources.getIntArray(R.array.ydl_colors)
header!!.setColorSchemeColors(colors)
header!!.layoutParams = PtrFrameLayout.LayoutParams(-1, -2)
val padding = resources.getDimension(R.dimen.default_dis_size).toInt()
val padding = resources.getDimension(R.dimen.dynamic_default_dis_size).toInt()
header!!.setPadding(0, padding, 0, padding)
header!!.setPtrFrameLayout(store_house_ptr_frame)
store_house_ptr_frame!!.headerView = header
......@@ -102,7 +102,7 @@ class TrendsReplyInfoActivity : BaseActivity() {
recy_ico_list!!.layoutManager =
LinearLayoutManager(this, LinearLayoutManager.HORIZONTAL, false)
icoAdapter = object :
BaseRecyclerAdapter<TrendsInfoBean.ZanImg>(this, ArrayList(), R.layout.item_circleimg) {
BaseRecyclerAdapter<TrendsInfoBean.ZanImg>(this, ArrayList(), R.layout.dynamic_item_circleimg) {
override fun convert(
mContext: Context,
holder: BaseViewHolder,
......@@ -111,12 +111,12 @@ class TrendsReplyInfoActivity : BaseActivity() {
) {
val img = holder.getView<ImageView>(R.id.img_ico)
if (position == 7) {
GlideApp.with(mContext).load(R.drawable.newsfeed_zan_more).into(img)
GlideApp.with(mContext).load(R.drawable.dynamic_newsfeed_zan_more).into(img)
} else if (position > 7) {
} else {
GlideApp.with(mContext).load(bean.head)
.error(resources.getDrawable(R.drawable.head_place_hold_pic)).into(img)
.error(resources.getDrawable(R.drawable.dynamic_head_place_hold_pic)).into(img)
}
img.setOnClickListener {
//点击头像进入会员主页
......@@ -227,7 +227,7 @@ class TrendsReplyInfoActivity : BaseActivity() {
}
GlideApp.with(this).load(bean.info.header).circleCrop()
.error(R.drawable.head_place_hold_pic).into(item_recommend_trend_user_head!!)
.error(R.drawable.dynamic_head_place_hold_pic).into(item_recommend_trend_user_head!!)
// if (bean.getInfo().getgetGender() == 1) {
// //男
// Glide.with(this).load(R.mipmap.male).into(imgSex);
......@@ -276,7 +276,7 @@ class TrendsReplyInfoActivity : BaseActivity() {
GlideApp.with(this).load(infoBean!!.comment.header).circleCrop()
.into(item_recommend_trend_user_head_iv!!)
text_reply_userName!!.text = infoBean!!.comment.name
comment_sex_iv!!.setImageResource(if (infoBean!!.comment.gender == 1) R.drawable.male else R.drawable.female)
comment_sex_iv!!.setImageResource(if (infoBean!!.comment.gender == 1) R.drawable.dynamic_male else R.drawable.dynamic_female)
text_reply_time!!.text = infoBean!!.comment.time_str
// textCommentContent.setText(infoBean.getComment().getContent());
MoonUtil.identifyFaceExpression(
......@@ -288,9 +288,9 @@ class TrendsReplyInfoActivity : BaseActivity() {
//是否已赞
if (infoBean!!.comment.is_zan == 1) {
//已赞
img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.reply_zan_sel))
img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.dynamic_reply_zan_sel))
} else {
img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.reply_zan))
img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.dynamic_reply_zan))
}
}
}
......@@ -346,10 +346,10 @@ class TrendsReplyInfoActivity : BaseActivity() {
//评论点赞成功
if (infoBean!!.comment.is_zan == 1) {
infoBean!!.comment.is_zan = 2
img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.reply_zan))
img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.dynamic_reply_zan))
} else {
infoBean!!.comment.is_zan = 1
img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.reply_zan_sel))
img_comment_zan!!.setImageDrawable(resources.getDrawable(R.drawable.dynamic_reply_zan_sel))
}
}
} else {
......
m-dynamic/src/main/java/com/yidianling/dynamic/adapter/AllTopicAdapter.java
......@@ -53,7 +53,7 @@ public class AllTopicAdapter extends RecyclerView.Adapter<AllTopicViewHolder> {
@Override
public AllTopicViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view= mInflater.inflate(R.layout.item_alltopic,parent,false);
View view= mInflater.inflate(R.layout.dynamic_item_alltopic,parent,false);
AllTopicViewHolder viewHolder= new AllTopicViewHolder(view);
return viewHolder;
}
......@@ -68,8 +68,8 @@ public class AllTopicAdapter extends RecyclerView.Adapter<AllTopicViewHolder> {
String focus_state=recommendTopic.getFocus_state();
GlideApp.with(mContext)
.load(img_url)
.placeholder(R.drawable.default_img)
.error(R.drawable.default_img)
.placeholder(R.drawable.dynamic_default_img)
.error(R.drawable.dynamic_default_img)
.into(holder.item_topic_iv);
holder.item_topic_title_tv.setText(topic_title);
holder.item_topic_trend_num_tv.setText(String.format("动态 %s", trend_num));
......
m-dynamic/src/main/java/com/yidianling/dynamic/adapter/DialogListAdapter.java
......@@ -41,7 +41,7 @@ public class DialogListAdapter extends RecyclerView.Adapter<DialogListViewHolder
@Override
public DialogListViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view= mInflater.inflate(R.layout.item_dialog_list,parent,false);
View view= mInflater.inflate(R.layout.dynamic_item_dialog_list,parent,false);
DialogListViewHolder viewHolder= new DialogListViewHolder(view);
return viewHolder;
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/adapter/PublishTrendImgAdapter.java
......@@ -70,7 +70,7 @@ public class PublishTrendImgAdapter extends RecyclerView.Adapter<PublishTrendImg
@Override
public PublishTrendImgViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = null;
view = mInflater.inflate(R.layout.item_publish_trend_img, parent, false);
view = mInflater.inflate(R.layout.dynamic_item_publish_trend_img, parent, false);
PublishTrendImgViewHolder viewHolder = new PublishTrendImgViewHolder(view);
return viewHolder;
}
......@@ -90,7 +90,7 @@ public class PublishTrendImgAdapter extends RecyclerView.Adapter<PublishTrendImg
holder.item_publish_iv.setVisibility(View.VISIBLE);
GlideApp.with(mContext)
.load(path)
.error(R.drawable.default_img)
.error(R.drawable.dynamic_default_img)
.transform(new GlideRoundTransform(mContext, 6))
// .centerCrop()
.into(holder.item_publish_iv);
......
m-dynamic/src/main/java/com/yidianling/dynamic/adapter/RecommendDicussAdapter.java
......@@ -40,7 +40,7 @@ public class RecommendDicussAdapter extends RecyclerView.Adapter<RecommendDicuss
@Override
public RecommendDicussViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view= mInflater.inflate(R.layout.item_discuss_list,parent,false);
View view= mInflater.inflate(R.layout.dynamic_item_discuss_list,parent,false);
RecommendDicussViewHolder viewHolder= new RecommendDicussViewHolder(view);
return viewHolder;
}
......@@ -54,7 +54,7 @@ public class RecommendDicussAdapter extends RecyclerView.Adapter<RecommendDicuss
String content=reconmmendDicuss.getContent();
// holder.discuss_tv.setText(content);
MoonUtil.SetDicuss(mContext,holder.discuss_tv,content,user_name,R.color.default_text_color,reply_user_name, ImageSpan.ALIGN_BOTTOM);
MoonUtil.SetDicuss(mContext,holder.discuss_tv,content,user_name,R.color.dynamic_default_text_color,reply_user_name, ImageSpan.ALIGN_BOTTOM);
setUpItemEvent(holder);
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/adapter/RecommendTopicAdapter.java
......@@ -42,7 +42,7 @@ public class RecommendTopicAdapter extends RecyclerView.Adapter<RecommendTopicVi
@Override
public RecommendTopicViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view= mInflater.inflate(R.layout.item_recommend_topic,parent,false);
View view= mInflater.inflate(R.layout.dynamic_item_recommend_topic,parent,false);
RecommendTopicViewHolder viewHolder= new RecommendTopicViewHolder(view);
return viewHolder;
}
......@@ -55,7 +55,7 @@ public class RecommendTopicAdapter extends RecyclerView.Adapter<RecommendTopicVi
String topic_title=recommendTopic.getTopic_title();
GlideApp.with(mContext)
.load(img_url)
.error(R.drawable.default_img)
.error(R.drawable.dynamic_default_img)
.transform(new CropSquareTransformation(mContext))//裁剪正方形
.override(270, 150)
.centerCrop()
......
m-dynamic/src/main/java/com/yidianling/dynamic/adapter/RecommendTrendAdapter.java
......@@ -121,21 +121,21 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
RecyclerView.ViewHolder holder = null;
switch (viewType) {
case TYPE_ONE:
view = mInflater.inflate(R.layout.item_recommend_trend, parent, false);
view = mInflater.inflate(R.layout.dynamic_item_recommend_trend, parent, false);
holder = new RecommendTrendViewHolder(view);
break;
case TYPE_TWO:
view = mInflater.inflate(R.layout.item_recommend_trend_ad, parent, false);
view = mInflater.inflate(R.layout.dynamic_item_recommend_trend_ad, parent, false);
holder = new RecommendTrendAdViewHolder(view);
break;
case TYPE_LODE_MORE:
view = mInflater.inflate(R.layout.item_trend_load_more, parent, false);
view = mInflater.inflate(R.layout.dynamic_item_trend_load_more, parent, false);
holder = new TrendLoadMoreViewHolder(view);
break;
case TYPE_THREE://广告
view = mInflater.inflate(R.layout.item_recommend_trend_ad2, parent, false);
view = mInflater.inflate(R.layout.dynamic_item_recommend_trend_ad2, parent, false);
holder = new RecommendTrendAdViewHolder2(view);
break;
}
......@@ -184,7 +184,7 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
recommendedDiscusses = recommendedTrend.getTrednDiscuss();
int DiscussNum = recommendedTrend.getDiscussNum();
if ("2".equals(up_flag)) {
holderOne.trend_title_tv.setText(Utils.textValueOf(R.drawable.newsfeed_icon_zhiding, trend_title));
holderOne.trend_title_tv.setText(Utils.textValueOf(R.drawable.dynamic_newsfeed_icon_zhiding, trend_title));
} else {
holderOne.trend_title_tv.setText(trend_title);
}
......@@ -195,17 +195,17 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
GlideApp.with(mContext)
.load(user_head)
.circleCrop()
.placeholder(R.drawable.head_place_hold_pic)
.error(R.drawable.head_place_hold_pic)
.placeholder(R.drawable.dynamic_head_place_hold_pic)
.error(R.drawable.dynamic_head_place_hold_pic)
.into(holderOne.user_head_iv);
} catch (Exception e) {
e.printStackTrace();
}
if ("1".equals(user_gender)) {
holderOne.user_gender_iv.setImageResource(R.drawable.male);
holderOne.user_gender_iv.setImageResource(R.drawable.dynamic_male);
} else if ("2".equals(user_gender)) {
holderOne.user_gender_iv.setImageResource(R.drawable.female);
holderOne.user_gender_iv.setImageResource(R.drawable.dynamic_female);
}
holderOne.time_tv.setText(time);
......@@ -235,10 +235,10 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
if ("1".equals(is_zan)) {//赞
holderOne.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.newsfeed_like_sel));
holderOne.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.dynamic_newsfeed_like_sel));
// holderOne.text_zan_num.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(mContext,R.mipmap.newsfeed_like_sel),null,null,null);
} else {//未赞
holderOne.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.newsfeed_like));
holderOne.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.dynamic_newsfeed_like));
// holderOne.text_zan_num.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(mContext,R.mipmap.newsfeed_like),null,null,null);
}
......@@ -318,7 +318,7 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
dicussAdapter = new RecommendDicussAdapter(recommendedDiscusses2, mContext);
int DiscussNum1 = recommendedTrend.getDiscussNum();
if ("2".equals(up_flag)) {
holdertwo.trend_title_tv.setText(Utils.textValueOf(R.drawable.newsfeed_icon_zhiding, trend_title));
holdertwo.trend_title_tv.setText(Utils.textValueOf(R.drawable.dynamic_newsfeed_icon_zhiding, trend_title));
} else {
holdertwo.trend_title_tv.setText(trend_title);
}
......@@ -328,14 +328,14 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
GlideApp.with(mContext)
.load(user_head)
.circleCrop()
.placeholder(R.drawable.default_img)
.error(R.drawable.default_img)
.placeholder(R.drawable.dynamic_default_img)
.error(R.drawable.dynamic_default_img)
.into(holdertwo.user_head_iv);
if ("1".equals(user_gender)) {
holdertwo.user_gender_iv.setImageResource(R.drawable.male);
holdertwo.user_gender_iv.setImageResource(R.drawable.dynamic_male);
} else if ("2".equals(user_gender)) {
holdertwo.user_gender_iv.setImageResource(R.drawable.female);
holdertwo.user_gender_iv.setImageResource(R.drawable.dynamic_female);
}
holdertwo.time_tv.setText(time);
......@@ -361,10 +361,10 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
}
if ("1".equals(is_zan)) {//赞
holdertwo.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.newsfeed_like_sel));
holdertwo.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.dynamic_newsfeed_like_sel));
// holdertwo.text_zan_num.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(mContext,R.mipmap.newsfeed_like_sel),null,null,null);
} else {//未赞
holdertwo.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.newsfeed_like));
holdertwo.item_recommend_trend_zan_iv.setImageDrawable(ContextCompat.getDrawable(mContext, R.drawable.dynamic_newsfeed_like));
// holdertwo.text_zan_num.setCompoundDrawablesWithIntrinsicBounds(ContextCompat.getDrawable(mContext,R.mipmap.newsfeed_like),null,null,null);
}
//评论
......@@ -391,8 +391,8 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
GlideApp.with(mContext)
.load(ad_img)
.placeholder(R.drawable.default_img)
.error(R.drawable.default_img)
.placeholder(R.drawable.dynamic_default_img)
.error(R.drawable.dynamic_default_img)
.into(holdertwo.trend_ad_iv);
holdertwo.trend_ad_tv.setText(jump_title);
......@@ -415,14 +415,14 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
GlideApp.with(mContext)
.load(user_head)
.circleCrop()
.placeholder(R.drawable.head_place_hold_pic)
.error(R.drawable.head_place_hold_pic)
.placeholder(R.drawable.dynamic_head_place_hold_pic)
.error(R.drawable.dynamic_head_place_hold_pic)
.into(holderThree.itemRecommendTrendUserHeadIv);
if ("1".equals(user_gender)) {
holderThree.itemRecommendTrendUserGenderIv.setImageResource(R.drawable.male);
holderThree.itemRecommendTrendUserGenderIv.setImageResource(R.drawable.dynamic_male);
} else if ("2".equals(user_gender)) {
holderThree.itemRecommendTrendUserGenderIv.setImageResource(R.drawable.female);
holderThree.itemRecommendTrendUserGenderIv.setImageResource(R.drawable.dynamic_female);
}
holderThree.itemRecommendTrendTimeTv.setText(time);
......@@ -436,7 +436,7 @@ public class RecommendTrendAdapter extends RecyclerView.Adapter<RecyclerView.Vie
holderThree.itemRecommendTrendReadedTv.setText(read_num);
GlideApp.with(mContext)
.load(recommendedTrend.getAdImg())
.placeholder(R.drawable.default_img)
.placeholder(R.drawable.dynamic_default_img)
.into(holderThree.ivAdImg);
holderThree.itemView.setOnClickListener(v -> {
H5Params params = new H5Params(recommendedTrend.getUrl(), null, recommendedTrend.getShare());
......
m-dynamic/src/main/java/com/yidianling/dynamic/adapter/RecommendTrendImgAdapter.java
......@@ -49,7 +49,7 @@ public class RecommendTrendImgAdapter extends RecyclerView.Adapter<RecommendTren
@Override
public RecommendTrendImgViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view=null;
view=mInflater.inflate(R.layout.item_recommend_trend_img,parent,false);
view=mInflater.inflate(R.layout.dynamic_item_recommend_trend_img,parent,false);
RecommendTrendImgViewHolder viewHolder= new RecommendTrendImgViewHolder(view);
return viewHolder;
}
......@@ -63,7 +63,7 @@ public class RecommendTrendImgAdapter extends RecyclerView.Adapter<RecommendTren
GlideApp.with(mContext)
.load(img_url)
// .override(width,width)
.error(R.drawable.default_img)
.error(R.drawable.dynamic_default_img)
.centerCrop()
// .bitmapTransform(new CropSquareTransformation(mContext))//裁剪正方形
.into(holder.trend_img1);
......
m-dynamic/src/main/java/com/yidianling/dynamic/adapter/SelectTopicAdapter.java
......@@ -40,7 +40,7 @@ public class SelectTopicAdapter extends RecyclerView.Adapter<SelectTopiViewHolde
@Override
public SelectTopiViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view= mInflater.inflate(R.layout.item_select_topic,parent,false);
View view= mInflater.inflate(R.layout.dynamic_item_select_topic,parent,false);
SelectTopiViewHolder viewHolder= new SelectTopiViewHolder(view);
return viewHolder;
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/adapter/TopicDetailMemberAdapter.java
......@@ -93,7 +93,7 @@ public class TopicDetailMemberAdapter extends RecyclerView.Adapter<TopicDetailMe
@Override
public TopicDetailMemberViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = null;
view = mInflater.inflate(R.layout.item_topicdetail_member_head, parent, false);
view = mInflater.inflate(R.layout.dynamic_item_topicdetail_member_head, parent, false);
TopicDetailMemberViewHolder viewHolder = new TopicDetailMemberViewHolder(view);
return viewHolder;
}
......@@ -104,10 +104,10 @@ public class TopicDetailMemberAdapter extends RecyclerView.Adapter<TopicDetailMe
String img_url = topicDetailMemberHead.head;
GlideApp.with(mContext)
.load(img_url)
.error(R.drawable.head_place_hold_pic)
.error(R.drawable.dynamic_head_place_hold_pic)
.circleCrop()
.placeholder(R.drawable.head_place_hold_pic)
.error(R.drawable.head_place_hold_pic)
.placeholder(R.drawable.dynamic_head_place_hold_pic)
.error(R.drawable.dynamic_head_place_hold_pic)
.into(holder.item_topic_member_head_iv);
setUpItemEvent(holder);
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/common/browsePictures/BrowsePicturesActivity.java
......@@ -66,7 +66,7 @@ public class BrowsePicturesActivity extends BaseActivity implements ViewPager.On
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_browse_pictures);
setContentView(R.layout.dynamic_activity_browse_pictures);
browse_pictures_vp = (ViewPager) findViewById(R.id.browse_pictures_vp);
back_iv = (ImageView) findViewById(R.id.browse_pictures_back_iv);
title_tv = (TextView) findViewById(R.id.browse_pictures_num_tv);
......@@ -316,7 +316,7 @@ public class BrowsePicturesActivity extends BaseActivity implements ViewPager.On
public Object instantiateItem(View container, int position) {
GlideApp.with(mContext)
.load(mImages.get(position).getImage_url())
.error(R.drawable.default_img)
.error(R.drawable.dynamic_default_img)
.into(mDatas.get(position));
mDatas.get(position).setOnPhotoTapListener(new PhotoViewAttacher.OnPhotoTapListener() {
@Override
......
m-dynamic/src/main/java/com/yidianling/dynamic/common/browsePictures/BrowsePicturesActivity2.java
......@@ -56,7 +56,7 @@ public class BrowsePicturesActivity2 extends BaseActivity implements ViewPager.O
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_browse_pictures);
setContentView(R.layout.dynamic_activity_browse_pictures);
browse_pictures_vp=(ViewPager) findViewById(R.id.browse_pictures_vp);
back_iv=(ImageView)findViewById(R.id.browse_pictures_back_iv);
title_tv=(TextView)findViewById(R.id.browse_pictures_num_tv);
......@@ -255,7 +255,7 @@ public class BrowsePicturesActivity2 extends BaseActivity implements ViewPager.O
public Object instantiateItem(View container, int position) {
GlideApp.with(mContext)
.load(mImages.get(position))
.error(R.drawable.default_img)
.error(R.drawable.dynamic_default_img)
.into(mDatas.get(position));
mDatas.get(position).setOnPhotoTapListener(new PhotoViewAttacher.OnPhotoTapListener() {
@Override
......
m-dynamic/src/main/java/com/yidianling/dynamic/common/emoji/EmojiAdapter.java
......@@ -39,12 +39,12 @@ public class EmojiAdapter extends BaseAdapter {
@SuppressLint({ "ViewHolder", "InflateParams" })
public View getView(int position, View convertView, ViewGroup parent) {
convertView = LayoutInflater.from(context).inflate(R.layout.nim_emoji_item, null);
convertView = LayoutInflater.from(context).inflate(R.layout.dynamic_nim_emoji_item, null);
ImageView emojiThumb = (ImageView) convertView.findViewById(R.id.imgEmoji);
int count = EmojiManager.getDisplayCount();
int index = startIndex + position;
if (position == EmoticonView.EMOJI_PER_PAGE || index == count) {
emojiThumb.setBackgroundResource(R.drawable.nim_emoji_del);
emojiThumb.setBackgroundResource(R.drawable.dynamic_nim_emoji_del);
} else if (index < count) {
emojiThumb.setBackgroundDrawable(EmojiManager.getDisplayDrawable(context, index));
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/common/emoji/EmoticonPickerView.java
......@@ -76,7 +76,7 @@ public class EmoticonPickerView extends LinearLayout implements IEmoticonCategor
this.uiHandler = new Handler(context.getMainLooper());
LayoutInflater inflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
inflater.inflate(R.layout.nim_emoji_layout, this);
inflater.inflate(R.layout.dynamic_nim_emoji_layout, this);
}
@Override
......@@ -140,8 +140,8 @@ public class EmoticonPickerView extends LinearLayout implements IEmoticonCategor
// emoji表情
CheckedImageButton btn = addEmoticonTabBtn(index++, tabCheckListener);
btn.setNormalImageId(R.drawable.nim_emoji_icon_inactive);
btn.setCheckedImageId(R.drawable.nim_emoji_icon);
btn.setNormalImageId(R.drawable.dynamic_nim_emoji_icon_inactive);
btn.setCheckedImageId(R.drawable.dynamic_nim_emoji_icon);
// 贴图
List<StickerCategory> categories = manager.getCategories();
......@@ -154,8 +154,8 @@ public class EmoticonPickerView extends LinearLayout implements IEmoticonCategor
private CheckedImageButton addEmoticonTabBtn(int index, OnClickListener listener) {
CheckedImageButton emotBtn = new CheckedImageButton(context);
emotBtn.setNormalBkResId(R.drawable.nim_sticker_button_background_normal_layer_list);
emotBtn.setCheckedBkResId(R.drawable.nim_sticker_button_background_pressed_layer_list);
emotBtn.setNormalBkResId(R.drawable.dynamic_nim_sticker_button_background_normal_layer_list);
emotBtn.setCheckedBkResId(R.drawable.dynamic_nim_sticker_button_background_pressed_layer_list);
emotBtn.setId(index);
emotBtn.setOnClickListener(listener);
emotBtn.setScaleType(ImageView.ScaleType.FIT_CENTER);
......
m-dynamic/src/main/java/com/yidianling/dynamic/common/emoji/EmoticonView.java
......@@ -140,7 +140,7 @@ public class EmoticonView {
imgCur = (ImageView) pageNumberLayout.getChildAt(i);
} else {
imgCur = new ImageView(context);
imgCur.setBackgroundResource(R.drawable.nim_view_pager_indicator_selector);
imgCur.setBackgroundResource(R.drawable.dynamic_nim_view_pager_indicator_selector);
pageNumberLayout.addView(imgCur);
}
}
......@@ -359,7 +359,7 @@ public class EmoticonView {
gridView.setHorizontalSpacing(5);
gridView.setVerticalSpacing(5);
gridView.setGravity(Gravity.CENTER);
gridView.setSelector(R.drawable.nim_emoji_item_selector);
gridView.setSelector(R.drawable.dynamic_nim_emoji_item_selector);
container.addView(gridView);
return gridView;
} else {
......@@ -371,7 +371,7 @@ public class EmoticonView {
gridView.setNumColumns(4);
gridView.setHorizontalSpacing(5);
gridView.setGravity(Gravity.CENTER);
gridView.setSelector(R.drawable.nim_emoji_item_selector);
gridView.setSelector(R.drawable.dynamic_nim_emoji_item_selector);
container.addView(gridView);
return gridView;
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/common/emoji/StickerAdapter.java
......@@ -45,7 +45,7 @@ public class StickerAdapter extends BaseAdapter {
public View getView(int position, View convertView, ViewGroup parent) {
StickerViewHolder viewHolder;
if (convertView == null) {
convertView = View.inflate(context, R.layout.nim_sticker_picker_view, null);
convertView = View.inflate(context, R.layout.dynamic_nim_sticker_picker_view, null);
viewHolder = new StickerViewHolder();
viewHolder.imageView = (ImageView) convertView.findViewById(R.id.sticker_thumb_image);
viewHolder.descLabel = (TextView) convertView.findViewById(R.id.sticker_desc_label);
......@@ -66,7 +66,7 @@ public class StickerAdapter extends BaseAdapter {
GlideApp.with(context)
.load(StickerManager.getInstance().getStickerUri(sticker.getCategory(), sticker.getName()))
.error(R.drawable.nim_default_img_failed)
.error(R.drawable.dynamic_nim_default_img_failed)
.dontAnimate()
.into(viewHolder.imageView);
......
m-dynamic/src/main/java/com/yidianling/dynamic/common/tool/GlideImageLoader.java
......@@ -26,8 +26,8 @@ public class GlideImageLoader implements ImageLoader {
private void showImage(Activity activity, String path, ImageView imageView, int width, int height){
SimpleImageOpConfiger sp = new SimpleImageOpConfiger();
sp.loadingPic = R.drawable.default_img;
sp.errorPic = R.drawable.default_img;
sp.loadingPic = R.drawable.dynamic_default_img;
sp.errorPic = R.drawable.dynamic_default_img;
sp.scaleType = ISimpleImageOpConfig.CENTER_CROP;
sp.isCacheOnDisk = false;
YDLImageCacheManager.showImage(activity,path,imageView,width, height,sp);
......
m-dynamic/src/main/java/com/yidianling/dynamic/common/view/LooperTextView.java
......@@ -80,7 +80,7 @@ public class LooperTextView extends FrameLayout {
}
private View newTextView(int status) {
View view = LayoutInflater.from(getContext()).inflate(R.layout.looper_item, null, false);
View view = LayoutInflater.from(getContext()).inflate(R.layout.dynamic_looper_item, null, false);
if (status == STATUS_IN) {
content_before_in = (TextView) view.findViewById(R.id.loop_content_before);
} else if (status == STATUS_OUT) {
......
m-dynamic/src/main/java/com/yidianling/dynamic/common/view/NineGridViewAdapter.java
......@@ -39,7 +39,7 @@ public abstract class NineGridViewAdapter implements Serializable {
protected ImageView generateImageView(Context context) {
NineGridViewWrapper imageView = new NineGridViewWrapper(context);
imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
imageView.setImageResource(R.drawable.ic_default_color);
imageView.setImageResource(R.drawable.dynamic_ic_default_color);
return imageView;
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/dialog/CancelFocusDialog.kt
......@@ -6,7 +6,7 @@ import android.os.Bundle
import android.view.WindowManager
import com.yidianling.dynamic.R
import com.yidianling.dynamic.dialog.listener.CancelFocusDialogListener
import kotlinx.android.synthetic.main.cancel_focus_dialog_layout.*
import kotlinx.android.synthetic.main.dynamic_cancel_focus_dialog_layout.*
/**
* Created by xj on 2019/9/25.
......@@ -16,7 +16,7 @@ class CancelFocusDialog(val mContext: Context, val listener: CancelFocusDialogLi
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.cancel_focus_dialog_layout)
setContentView(R.layout.dynamic_cancel_focus_dialog_layout)
val params = window.attributes
params.width = WindowManager.LayoutParams.MATCH_PARENT
......
m-dynamic/src/main/java/com/yidianling/dynamic/members/MemberFragment.java
......@@ -39,7 +39,7 @@ public class MemberFragment extends DynamicFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
view = this.getActivity().getLayoutInflater().inflate(R.layout.fragment_member, null);
view = this.getActivity().getLayoutInflater().inflate(R.layout.dynamic_fragment_member, null);
context = getActivity().getApplicationContext();
member_age_tv=(TextView)view.findViewById(R.id.member_age_tv);
member_emotional_state_tv=(TextView)view.findViewById(R.id.member_emotional_state_tv);
......
m-dynamic/src/main/java/com/yidianling/dynamic/members/MembersActivity.java
......@@ -117,7 +117,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_members);
setContentView(R.layout.dynamic_activity_members);
EventBus.getDefault().register(this);
// mem_id = getIntent().getStringExtra("user_id");
Bundle bundle = getIntent().getBundleExtra(YDLConstants.BUNDLE);
......@@ -182,7 +182,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
*/
private void initLoadMore() {
member_swrl.setOnRefreshListener(this);
member_swrl.setColorSchemeResources(R.color.google_green);
member_swrl.setColorSchemeResources(R.color.dynamic_google_green);
member_swrl.post(new Runnable() {
@Override
public void run() {
......@@ -248,19 +248,19 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
String bg = person.bg;
GlideApp.with(MembersActivity.this)
.load(head)
.error(R.drawable.head_place_hold_pic)
.error(R.drawable.dynamic_head_place_hold_pic)
.into(members_top_head_iv);
GlideApp.with(MembersActivity.this)
.load(bg)
.placeholder(R.drawable.default_img)
.error(R.drawable.default_img)
.placeholder(R.drawable.dynamic_default_img)
.error(R.drawable.dynamic_default_img)
.centerCrop()
.into(members_top_bg_iv);
members_top_user_tv.setText(name);
if ("1".equals(gender)) {//1男2女
members_top_user_gender_iv.setImageResource(R.drawable.male);
members_top_user_gender_iv.setImageResource(R.drawable.dynamic_male);
} else if ("2".equals(gender)) {
members_top_user_gender_iv.setImageResource(R.drawable.female);
members_top_user_gender_iv.setImageResource(R.drawable.dynamic_female);
}
members_top_user_visit_num_tv.setText("访客 " + visit_count);
members_top_user_fensi_num_tv.setText("粉丝 " + fans_count);
......@@ -268,18 +268,18 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
if (!"4".equals(focus_state)) {
members_top_user_focus_iv.setVisibility(View.VISIBLE);
if ("1".equals(is_black)) { //黑名单关系，1已加入黑名单，2未入黑名单
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.focused_topic_detail_bg);
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focused_topic_detail_bg);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, null, null);
members_top_user_focus_iv.setVisibility(View.GONE);
members_top_user_focus_ortion_tv.setText("已屏蔽");
shielding = true;
} else {
shielding = false;
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.focus_topic_detail_bg);
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
members_top_user_focus_iv.setVisibility(View.VISIBLE);
if ("1".equals(is_focused)) {//关注：1已关注，2未关注
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.has_focus_bg);
Drawable drawable = getResources().getDrawable(R.drawable.has_focus_down);
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_has_focus_bg);
Drawable drawable = getResources().getDrawable(R.drawable.dynamic_has_focus_down);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
members_top_user_focus_ortion_tv.setCompoundDrawablePadding(20);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, drawable, null);
......@@ -289,7 +289,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
members_top_user_focus_ortion_tv.setTextColor(Color.parseColor("#1DA1F2"));
focus_state = "1";
} else {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.focus_topic_detail_bg);
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, null, null);
members_top_user_focus_ortion_tv.setText("+ 关注");
members_top_user_focus_ortion_tv.setTextColor(Color.parseColor("#ffffff"));
......@@ -297,10 +297,10 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
}
if ("1".equals(is_zan)) {//1赞，2未赞
members_top_user_focus_iv.setImageResource(R.drawable.newsfeed_like_sel);
members_top_user_focus_iv.setImageResource(R.drawable.dynamic_newsfeed_like_sel);
zan_state = true;
} else {
members_top_user_focus_iv.setImageResource(R.drawable.newsfeed_like);
members_top_user_focus_iv.setImageResource(R.drawable.dynamic_newsfeed_like);
zan_state = false;
}
}
......@@ -393,7 +393,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
int zan_numi = Integer.valueOf(zan_count);
switch (resp.data.status) {
case 1: {
members_top_user_focus_iv.setImageResource(R.drawable.newsfeed_like_sel);
members_top_user_focus_iv.setImageResource(R.drawable.dynamic_newsfeed_like_sel);
ObjectAnimator animator1 = ObjectAnimator.ofFloat(members_top_user_focus_iv, "scaleX", 1f, 1.5f, 1f);
ObjectAnimator animator2 = ObjectAnimator.ofFloat(members_top_user_focus_iv, "scaleY", 1f, 1.5f, 1f);
AnimatorSet set = new AnimatorSet();
......@@ -406,7 +406,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
break;
}
case 2: {
members_top_user_focus_iv.setImageResource(R.drawable.newsfeed_like);
members_top_user_focus_iv.setImageResource(R.drawable.dynamic_newsfeed_like);
ObjectAnimator animator1 = ObjectAnimator.ofFloat(members_top_user_focus_iv, "scaleX", 1f, 1.5f, 1f);
ObjectAnimator animator2 = ObjectAnimator.ofFloat(members_top_user_focus_iv, "scaleY", 1f, 1.5f, 1f);
AnimatorSet set = new AnimatorSet();
......@@ -453,24 +453,24 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
int fans_counti = Integer.valueOf(fans_count);
String status = String.valueOf(resp.data.status);//1关注，2取消关注
if ("1".equals(status)) {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.has_focus_bg);
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_has_focus_bg);
fans_count = (fans_counti + 1) + "";
members_top_user_fensi_num_tv.setText("粉丝 " + fans_count);
focus_state = "1";
Drawable drawable = getResources().getDrawable(R.drawable.has_focus_down);
Drawable drawable = getResources().getDrawable(R.drawable.dynamic_has_focus_down);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
members_top_user_focus_ortion_tv.setCompoundDrawablePadding(20);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, drawable, null);
members_top_user_focus_ortion_tv.setText("已关注");
members_top_user_focus_ortion_tv.setTextColor(Color.parseColor("#1DA1F2"));
} else {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.focus_topic_detail_bg);
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
fans_count = (fans_counti - 1) + "";
members_top_user_fensi_num_tv.setText("粉丝 " + fans_count);
focus_state = "2";
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, null, null);
members_top_user_focus_ortion_tv.setText("+ 关注");
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.white));
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.dynamic_white));
}
} else {
String msg = resp.msg;
......@@ -495,7 +495,7 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
dialog_datas.add("解除屏蔽");
}
dialog_datas.add("举报");
int itemTextColor = getResources().getColor(R.color.black);
int itemTextColor = getResources().getColor(R.color.dynamic_black);
ListDialog.Builder builder1 = new ListDialog.Builder(MembersActivity.this, dialog_datas, itemTextColor);
builder1.SetLastStr("取消");
builder1.SetLastButton("取消", new DialogInterface.OnClickListener() {
......@@ -548,23 +548,23 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
.subscribe(resp -> {
members_top_user_focus_iv.setVisibility(View.VISIBLE);
if ("1".equals(focus_state)) {//关注：1已关注，2未关注
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.has_focus_bg);
Drawable drawable = getResources().getDrawable(R.drawable.has_focus_down);
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_has_focus_bg);
Drawable drawable = getResources().getDrawable(R.drawable.dynamic_has_focus_down);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());
members_top_user_focus_ortion_tv.setCompoundDrawablePadding(20);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, drawable, null);
members_top_user_focus_ortion_tv.setText("已关注");
members_top_user_focus_ortion_tv.setTextColor(Color.parseColor("#1DA1F2"));
} else {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.focus_topic_detail_bg);
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, null, null);
members_top_user_focus_ortion_tv.setText("+ 关注");
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.white));
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.dynamic_white));
}
if (zan_state == true) {//1赞，2未赞
members_top_user_focus_iv.setImageResource(R.drawable.newsfeed_like_sel);
members_top_user_focus_iv.setImageResource(R.drawable.dynamic_newsfeed_like_sel);
} else {
members_top_user_focus_iv.setImageResource(R.drawable.newsfeed_like);
members_top_user_focus_iv.setImageResource(R.drawable.dynamic_newsfeed_like);
}
members_top_user_focus_iv.setVisibility(View.VISIBLE);
shielding = false;
......@@ -617,11 +617,11 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
.compose(RxUtils.INSTANCE.resultData())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(resp -> {
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.focused_topic_detail_bg);
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focused_topic_detail_bg);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, null, null);
members_top_user_focus_iv.setVisibility(View.GONE);
members_top_user_focus_ortion_tv.setText("已屏蔽");
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.white));
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.dynamic_white));
ToastUtil.toastShort("已屏蔽");
BlackEvent changeEvent = new BlackEvent(true);
EventBus.getDefault().post(changeEvent);
......@@ -730,8 +730,8 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
hideFragments(transaction);
switch (index) {
case 0:
members_trend_tv.setTextColor(getResources().getColor(R.color.google_green));
members_trend_hint_tv.setBackgroundColor(getResources().getColor(R.color.google_green));
members_trend_tv.setTextColor(getResources().getColor(R.color.dynamic_google_green));
members_trend_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_google_green));
if (trendlisfragment == null) {
trendlisfragment = TrendListInFragment.newInstance("3", "0", "member_trend", mem_id);
......@@ -742,8 +742,8 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
select_tab = 0;
break;
case 1:
members_information_tv.setTextColor(getResources().getColor(R.color.google_green));
members_information_hint_tv.setBackgroundColor(getResources().getColor(R.color.google_green));
members_information_tv.setTextColor(getResources().getColor(R.color.dynamic_google_green));
members_information_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_google_green));
if (memberfragment == null) {
memberfragment = MemberFragment.newInstance(age, emotional_state, job, address, introduction);
transaction.add(R.id.members_content_frm, memberfragment);
......@@ -768,10 +768,10 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
}
private void resetText() {
members_trend_tv.setTextColor(getResources().getColor(R.color.text_gray));
members_trend_hint_tv.setBackgroundColor(getResources().getColor(R.color.white));
members_information_tv.setTextColor(getResources().getColor(R.color.text_gray));
members_information_hint_tv.setBackgroundColor(getResources().getColor(R.color.white));
members_trend_tv.setTextColor(getResources().getColor(R.color.dynamic_text_gray));
members_trend_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
members_information_tv.setTextColor(getResources().getColor(R.color.dynamic_text_gray));
members_information_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
}
@Override
......@@ -789,26 +789,26 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
}
if (scrollY <= 0) { //设置标题的背景颜色
members_title_top_tv.setTextColor(getResources().getColor(R.color.trend_transparent));
members_title_top_tv.setTextColor(getResources().getColor(R.color.dynamic_trend_transparent));
members_title_top_tv.setText("");
members_title_back_iv.setImageResource(R.drawable.titlebar_back2);
members_title_top_right_tv.setImageResource(R.drawable.more_green2);
members_title_rel.setBackgroundColor(getResources().getColor(R.color.trend_transparent));
// members_top_view.setBackgroundColor(getResources().getColor(R.color.trend_transparent));
members_title_back_iv.setImageResource(R.drawable.dynamic_titlebar_back2);
members_title_top_right_tv.setImageResource(R.drawable.dynamic_more_green2);
members_title_rel.setBackgroundColor(getResources().getColor(R.color.dynamic_trend_transparent));
// members_top_view.setBackgroundColor(getResources().getColor(R.color.dynamic_trend_transparent));
} else if (scrollY > 0 && scrollY <= height - 55) { //滑动距离小于banner图的高度时，设置背景和字体颜色颜色透明度渐变
members_title_top_tv.setTextColor(getResources().getColor(R.color.trend_transparent));
members_title_top_tv.setTextColor(getResources().getColor(R.color.dynamic_trend_transparent));
members_title_top_tv.setText("");
members_title_back_iv.setImageResource(R.drawable.titlebar_back2);
members_title_top_right_tv.setImageResource(R.drawable.more_green2);
// members_top_view.setBackgroundColor(getResources().getColor(R.color.trend_transparent));
members_title_rel.setBackgroundColor(getResources().getColor(R.color.trend_transparent));
members_title_back_iv.setImageResource(R.drawable.dynamic_titlebar_back2);
members_title_top_right_tv.setImageResource(R.drawable.dynamic_more_green2);
// members_top_view.setBackgroundColor(getResources().getColor(R.color.dynamic_trend_transparent));
members_title_rel.setBackgroundColor(getResources().getColor(R.color.dynamic_trend_transparent));
} else { //滑动到banner下面设置普通颜色
members_title_top_tv.setTextColor(getResources().getColor(R.color.black));
members_title_top_tv.setTextColor(getResources().getColor(R.color.dynamic_black));
members_title_top_tv.setText(name);
members_title_back_iv.setImageResource(R.drawable.toolbar_back);
members_title_top_right_tv.setImageResource(R.drawable.more_green);
// members_top_view.setBackgroundColor(getResources().getColor(R.color.black));
members_title_rel.setBackgroundDrawable(getResources().getDrawable(R.drawable.layout_border));
members_title_back_iv.setImageResource(R.drawable.dynamic_toolbar_back);
members_title_top_right_tv.setImageResource(R.drawable.dynamic_more_green);
// members_top_view.setBackgroundColor(getResources().getColor(R.color.dynamic_black));
members_title_rel.setBackgroundDrawable(getResources().getDrawable(R.drawable.dynamic_layout_border));
}
}
......@@ -820,12 +820,12 @@ public class MembersActivity extends BaseActivity implements View.OnClickListene
if (mem_id.equals(DynamicIn.INSTANCE.getUserInfo().getUid() + "")) {
focus_state = "4";
// members_top_user_focus_ortion_rel.setVisibility(View.VISIBLE);
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.focused_topic_detail_bg);
members_top_user_focus_ortion_rel.setBackgroundResource(R.drawable.dynamic_focused_topic_detail_bg);
// members_top_user_focus_ortion_hint_iv.setVisibility(View.GONE);
members_top_user_focus_ortion_tv.setCompoundDrawables(null, null, null, null);
members_top_user_focus_iv.setVisibility(View.GONE);
members_top_user_focus_ortion_tv.setText("修改资料");
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.text_trend_black));
members_top_user_focus_ortion_tv.setTextColor(getResources().getColor(R.color.dynamic_text_trend_black));
members_title_top_right_tv.setVisibility(View.GONE);
members_top_user_focus_iv.setVisibility(View.GONE);
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/PublishTrendActivity.java
......@@ -95,7 +95,7 @@ public class PublishTrendActivity extends BaseActivity {
@Override
protected int layoutResId() {
return R.layout.activity_trend;
return R.layout.dynamic_activity_trend;
}
@Override
......@@ -187,7 +187,7 @@ public class PublishTrendActivity extends BaseActivity {
TextView textView = mTableLayout.getTitleView(1);
textView.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
int textViewWidth = textView.getMeasuredWidth();
View view = LayoutInflater.from(this).inflate(R.layout.popup_notice, null);
View view = LayoutInflater.from(this).inflate(R.layout.dynamic_popup_notice, null);
view.measure(View.MeasureSpec.UNSPECIFIED, View.MeasureSpec.UNSPECIFIED);
int wid = view.getMeasuredWidth();
noticePopupWindow = new PopupWindow(view);
......
m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/SelecTopicActivity.java
......@@ -37,7 +37,7 @@ public class SelecTopicActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_selec_topic);
setContentView(R.layout.dynamic_activity_selec_topic);
Cancletv = (TextView) findViewById(R.id.select_topic_cancel_tv);
focus_rcv = (RecyclerViewForScrollView) findViewById(R.id.select_topic_focus_rcv);
recommend_rcv = (RecyclerViewForScrollView) findViewById(R.id.select_topic_recommend_rcv);
......
m-dynamic/src/main/java/com/yidianling/dynamic/publishTrend/fragment/PublishQuestionAndTrendFragment.java
......@@ -189,7 +189,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
@Override
public int layoutResId() {
return R.layout.fragment_publish_trend;
return R.layout.dynamic_fragment_publish_trend;
}
@Override
......@@ -246,8 +246,8 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
publish_trend_ad_rel.setVisibility(View.VISIBLE);
GlideApp.with(activity)
.load(Test_cover)
.placeholder(R.drawable.default_img)
.error(R.drawable.default_img)
.placeholder(R.drawable.dynamic_default_img)
.error(R.drawable.dynamic_default_img)
.into(publish_trend_ad_iv);
publish_trend_ad_tv.setText(Test_title);
if (isFromFm == 1) {
......@@ -258,7 +258,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
} else {
publish_trend_img_rcv.setVisibility(View.VISIBLE);
publish_trend_ad_rel.setVisibility(View.GONE);
publish_trend_bottom_img_iv.setImageResource(R.drawable.edit_img);
publish_trend_bottom_img_iv.setImageResource(R.drawable.dynamic_edit_img);
head_dir = RxFileTool.getStorageDirectory(activity) + "/img/publish_img/";
if (adapter == null) {
......@@ -368,21 +368,21 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
// 此处为得到焦点时的处理内容
writeing_title = true;
hideEmojiLayout();
publish_emoji_iv.setImageResource(R.drawable.edict_ico_emoji_dis);
publish_emoji_iv.setImageResource(R.drawable.dynamic_edict_ico_emoji_dis);
} else {
// 此处为失去焦点时的处理内容
writeing_title = false;
if (writeing_title == false && ("".equals(Test_url) || Test_url == null || "".equals(Test_cover) || Test_cover == null ||
"".equals(Test_title) || Test_title == null)) {
publish_emoji_iv.setImageResource(R.drawable.edict_ico_emoji);
// publish_trend_bottom_img_iv.setImageResource(R.drawable.edit_img);
publish_emoji_iv.setImageResource(R.drawable.dynamic_edict_ico_emoji);
// publish_trend_bottom_img_iv.setImageResource(R.drawable.dynamic_edit_img);
}
}
}
});
publish_trend_content_editext.setOnTouchListener((v, event) -> {
hideEmojiLayout();
publish_emoji_iv.setImageResource(R.drawable.edict_ico_emoji);
publish_emoji_iv.setImageResource(R.drawable.dynamic_edict_ico_emoji);
return false;
});
......@@ -424,7 +424,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
publish_anonymity_iv.setImageResource(R.drawable.checkbox_sel);
publish_anonymity_iv.setImageResource(R.drawable.dynamic_checkbox_sel);
is_niming = 2;
dialog.dismiss();
}
......@@ -438,7 +438,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
});
builder.create().show();
} else {
publish_anonymity_iv.setImageResource(R.drawable.checkbox);
publish_anonymity_iv.setImageResource(R.drawable.dynamic_checkbox);
is_niming = 1;
}
} else if (v.getId() == R.id.publish_trend_bottom_img_iv) {
......@@ -465,10 +465,10 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
} else if (v.getId() == R.id.ll_to_expert) {//仅对专家可见
if (isDoctorShow == 1) {
isDoctorShow = 2;
iv_to_expert.setImageResource(R.drawable.checkbox);
iv_to_expert.setImageResource(R.drawable.dynamic_checkbox);
} else {
isDoctorShow = 1;
iv_to_expert.setImageResource(R.drawable.checkbox_sel);
iv_to_expert.setImageResource(R.drawable.dynamic_checkbox_sel);
}
}
}
......@@ -483,7 +483,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
if ("".equals(phone) || phone == null) {
NormalDialog.Builder builder = new NormalDialog.Builder(getActivity(), "left", true);
builder.setTitle("");
builder.setMessage(BaseApp.instance.getResources().getString(R.string.bindphone));
builder.setMessage(BaseApp.instance.getResources().getString(R.string.dynamic_bindphone));
builder.setPositiveButton("果断绑定", (dialog, which) -> {
startActivity(DynamicIn.INSTANCE.inputPhoneIntent(getActivity(), DynamicConstants.BIND_PHONE_ACTION));
dialog.dismiss();
......@@ -800,7 +800,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
private void showUserSliencedDialog(PublishTrendResult resp) {
CommonDialog.create(getActivity())
.setMessage(resp.tips)
.setLeftOnclick(getActivity().getString(R.string.details), new View.OnClickListener() {
.setLeftOnclick(getActivity().getString(R.string.dynamic_details), new View.OnClickListener() {
@Override
public void onClick(View v) {
String realUrl = TextUtils.isEmpty(resp.url) ? DynamicConstants.HELP_URL : resp.url;
......@@ -808,7 +808,7 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
NewH5Activity.start(getActivity(), params);
}
})
.setRightClick(getActivity().getString(R.string.approval), new View.OnClickListener() {
.setRightClick(getActivity().getString(R.string.dynamic_approval), new View.OnClickListener() {
@Override
public void onClick(View v) {
......@@ -910,11 +910,11 @@ public class PublishQuestionAndTrendFragment extends BaseFragment implements Vie
private void toggleEmojiLayout() {
if (emoticon_picker_view == null || emoticon_picker_view.getVisibility() == View.GONE) {
showEmojiLayout();
// publish_emoji_iv.setImageResource(R.drawable.edict_ico_key);
// publish_emoji_iv.setImageResource(R.drawable.dynamic_edict_ico_key);
} else {
hideEmojiLayout();
showInputMethod(publish_trend_content_editext);
publish_emoji_iv.setImageResource(R.drawable.edict_ico_emoji);
publish_emoji_iv.setImageResource(R.drawable.dynamic_edict_ico_emoji);
}
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/thank/ShowIntroduceDialogFragment.java
......@@ -66,7 +66,7 @@ public class ShowIntroduceDialogFragment extends BaseDialogFragment {
@Nullable
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_dialog_show_introduce, container, false);
View view = inflater.inflate(R.layout.dynamic_fragment_dialog_show_introduce, container, false);
ButterKnife.bind(this, view);
init();
return view;
......@@ -139,11 +139,11 @@ public class ShowIntroduceDialogFragment extends BaseDialogFragment {
.into(mHead);
if (zjservice.is_online.equals("2")) {
mChangeImg.setImageResource(R.drawable.icon_layer_chat);
mChangeImg.setImageResource(R.drawable.dynamic_icon_layer_chat);
mChangeText.setText("私聊");
}
if (zjservice.is_online.equals("3") || zjservice.is_online.equals("4")) {
mChangeImg.setImageResource(R.drawable.icon_layer_chat_off);
mChangeImg.setImageResource(R.drawable.dynamic_icon_layer_chat_off);
mChangeText.setText("私聊");
mChangeText.setTextColor(Color.parseColor("#888888"));
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/thank/ThankActivity.java
......@@ -71,7 +71,7 @@ public class ThankActivity extends BaseActivity implements PtrHandler, LoadMoreH
int[] colors = getResources().getIntArray(R.array.ydl_colors);
header.setColorSchemeColors(colors);
header.setLayoutParams(new PtrFrameLayout.LayoutParams(-1, -2));
int padding = (int) getResources().getDimension(R.dimen.default_dis_size);
int padding = (int) getResources().getDimension(R.dimen.dynamic_default_dis_size);
header.setPadding(0, padding, 0, padding);
header.setPtrFrameLayout(store_house_ptr_frame);
......@@ -210,7 +210,7 @@ public class ThankActivity extends BaseActivity implements PtrHandler, LoadMoreH
@Override
protected int layoutResId() {
return R.layout.activity_thank;
return R.layout.dynamic_activity_thank;
}
@Override
......@@ -283,7 +283,7 @@ public class ThankActivity extends BaseActivity implements PtrHandler, LoadMoreH
protected void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
if (requestCode == 0 && resultCode == RESULT_OK) {
ToastUtil.toastImg(this, R.drawable.dialog_send_thx_success);
ToastUtil.toastImg(this, R.drawable.dynamic_dialog_send_thx_success);
if (worryDetailAnswerForEventBus != null) {
worryDetailAnswerForEventBus.pIsZan = true;
worryDetailAnswerForEventBus.pZan++;
......
m-dynamic/src/main/java/com/yidianling/dynamic/thank/view/ThankHeadView.kt
......@@ -26,7 +26,7 @@ import com.yidianling.ydl_pay.CommonPayDialog
import de.greenrobot.event.EventBus
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.ui_thank_head.view.*
import kotlinx.android.synthetic.main.dynamic_ui_thank_head.view.*
/**
* Created by softrice on 15/11/25.
......@@ -64,7 +64,7 @@ class ThankHeadView(activity: Activity) : LinearLayout(activity) {
init {
View.inflate(activity, R.layout.ui_thank_head, this)
View.inflate(activity, R.layout.dynamic_ui_thank_head, this)
this.activity = activity as BaseActivity
}
......@@ -75,8 +75,8 @@ class ThankHeadView(activity: Activity) : LinearLayout(activity) {
GlideApp.with(activity)
.load(thxData.userInfo.head)
.transform(GlideCircleTransform(activity))
.placeholder(R.drawable.head_place_hold_pic)
.error(R.drawable.head_place_hold_pic)
.placeholder(R.drawable.dynamic_head_place_hold_pic)
.error(R.drawable.dynamic_head_place_hold_pic)
.into(sdv_head!!)
rcb_submit.setOnClickListener {
......@@ -165,10 +165,10 @@ class ThankHeadView(activity: Activity) : LinearLayout(activity) {
(context as Activity).fragmentManager,
showIntroduceDialogFragment.javaClass.name
)
ToastUtil.toastImg(context, R.drawable.dialog_send_thx_success)
ToastUtil.toastImg(context, R.drawable.dynamic_dialog_send_thx_success)
EventBus.getDefault().post(ThankReplyUpdateEvent())
} else {
ToastUtil.toastImg(context, R.drawable.dialog_send_thx_success)
ToastUtil.toastImg(context, R.drawable.dynamic_dialog_send_thx_success)
EventBus.getDefault().post(ThankReplyUpdateEvent())
//通知更新
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/thank/view/ThxSelectView.java
......@@ -55,39 +55,39 @@ public class ThxSelectView extends LinearLayout {
public ThxSelectView(Context context) {
super(context);
inflate(context, R.layout.ui_thx_select, this);
inflate(context, R.layout.dynamic_ui_thx_select, this);
ButterKnife.bind(this);
}
public ThxSelectView(Context context, AttributeSet attrs) {
super(context, attrs);
inflate(context, R.layout.ui_thx_select, this);
inflate(context, R.layout.dynamic_ui_thx_select, this);
ButterKnife.bind(this);
}
public void select(int position) {
if (position >= 0 && position < 3) {
Drawable drawable = getResources().getDrawable(R.drawable.love_white);
Drawable drawable = getResources().getDrawable(R.drawable.dynamic_love_white);
cleanSelect();
selectId = position;
switch (position) {
case 0:
ll_left.setBackgroundResource(R.drawable.shape_red_bg);
ll_left.setBackgroundResource(R.drawable.dynamic_shape_red_bg);
tv_left_down.setTextColor(disSelectColor);
tv_left_up.setTextColor(disSelectColor);
tv_left_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
break;
case 1:
ll_center.setBackgroundResource(R.drawable.shape_red_bg);
ll_center.setBackgroundResource(R.drawable.dynamic_shape_red_bg);
tv_center_down.setTextColor(disSelectColor);
tv_center_up.setTextColor(disSelectColor);
tv_center_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
break;
case 2:
ll_right.setBackgroundResource(R.drawable.shape_red_bg);
ll_right.setBackgroundResource(R.drawable.dynamic_shape_red_bg);
tv_right_down.setTextColor(disSelectColor);
tv_right_up.setTextColor(disSelectColor);
tv_right_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
......@@ -113,18 +113,18 @@ public class ThxSelectView extends LinearLayout {
}
void cleanSelect() {
Drawable drawable = getResources().getDrawable(R.drawable.love_red);
ll_left.setBackgroundResource(R.drawable.shape_red_round);
Drawable drawable = getResources().getDrawable(R.drawable.dynamic_love_red);
ll_left.setBackgroundResource(R.drawable.dynamic_shape_red_round);
tv_left_down.setTextColor(selectColor);
tv_left_up.setTextColor(selectColor);
tv_left_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
ll_center.setBackgroundResource(R.drawable.shape_red_round);
ll_center.setBackgroundResource(R.drawable.dynamic_shape_red_round);
tv_center_down.setTextColor(selectColor);
tv_center_up.setTextColor(selectColor);
tv_center_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
ll_right.setBackgroundResource(R.drawable.shape_red_round);
ll_right.setBackgroundResource(R.drawable.dynamic_shape_red_round);
tv_right_down.setTextColor(selectColor);
tv_right_up.setTextColor(selectColor);
tv_right_up.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null);
......
m-dynamic/src/main/java/com/yidianling/dynamic/thank/view/ZanReplyListItemView.java
......@@ -34,7 +34,7 @@ public class ZanReplyListItemView extends LinearLayout {
public ZanReplyListItemView(Context context) {
super(context);
inflate(context,R.layout.ui_zan_reply_list,this);
inflate(context,R.layout.dynamic_ui_zan_reply_list,this);
ButterKnife.bind(this);
}
......@@ -44,8 +44,8 @@ public class ZanReplyListItemView extends LinearLayout {
GlideApp.with(getContext())
.load(thxZan.head)
.transform(new GlideCircleTransform(getContext()))
.placeholder(R.drawable.head_place_hold_pic)
.error(R.drawable.head_place_hold_pic)
.placeholder(R.drawable.dynamic_head_place_hold_pic)
.error(R.drawable.dynamic_head_place_hold_pic)
.into(sdv_head);
if (thxZan.num.endsWith("0"))
tv_zan_num.setText("");
......
m-dynamic/src/main/java/com/yidianling/dynamic/topic/AllTopicActivity.java
......@@ -33,7 +33,7 @@ public class AllTopicActivity extends BaseActivity implements View.OnClickListen
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_all_topic);
setContentView(R.layout.dynamic_activity_all_topic);
initView();
}
......@@ -79,13 +79,13 @@ public class AllTopicActivity extends BaseActivity implements View.OnClickListen
// resetText();
// switch (position) {
// case 0:
// topic_tab_all_tv.setTextColor(getResources().getColor(R.color.title_green));
// topic_tab_all_hint_tv.setBackgroundColor(getResources().getColor(R.color.title_green));
// topic_tab_all_tv.setTextColor(getResources().getColor(R.color.dynamic_title_green));
// topic_tab_all_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_title_green));
//
// break;
// case 1:
// topic_tab_hot_tv.setTextColor(getResources().getColor(R.color.title_green));
// topic_tab_hot_hint_tv.setBackgroundColor(getResources().getColor(R.color.title_green));
// topic_tab_hot_tv.setTextColor(getResources().getColor(R.color.dynamic_title_green));
// topic_tab_hot_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_title_green));
//
// break;
//
......@@ -100,10 +100,10 @@ public class AllTopicActivity extends BaseActivity implements View.OnClickListen
}
// private void resetText() {
// topic_tab_all_tv.setTextColor(getResources().getColor(R.color.text_gray));
// topic_tab_all_hint_tv.setBackgroundColor(getResources().getColor(R.color.white));
// topic_tab_hot_tv.setTextColor(getResources().getColor(R.color.text_gray));
// topic_tab_hot_hint_tv.setBackgroundColor(getResources().getColor(R.color.white));
// topic_tab_all_tv.setTextColor(getResources().getColor(R.color.dynamic_text_gray));
// topic_tab_all_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
// topic_tab_hot_tv.setTextColor(getResources().getColor(R.color.dynamic_text_gray));
// topic_tab_hot_hint_tv.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
// }
@Override
......
m-dynamic/src/main/java/com/yidianling/dynamic/topic/AllTopicFragment.java
......@@ -45,7 +45,7 @@ public class AllTopicFragment extends DynamicFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
view = inflater.inflate(R.layout.fragment_all_topic, container, false);
view = inflater.inflate(R.layout.dynamic_fragment_all_topic, container, false);
context = getActivity().getApplicationContext();
initView();
return view;
......
m-dynamic/src/main/java/com/yidianling/dynamic/topic/HotTopicFragment.java
......@@ -21,7 +21,7 @@ public class HotTopicFragment extends DynamicFragment {
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
view = inflater.inflate(R.layout.fragment_newest, container, false);
view = inflater.inflate(R.layout.dynamic_fragment_newest, container, false);
context=getActivity().getApplicationContext();
initView();
return view;
......
m-dynamic/src/main/java/com/yidianling/dynamic/topic/topicDetail/TopicDetailActivity.java
......@@ -149,7 +149,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_topic_detail);
setContentView(R.layout.dynamic_activity_topic_detail);
ButterKnife.bind(this);
initDatas();
initViews();
......@@ -234,39 +234,39 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
}
LogUtil.d("tool bar size: " + mToolbar.getHeight());
if (verticalOffset <= (-appBarLayout.getTotalScrollRange() + mToolbar.getHeight() / 2)) {
if (backgroundColor != R.color.white) {
mToolbar.setBackgroundColor(getResources().getColor(R.color.white));
if (backgroundColor != R.color.dynamic_white) {
mToolbar.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
alPhaAnimation(mToolbar, 0, 1, null);
mTopicDetailTitleBackIv.setImageResource(R.drawable.toolbar_back);
mTopicDetailTitleTopRightTv.setImageResource(R.drawable.more_green);
backgroundColor = R.color.white;
mTopicDetailTitleBackIv.setImageResource(R.drawable.dynamic_toolbar_back);
mTopicDetailTitleTopRightTv.setImageResource(R.drawable.dynamic_more_green);
backgroundColor = R.color.dynamic_white;
}
collapsingToolbarLayout.setTitle(topicTitle);
//使用下面两个CollapsingToolbarLayout的方法设置展开透明->折叠时你想要的颜色
collapsingToolbarLayout.setExpandedTitleColor(getResources().getColor(android.R.color.transparent));
collapsingToolbarLayout.setCollapsedTitleTextColor(getResources().getColor(R.color.black));
collapsingToolbarLayout.setExpandedTitleColor(getResources().getColor(R.color.dynamic_transparent));
collapsingToolbarLayout.setCollapsedTitleTextColor(getResources().getColor(R.color.dynamic_black));
} else if (verticalOffset >= -appBarLayout.getTotalScrollRange() / 5) {
collapsingToolbarLayout.setTitle("");
if (backgroundColor != android.R.color.transparent) {
if (backgroundColor != R.color.dynamic_transparent) {
alPhaAnimation(mToolbar, 1, 0f, new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
super.onAnimationEnd(animation);
mToolbar.setBackgroundColor(getResources().getColor(android.R.color.transparent));
mToolbar.setBackgroundColor(getResources().getColor(R.color.dynamic_transparent));
mToolbar.setAlpha(1f);
mTopicDetailTitleBackIv.setImageResource(R.drawable.titlebar_back2);
mTopicDetailTitleTopRightTv.setImageResource(R.drawable.more_green2);
mTopicDetailTitleBackIv.setImageResource(R.drawable.dynamic_titlebar_back2);
mTopicDetailTitleTopRightTv.setImageResource(R.drawable.dynamic_more_green2);
}
});
backgroundColor = android.R.color.transparent;
backgroundColor = R.color.dynamic_transparent;
}
} else {
if (backgroundColor != android.R.color.transparent) {
mToolbar.setBackgroundColor(getResources().getColor(android.R.color.transparent));
if (backgroundColor != R.color.dynamic_transparent) {
mToolbar.setBackgroundColor(getResources().getColor(R.color.dynamic_transparent));
mToolbar.setAlpha(1f);
mTopicDetailTitleBackIv.setImageResource(R.drawable.titlebar_back2);
mTopicDetailTitleTopRightTv.setImageResource(R.drawable.more_green2);
backgroundColor = android.R.color.transparent;
mTopicDetailTitleBackIv.setImageResource(R.drawable.dynamic_titlebar_back2);
mTopicDetailTitleTopRightTv.setImageResource(R.drawable.dynamic_more_green2);
backgroundColor = R.color.dynamic_transparent;
}
collapsingToolbarLayout.setTitle("");
}
......@@ -391,7 +391,7 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
private void ShowCustomShareDialog(final String share_title, final String share_url, final String share_context, final String share_head) {
View view = getLayoutInflater().inflate(R.layout.share_select_dialog,
View view = getLayoutInflater().inflate(R.layout.dynamic_share_select_dialog,
null);
final Dialog dialog = new Dialog(this,
R.style.transparentFrameWindowStyle);
......@@ -442,10 +442,10 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
}
private void resetText() {
mItemTopicDetailNewTv.setTextColor(getResources().getColor(R.color.text_gray));
mItemTopicDetailNewHintTv.setBackgroundColor(getResources().getColor(R.color.white));
mItemTopicDetailHotTv.setTextColor(getResources().getColor(R.color.text_gray));
mItemTopicDetailHotHintTv.setBackgroundColor(getResources().getColor(R.color.white));
mItemTopicDetailNewTv.setTextColor(getResources().getColor(R.color.dynamic_text_gray));
mItemTopicDetailNewHintTv.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
mItemTopicDetailHotTv.setTextColor(getResources().getColor(R.color.dynamic_text_gray));
mItemTopicDetailHotHintTv.setBackgroundColor(getResources().getColor(R.color.dynamic_white));
}
private void setTabSelection(int index) {
......@@ -494,11 +494,11 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
mTopicDetailTrendNumTv.setText("" + topicDetail.topic.postsCount);
GlideApp.with(TopicDetailActivity.this)
.load(cover)
.placeholder(R.drawable.default_img)
.error(R.drawable.default_img)
.placeholder(R.drawable.dynamic_default_img)
.error(R.drawable.dynamic_default_img)
.into(mTopicDetailTopBgIv);
mTopicDetailFocusTv.setBackgroundResource("1".equals(is_focused) ? R.drawable.focused_topic_detail_bg : R.drawable.focus_topic_detail_bg);
mTopicDetailFocusTv.setText("1".equals(is_focused) ? this.getString(R.string.trend_foucused) : "+" + this.getString(R.string.trend_foucus));
mTopicDetailFocusTv.setBackgroundResource("1".equals(is_focused) ? R.drawable.dynamic_focused_topic_detail_bg : R.drawable.dynamic_focus_topic_detail_bg);
mTopicDetailFocusTv.setText("1".equals(is_focused) ? this.getString(R.string.dynamic_trend_foucused) : "+" + this.getString(R.string.dynamic_trend_foucus));
if (!"2".equals(topicId)) {
mTopicDetailFocusTv.setVisibility(View.VISIBLE);
}
......@@ -550,8 +550,8 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
.burryPoint("Theme_attention");
totalMembers += 1;
mTopicDetailUsersNumTv.setText(totalMembers + "人");
mTopicDetailFocusTv.setBackgroundResource(R.drawable.focused_topic_detail_bg);
mTopicDetailFocusTv.setText(this.getString(R.string.trend_foucused));
mTopicDetailFocusTv.setBackgroundResource(R.drawable.dynamic_focused_topic_detail_bg);
mTopicDetailFocusTv.setText(this.getString(R.string.dynamic_trend_foucused));
TopicDetailBean.Member member = new TopicDetailBean.Member();
member.head = DynamicIn.INSTANCE.getUserInfo().getHead();
member.uid = DynamicIn.INSTANCE.getUserInfo().getUid() + "";
......@@ -559,8 +559,8 @@ public class TopicDetailActivity extends BaseMvpActivity<TopicDetailView, TopicD
} else {
totalMembers = totalMembers - 1;
mTopicDetailUsersNumTv.setText(totalMembers + "人");
mTopicDetailFocusTv.setBackgroundResource(R.drawable.focus_topic_detail_bg);
mTopicDetailFocusTv.setText("+" + this.getString(R.string.trend_foucus));
mTopicDetailFocusTv.setBackgroundResource(R.drawable.dynamic_focus_topic_detail_bg);
mTopicDetailFocusTv.setText("+" + this.getString(R.string.dynamic_trend_foucus));
if (adapter.getDatas() != null && adapter.getDatas().size() > 0) {
for (TopicDetailBean.Member m : adapter.getDatas()) {
if (m.uid.equals(DynamicIn.INSTANCE.getUserInfo().getUid())) {
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendListInFragment.java
......@@ -112,7 +112,7 @@ public class TrendListInFragment extends DynamicFragment implements ITrendsListV
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.fragment_trend_list_in, container, false);
View view = inflater.inflate(R.layout.dynamic_fragment_trend_list_in, container, false);
unbinder = ButterKnife.bind(this, view);
initFileds();
initView();
......@@ -267,9 +267,9 @@ public class TrendListInFragment extends DynamicFragment implements ITrendsListV
private View getFooterView() {
View view;
if (trendsRcv != null) {
view = LayoutInflater.from(getActivity()).inflate(R.layout.progress_item, trendsRcv, false);
view = LayoutInflater.from(getActivity()).inflate(R.layout.dynamic_progress_item, trendsRcv, false);
} else {
view = LayoutInflater.from(getActivity()).inflate(R.layout.progress_item, null);
view = LayoutInflater.from(getActivity()).inflate(R.layout.dynamic_progress_item, null);
}
return view;
}
......@@ -411,7 +411,7 @@ public class TrendListInFragment extends DynamicFragment implements ITrendsListV
@Override
public void showLoadingDialog(boolean isNeedShowLoading) {
if (trendType.equals("member_trend")) {
showProgressDialog(getActivity().getString(R.string.dialog_loading));
showProgressDialog(getActivity().getString(R.string.dynamic_dialog_loading));
}
}
......@@ -483,7 +483,7 @@ public class TrendListInFragment extends DynamicFragment implements ITrendsListV
.burryPoint("Warmth_dynamic");
mDatas.get(position).isZan = 1;
mDatas.get(position).zanCount += 1;
((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.newsfeed_like_sel);
((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.dynamic_newsfeed_like_sel);
((TextView) view.findViewById(R.id.text_zan_num)).setText(mDatas.get(position).zanCount + "");
startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position);
isDoLikeAction = false;
......@@ -493,7 +493,7 @@ public class TrendListInFragment extends DynamicFragment implements ITrendsListV
public void showDisLikeView(View view, int position, ZanResult zanResultBaseBean, List<TrendsListBean.Trend> mDatas) {
mDatas.get(position).isZan = 2;
mDatas.get(position).zanCount -= 1;
((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.newsfeed_like);
((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.dynamic_newsfeed_like);
((TextView) view.findViewById(R.id.text_zan_num)).setText(String.valueOf(mDatas.get(position).zanCount));
startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position);
isDoLikeAction = false;
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/TrendsListFragment.kt
......@@ -43,7 +43,7 @@ import com.yidianling.dynamic.trendsDetail.TrendsDetailActivity
import com.yidianling.dynamic.trendsHome.TrendsHomeFragment
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.fragment_trends_list.*
import kotlinx.android.synthetic.main.dynamic_fragment_trends_list.*
import java.util.*
......@@ -97,7 +97,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
private val headerView: View
get() {
val view = LayoutInflater.from(activity)
.inflate(R.layout.item_trends_head_recommend_topic, null)
.inflate(R.layout.dynamic_item_trends_head_recommend_topic, null)
recommendTopicDatas = ArrayList()
mRecommendTopicListAdapter = RecommendTopicListAdapter(activity, recommendTopicDatas)
val allTopicLin = view.findViewById<View>(R.id.all_topic_lin) as LinearLayout
......@@ -117,7 +117,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
//置顶帖Header View
private val recommendTopHeaderView: View
get() {
val view = LayoutInflater.from(activity).inflate(R.layout.item_recommend_top, null)
val view = LayoutInflater.from(activity).inflate(R.layout.dynamic_item_recommend_top, null)
val linearLayoutManager = LinearLayoutManager(activity)
mRecommendTopAdapter = RecommendTopAdapter<TrendsListBean.ExtData>(activity)
mRecommendTopRcv = view.findViewById<View>(R.id.recy_top) as RecyclerView
......@@ -141,9 +141,9 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
val view: View
if (trends_rcv != null) {
view =
LayoutInflater.from(activity).inflate(R.layout.progress_item, trends_rcv, false)
LayoutInflater.from(activity).inflate(R.layout.dynamic_progress_item, trends_rcv, false)
} else {
view = LayoutInflater.from(activity).inflate(R.layout.progress_item, null)
view = LayoutInflater.from(activity).inflate(R.layout.dynamic_progress_item, null)
}
return view
}
......@@ -179,7 +179,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
}
override fun getLayoutId(): Int {
return R.layout.fragment_trends_list
return R.layout.dynamic_fragment_trends_list
}
override fun lazyLoad() {
......@@ -648,7 +648,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
) {
mDatas[position].isZan = 2
mDatas[position].zanCount -= 1
(view.findViewById<View>(R.id.item_trend_zan_iv) as ImageView).setImageResource(R.drawable.newsfeed_like)
(view.findViewById<View>(R.id.item_trend_zan_iv) as ImageView).setImageResource(R.drawable.dynamic_newsfeed_like)
(view.findViewById<View>(R.id.text_zan_num) as TextView).text =
mDatas[position].zanCount.toString() + ""
startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position)
......@@ -670,7 +670,7 @@ class TrendsListFragment : BaseLazyFragment(), ITrendsListView,
.burryPoint("Warmth_dynamic")
mDatas[position].isZan = 1
mDatas[position].zanCount += 1
(view.findViewById<View>(R.id.item_trend_zan_iv) as ImageView).setImageResource(R.drawable.newsfeed_like_sel)
(view.findViewById<View>(R.id.item_trend_zan_iv) as ImageView).setImageResource(R.drawable.dynamic_newsfeed_like_sel)
(view.findViewById<View>(R.id.text_zan_num) as TextView).text =
mDatas[position].zanCount.toString() + ""
startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position)
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/ItemCommentsAdapter.java
......@@ -42,7 +42,7 @@ public class ItemCommentsAdapter extends RecyclerView.Adapter<BaseViewHolder> {
@Override
public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_discuss_list, parent, false);
View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.dynamic_item_discuss_list, parent, false);
return new BaseViewHolder(view, parent.getContext(), viewType);
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/ItemImageAdapter.java
......@@ -37,9 +37,9 @@ public class ItemImageAdapter extends RecyclerView.Adapter<BaseViewHolder> {
public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view;
if (viewType == 0) {
view = LayoutInflater.from(mContext).inflate(R.layout.item_trend_imag, parent, false);
view = LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_trend_imag, parent, false);
} else {
view = LayoutInflater.from(mContext).inflate(R.layout.item_trend_imag_ad, parent, false);
view = LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_trend_imag_ad, parent, false);
}
return new BaseViewHolder(view, mContext, viewType);
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/RecommendTopAdapter.java
......@@ -37,7 +37,7 @@ public class RecommendTopAdapter<T extends ITopTrends> extends RecyclerView.Adap
@Override
public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view= LayoutInflater.from(mContext).inflate(R.layout.item_last_trend_top,parent,false);
View view= LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_last_trend_top,parent,false);
return new BaseViewHolder(view);
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/RecommendTopicListAdapter.java
......@@ -36,7 +36,7 @@ public class RecommendTopicListAdapter extends RecyclerView.Adapter<BaseViewHold
@Override
public BaseViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
View view = LayoutInflater.from(mContext).inflate(R.layout.item_recommend_topic, parent, false);
View view = LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_recommend_topic, parent, false);
return new BaseViewHolder(view, mContext, viewType);
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendList/adapter/TrendsListAdapter.java
......@@ -116,7 +116,7 @@ public class TrendsListAdapter extends RecyclerView.Adapter<BaseViewHolder> {
if (mFootViews != null && mFootViews.get(viewType) != null) {
return new BaseViewHolder(mFootViews.get(viewType), mContext, viewType);
}
View view = LayoutInflater.from(mContext).inflate(R.layout.item_trends_list, parent, false);
View view = LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_trends_list, parent, false);
((RecyclerView) view.findViewById(R.id.item_trend_img_rcv)).setNestedScrollingEnabled(false);
return new BaseViewHolder(view, mContext, viewType);
}
......@@ -183,12 +183,12 @@ public class TrendsListAdapter extends RecyclerView.Adapter<BaseViewHolder> {
.setText(R.id.text_con, "数据加载失败");
break;
case FOOTER_STATE_NO_DATA:
holder.setText(R.id.text_con, mContext.getString(R.string.no_more_data_hint))
holder.setText(R.id.text_con, mContext.getString(R.string.dynamic_no_more_data_hint))
.setVisibility(R.id.text_con, View.VISIBLE)
.setVisibility(R.id.pb, View.GONE);
break;
case FOOTRE_STATE_LOAD_MORE:
holder.setText(R.id.text_con, mContext.getString(R.string.loading_hint))
holder.setText(R.id.text_con, mContext.getString(R.string.dynamic_loading_hint))
.setVisibility(R.id.pb, View.VISIBLE)
.setVisibility(R.id.text_con, View.VISIBLE);
break;
......@@ -262,8 +262,8 @@ public class TrendsListAdapter extends RecyclerView.Adapter<BaseViewHolder> {
.setText(R.id.text_zan_num, String.valueOf(trend.zanCount))
.setText(R.id.text_talk_num, trend.commentsCount == 0 ? "评论" : trend.commentsCount + "")
.setText(R.id.text_trend, "#" + trend.topicTitle + "#")
.setImageResource(R.id.item_trend_zan_iv, trend.isZan == 1 ? R.drawable.newsfeed_like_sel : R.drawable.newsfeed_like)
.setImageResource(R.id.item_trend_user_gender_iv, "2".equals(trend.gender) ? R.drawable.female : R.drawable.male)
.setImageResource(R.id.item_trend_zan_iv, trend.isZan == 1 ? R.drawable.dynamic_newsfeed_like_sel : R.drawable.dynamic_newsfeed_like)
.setImageResource(R.id.item_trend_user_gender_iv, "2".equals(trend.gender) ? R.drawable.dynamic_female : R.drawable.dynamic_male)
.setOnClickListener(R.id.item_trend_zan_iv, v -> {
if (onItemClickListener != null) {
onItemClickListener.onItemLikeClick(holder.getView(R.id.item_trend_zan_rel), position - getHeadersCount(), mDatas);
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsDetail/AdViewPagerAdapter.kt
......@@ -17,7 +17,7 @@ import com.yidianling.dynamic.model.Command
import com.yidianling.dynamic.model.TrendsDetailInfoBean
import io.reactivex.android.schedulers.AndroidSchedulers
import io.reactivex.schedulers.Schedulers
import kotlinx.android.synthetic.main.item_trend_detail_ad.view.*
import kotlinx.android.synthetic.main.dynamic_item_trend_detail_ad.view.*
/**
* 动态广告图展示
......@@ -32,12 +32,12 @@ class AdViewPagerAdapter(private val context: Context, private val adList: Mutab
override fun getCount() = adList.size
override fun instantiateItem(container: ViewGroup?, position: Int): Any? {
val view = LayoutInflater.from(context).inflate(R.layout.item_trend_detail_ad, container, false)
val view = LayoutInflater.from(context).inflate(R.layout.dynamic_item_trend_detail_ad, container, false)
view.ivAd.layoutParams.height = ScreenUtil.getDisplayWidth() * 19 / 66
val ad = adList[position]
GlideApp.with(context)
.load(ad.adImg)
.placeholder(R.drawable.default_img)
.placeholder(R.drawable.dynamic_default_img)
.into(view.ivAd)
view.setOnClickListener {
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsDetail/TrendsDetailActivity.java
......@@ -370,7 +370,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_trend_details);
setContentView(R.layout.dynamic_activity_trend_details);
ButterKnife.bind(this);
initDatas();
initViews();
......@@ -482,7 +482,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
public void showSilencedDialog(String tips, String url) {
CommonDialog.create(this)
.setMessage(tips)
.setLeftOnclick(TrendsDetailActivity.this.getString(R.string.details), new View.OnClickListener() {
.setLeftOnclick(TrendsDetailActivity.this.getString(R.string.dynamic_details), new View.OnClickListener() {
@Override
public void onClick(View v) {
String realUrl = TextUtils.isEmpty(url) ? DynamicConstants.HELP_URL : url;
......@@ -490,7 +490,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
NewH5Activity.start(TrendsDetailActivity.this, params);
}
})
.setRightClick(TrendsDetailActivity.this.getString(R.string.approval), null)
.setRightClick(TrendsDetailActivity.this.getString(R.string.dynamic_approval), null)
.show();
}
......@@ -580,12 +580,12 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
linNullTip.setVisibility(GONE);
} else {
linNullTip.setVisibility(VISIBLE);
tvNoComments.setText(this.getString(R.string.trend_comments_load_error));
tvNoComments.setText(this.getString(R.string.dynamic_trend_comments_load_error));
}
}
private void setZanBackground(boolean isSelect) {
Drawable drawable = getResources().getDrawable(isSelect ? R.drawable.icon_warm_sel : R.drawable.icon_warm_nor);
Drawable drawable = getResources().getDrawable(isSelect ? R.drawable.dynamic_icon_warm_sel : R.drawable.dynamic_icon_warm_nor);
drawable.setBounds(0, 0, drawable.getMinimumWidth(), drawable.getMinimumHeight());//这句一定要加
tvZanNum.setCompoundDrawables(drawable, null, null, null);
}
......@@ -601,7 +601,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
.burryPoint("Warmth_dynamic");
int length = zanImgListAdapter.getDatas().size() > 7 ? 7 : zanImgListAdapter.getDatas().size();
likeState = 1;
ivLike.setImageResource(R.drawable.newsfeed_like_sel);
ivLike.setImageResource(R.drawable.dynamic_newsfeed_like_sel);
startAnimation(ivLike);
LogUtil.d("uid: " + DynamicIn.INSTANCE.getUserInfo().getUid());
if (!isZanListContainUser() && DynamicIn.INSTANCE.isLogin() && length < 7) {
......@@ -619,7 +619,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
LogUtil.d("showUnLikeView");
int length = zanImgListAdapter.getDatas().size() > 7 ? 7 : zanImgListAdapter.getDatas().size();
likeState = 2;
ivLike.setImageResource(R.drawable.newsfeed_like);
ivLike.setImageResource(R.drawable.dynamic_newsfeed_like);
startAnimation(ivLike);
mTrendBody.zanCount -= 1;
tvZanNum.setText(String.valueOf(mTrendBody.zanCount));
......@@ -723,7 +723,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
linNullTip.setVisibility(GONE);
} else {
linNullTip.setVisibility(VISIBLE);
tvNoComments.setText(isDataLoadError ? this.getString(R.string.trend_comments_load_error) : this.getString(R.string.trend_waitting_for_comment));
tvNoComments.setText(isDataLoadError ? this.getString(R.string.dynamic_trend_comments_load_error) : this.getString(R.string.dynamic_trend_waitting_for_comment));
}
}
......@@ -773,7 +773,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
});
}
swl.setOnRefreshListener(this);
swl.setColorSchemeResources(R.color.google_green);
swl.setColorSchemeResources(R.color.dynamic_google_green);
vpAds.getLayoutParams().height = ScreenUtil.getDisplayWidth() * 19 / 66;
vpAds.requestLayout();
vpAds.setOnTouchListener((v, event) -> {
......@@ -813,7 +813,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
@Override
public boolean onTouch(View v, MotionEvent event) {
hideEmojiLayout();
ivChooseEmoji.setImageResource(R.drawable.edict_ico_emoji);
ivChooseEmoji.setImageResource(R.drawable.dynamic_edict_ico_emoji);
return false;
}
});
......@@ -892,19 +892,19 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
LinearLayoutManager linlayoutmanager2 = new LinearLayoutManager(this);
rcvCommentsList.setLayoutManager(linlayoutmanager2);
rcvCommentsList.getItemAnimator().setChangeDuration(0);
commentListAdapter = new CommonAdapter<CommentBean>(this, R.layout.item_talk_list, comments) {
commentListAdapter = new CommonAdapter<CommentBean>(this, R.layout.dynamic_item_talk_list, comments) {
@Override
public void convert(BaseViewHolder holder, int position, CommentBean data, int dataState) {
if (lastId == data.getId() && isScrollToComment) {
holder.setBackgroundColor(R.id.lin_body, TrendsDetailActivity.this.getResources().getColor(R.color.fffaec));
holder.setBackgroundColor(R.id.lin_body, TrendsDetailActivity.this.getResources().getColor(R.color.dynamic_fffaec));
} else {
holder.setBackgroundColor(R.id.lin_body, TrendsDetailActivity.this.getResources().getColor(R.color.white));
holder.setBackgroundColor(R.id.lin_body, TrendsDetailActivity.this.getResources().getColor(R.color.dynamic_white));
}
holder.setHeadImageWithUrl(R.id.item_recommend_trend_user_head_iv, data.getHeader()); //头像
holder.setText(R.id.text_userName, data.getName()); //用户名
holder.setText(R.id.text_time, data.getTime_str()); //发布时间
holder.setImageResource(R.id.img_comment_sex, data.getGender() == 1 ? R.drawable.male : R.drawable.female);
holder.setImageResource(R.id.img_comment_zan, data.getIs_zan() == 1 ? R.drawable.reply_zan_sel : R.drawable.reply_zan);
holder.setImageResource(R.id.img_comment_sex, data.getGender() == 1 ? R.drawable.dynamic_male : R.drawable.dynamic_female);
holder.setImageResource(R.id.img_comment_zan, data.getIs_zan() == 1 ? R.drawable.dynamic_reply_zan_sel : R.drawable.dynamic_reply_zan);
showCommentItemContent(holder, data);
//咨询师标志
holder.setVisibility(R.id.iv_shang, data.getUser_type() == 2 ? VISIBLE : View.GONE) //赏
......@@ -995,11 +995,11 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
public void callBack(int result) {
switch (result) {
case 1: //已赞
holder.setImageResource(R.id.img_comment_zan, R.drawable.reply_zan_sel);
holder.setImageResource(R.id.img_comment_zan, R.drawable.dynamic_reply_zan_sel);
startAnimation(holder.getView(R.id.img_comment_zan));
break;
case 2: //未赞
holder.setImageResource(R.id.img_comment_zan, R.drawable.reply_zan);
holder.setImageResource(R.id.img_comment_zan, R.drawable.dynamic_reply_zan);
startAnimation(holder.getView(R.id.img_comment_zan));
break;
}
......@@ -1060,7 +1060,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
private void initImageContentRcv() {
LinearLayoutManager linlayoutmanager1 = new LinearLayoutManager(this);
rcvContentImags.setLayoutManager(linlayoutmanager1);
imagsContentAdapter = new CommonAdapter<TrendsDetailInfoBean.IMage>(this, R.layout.item_image, contentImags) {
imagsContentAdapter = new CommonAdapter<TrendsDetailInfoBean.IMage>(this, R.layout.dynamic_item_image, contentImags) {
@Override
public void convert(BaseViewHolder holder, int position, TrendsDetailInfoBean.IMage data, int dataState) {
GlideApp.with(TrendsDetailActivity.this)
......@@ -1081,11 +1081,11 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
private void initZanListImagRcv() {
LinearLayoutManager horizontallinManager = new LinearLayoutManager(TrendsDetailActivity.this);
horizontallinManager.setOrientation(LinearLayoutManager.HORIZONTAL);
zanImgListAdapter = new CommonAdapter<TrendsDetailInfoBean.ZanImg>(this, R.layout.item_circleimg, zanMembers) {
zanImgListAdapter = new CommonAdapter<TrendsDetailInfoBean.ZanImg>(this, R.layout.dynamic_item_circleimg, zanMembers) {
@Override
public void convert(BaseViewHolder holder, int position, TrendsDetailInfoBean.ZanImg data, int dataState) {
if (position == zan_max_num) {
holder.setImageResource(R.id.img_ico, R.drawable.newsfeed_zan_more);
holder.setImageResource(R.id.img_ico, R.drawable.dynamic_newsfeed_zan_more);
} else if (position > zan_max_num) {
//多余图片不展示
} else {
......@@ -1269,7 +1269,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
this.toContent = toContent;
this.toUsername = toName;
hideEmojiLayout();
ivChooseEmoji.setImageResource(R.drawable.edict_ico_emoji);
ivChooseEmoji.setImageResource(R.drawable.dynamic_edict_ico_emoji);
edCommentContent.setFocusable(true);
edCommentContent.setFocusableInTouchMode(true);
edCommentContent.requestFocus();
......@@ -1314,11 +1314,11 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
private void toggleEmojiLayout() {
if (mEmoticonPickerView == null || mEmoticonPickerView.getVisibility() == View.GONE) {
showEmojiLayout();
ivChooseEmoji.setImageResource(R.drawable.edict_ico_key);
ivChooseEmoji.setImageResource(R.drawable.dynamic_edict_ico_key);
} else {
hideEmojiLayout();
showInputMethod(edCommentContent);
ivChooseEmoji.setImageResource(R.drawable.edict_ico_emoji);
ivChooseEmoji.setImageResource(R.drawable.dynamic_edict_ico_emoji);
}
}
......@@ -1382,7 +1382,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
relNotExist.setVisibility(View.GONE);
linNullTip.setVisibility(mTrendBody.replyCounter > 0 ? GONE : VISIBLE);
tvGuanzhu.setVisibility(mTrendBody.is_focused == 1 || mTrendBody.uid.equals("0") || TextUtils.equals(mTrendBody.uid, DynamicIn.INSTANCE.getUserInfo().getUid()) ? View.GONE : View.VISIBLE);
ivLike.setImageResource(mTrendBody.isZan == 1 ? R.drawable.newsfeed_like_sel : R.drawable.newsfeed_like);
ivLike.setImageResource(mTrendBody.isZan == 1 ? R.drawable.dynamic_newsfeed_like_sel : R.drawable.dynamic_newsfeed_like);
if (!TextUtils.isEmpty(mTrendBody.content)) {
MoonUtil.identifyFaceExpression(this, tvContent, mTrendBody.content, ImageSpan.ALIGN_BOTTOM);
tvContent.setVisibility(View.VISIBLE);
......@@ -1405,11 +1405,11 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
setZanBackground(mTrendBody.isZan == 1);
tvHuati.setText("#" + mTrendBody.topicTitle + "#");
tvCommentNum.setText(mTrendBody.replyCounter + "个评论");
ivSex.setImageResource(mTrendBody.gender == 2 ? R.drawable.female : R.drawable.male);
ivSex.setImageResource(mTrendBody.gender == 2 ? R.drawable.dynamic_female : R.drawable.dynamic_male);
GlideApp.with(this)
.load(mTrendBody.header)
.placeholder(R.drawable.head_place_hold_pic)
.error(R.drawable.head_place_hold_pic)
.placeholder(R.drawable.dynamic_head_place_hold_pic)
.error(R.drawable.dynamic_head_place_hold_pic)
.circleCrop()
.skipMemoryCache(true)
.into(ivUserHead);//头像
......@@ -1436,7 +1436,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
tvAdTitle.setText(mTrendBody.ext.title);
GlideApp.with(this)
.load(mTrendBody.ext.cover)
.placeholder(R.drawable.default_img)
.placeholder(R.drawable.dynamic_default_img)
.centerCrop()
.into(ivAd);
iv_fm.setVisibility((null != mTrendBody && null != mTrendBody.ext && mTrendBody.ext.url.contains("fm/detail")) ? View.VISIBLE : View.GONE);
......@@ -1787,7 +1787,7 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
public void onScrollChanged(MyScrollview scrollView, int x, int y, int oldx, int oldy) {
hideEmojiLayout();
hideInputMethod();
ivChooseEmoji.setImageResource(R.drawable.edict_ico_key);
ivChooseEmoji.setImageResource(R.drawable.dynamic_edict_ico_key);
edCommentContent.clearFocus();
}
......@@ -1877,14 +1877,14 @@ public class TrendsDetailActivity extends BaseMvpActivity<ITrendsDetailView, ITr
private boolean judgeIsSlienced() {
if (DynamicIn.INSTANCE.getUserInfo() != null && DynamicIn.INSTANCE.getUserInfo().is_silenced() == 2) {
CommonDialog.create(this)
.setMessage(TrendsDetailActivity.this.getString(R.string.silence_content))
.setMessage(TrendsDetailActivity.this.getString(R.string.dynamic_silence_content))
.setLeftOnclick(TrendsDetailActivity.this.getString(R.string.platform_appeal), new View.OnClickListener() {
@Override
public void onClick(View v) {
DynamicIn.INSTANCE.startChat(TrendsDetailActivity.this, "14");
}
})
.setRightClick(TrendsDetailActivity.this.getString(R.string.approval), null)
.setRightClick(TrendsDetailActivity.this.getString(R.string.dynamic_approval), null)
.show();
return true;
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/TrendsHomeFragment.java
......@@ -128,7 +128,7 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
@Override
public int layoutResId() {
return R.layout.fragment_moments;
return R.layout.dynamic_fragment_moments;
}
@Override
......@@ -285,9 +285,9 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
switch (index) {
case 0:
mItemRecommendTv.setSelected(false);
mItemRecommendTv.setTextColor(getResources().getColor(R.color.text_666666));
mItemRecommendTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemFocusTv.setSelected(false);
mItemFocusTv.setTextColor(getResources().getColor(R.color.text_666666));
mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemHotTv.setSelected(true);
mItemHotTv.setTextColor(Color.WHITE);
break;
......@@ -295,17 +295,17 @@ public class TrendsHomeFragment extends BaseFragment implements ITrendHomeView,
mItemRecommendTv.setSelected(true);
mItemRecommendTv.setTextColor(Color.WHITE);
mItemFocusTv.setSelected(false);
mItemFocusTv.setTextColor(getResources().getColor(R.color.text_666666));
mItemFocusTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemHotTv.setSelected(false);
mItemHotTv.setTextColor(getResources().getColor(R.color.text_666666));
mItemHotTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
break;
case 2:
mItemRecommendTv.setSelected(false);
mItemRecommendTv.setTextColor(getResources().getColor(R.color.text_666666));
mItemRecommendTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
mItemFocusTv.setSelected(true);
mItemFocusTv.setTextColor(Color.WHITE);
mItemHotTv.setSelected(false);
mItemHotTv.setTextColor(getResources().getColor(R.color.text_666666));
mItemHotTv.setTextColor(getResources().getColor(R.color.dynamic_text_666666));
break;
}
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/content/TrendsContentListFragment.java
......@@ -93,7 +93,7 @@ public class TrendsContentListFragment extends BaseFragment implements ITrendsLi
@Override
public int layoutResId() {
return R.layout.fragment_trend_list_in;
return R.layout.dynamic_fragment_trend_list_in;
}
@Override
......@@ -241,9 +241,9 @@ public class TrendsContentListFragment extends BaseFragment implements ITrendsLi
private View getFooterView() {
View view;
if (trendsRcv != null) {
view = LayoutInflater.from(getActivity()).inflate(R.layout.progress_item, trendsRcv, false);
view = LayoutInflater.from(getActivity()).inflate(R.layout.dynamic_progress_item, trendsRcv, false);
} else {
view = LayoutInflater.from(getActivity()).inflate(R.layout.progress_item, null);
view = LayoutInflater.from(getActivity()).inflate(R.layout.dynamic_progress_item, null);
}
return view;
}
......@@ -464,7 +464,7 @@ public class TrendsContentListFragment extends BaseFragment implements ITrendsLi
public void showDisLikeView(View view, int position, ZanResult zanResultBaseBean, List<TrendsListBean.Trend> mDatas) {
mDatas.get(position).isZan = 2;
mDatas.get(position).zanCount -= 1;
((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.icon_warm_nor);
((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.dynamic_icon_warm_nor);
((TextView) view.findViewById(R.id.text_zan_num)).setText(String.valueOf(mDatas.get(position).zanCount));
startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position);
isDoLikeAction = false;
......@@ -481,7 +481,7 @@ public class TrendsContentListFragment extends BaseFragment implements ITrendsLi
.burryPoint("Warmth_dynamic");
mDatas.get(position).isZan = 1;
mDatas.get(position).zanCount += 1;
((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.icon_warm_sel);
((ImageView) view.findViewById(R.id.item_trend_zan_iv)).setImageResource(R.drawable.dynamic_icon_warm_sel);
((TextView) view.findViewById(R.id.text_zan_num)).setText(mDatas.get(position).zanCount + "");
startLikeViewAnimation(view.findViewById(R.id.item_trend_zan_iv), position);
isDoLikeAction = false;
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/content/TrendsCotentListAdapter.java
......@@ -120,7 +120,7 @@ public class TrendsCotentListAdapter extends RecyclerView.Adapter<BaseViewHolder
return new BaseViewHolder(mFootViews.get(viewType), mContext, viewType);
}
View view = LayoutInflater.from(mContext).inflate(R.layout.item_trends_content_list, parent, false);
View view = LayoutInflater.from(mContext).inflate(R.layout.dynamic_item_trends_content_list, parent, false);
return new BaseViewHolder(view, mContext, viewType);
}
......@@ -186,12 +186,12 @@ public class TrendsCotentListAdapter extends RecyclerView.Adapter<BaseViewHolder
.setText(R.id.text_con, "数据加载失败");
break;
case FOOTER_STATE_NO_DATA:
holder.setText(R.id.text_con, mContext.getString(R.string.no_more_data_hint))
holder.setText(R.id.text_con, mContext.getString(R.string.dynamic_no_more_data_hint))
.setVisibility(R.id.text_con, View.VISIBLE)
.setVisibility(R.id.pb, View.GONE);
break;
case FOOTRE_STATE_LOAD_MORE:
holder.setText(R.id.text_con, mContext.getString(R.string.loading_hint))
holder.setText(R.id.text_con, mContext.getString(R.string.dynamic_loading_hint))
.setVisibility(R.id.pb, View.VISIBLE)
.setVisibility(R.id.text_con, View.VISIBLE);
break;
......@@ -264,8 +264,8 @@ public class TrendsCotentListAdapter extends RecyclerView.Adapter<BaseViewHolder
.setText(R.id.text_zan_num, trend.zanCount + "")
.setText(R.id.text_talk_num, trend.commentsCount + "")
.setText(R.id.text_trend, "#" + trend.topicTitle + "#")
.setImageResource(R.id.item_trend_zan_iv, trend.isZan == 1 ? R.drawable.icon_warm_sel : R.drawable.icon_warm_nor)
.setImageResource(R.id.item_trend_user_gender_iv, trend.gender.equals("2") ? R.drawable.new_female : R.drawable.new_male)
.setImageResource(R.id.item_trend_zan_iv, trend.isZan == 1 ? R.drawable.dynamic_icon_warm_sel : R.drawable.dynamic_icon_warm_nor)
.setImageResource(R.id.item_trend_user_gender_iv, trend.gender.equals("2") ? R.drawable.dynamic_new_female : R.drawable.dynamic_new_male)
.setOnClickListener(R.id.item_trend_zan_iv, v -> {
if (onItemClickListener != null) {
onItemClickListener.onItemLikeClick(holder.getView(R.id.item_trend_zan_rel), position - getHeadersCount(), mDatas);
......@@ -340,7 +340,7 @@ public class TrendsCotentListAdapter extends RecyclerView.Adapter<BaseViewHolder
public void onDisplayImage(Context context, ImageView imageView, String url) {
imageView.setScaleType(ImageView.ScaleType.CENTER_CROP);
SimpleImageOpConfiger sp = new SimpleImageOpConfiger();
sp.errorPic = R.drawable.ic_default_color;
sp.errorPic = R.drawable.dynamic_ic_default_color;
sp.isCacheOnDisk = false;
YDLImageCacheManager.showImage(context,url,imageView,sp);
}
......
m-dynamic/src/main/java/com/yidianling/dynamic/trendsHome/view/TrendsHomeBannerView.kt
......@@ -11,7 +11,7 @@ import com.yidianling.dynamic.R
import com.yidianling.dynamic.model.TrendsListBean
import com.ydl.ydlcommon.router.IYDLRouterConstant
import com.ydl.ydlcommon.view.banner.GlideImageLoader
import kotlinx.android.synthetic.main.trends_home_banner.view.*
import kotlinx.android.synthetic.main.dynamic_trends_home_banner.view.*
/**
* @author yuanwai
......@@ -45,7 +45,7 @@ class TrendsHomeBannerView : FrameLayout {
private fun initView() {
val params = FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT)
View.inflate(context, R.layout.trends_home_banner, this)
View.inflate(context, R.layout.dynamic_trends_home_banner, this)
layoutParams = params
dp14 = RxImageTool.dip2px(14f)
dp4 = RxImageTool.dip2px(4f)
......
m-dynamic/src/main/res/drawable/bg_anonymity_line.xml → m-dynamic/src/main/res/drawable/dynamic_bg_anonymity_line.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white" />
<solid android:color="@color/dynamic_white" />
<stroke
android:width="0.5dp"
android:color="@color/platform_line" />
......
m-dynamic/src/main/res/drawable/bg_bottom_trend_line.xml → m-dynamic/src/main/res/drawable/dynamic_bg_bottom_trend_line.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid
android:color="@color/GreyWhite"/>
android:color="@color/dynamic_GreyWhite"/>
<corners
android:bottomRightRadius="0dp"
android:bottomLeftRadius="0dp"
......@@ -9,5 +9,5 @@
android:topRightRadius="0dp"/>
<stroke
android:width="0.8dp"
android:color="@color/GreyWhite"/>
android:color="@color/dynamic_GreyWhite"/>
</shape>
m-dynamic/src/main/res/drawable/bg_publish_button.xml → m-dynamic/src/main/res/drawable/dynamic_bg_publish_button.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/white" />
<solid android:color="@color/dynamic_white" />
<stroke
android:width="0.5dp"
android:color="@color/platform_line" />
......
m-dynamic/src/main/res/drawable/bg_radius_line_gray.xml → m-dynamic/src/main/res/drawable/dynamic_bg_radius_line_gray.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="2dp"/>
<solid android:color="@color/white" />
<solid android:color="@color/dynamic_white" />
<stroke android:width="1dp" android:color="@color/platform_color_grey_d0d0d0"/>
</shape>
m-dynamic/src/main/res/drawable/bg_radius_line_gray_20.xml → m-dynamic/src/main/res/drawable/dynamic_bg_radius_line_gray_20.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="10dp"></corners>
<solid android:color="@color/white" />
<solid android:color="@color/dynamic_white" />
<stroke android:width="1dp" android:color="#BEBEBE"/>
</shape>
m-dynamic/src/main/res/drawable/bg_radius_line_green_20.xml → m-dynamic/src/main/res/drawable/dynamic_bg_radius_line_green_20.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="20dp"></corners>
<solid android:color="@color/white" />
<stroke android:width="1dp" android:color="@color/google_green"/>
<solid android:color="@color/dynamic_white" />
<stroke android:width="1dp" android:color="@color/dynamic_google_green"/>
</shape>
m-dynamic/src/main/res/drawable/bg_radius_white_20.xml → m-dynamic/src/main/res/drawable/dynamic_bg_radius_white_20.xml
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="16dp"></corners>
<solid android:color="@color/white" />
<solid android:color="@color/dynamic_white" />
</shape>
......@@ -28,7 +28,7 @@
<!--<shape xmlns:android="http://schemas.android.com/apk/res/android">-->
<!--<corners android:radius="10dp"></corners>-->
<!--<solid android:color="@color/white" />-->
<!--<solid android:color="@color/dynamic_white" />-->
<!--</shape>-->
<!--</item>-->
......
m-dynamic/src/main/res/drawable/bg_topic.xml → m-dynamic/src/main/res/drawable/dynamic_bg_topic.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/msg_system_press" />
<solid android:color="@color/dynamic_msg_system_press" />
<stroke
android:width="0.5dp"
android:color="@color/platform_line" />
......
m-dynamic/src/main/res/drawable/cancel_focus_dialog_center_bg.xml → m-dynamic/src/main/res/drawable/dynamic_cancel_focus_dialog_center_bg.xml
......@@ -5,6 +5,6 @@
<corners android:radius="8dp" />
<solid
android:color="@color/white"/>
android:color="@color/dynamic_white"/>
</shape>
m-dynamic/src/main/res/drawable/confide_shape_border_trend_info_bg.xml → m-dynamic/src/main/res/drawable/dynamic_confide_shape_border_trend_info_bg.xml
......@@ -7,6 +7,6 @@
<stroke
android:width="1dp"
android:color="@color/platform_color_32D296" />
<solid android:color="@color/transparent" />
<solid android:color="@color/dynamic_transparent" />
</shape>
m-dynamic/src/main/res/drawable/focus_btn_bg2.xml → m-dynamic/src/main/res/drawable/dynamic_focus_btn_bg2.xml
......@@ -5,7 +5,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="@color/white"/>
android:color="@color/dynamic_white"/>
<corners
android:bottomRightRadius="20dp"
android:bottomLeftRadius="20dp"
......@@ -13,7 +13,7 @@
android:topRightRadius="20dp"/>
<stroke
android:width="1dp"
android:color="@color/google_green"/>
android:color="@color/dynamic_google_green"/>
</shape>
</item>
</layer-list>
m-dynamic/src/main/res/drawable/focus_topic_detail_bg.xml → m-dynamic/src/main/res/drawable/dynamic_focus_topic_detail_bg.xml
......@@ -5,7 +5,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="@color/google_green"/>
android:color="@color/dynamic_google_green"/>
<corners
android:bottomRightRadius="20dp"
android:bottomLeftRadius="20dp"
......@@ -13,7 +13,7 @@
android:topRightRadius="20dp"/>
<stroke
android:width="0.5dp"
android:color="@color/google_green"/>
android:color="@color/dynamic_google_green"/>
</shape>
</item>
</layer-list>
m-dynamic/src/main/res/drawable/focused_topic_detail_bg.xml → m-dynamic/src/main/res/drawable/dynamic_focused_topic_detail_bg.xml
......@@ -13,7 +13,7 @@
android:topRightRadius="20dp"/>
<stroke
android:width="0.5dp"
android:color="@color/white"/>
android:color="@color/dynamic_white"/>
</shape>
</item>
</layer-list>
m-dynamic/src/main/res/drawable/ic_default_color.xml → m-dynamic/src/main/res/drawable/dynamic_ic_default_color.xml
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/gray7"/>
<solid android:color="@color/dynamic_gray7"/>
</shape>
m-dynamic/src/main/res/drawable/layout_border.xml → m-dynamic/src/main/res/drawable/dynamic_layout_border.xml
......@@ -5,7 +5,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="@color/white"/>
android:color="@color/dynamic_white"/>
<corners
android:bottomRightRadius="0dp"
android:bottomLeftRadius="0dp"
......
m-dynamic/src/main/res/drawable/nim_emoji_item_selector.xml → m-dynamic/src/main/res/drawable/dynamic_nim_emoji_item_selector.xml
<?xml version="1.0" encoding="UTF-8"?>
<selector
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:state_pressed="true" android:drawable="@drawable/nim_emoji_ck_bg" />
<item android:state_pressed="true" android:drawable="@drawable/dynamic_nim_emoji_ck_bg" />
<item android:state_pressed="false" android:drawable="@android:color/transparent" />
</selector>
m-dynamic/src/main/res/drawable/nim_sticker_button_background_normal_layer_list.xml → m-dynamic/src/main/res/drawable/dynamic_nim_sticker_button_background_normal_layer_list.xml
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:width="@dimen/split_one_pixels">
<item android:width="@dimen/dynamic_split_one_pixels">
<shape android:shape="rectangle" >
<solid android:color="@color/platform_color_split_line_d9d9d9" />
</shape>
</item>
<item android:left="@dimen/split_one_pixels">
<item android:left="@dimen/dynamic_split_one_pixels">
<shape android:shape="rectangle" >
<solid android:color="@color/white" />
<solid android:color="@color/dynamic_white" />
</shape>
</item>
......
m-dynamic/src/main/res/drawable/nim_sticker_button_background_pressed_layer_list.xml → m-dynamic/src/main/res/drawable/dynamic_nim_sticker_button_background_pressed_layer_list.xml
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:width="@dimen/split_one_pixels">
<item android:width="@dimen/dynamic_split_one_pixels">
<shape android:shape="rectangle" >
<solid android:color="@color/platform_color_split_line_d9d9d9" />
</shape>
</item>
<item android:left="@dimen/split_one_pixels">
<item android:left="@dimen/dynamic_split_one_pixels">
<shape android:shape="rectangle" >
<solid android:color="@color/platform_color_split_line_d9d9d9" />
</shape>
......
m-dynamic/src/main/res/drawable/nim_view_pager_indicator_selector.xml → m-dynamic/src/main/res/drawable/dynamic_nim_view_pager_indicator_selector.xml
<?xml version="1.0" encoding="UTF-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/nim_moon_page_selected" android:state_selected="true"/>
<item android:drawable="@drawable/nim_moon_page_unselected"/>
<item android:drawable="@drawable/dynamic_nim_moon_page_selected" android:state_selected="true"/>
<item android:drawable="@drawable/dynamic_nim_moon_page_unselected"/>
</selector>
m-dynamic/src/main/res/drawable/dynamic_selector_bg_focus.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/dynamic_bg_fcous_selected" android:state_selected="true"/>
<item android:state_selected="false" android:drawable="@drawable/dynamic_bg_fcous_unselect"/>
</selector>
m-dynamic/src/main/res/drawable/dynamic_selector_bg_hot.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/dynamic_bg_hot_selected" android:state_selected="true"/>
<item android:state_selected="false" android:drawable="@drawable/dynamic_bg_hot_unselect"/>
</selector>
m-dynamic/src/main/res/drawable/dynamic_selector_bg_recommend.xml 0 → 100644
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/dynamic_bg_recommend_selected" android:state_selected="true"/>
<item android:state_selected="false" android:drawable="@drawable/dynamic_bg_recommend_unselect"/>
</selector>
m-dynamic/src/main/res/drawable/shape_gray_round.xml → m-dynamic/src/main/res/drawable/dynamic_shape_gray_round.xml
......@@ -2,10 +2,10 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<!-- 圆角 -->
<corners android:radius="@dimen/default_dis_size_big" />
<corners android:radius="@dimen/dynamic_default_dis_size_big" />
<stroke
android:width="1dp"
android:color="#D6D6D6" />
<solid android:color="@color/transparent" />
<solid android:color="@color/dynamic_transparent" />
</shape>
m-dynamic/src/main/res/drawable/shape_green_border_trend_info_bg.xml → m-dynamic/src/main/res/drawable/dynamic_shape_green_border_trend_info_bg.xml
......@@ -6,7 +6,7 @@
<stroke
android:width="1dp"
android:color="@color/google_green" />
<solid android:color="@color/transparent" />
android:color="@color/dynamic_google_green" />
<solid android:color="@color/dynamic_transparent" />
</shape>
m-dynamic/src/main/res/drawable/shape_red_round.xml → m-dynamic/src/main/res/drawable/dynamic_shape_red_round.xml
......@@ -6,6 +6,6 @@
<stroke
android:width="3dp"
android:color="#EB5835" />
<solid android:color="@color/transparent" />
<solid android:color="@color/dynamic_transparent" />
</shape>
m-dynamic/src/main/res/drawable/selector_bg_focus.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_fcous_selected" android:state_selected="true"/>
<item android:state_selected="false" android:drawable="@drawable/bg_fcous_unselect"/>
</selector>
\ No newline at end of file
m-dynamic/src/main/res/drawable/selector_bg_hot.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_hot_selected" android:state_selected="true"/>
<item android:state_selected="false" android:drawable="@drawable/bg_hot_unselect"/>
</selector>
\ No newline at end of file
m-dynamic/src/main/res/drawable/selector_bg_recommend.xml deleted 100644 → 0
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/bg_recommend_selected" android:state_selected="true"/>
<item android:state_selected="false" android:drawable="@drawable/bg_recommend_unselect"/>
</selector>
\ No newline at end of file
m-dynamic/src/main/res/layout/activity_all_topic.xml → m-dynamic/src/main/res/layout/dynamic_activity_all_topic.xml
......@@ -6,15 +6,15 @@
<RelativeLayout
android:id="@+id/topic_title_rel"
android:layout_width="match_parent"
android:layout_height="@dimen/title_height"
android:background="@drawable/layout_border"
android:layout_height="@dimen/dynamic_title_height"
android:background="@drawable/dynamic_layout_border"
android:layout_alignParentTop="true">
<ImageView
android:id="@+id/topic_title_back_iv"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:src="@drawable/toolbar_back"
android:src="@drawable/dynamic_toolbar_back"
android:layout_centerInParent="true"
android:paddingLeft="15dp"
android:paddingRight="30dp"
......@@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="话题"
android:textSize="@dimen/title_txt_sp" />
android:textSize="@dimen/dynamic_title_txt_sp" />
</RelativeLayout>
<android.support.v4.view.ViewPager
......
m-dynamic/src/main/res/layout/activity_browse_pictures.xml → m-dynamic/src/main/res/layout/dynamic_activity_browse_pictures.xml
......@@ -21,7 +21,7 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/title_height"
android:layout_height="@dimen/dynamic_title_height"
android:layout_below="@+id/browse_pictures_top_v"
android:background="#00ffffff">
......@@ -33,7 +33,7 @@
android:layout_centerVertical="true"
android:paddingLeft="15dp"
android:paddingRight="30dp"
android:src="@drawable/titlebar_back1" />
android:src="@drawable/dynamic_titlebar_back1" />
<TextView
android:id="@+id/browse_pictures_num_tv"
......@@ -41,8 +41,8 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="1/9"
android:textColor="@color/white"
android:textSize="@dimen/title_txt_sp" />
android:textColor="@color/dynamic_white"
android:textSize="@dimen/dynamic_title_txt_sp" />
<TextView
android:id="@+id/browse_pictures_save_tv"
......@@ -53,8 +53,8 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="保存"
android:textColor="@color/white"
android:textSize="@dimen/title_txt_sp" />
android:textColor="@color/dynamic_white"
android:textSize="@dimen/dynamic_title_txt_sp" />
</RelativeLayout>
</RelativeLayout>
m-dynamic/src/main/res/layout/activity_members.xml → m-dynamic/src/main/res/layout/dynamic_activity_members.xml
......@@ -4,7 +4,7 @@
xmlns:myapp="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/dynamic_white"
tools:context=".members.MembersActivity">
......@@ -66,9 +66,9 @@
android:id="@+id/members_top_head_iv"
android:layout_width="80dp"
android:layout_height="80dp"
android:src="@drawable/head_place_hold_pic"
android:src="@drawable/dynamic_head_place_hold_pic"
myapp:pa_border_width="2dp"
myapp:pa_border_color="@color/white"
myapp:pa_border_color="@color/dynamic_white"
android:layout_centerInParent="true" />
<LinearLayout
android:id="@+id/members_top_user_lin"
......@@ -84,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:textSize="18sp" />
<ImageView
......@@ -93,7 +93,7 @@
android:layout_height="15dp"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp"
android:src="@drawable/male" />
android:src="@drawable/dynamic_male" />
</LinearLayout>
<LinearLayout
android:id="@+id/members_top_user_focus_lin"
......@@ -110,7 +110,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/text_gray" />
android:textColor="@color/dynamic_text_gray" />
<TextView
android:layout_width="wrap_content"
......@@ -118,14 +118,14 @@
android:layout_margin="5dp"
android:layout_marginRight="5dp"
android:text="|"
android:textColor="@color/text_gray" />
android:textColor="@color/dynamic_text_gray" />
<TextView
android:id="@+id/members_top_user_fensi_num_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/text_gray" />
android:textColor="@color/dynamic_text_gray" />
<TextView
android:layout_width="wrap_content"
......@@ -133,14 +133,14 @@
android:layout_margin="5dp"
android:layout_marginRight="5dp"
android:text="|"
android:textColor="@color/text_gray" />
android:textColor="@color/dynamic_text_gray" />
<TextView
android:id="@+id/members_top_user_zan_num_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text=""
android:textColor="@color/text_gray" />
android:textColor="@color/dynamic_text_gray" />
</LinearLayout>
<RelativeLayout
......@@ -155,7 +155,7 @@
android:layout_height="35dp"
android:layout_centerInParent="true"
android:visibility="gone"
android:background="@drawable/focus_topic_detail_bg">
android:background="@drawable/dynamic_focus_topic_detail_bg">
<TextView
android:id="@+id/members_top_user_focus_ortion_tv"
......@@ -165,7 +165,7 @@
android:text=""
android:textSize="@dimen/platform_dp_15"
android:drawablePadding="10dp"
android:textColor="@color/white" />
android:textColor="@color/dynamic_white" />
</RelativeLayout>
......@@ -179,7 +179,7 @@
android:layout_centerVertical="true"
android:visibility="gone"
android:layout_toRightOf="@+id/members_top_user_focus_ortion_rel"
android:src="@drawable/newsfeed_like" />
android:src="@drawable/dynamic_newsfeed_like" />
</RelativeLayout>
</RelativeLayout>
......@@ -217,15 +217,15 @@
android:layout_alignParentTop="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:background="@color/trend_transparent"
android:background="@color/dynamic_trend_transparent"
android:visibility="visible" />-->
<RelativeLayout
android:id="@+id/members_title_rel"
android:layout_width="match_parent"
android:layout_alignParentTop="true"
android:layout_height="@dimen/title_height"
android:background="@color/trend_transparent">
android:layout_height="@dimen/dynamic_title_height"
android:background="@color/dynamic_trend_transparent">
<ImageView
android:id="@+id/members_title_back_iv"
......@@ -235,21 +235,21 @@
android:layout_centerInParent="true"
android:paddingLeft="15dp"
android:paddingRight="30dp"
android:src="@drawable/titlebar_back2" />
android:src="@drawable/dynamic_titlebar_back2" />
<TextView
android:id="@+id/members_title_top_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:gravity="center_horizontal"
android:layout_centerInParent="true"
android:layout_marginLeft="45dp"
android:layout_marginRight="45dp"
android:text=""
android:singleLine="true"
android:textSize="@dimen/title_txt_sp"/>
android:textSize="@dimen/dynamic_title_txt_sp"/>
<ImageView
android:id="@+id/members_title_top_right_tv"
android:layout_width="wrap_content"
......@@ -260,7 +260,7 @@
android:paddingRight="15dp"
android:paddingTop="15dp"
android:paddingBottom="15dp"
android:src="@drawable/more_green2" />
android:src="@drawable/dynamic_more_green2" />
</RelativeLayout>
<LinearLayout
......@@ -274,7 +274,7 @@
android:layout_width="match_parent"
android:layout_height="49.5dp"
android:orientation="horizontal"
android:background="@color/white">
android:background="@color/dynamic_white">
<RelativeLayout
android:id="@+id/members_trend_rel"
android:layout_width="0dp"
......@@ -289,7 +289,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="动态"
android:textColor="@color/title_green"
android:textColor="@color/dynamic_title_green"
android:textSize="18sp" />
<TextView
......@@ -298,7 +298,7 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/title_green" />
android:background="@color/dynamic_title_green" />
</RelativeLayout>
......@@ -316,7 +316,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="个人资料"
android:textColor="@color/text_gray"
android:textColor="@color/dynamic_text_gray"
android:textSize="18sp" />
<TextView
......@@ -325,13 +325,13 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/white" />
android:background="@color/dynamic_white" />
</RelativeLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_below="@+id/members_type_lin"
android:background="@color/title_bottom_line_bg"/>
android:background="@color/dynamic_title_bottom_line_bg"/>
</LinearLayout>
</RelativeLayout>
m-dynamic/src/main/res/layout/activity_mytrends.xml → m-dynamic/src/main/res/layout/dynamic_activity_mytrends.xml
......@@ -7,7 +7,7 @@
android:id="@+id/rela_toolBar"
android:layout_width="match_parent"
android:layout_height="45dp"
android:background="@color/white">
android:background="@color/dynamic_white">
<ImageView
android:id="@+id/image_back"
......@@ -16,7 +16,7 @@
android:paddingLeft="15dp"
android:paddingRight="30dp"
android:gravity="center_vertical"
android:src="@drawable/toolbar_back" />
android:src="@drawable/dynamic_toolbar_back" />
<TextView
android:id="@+id/tv_center_title"
......@@ -30,8 +30,8 @@
android:text="我的动态"
android:focusable="true"
android:focusableInTouchMode="true"
android:textColor="@color/default_text_color"
android:textSize="@dimen/default_text_size_big" />
android:textColor="@color/dynamic_default_text_color"
android:textSize="@dimen/dynamic_default_text_size_big" />
<ImageView
android:id="@+id/image_right"
......@@ -43,14 +43,14 @@
android:gravity="center_vertical"
android:paddingRight="10dp"
android:visibility="gone"
android:src="@drawable/more12x" />
android:src="@drawable/dynamic_more12x" />
</RelativeLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white"
android:background="@color/dynamic_white"
android:orientation="horizontal">
<RelativeLayout
......@@ -68,7 +68,7 @@
android:paddingRight="15dp"
android:gravity="center_vertical"
android:text="我发布的"
android:textColor="@color/title_green"
android:textColor="@color/dynamic_title_green"
android:textSize="18sp" />
<TextView
......@@ -77,7 +77,7 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/title_green" />
android:background="@color/dynamic_title_green" />
</RelativeLayout>
<RelativeLayout
......@@ -95,7 +95,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="我评论的"
android:textColor="@color/text_gray"
android:textColor="@color/dynamic_text_gray"
android:textSize="18sp" />
<TextView
......@@ -104,14 +104,14 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/white" />
android:background="@color/dynamic_white" />
</RelativeLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/title_bottom_line_bg" />
android:background="@color/dynamic_title_bottom_line_bg" />
<android.support.v4.view.ViewPager
android:id="@+id/viewpager_frag"
......
m-dynamic/src/main/res/layout/activity_selec_topic.xml → m-dynamic/src/main/res/layout/dynamic_activity_selec_topic.xml
......@@ -3,14 +3,14 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/dynamic_white">
<RelativeLayout
android:id="@+id/select_topic_title_rel"
android:layout_width="match_parent"
android:layout_height="@dimen/title_height"
android:layout_height="@dimen/dynamic_title_height"
android:layout_alignParentTop="true"
android:background="@color/white">
android:background="@color/dynamic_white">
<TextView
......@@ -18,7 +18,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="选择话题"
android:textSize="@dimen/title_txt_sp" />
android:textSize="@dimen/dynamic_title_txt_sp" />
<TextView
android:id="@+id/select_topic_cancel_tv"
......@@ -29,7 +29,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="取消"
android:textColor="@color/google_green"
android:textColor="@color/dynamic_google_green"
android:textSize="18sp" />
</RelativeLayout>
<ScrollView
......@@ -51,7 +51,7 @@
android:layout_height="40dp"
android:paddingLeft="15dp"
android:textSize="16sp"
android:background="@color/defult_bg"
android:background="@color/dynamic_defult_bg"
android:gravity="center_vertical"
android:text="我关注的" />
<com.ydl.ydlcommon.view.widgets.RecyclerViewForScrollView
......@@ -74,7 +74,7 @@
android:layout_height="40dp"
android:paddingLeft="15dp"
android:textSize="16sp"
android:background="@color/defult_bg"
android:background="@color/dynamic_defult_bg"
android:gravity="center_vertical"
android:text="推荐话题" />
<com.ydl.ydlcommon.view.widgets.RecyclerViewForScrollView
......
m-dynamic/src/main/res/layout/activity_topic_detail.xml → m-dynamic/src/main/res/layout/dynamic_activity_topic_detail.xml
......@@ -63,7 +63,7 @@
android:layout_marginBottom="10dp"
android:gravity="center_horizontal"
android:text=""
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:textSize="22sp"
android:textStyle="bold" />
......@@ -76,7 +76,7 @@
android:layout_marginBottom="10dp"
android:gravity="center_horizontal"
android:text=""
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:textSize="14sp" />
<RelativeLayout
......@@ -90,10 +90,10 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/topic_detail_visit_zj_tv"
android:drawableLeft="@drawable/pageview"
android:drawableLeft="@drawable/dynamic_pageview"
android:drawablePadding="5dp"
android:text=""
android:textColor="@color/white" />
android:textColor="@color/dynamic_white" />
<TextView
android:id="@+id/topic_detail_visit_zj_tv"
......@@ -109,10 +109,10 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toRightOf="@+id/topic_detail_visit_zj_tv"
android:drawableLeft="@drawable/post"
android:drawableLeft="@drawable/dynamic_post"
android:drawablePadding="5dp"
android:text=""
android:textColor="@color/white" />
android:textColor="@color/dynamic_white" />
</RelativeLayout>
......@@ -121,10 +121,10 @@
android:layout_width="100dp"
android:layout_height="30dp"
android:layout_gravity="center_horizontal"
android:background="@drawable/focus_topic_detail_bg"
android:background="@drawable/dynamic_focus_topic_detail_bg"
android:gravity="center"
android:text=""
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:textSize="14sp"
android:visibility="gone" />
</LinearLayout>
......@@ -141,7 +141,7 @@
android:id="@+id/topic_detail_users_rel"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@color/white">
android:background="@color/dynamic_white">
<ImageView
android:id="@+id/mine_next_iv"
......@@ -150,7 +150,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:src="@drawable/mine_next" />
android:src="@drawable/dynamic_mine_next" />
<TextView
android:id="@+id/topic_detail_users_num_tv"
......@@ -161,7 +161,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text=""
android:textColor="@color/google_green" />
android:textColor="@color/dynamic_google_green" />
<android.support.v7.widget.RecyclerView
android:id="@+id/topic_detail_users_rcv"
......@@ -180,13 +180,13 @@
android:id="@+id/divide_line"
android:layout_width="match_parent"
android:layout_height="5dp"
android:background="@color/divide_color" />
android:background="@color/dynamic_divide_color" />
<android.support.v7.widget.RecyclerView
android:id="@+id/top_trends_rcv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/dynamic_white"
android:clickable="false"
android:focusable="false" />
......@@ -208,7 +208,7 @@
android:layout_alignParentLeft="true"
android:layout_centerInParent="true"
android:paddingRight="30dp"
android:src="@drawable/titlebar_back2" />
android:src="@drawable/dynamic_titlebar_back2" />
<ImageView
android:id="@+id/topic_detail_title_top_right_tv"
......@@ -221,7 +221,7 @@
android:paddingTop="15dp"
android:paddingRight="15dp"
android:paddingBottom="15dp"
android:src="@drawable/more_green2" />
android:src="@drawable/dynamic_more_green2" />
</android.support.v7.widget.Toolbar>
......@@ -232,7 +232,7 @@
android:id="@+id/topic_detail_type_lin"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@drawable/layout_border"
android:background="@drawable/dynamic_layout_border"
android:orientation="horizontal">
<RelativeLayout
......@@ -275,7 +275,7 @@
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="推荐"
android:textColor="@color/text_gray"
android:textColor="@color/dynamic_text_gray"
android:textSize="18sp" />
<View
......@@ -284,7 +284,7 @@
android:layout_height="2dp"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@color/white" />
android:background="@color/dynamic_white" />
</RelativeLayout>
</LinearLayout>
......@@ -305,8 +305,8 @@
android:layout_marginRight="20dp"
android:layout_marginBottom="20dp"
android:elevation="3dp"
android:src="@drawable/newsfeed_new2"
app:backgroundTint="@color/google_green"
android:src="@drawable/dynamic_newsfeed_new2"
app:backgroundTint="@color/dynamic_google_green"
app:borderWidth="0dp"
app:fabSize="normal" />
......
m-dynamic/src/main/res/layout/activity_trend.xml → m-dynamic/src/main/res/layout/dynamic_activity_trend.xml
......@@ -8,8 +8,8 @@
<RelativeLayout
android:id="@+id/publish_trend_title_rel"
android:layout_width="match_parent"
android:layout_height="@dimen/title_height"
android:background="@drawable/background_publish_trend_top">
android:layout_height="@dimen/dynamic_title_height"
android:background="@drawable/dynamic_background_publish_trend_top">
<ImageView
android:id="@+id/img_back"
......@@ -29,7 +29,7 @@
app:tl_indicator_anim_enable="false"
app:tl_indicator_height="0dp"
app:tl_tab_space_equal="true"
app:tl_textSelectColor="@color/white"
app:tl_textSelectColor="@color/dynamic_white"
app:tl_textUnselectColor="@color/platform_color_50ffffff"
app:tl_textsize="17sp" />
......@@ -41,7 +41,7 @@
android:layout_alignParentRight="true"
android:layout_centerInParent="true"
android:layout_marginRight="15dp"
android:background="@drawable/bg_publish_button"
android:background="@drawable/dynamic_bg_publish_button"
android:gravity="center"
android:paddingLeft="10dp"
android:paddingRight="10dp"
......@@ -83,10 +83,10 @@
<!--android:layout_height="wrap_content"-->
<!--android:layout_below="@+id/view"-->
<!--android:layout_marginTop="-1dp"-->
<!--android:background="@drawable/background_publish_notice_view"-->
<!--android:background="@drawable/dynamic_background_publish_notice_view"-->
<!--android:padding="5dp"-->
<!--android:text="点击这里可以提问哦"-->
<!--android:textColor="@color/white"-->
<!--android:textColor="@color/dynamic_white"-->
<!--android:textSize="11dp" />-->
<!--<View-->
......@@ -94,7 +94,7 @@
<!--android:layout_width="15dp"-->
<!--android:layout_height="15dp"-->
<!--android:layout_centerHorizontal="true"-->
<!--android:background="@drawable/background_publish_triangle_view" />-->
<!--android:background="@drawable/dynamic_background_publish_triangle_view" />-->
<!--</RelativeLayout>-->
</FrameLayout>
m-dynamic/src/main/res/layout/activity_trend_details.xml → m-dynamic/src/main/res/layout/dynamic_activity_trend_details.xml
......@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white"
android:background="@color/dynamic_white"
android:orientation="vertical">
<!--TitleBar-->
<RelativeLayout
......@@ -19,7 +19,7 @@
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="30dp"
android:src="@drawable/toolbar_back" />
android:src="@drawable/dynamic_toolbar_back" />
<TextView
android:id="@+id/tv_center_title"
......@@ -31,8 +31,8 @@
android:maxEms="12"
android:maxLines="1"
android:text="动态详情"
android:textColor="@color/default_text_color"
android:textSize="@dimen/default_text_size_big" />
android:textColor="@color/dynamic_default_text_color"
android:textSize="@dimen/dynamic_default_text_size_big" />
<ImageView
android:id="@+id/image_right"
......@@ -42,13 +42,13 @@
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:src="@drawable/more_green" />
android:src="@drawable/dynamic_more_green" />
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:layout_height="@dimen/dynamic_divide_line_stroke_width"
android:layout_alignParentBottom="true"
android:background="@color/divide_color" />
android:background="@color/dynamic_divide_color" />
</RelativeLayout>
......@@ -96,7 +96,7 @@
android:paddingLeft="15dp"
android:paddingRight="10dp"
android:paddingTop="10dp"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:textSize="18sp"
android:textStyle="bold"
tools:text="标题有报道称，朝鲜正在准备进行第六次核试验，预计此次核试规模将" />
......@@ -117,7 +117,7 @@
android:id="@+id/item_recommend_trend_user_head_iv"
android:layout_width="45dp"
android:layout_height="45dp"
android:src="@drawable/head_place_hold_pic" />
android:src="@drawable/dynamic_head_place_hold_pic" />
<RelativeLayout
android:id="@+id/text_userName_rel"
......@@ -133,7 +133,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textColor="@color/text_trend_black"
android:textColor="@color/dynamic_text_trend_black"
tools:text="小明" />
<ImageView
......@@ -144,7 +144,7 @@
android:layout_marginLeft="5dp"
android:layout_toRightOf="@+id/text_userName"
android:scaleType="fitXY"
android:src="@drawable/male" />
android:src="@drawable/dynamic_male" />
</RelativeLayout>
......@@ -157,7 +157,7 @@
android:layout_marginLeft="10dp"
android:layout_marginTop="7dp"
android:layout_toRightOf="@+id/item_recommend_trend_user_head_iv"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp"
tools:text="23分钟前" />
......@@ -168,7 +168,7 @@
android:layout_below="@+id/text_userName_rel"
android:layout_marginTop="7dp"
android:layout_toRightOf="@id/text_time"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp"
tools:text=" - 来自安卓客户端" />
......@@ -179,11 +179,11 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="5dp"
android:background="@drawable/shape_green_border_trend_info_bg"
android:background="@drawable/dynamic_shape_green_border_trend_info_bg"
android:clickable="true"
android:gravity="center"
android:text="+ 关注"
android:textColor="@color/green3"
android:textColor="@color/dynamic_green3"
android:textSize="14sp"
android:visibility="gone"
tools:visibility="visible" />
......@@ -199,7 +199,7 @@
android:layout_marginRight="15dp"
android:layout_marginTop="10dp"
android:lineSpacingExtra="3dp"
android:textColor="@color/text_trend_black"
android:textColor="@color/dynamic_text_trend_black"
android:textSize="17sp"
tools:contentDescription="链接位"
tools:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计此次核试规模将比上一次增加十几倍。对此，外交部回应表示：中方反对朝鲜核试的立场是明确和一贯的。当前半岛形势高度复杂敏感，任何可能加剧半岛局势紧张的举动都是不可取的。希望相关各方都保持冷静克制，负起自己的责任，不要采取进一步相互刺激和加剧局势紧张的行动。" />
......@@ -223,7 +223,7 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginTop="15dp"
android:background="@color/trend_gray"
android:background="@color/dynamic_trend_gray"
android:visibility="gone"
tools:visibility="visible">
......@@ -233,14 +233,14 @@
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_centerVertical="true"
android:src="@drawable/default_img" />
android:src="@drawable/dynamic_default_img" />
<ImageView
android:id="@+id/iv_fm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:src="@drawable/img_trend_fm_play"
android:src="@drawable/dynamic_img_trend_fm_play"
android:visibility="gone"
tools:visibility="visible" />
<TextView
......@@ -263,7 +263,7 @@
android:layout_height="0.5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/f5f5f5" />
android:background="@color/dynamic_f5f5f5" />
<LinearLayout
android:layout_width="match_parent"
......@@ -278,17 +278,17 @@
android:drawablePadding="3dp"
android:gravity="center_vertical"
android:text="来自话题"
android:textSize="@dimen/text_size_13" />
android:textSize="@dimen/dynamic_text_size_13" />
<TextView
android:id="@+id/text_huati"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:drawableRight="@drawable/msg_next"
android:drawableRight="@drawable/dynamic_msg_next"
android:gravity="center_vertical"
android:textColor="@color/platform_color_blue_3a9efb"
android:textSize="@dimen/text_size_17"
android:textSize="@dimen/dynamic_text_size_17"
tools:text="#小朋友去哪了#" />
</LinearLayout>
......@@ -298,7 +298,7 @@
android:layout_marginBottom="10dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/f5f5f5" />
android:background="@color/dynamic_f5f5f5" />
<!--赞阅读量-->
<RelativeLayout
......@@ -317,9 +317,9 @@
android:layout_centerVertical="true"
android:gravity="center"
android:adjustViewBounds="true"
android:drawableLeft="@drawable/icon_see_nor"
android:drawableLeft="@drawable/dynamic_icon_see_nor"
android:drawablePadding="4dp"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
tools:text="5" />
<TextView
......@@ -331,8 +331,8 @@
android:adjustViewBounds="true"
android:layout_marginLeft="15dp"
android:layout_toRightOf="@+id/item_recommend_trend_readed_tv"
android:textColor="@color/text_trend_defult"
android:drawableLeft="@drawable/icon_warm_nor"
android:textColor="@color/dynamic_text_trend_defult"
android:drawableLeft="@drawable/dynamic_icon_warm_nor"
android:drawablePadding="4dp"
tools:text="10" />
......@@ -364,7 +364,7 @@
android:layout_alignParentRight="true"
android:layout_gravity="center|right"
android:paddingLeft="15dp"
android:src="@drawable/msg_next"
android:src="@drawable/dynamic_msg_next"
android:visibility="gone"
tools:visibility="visible" />
</LinearLayout>
......@@ -372,7 +372,7 @@
<View
android:layout_width="match_parent"
android:layout_height="15dp"
android:background="@color/f5f5f5" />
android:background="@color/dynamic_f5f5f5" />
<FrameLayout
......@@ -385,7 +385,7 @@
android:id="@+id/vp_ads"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white" />
android:background="@color/dynamic_white" />
<me.relex.circleindicator.CircleIndicator
android:id="@+id/circle_indicator"
......@@ -397,7 +397,7 @@
<View
android:layout_width="match_parent"
android:layout_height="15dp"
android:background="@color/f5f5f5" />
android:background="@color/dynamic_f5f5f5" />
<TextView
android:id="@+id/text_talk_num"
......@@ -414,13 +414,13 @@
android:layout_gravity="center_horizontal"
android:layout_marginBottom="20dp"
android:layout_marginTop="5dp"
android:background="@drawable/shape_green_border_trend_info_bg"
android:background="@drawable/dynamic_shape_green_border_trend_info_bg"
android:paddingBottom="8dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingTop="8dp"
android:text="显示所有评论"
android:textColor="@color/google_green"
android:textColor="@color/dynamic_google_green"
android:textSize="15sp"
android:visibility="gone"
tools:visibility="visible" />
......@@ -447,7 +447,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:src="@drawable/blank"
android:src="@drawable/dynamic_blank"
android:visibility="visible" />
<TextView
......@@ -481,7 +481,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/blank" />
android:src="@drawable/dynamic_blank" />
<TextView
android:layout_width="wrap_content"
......@@ -493,7 +493,7 @@
</RelativeLayout>
<include layout="@layout/include_trend_info_bottom" />
<include layout="@layout/dynamic_include_trend_info_bottom" />
</LinearLayout>
<com.ydl.ydlcommon.ui.LogoLoadingView
......
m-dynamic/src/main/res/layout/activity_trends_reply_info.xml → m-dynamic/src/main/res/layout/dynamic_activity_trends_reply_info.xml
......@@ -5,7 +5,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/dynamic_white">
<RelativeLayout
android:id="@+id/rela_toolBar"
......@@ -19,7 +19,7 @@
android:gravity="center_vertical"
android:paddingLeft="15dp"
android:paddingRight="30dp"
android:src="@drawable/toolbar_back" />
android:src="@drawable/dynamic_toolbar_back" />
<TextView
android:id="@+id/tv_center_title"
......@@ -31,8 +31,8 @@
android:maxEms="12"
android:maxLines="1"
android:text="评论详情"
android:textColor="@color/default_text_color"
android:textSize="@dimen/default_text_size_big" />
android:textColor="@color/dynamic_default_text_color"
android:textSize="@dimen/dynamic_default_text_size_big" />
<ImageView
android:id="@+id/image_right"
......@@ -44,13 +44,13 @@
android:gravity="center_vertical"
android:paddingRight="10dp"
android:visibility="gone"
android:src="@drawable/more12x" />
android:src="@drawable/dynamic_more12x" />
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:layout_height="@dimen/dynamic_divide_line_stroke_width"
android:layout_alignParentBottom="true"
android:background="@color/divide_color" />
android:background="@color/dynamic_divide_color" />
</RelativeLayout>
......@@ -98,7 +98,7 @@
android:id="@+id/item_recommend_trend_user_head"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/head_place_hold_pic" />
android:src="@drawable/dynamic_head_place_hold_pic" />
<ImageView
android:id="@+id/img_sex"
......@@ -107,7 +107,7 @@
android:visibility="gone"
android:layout_alignBottom="@id/item_recommend_trend_user_head"
android:layout_alignRight="@+id/item_recommend_trend_user_head"
android:src="@drawable/male" />
android:src="@drawable/dynamic_male" />
</RelativeLayout>
......@@ -120,7 +120,7 @@
android:layout_marginTop="10dp"
android:layout_toRightOf="@+id/item_trend_user_head"
android:drawablePadding="5dp"
android:textColor="@color/text_trend_black"
android:textColor="@color/dynamic_text_trend_black"
tools:text="小明" />
......@@ -132,7 +132,7 @@
android:layout_marginLeft="20dp"
android:layout_marginTop="5dp"
android:layout_toRightOf="@+id/item_trend_user_head"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp"
tools:text="23分钟前" />
</RelativeLayout>
......@@ -147,7 +147,7 @@
android:lineSpacingExtra="3dp"
android:layout_marginBottom="10dp"
android:textSize="17sp"
android:textColor="@color/text_trend_black"
android:textColor="@color/dynamic_text_trend_black"
tools:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计此次核试规模将比上一次增加十几倍。对此，外交部回应表示：中方反对朝鲜核试的立场是明确和一贯的。当前半岛形势高度复杂敏感，任何可能加剧半岛局势紧张的举动都是不可取的。希望相关各方都保持冷静克制，负起自己的责任，不要采取进一步相互刺激和加剧局势紧张的行动。" />
<View
......@@ -155,7 +155,7 @@
android:layout_height="0.5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:background="@color/f5f5f5" />
android:background="@color/dynamic_f5f5f5" />
<TextView
......@@ -166,13 +166,13 @@
android:layout_marginLeft="15dp"
android:gravity="center_vertical"
android:layout_toRightOf="@+id/item_recommend_trend_readed_tv"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
tools:text="赞 10" />
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/f5f5f5" />
android:background="@color/dynamic_f5f5f5" />
<android.support.v7.widget.RecyclerView
android:id="@+id/recy_ico_list"
......@@ -184,7 +184,7 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/f5f5f5" />
android:background="@color/dynamic_f5f5f5" />
<TextView
android:id="@+id/text_talk_num"
......@@ -215,20 +215,20 @@
android:id="@+id/item_recommend_trend_user_head_iv"
android:layout_width="40dp"
android:layout_height="40dp"
tools:src="@drawable/head_place_hold_pic"/>
tools:src="@drawable/dynamic_head_place_hold_pic"/>
<TextView
android:id="@+id/text_zixunshi"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/bg_radius_line_yellow20"
android:background="@drawable/dynamic_bg_radius_line_yellow20"
android:paddingLeft="3dp"
android:paddingRight="3dp"
android:paddingTop="2dp"
android:paddingBottom="1dp"
android:gravity="center"
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:layout_centerHorizontal="true"
android:textSize="@dimen/text_size_9"
android:textSize="@dimen/dynamic_text_size_9"
android:layout_alignParentBottom="true"
tools:visibility="visible"
android:visibility="gone"
......@@ -246,7 +246,7 @@
android:drawablePadding="5dp"
android:layout_alignParentTop="true"
android:layout_toRightOf="@+id/item_trend_user_head_rel"
android:textColor="@color/text_trend_black" />
android:textColor="@color/dynamic_text_trend_black" />
<ImageView
android:id="@+id/comment_sex_iv"
......@@ -266,7 +266,7 @@
android:layout_marginTop="5dp"
android:layout_toRightOf="@+id/item_trend_user_head_rel"
tools:text="23分钟前"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp" />
<TextView
......@@ -276,9 +276,9 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:background="@drawable/shape_green_border_trend_info_bg"
android:background="@drawable/dynamic_shape_green_border_trend_info_bg"
android:gravity="center"
android:textColor="@color/google_green"
android:textColor="@color/dynamic_google_green"
tools:visibility="visible"
android:visibility="gone"
android:text="私聊"/>
......@@ -309,7 +309,7 @@
android:layout_weight="1"
android:id="@+id/iv_shang"
android:layout_gravity="center_vertical"
android:src="@drawable/reply_shang"
android:src="@drawable/dynamic_reply_shang"
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_marginRight="20dp"
......@@ -322,7 +322,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:layout_toLeftOf="@+id/img_comment_share"
android:src="@drawable/reply_zan" />
android:src="@drawable/dynamic_reply_zan" />
<ImageView
android:id="@+id/img_comment_share"
......@@ -330,7 +330,7 @@
android:layout_height="25dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/newsfeed_reply" />
android:src="@drawable/dynamic_newsfeed_reply" />
</RelativeLayout>
</LinearLayout>
......@@ -345,8 +345,8 @@
android:layout_marginBottom="10dp"
android:layout_marginLeft="40dp"
android:layout_marginRight="40dp"
android:textColor="@color/google_green"
android:background="@drawable/bg_radius_line_green_20"
android:textColor="@color/dynamic_google_green"
android:background="@drawable/dynamic_bg_radius_line_green_20"
android:text="回到主贴"/>
</LinearLayout>
......@@ -365,7 +365,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/blank"/>
android:src="@drawable/dynamic_blank"/>
<TextView
android:id="@+id/tv_null_tip"
android:layout_width="wrap_content"
......
m-dynamic/src/main/res/layout/cancel_focus_dialog_layout.xml → m-dynamic/src/main/res/layout/dynamic_cancel_focus_dialog_layout.xml
......@@ -14,7 +14,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/platform_dp_40"
android:layout_marginRight="@dimen/platform_dp_40"
android:background="@drawable/cancel_focus_dialog_center_bg"
android:background="@drawable/dynamic_cancel_focus_dialog_center_bg"
android:orientation="vertical">
<TextView
......@@ -22,7 +22,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="取消关注"
android:textSize="@dimen/text_size_18"
android:textSize="@dimen/dynamic_text_size_18"
android:textColor="@color/platform_color_242424"
android:textStyle="bold"
android:paddingLeft="@dimen/platform_dp_24"
......@@ -36,7 +36,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="取消关注后，将不再看到Ta的动态"
android:textSize="@dimen/text_size_13"
android:textSize="@dimen/dynamic_text_size_13"
android:textColor="@color/platform_color_666666"
android:textStyle="bold"
android:paddingLeft="@dimen/platform_dp_24"
......@@ -59,8 +59,8 @@
android:layout_weight="1"
android:text="再想想"
android:textColor="@color/platform_color_666666"
android:background="@drawable/cancel_focus_text_top_line"
android:textSize="@dimen/text_size_16"
android:background="@drawable/dynamic_cancel_focus_text_top_line"
android:textSize="@dimen/dynamic_text_size_16"
android:gravity="center"
/>
......@@ -75,10 +75,10 @@
android:layout_height="match_parent"
android:layout_weight="1"
android:text="确定"
android:textColor="@color/white"
android:textSize="@dimen/text_size_16"
android:textColor="@color/dynamic_white"
android:textSize="@dimen/dynamic_text_size_16"
android:gravity="center"
android:background="@drawable/cancel_focus_text_bg"
android:background="@drawable/dynamic_cancel_focus_text_bg"
/>
</LinearLayout>
......
m-dynamic/src/main/res/layout/fragment_all_topic.xml → m-dynamic/src/main/res/layout/dynamic_fragment_all_topic.xml
......@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/dynamic_white">
<ScrollView
android:layout_width="match_parent"
......@@ -27,7 +27,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="@color/defult_bg"
android:background="@color/dynamic_defult_bg"
android:paddingBottom="10dp"
android:paddingLeft="15dp"
android:paddingTop="10dp"
......@@ -53,7 +53,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:background="@color/defult_bg"
android:background="@color/dynamic_defult_bg"
android:paddingBottom="10dp"
android:paddingLeft="15dp"
android:paddingTop="10dp"
......
m-dynamic/src/main/res/layout/fragment_dialog_show_introduce.xml → m-dynamic/src/main/res/layout/dynamic_fragment_dialog_show_introduce.xml
......@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/transparent"
android:background="@color/dynamic_transparent"
android:gravity="center_horizontal">
<LinearLayout
......@@ -12,10 +12,10 @@
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="36dp"
android:background="@color/white"
android:background="@color/dynamic_white"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="@dimen/default_dis_size">
android:padding="@dimen/dynamic_default_dis_size">
<TextView
android:id="@+id/name"
......@@ -30,7 +30,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textColor="@color/default_text_color_hint" />
android:textColor="@color/dynamic_default_text_color_hint" />
<ImageView
......@@ -39,7 +39,7 @@
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="12dp"
android:background="@color/divide_color" />
android:background="@color/dynamic_divide_color" />
<TextView
android:layout_width="wrap_content"
......@@ -47,7 +47,7 @@
android:layout_marginTop="15dp"
android:gravity="center"
android:text="感谢您的信任，如果有需要，\n可随时找我聊聊~"
android:textColor="@color/default_text_color" />
android:textColor="@color/dynamic_default_text_color" />
<ImageView
android:layout_width="match_parent"
......@@ -55,7 +55,7 @@
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp"
android:layout_marginTop="12dp"
android:background="@color/divide_color" />
android:background="@color/dynamic_divide_color" />
<LinearLayout
android:layout_width="match_parent"
......@@ -76,7 +76,7 @@
android:id="@+id/changeimg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_layer_call" />
android:src="@drawable/dynamic_icon_layer_call" />
<TextView
android:id="@+id/changtext"
......@@ -84,7 +84,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="实时电话倾诉"
android:textColor="@color/default_text_color_hint"
android:textColor="@color/dynamic_default_text_color_hint"
android:textSize="12sp" />
</LinearLayout>
......@@ -100,14 +100,14 @@
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/icon_layer_order" />
android:src="@drawable/dynamic_icon_layer_order" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="8dp"
android:text="预约咨询"
android:textColor="@color/default_text_color_hint"
android:textColor="@color/dynamic_default_text_color_hint"
android:textSize="12sp" />
</LinearLayout>
</LinearLayout>
......@@ -119,12 +119,12 @@
android:layout_height="45dp"
android:layout_alignParentRight="true"
android:layout_marginTop="20dp"
android:src="@drawable/icon_layer_close" />
android:src="@drawable/dynamic_icon_layer_close" />
<ImageView
android:id="@+id/sdv_head"
android:layout_width="@dimen/head_size_big"
android:layout_height="@dimen/head_size_big"
android:layout_width="@dimen/dynamic_head_size_big"
android:layout_height="@dimen/dynamic_head_size_big"
android:layout_centerHorizontal="true"
android:layout_marginTop="3dp" />
</RelativeLayout>
m-dynamic/src/main/res/layout/fragment_member.xml → m-dynamic/src/main/res/layout/dynamic_fragment_member.xml
......@@ -14,7 +14,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:text="年龄"
android:textSize="18sp"
android:layout_marginRight="15dp"/>
......@@ -22,7 +22,7 @@
android:id="@+id/member_age_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:text=""
android:textSize="18sp"/>
</LinearLayout>
......@@ -36,7 +36,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:text="情感"
android:textSize="18sp"
android:layout_marginRight="15dp"/>
......@@ -44,7 +44,7 @@
android:id="@+id/member_emotional_state_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:text=""
android:textSize="18sp"/>
</LinearLayout>
......@@ -58,7 +58,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:text="职业"
android:textSize="18sp"
android:layout_marginRight="15dp"/>
......@@ -66,7 +66,7 @@
android:id="@+id/member_job_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:text=""
android:textSize="18sp"/>
</LinearLayout>
......@@ -80,7 +80,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:text="城市"
android:textSize="18sp"
android:layout_marginRight="15dp"/>
......@@ -88,7 +88,7 @@
android:id="@+id/member_address_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:text=""
android:textSize="18sp"/>
</LinearLayout>
......@@ -102,7 +102,7 @@
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:text="简介"
android:textSize="18sp"
android:layout_marginRight="15dp"/>
......@@ -110,7 +110,7 @@
android:id="@+id/member_introduction_tv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:text=""
android:textSize="18sp"/>
</LinearLayout>
......
m-dynamic/src/main/res/layout/fragment_moments.xml → m-dynamic/src/main/res/layout/dynamic_fragment_moments.xml
......@@ -34,7 +34,7 @@
<!--android:id="@+id/iv_background"-->
<!--android:layout_width="match_parent"-->
<!--android:layout_height="160dp"-->
<!--android:background="@drawable/trends_banner"-->
<!--android:background="@drawable/dynamic_trends_banner"-->
<!--app:layout_scrollFlags="scroll|enterAlways" />-->
......@@ -43,7 +43,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="160dp"
android:background="@color/white"
android:background="@color/dynamic_white"
android:paddingTop="25dp"
app:layout_scrollFlags="scroll|enterAlways">
......@@ -52,11 +52,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="15dp"
android:drawableLeft="@drawable/minds_group"
android:drawableLeft="@drawable/dynamic_minds_group"
android:drawablePadding="5dp"
android:text="心事群"
android:textColor="#666666"
android:textSize="@dimen/text_size_16"
android:textSize="@dimen/dynamic_text_size_16"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
......@@ -65,11 +65,11 @@
android:layout_width="40dp"
android:layout_height="20dp"
android:layout_marginRight="15dp"
android:background="@drawable/bg_radius_line_gray_20"
android:background="@drawable/dynamic_bg_radius_line_gray_20"
android:gravity="center"
android:text=" 更多 "
android:textColor="@color/_9"
android:textSize="@dimen/default_text_size_little"
android:textSize="@dimen/dynamic_default_text_size_little"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="@+id/trends_tv_mind_group" />
......@@ -91,8 +91,8 @@
<FrameLayout
android:id="@+id/frl_topic_iv1"
android:layout_width="@dimen/topic_banner_iv1_w"
android:layout_height="@dimen/topic_banner_iv1_h"
android:layout_width="@dimen/dynamic_topic_banner_iv1_w"
android:layout_height="@dimen/dynamic_topic_banner_iv1_h"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent">
......@@ -102,7 +102,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
tools:background="@color/colorAccent" />
tools:background="@color/dynamic_colorAccent" />
<TextView
android:id="@+id/trends_topic_tv1"
......@@ -112,15 +112,15 @@
android:layout_marginLeft="13dp"
android:layout_marginBottom="9dp"
android:text="#情绪压力那些事#"
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:textSize="12sp" />
</FrameLayout>
<FrameLayout
android:id="@+id/frl_topic_iv2"
android:layout_width="@dimen/topic_banner_iv2_3_w"
android:layout_height="@dimen/topic_banner_iv2_3_h"
android:layout_width="@dimen/dynamic_topic_banner_iv2_3_w"
android:layout_height="@dimen/dynamic_topic_banner_iv2_3_h"
android:layout_marginLeft="1dp"
app:layout_constraintStart_toEndOf="@+id/frl_topic_iv1"
app:layout_constraintTop_toTopOf="parent">
......@@ -130,7 +130,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
tools:background="@color/colorAccent" />
tools:background="@color/dynamic_colorAccent" />
<TextView
android:id="@+id/trends_topic_tv2"
......@@ -140,15 +140,15 @@
android:layout_marginLeft="13dp"
android:layout_marginBottom="9dp"
android:text="#情绪压力那些事#"
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:textSize="12sp" />
</FrameLayout>
<FrameLayout
android:id="@+id/frl_topic_iv3"
android:layout_width="@dimen/topic_banner_iv2_3_w"
android:layout_height="@dimen/topic_banner_iv2_3_h"
android:layout_width="@dimen/dynamic_topic_banner_iv2_3_w"
android:layout_height="@dimen/dynamic_topic_banner_iv2_3_h"
android:layout_marginLeft="1dp"
android:layout_marginTop="1dp"
app:layout_constraintLeft_toRightOf="@+id/frl_topic_iv1"
......@@ -159,7 +159,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
tools:background="@color/colorAccent" />
tools:background="@color/dynamic_colorAccent" />
<TextView
android:id="@+id/trends_topic_tv3"
......@@ -169,7 +169,7 @@
android:layout_marginLeft="13dp"
android:layout_marginBottom="9dp"
android:text="#情绪压力那些事#"
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:textSize="12sp" />
</FrameLayout>
......@@ -207,7 +207,7 @@
android:layout_marginRight="15dp"
android:gravity="center"
android:text="问答"
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:textSize="20sp" />
......@@ -220,7 +220,7 @@
android:id="@+id/trend_detail_type_lin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/dynamic_white"
android:gravity="center_horizontal"
android:orientation="horizontal"
android:paddingLeft="15dp"
......@@ -236,12 +236,12 @@
android:layout_centerInParent="true"
android:layout_marginRight="1dp"
android:layout_weight="1"
android:background="@drawable/selector_bg_hot"
android:background="@drawable/dynamic_selector_bg_hot"
android:gravity="center"
android:paddingLeft="15dp"
android:paddingRight="15dp"
android:text="推荐"
android:textColor="@color/text_666666"
android:textColor="@color/dynamic_text_666666"
android:textSize="15sp" />
......@@ -251,7 +251,7 @@
android:layout_height="35dp"
android:layout_marginRight="1dp"
android:layout_weight="1"
android:background="@drawable/selector_bg_recommend"
android:background="@drawable/dynamic_selector_bg_recommend"
android:gravity="center"
android:paddingLeft="15dp"
android:paddingRight="15dp"
......@@ -264,7 +264,7 @@
android:layout_width="0dp"
android:layout_height="35dp"
android:layout_weight="1"
android:background="@drawable/selector_bg_focus"
android:background="@drawable/dynamic_selector_bg_focus"
android:gravity="center"
android:paddingLeft="15dp"
android:paddingRight="15dp"
......@@ -292,7 +292,7 @@
android:layout_marginRight="20dp"
android:layout_marginBottom="40dp"
android:elevation="3dp"
android:src="@drawable/publish_trend"
android:src="@drawable/dynamic_publish_trend"
app:backgroundTint="#1DA1F2"
app:borderWidth="0dp"
app:fabSize="normal" />
......
m-dynamic/src/main/res/layout/fragment_publish_trend.xml → m-dynamic/src/main/res/layout/dynamic_fragment_publish_trend.xml
......@@ -13,13 +13,13 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/white">
android:background="@color/dynamic_white">
<EditText
android:id="@+id/publish_trend_title_editext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/msg_system_press"
android:background="@color/dynamic_msg_system_press"
android:gravity="center_vertical"
android:hint="标题：准确概括你的问题，且不少于5个字"
android:minHeight="50dp"
......@@ -28,8 +28,8 @@
android:paddingTop="13dp"
android:paddingRight="15dp"
android:paddingBottom="13dp"
android:textColor="@color/text_trend_title_black"
android:textColorHint="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_title_black"
android:textColorHint="@color/dynamic_text_trend_defult"
android:textSize="17sp"
tools:text="标题：说说你的标题：说说你的标题：说说你的困惑标题：说说你的困标题：说说你的困惑标题：说说你的困惑困惑标题：说说你的困惑" />
......@@ -46,7 +46,7 @@
android:id="@+id/publish_trend_content_editext"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/dynamic_white"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="left|top"
......@@ -55,8 +55,8 @@
android:minLines="6"
android:padding="15dp"
android:paddingLeft="15dp"
android:textColor="@color/text_trend_title_black"
android:textColorHint="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_title_black"
android:textColorHint="@color/dynamic_text_trend_defult"
android:textSize="15sp" />
<RelativeLayout
......@@ -69,7 +69,7 @@
android:id="@+id/publish_trend_bottom_topic_tv"
android:layout_width="wrap_content"
android:layout_height="24dp"
android:background="@drawable/bg_topic"
android:background="@drawable/dynamic_bg_topic"
android:gravity="center_vertical"
android:paddingLeft="10dp"
android:paddingRight="10dp"
......@@ -133,7 +133,7 @@
android:layout_height="60dp"
android:layout_centerVertical="true"
android:scaleType="fitXY"
android:src="@drawable/default_img" />
android:src="@drawable/dynamic_default_img" />
<ImageView
android:id="@+id/iv_fm"
......@@ -141,7 +141,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="18dp"
android:src="@drawable/img_trend_fm_play"
android:src="@drawable/dynamic_img_trend_fm_play"
android:visibility="gone"
tools:visibility="visible" />
......@@ -166,6 +166,6 @@
</ScrollView>
</RelativeLayout>
<include layout="@layout/layout_publish_trend_bottom" />
<include layout="@layout/dynamic_layout_publish_trend_bottom" />
</LinearLayout>
m-dynamic/src/main/res/layout/fragment_trend_list_in.xml → m-dynamic/src/main/res/layout/dynamic_fragment_trend_list_in.xml
......@@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">
android:background="@color/dynamic_white">
<android.support.v7.widget.RecyclerView
android:id="@+id/recommend_dynamic_rcv"
......@@ -30,7 +30,7 @@
android:layout_height="100dp"
android:layout_marginTop="30dp"
android:layout_centerHorizontal="true"
android:src="@drawable/blank"/>
android:src="@drawable/dynamic_blank"/>
<TextView
android:id="@+id/trend_no_data_tv"
......@@ -38,7 +38,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:text="暂无数据"
android:textColor="@color/text_gray"
android:textColor="@color/dynamic_text_gray"
android:textSize="16sp"/>
</LinearLayout>
......
m-dynamic/src/main/res/layout/fragment_trends_list.xml → m-dynamic/src/main/res/layout/dynamic_fragment_trends_list.xml
......@@ -13,7 +13,7 @@
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:orientation="vertical"
android:background="@color/white">
android:background="@color/dynamic_white">
<android.support.design.widget.CoordinatorLayout
android:id="@+id/cdl"
......@@ -24,7 +24,7 @@
android:id="@+id/trends_rcv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/f5f5f5"
android:background="@color/dynamic_f5f5f5"
android:descendantFocusability="blocksDescendants"
app:layout_behavior="@string/appbar_scrolling_view_behavior"/>
......@@ -35,10 +35,10 @@
android:layout_marginBottom="85dp"
android:layout_marginRight="28dp"
android:padding="0dp"
android:background="@color/white"
android:src="@drawable/newsfeed_top"
android:background="@color/dynamic_white"
android:src="@drawable/dynamic_newsfeed_top"
android:visibility="visible"
app:backgroundTint="@color/white"
app:backgroundTint="@color/dynamic_white"
app:borderWidth="0dp"
app:fabSize="mini"
android:scaleType="center"
......@@ -52,11 +52,11 @@
android:layout_height="wrap_content"
android:layout_marginBottom="20dp"
android:layout_marginRight="20dp"
android:background="@color/google_green"
android:background="@color/dynamic_google_green"
android:elevation="3dp"
android:padding="0dp"
android:src="@drawable/newsfeed_new2"
app:backgroundTint="@color/google_green"
android:src="@drawable/dynamic_newsfeed_new2"
app:backgroundTint="@color/dynamic_google_green"
app:borderWidth="0dp"
app:fabSize="normal"
app:layout_anchor="@+id/trends_rcv"
......@@ -77,7 +77,7 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_centerHorizontal="true"
android:src="@drawable/blank"/>
android:src="@drawable/dynamic_blank"/>
<TextView
android:layout_width="wrap_content"
......@@ -86,7 +86,7 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="15dp"
android:text="暂无相关记录～"
android:textColor="@color/text_gray"/>
android:textColor="@color/dynamic_text_gray"/>
</RelativeLayout>
......
m-dynamic/src/main/res/layout/include_trend_info_bottom.xml → m-dynamic/src/main/res/layout/dynamic_include_trend_info_bottom.xml
......@@ -14,7 +14,7 @@
android:paddingLeft="15dp"
android:paddingTop="5dp"
android:focusable="true"
android:background="@color/f5f5f5"
android:background="@color/dynamic_f5f5f5"
android:focusableInTouchMode="true">
<LinearLayout
......@@ -33,7 +33,7 @@
android:layout_width="25dp"
android:layout_height="25dp"
android:layout_gravity="center_vertical"
android:src="@drawable/edict_ico_emoji"/>
android:src="@drawable/dynamic_edict_ico_emoji"/>
<TextView
android:id="@+id/trend_disscuss_send_tv"
......@@ -43,7 +43,7 @@
android:layout_marginLeft="10dp"
android:gravity="center_vertical"
android:text="发送"
android:textColor="@color/green3"
android:textColor="@color/dynamic_green3"
android:textSize="16sp"/>
</LinearLayout>
......@@ -64,7 +64,7 @@
android:layout_gravity="center_vertical"
android:layout_marginRight="15dp"
android:layout_marginLeft="15dp"
android:src="@drawable/newsfeed_like"/>
android:src="@drawable/dynamic_newsfeed_like"/>
<ImageView
android:id="@+id/img_share"
......@@ -72,7 +72,7 @@
android:layout_height="25dp"
android:layout_gravity="center_vertical"
android:layout_marginRight="15dp"
android:src="@drawable/share"/>
android:src="@drawable/dynamic_share"/>
</LinearLayout>
<EditText
......@@ -80,7 +80,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:background="@drawable/bg_radius_line_gray"
android:background="@drawable/dynamic_bg_radius_line_gray"
android:hint="发表评论"
android:maxLines="5"
android:minHeight="40dp"
......
m-dynamic/src/main/res/layout/include_user_info_part.xml → m-dynamic/src/main/res/layout/dynamic_include_user_info_part.xml
......@@ -15,7 +15,7 @@
android:layout_height="45dp"
android:layout_marginLeft="15dp"
android:layout_width="45dp"
android:src="@drawable/head_place_hold_pic"/>
android:src="@drawable/dynamic_head_place_hold_pic"/>
<RelativeLayout
......@@ -33,7 +33,7 @@
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:text="小明"
android:textColor="@color/text_trend_black"/>
android:textColor="@color/dynamic_text_trend_black"/>
<ImageView
android:id="@+id/item_trend_user_gender_iv"
......@@ -43,7 +43,7 @@
android:layout_toRightOf="@+id/item_trend_user_name_tv"
android:layout_width="12dp"
android:scaleType="fitXY"
android:src="@drawable/male"/>
android:src="@drawable/dynamic_male"/>
</RelativeLayout>
......@@ -56,7 +56,7 @@
android:layout_toRightOf="@+id/item_trend_user_head_iv"
android:layout_width="wrap_content"
android:text="23分钟前"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp"/>
<TextView
......@@ -67,6 +67,6 @@
android:layout_toRightOf="@+id/item_trend_time_tv"
android:layout_width="wrap_content"
android:text="-来自安卓终端"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp"/>
</RelativeLayout>
m-dynamic/src/main/res/layout/item_alltopic.xml → m-dynamic/src/main/res/layout/dynamic_item_alltopic.xml
......@@ -33,7 +33,7 @@
android:singleLine="true"
android:text="#我梦见夏天"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:textSize="18sp" />
<LinearLayout
......@@ -47,7 +47,7 @@
android:layout_height="wrap_content"
android:text="关注: 50w"
android:textSize="13sp"
android:textColor="@color/text_gray" />
android:textColor="@color/dynamic_text_gray" />
<TextView
android:id="@+id/item_topic_trend_num_tv"
android:layout_width="wrap_content"
......@@ -55,7 +55,7 @@
android:text="动态: 5898"
android:layout_marginLeft="15dp"
android:textSize="13sp"
android:textColor="@color/text_gray" />
android:textColor="@color/dynamic_text_gray" />
</LinearLayout>
</LinearLayout>
......@@ -64,7 +64,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_alignParentBottom="true"
android:background="@color/title_bottom_line_bg" />
android:background="@color/dynamic_title_bottom_line_bg" />
<RelativeLayout
android:id="@+id/item_topic_trend_focus_rel"
......@@ -75,7 +75,7 @@
android:layout_centerVertical="true"
android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:background="@drawable/focus_btn_bg2">
android:background="@drawable/dynamic_focus_btn_bg2">
<TextView
android:id="@+id/item_topic_trend_focus_tv"
......@@ -83,7 +83,7 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="+ 关注"
android:textColor="@color/google_green"
android:textColor="@color/dynamic_google_green"
android:textSize="16sp" />
</RelativeLayout>
......
m-dynamic/src/main/res/layout/item_dialog_list.xml → m-dynamic/src/main/res/layout/dynamic_item_dialog_list.xml
......@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@color/white">
android:background="@color/dynamic_white">
<TextView
android:id="@+id/item_dialog_tv"
......
m-dynamic/src/main/res/layout/item_discuss_list.xml → m-dynamic/src/main/res/layout/dynamic_item_discuss_list.xml
......@@ -13,5 +13,5 @@
android:ellipsize="end"
android:maxLength="45"
android:maxLines="3"
android:textColor="@color/text_trend_defult"/>
android:textColor="@color/dynamic_text_trend_defult"/>
</LinearLayout>
m-dynamic/src/main/res/layout/item_image.xml → m-dynamic/src/main/res/layout/dynamic_item_image.xml
......@@ -10,6 +10,6 @@
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginBottom="5dp"
tools:src="@drawable/default_img"/>
tools:src="@drawable/dynamic_default_img"/>
</RelativeLayout>
m-dynamic/src/main/res/layout/item_last_trend_top.xml → m-dynamic/src/main/res/layout/dynamic_item_last_trend_top.xml
......@@ -10,10 +10,10 @@
android:layout_width="match_parent"
android:layout_height="40dp"
tools:text="哈哈哈哈哈十六日集团和必然后果热交换听会歌个让他后来时间让他hi瓯江热火偶然间替换 "
android:drawableLeft="@drawable/newsfeed_icon_zhiding"
android:drawableLeft="@drawable/dynamic_newsfeed_icon_zhiding"
android:drawablePadding="10dp"
android:ellipsize="end"
android:textColor="@color/default_text_color"
android:textColor="@color/dynamic_default_text_color"
android:maxLines="1"
android:paddingLeft="10dp"
android:paddingRight="10dp"
......@@ -24,6 +24,6 @@
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginLeft="10dp"
android:background="@color/f5f5f5"/>
android:background="@color/dynamic_f5f5f5"/>
</LinearLayout>
m-dynamic/src/main/res/layout/item_publish_trend_img.xml → m-dynamic/src/main/res/layout/dynamic_item_publish_trend_img.xml
......@@ -9,7 +9,7 @@
android:id="@+id/item_publish_defult_iv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/img_add"
android:background="@drawable/dynamic_img_add"
android:contentDescription="@null"
android:scaleType="fitXY"
android:visibility="gone" />
......@@ -27,6 +27,6 @@
android:layout_height="22dp"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:src="@drawable/img_delete" />
android:src="@drawable/dynamic_img_delete" />
</com.yidianling.dynamic.common.view.SquareRelativeLayout>
m-dynamic/src/main/res/layout/item_recommend_top.xml → m-dynamic/src/main/res/layout/dynamic_item_recommend_top.xml
......@@ -9,7 +9,7 @@
android:id="@+id/recy_top"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white"
android:background="@color/dynamic_white"
android:layout_marginBottom="10dp">
</android.support.v7.widget.RecyclerView>
......
m-dynamic/src/main/res/layout/item_recommend_topic.xml → m-dynamic/src/main/res/layout/dynamic_item_recommend_topic.xml
......@@ -24,7 +24,7 @@
android:layout_marginRight="18dp"
android:gravity="center_horizontal"
android:text=""
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:textSize="16sp"/>
......
m-dynamic/src/main/res/layout/item_recommend_trend.xml → m-dynamic/src/main/res/layout/dynamic_item_recommend_trend.xml
......@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/white">
android:background="@color/dynamic_white">
<RelativeLayout
android:layout_width="match_parent"
......@@ -24,7 +24,7 @@
android:id="@+id/item_recommend_trend_line_v"
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/title_bottom_line_bg" />
android:background="@color/dynamic_title_bottom_line_bg" />
......@@ -44,7 +44,7 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="10dp"
android:text="查看8条评论"
android:textColor="@color/text_user" />
android:textColor="@color/dynamic_text_user" />
</RelativeLayout>
<View
......@@ -77,7 +77,7 @@
android:id="@+id/item_recommend_trend_user_head_iv"
android:layout_width="45dp"
android:layout_height="45dp"
android:src="@drawable/head_place_hold_pic" />
android:src="@drawable/dynamic_head_place_hold_pic" />
</RelativeLayout>
......@@ -97,7 +97,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="小明"
android:textColor="@color/text_trend_black" />
android:textColor="@color/dynamic_text_trend_black" />
<ImageView
android:id="@+id/item_recommend_trend_user_gender_iv"
......@@ -107,7 +107,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:scaleType="fitXY"
android:src="@drawable/male" />
android:src="@drawable/dynamic_male" />
</RelativeLayout>
......@@ -120,7 +120,7 @@
android:layout_marginTop="7dp"
android:layout_toRightOf="@+id/item_recommend_trend_user_head_rel"
android:text="23分钟前"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp" />
<TextView
android:id="@+id/item_recommend_trend_souce_tv"
......@@ -130,7 +130,7 @@
android:layout_marginTop="7dp"
android:layout_toRightOf="@+id/item_recommend_trend_time_tv"
android:text="-来自安卓终端"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp" />
</RelativeLayout>
......@@ -158,7 +158,7 @@
android:lineSpacingExtra="3dp"
android:textSize="16sp"
android:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计此次核试规模将比上一次增加十几倍。对此，外交部回应表示：中方反对朝鲜核试的立场是明确和一贯的。当前半岛形势高度复杂敏感，任何可能加剧半岛局势紧张的举动都是不可取的。希望相关各方都保持冷静克制，负起自己的责任，不要采取进一步相互刺激和加剧局势紧张的行动。"
android:textColor="@color/text_trend_black" />
android:textColor="@color/dynamic_text_trend_black" />
<RelativeLayout
......@@ -182,14 +182,14 @@
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_marginTop="5dp"
android:background="@drawable/radian_bg"
android:background="@drawable/dynamic_radian_bg"
android:paddingBottom="10dp"
android:layout_marginRight="5dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingTop="10dp"
android:text="共9张"
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:textSize="15sp" />
</RelativeLayout>
......@@ -202,7 +202,7 @@
android:layout_marginLeft="15dp"
android:ellipsize="end"
android:textSize="14sp"
android:textColor="@color/text_user"
android:textColor="@color/dynamic_text_user"
android:layout_below="@+id/item_recommend_trend_img_rel"
tools:text="#表白话题#"/>
......@@ -223,7 +223,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="2345浏览"
android:textColor="@color/text_trend_defult" />
android:textColor="@color/dynamic_text_trend_defult" />
<TextView
android:id="@+id/item_recommend_trend_zannum_tv"
......@@ -234,7 +234,7 @@
android:layout_toRightOf="@+id/item_recommend_trend_readed_tv"
android:text="2345赞"
android:visibility="gone"
android:textColor="@color/text_trend_defult" />
android:textColor="@color/dynamic_text_trend_defult" />
<ImageView
android:id="@+id/item_recommend_trend_zan_iv"
......@@ -242,7 +242,7 @@
android:layout_height="25dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/text_zan_num"
android:src="@drawable/newsfeed_like"/>
android:src="@drawable/dynamic_newsfeed_like"/>
<TextView
android:id="@+id/text_zan_num"
......@@ -255,7 +255,7 @@
android:layout_marginRight="10dp"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:layout_toLeftOf="@+id/item_recommend_trend_discuss_iv"/>
<ImageView
android:id="@+id/item_recommend_trend_discuss_iv"
......@@ -263,14 +263,14 @@
android:layout_height="25dp"
android:layout_toLeftOf="@+id/text_talk_num"
android:layout_centerVertical="true"
android:src="@drawable/newsfeed_reply"/>
android:src="@drawable/dynamic_newsfeed_reply"/>
<TextView
android:id="@+id/text_talk_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="评论"
android:minWidth="30dp"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:layout_marginLeft="5dp"
android:layout_centerVertical="true"
android:drawablePadding="5dp"
......
m-dynamic/src/main/res/layout/item_recommend_trend_ad.xml → m-dynamic/src/main/res/layout/dynamic_item_recommend_trend_ad.xml
......@@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/white">
android:background="@color/dynamic_white">
<RelativeLayout
android:layout_width="match_parent"
......@@ -35,7 +35,7 @@
android:id="@+id/item_recommend_trend_user_head_iv"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/head_place_hold_pic" />
android:src="@drawable/dynamic_head_place_hold_pic" />
</RelativeLayout>
......@@ -55,7 +55,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text="小明"
android:textColor="@color/text_trend_black" />
android:textColor="@color/dynamic_text_trend_black" />
<ImageView
android:id="@+id/item_recommend_trend_user_gender_iv"
......@@ -65,7 +65,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="5dp"
android:scaleType="fitXY"
android:src="@drawable/male" />
android:src="@drawable/dynamic_male" />
</RelativeLayout>
......@@ -78,7 +78,7 @@
android:layout_marginTop="7dp"
android:layout_toRightOf="@+id/item_recommend_trend_user_head_rel"
android:text="23分钟前"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp" />
<TextView
android:id="@+id/item_recommend_trend_souce_tv"
......@@ -88,7 +88,7 @@
android:layout_marginTop="7dp"
android:layout_toRightOf="@+id/item_recommend_trend_time_tv"
android:text="-来自安卓终端"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp" />
</RelativeLayout>
......@@ -101,7 +101,7 @@
android:layout_marginRight="15dp"
android:layout_marginTop="15dp"
android:text="标题"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:textSize="19sp" />
......@@ -109,7 +109,7 @@
android:id="@+id/item_recommend_trend_ad_rel"
android:layout_width="match_parent"
android:layout_height="60dp"
android:background="@color/trend_gray"
android:background="@color/dynamic_trend_gray"
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_below="@+id/item_recommend_trend_content_tv"
......@@ -121,7 +121,7 @@
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_centerVertical="true"
android:src="@drawable/default_img" />
android:src="@drawable/dynamic_default_img" />
<TextView
android:id="@+id/item_recommend_trend_ad_tv"
android:layout_width="match_parent"
......@@ -146,7 +146,7 @@
android:layout_marginLeft="15dp"
android:ellipsize="end"
android:textSize="14sp"
android:textColor="@color/text_user"
android:textColor="@color/dynamic_text_user"
android:layout_below="@+id/item_recommend_trend_ad_rel"
tools:text="#表白话题#"/>
......@@ -168,7 +168,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="2345浏览"
android:textColor="@color/text_trend_defult" />
android:textColor="@color/dynamic_text_trend_defult" />
<TextView
android:id="@+id/item_recommend_trend_zannum_tv"
......@@ -179,7 +179,7 @@
android:layout_toRightOf="@+id/item_recommend_trend_readed_tv"
android:text="2345赞"
android:visibility="gone"
android:textColor="@color/text_trend_defult" />
android:textColor="@color/dynamic_text_trend_defult" />
<ImageView
......@@ -188,7 +188,7 @@
android:layout_height="25dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/text_zan_num"
android:src="@drawable/newsfeed_like" />
android:src="@drawable/dynamic_newsfeed_like" />
<TextView
android:id="@+id/text_zan_num"
android:layout_width="wrap_content"
......@@ -200,7 +200,7 @@
android:layout_marginRight="10dp"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:layout_toLeftOf="@+id/item_recommend_trend_discuss_iv"/>
<ImageView
......@@ -209,14 +209,14 @@
android:layout_height="25dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/text_talk_num"
android:src="@drawable/newsfeed_reply" />
android:src="@drawable/dynamic_newsfeed_reply" />
<TextView
android:id="@+id/text_talk_num"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="评论"
android:minWidth="30dp"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:layout_marginLeft="5dp"
android:layout_centerVertical="true"
android:drawablePadding="5dp"
......@@ -232,7 +232,7 @@
android:lineSpacingExtra="3dp"
android:textSize="16sp"
android:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计此次核试规模将比上一次增加十几倍。对此，外交部回应表示：中方反对朝鲜核试的立场是明确和一贯的。当前半岛形势高度复杂敏感，任何可能加剧半岛局势紧张的举动都是不可取的。希望相关各方都保持冷静克制，负起自己的责任，不要采取进一步相互刺激和加剧局势紧张的行动。"
android:textColor="@color/text_trend_black"
android:textColor="@color/dynamic_text_trend_black"
android:layout_below="@+id/item_recommend_trend_title_tv"
android:layout_alignLeft="@+id/item_recommend_trend_title_tv"
android:layout_alignStart="@+id/item_recommend_trend_title_tv" />
......@@ -249,7 +249,7 @@
android:id="@+id/item_recommend_trend_line_v"
android:layout_width="match_parent"
android:layout_height="0.3dp"
android:background="@color/title_bottom_line_bg" />
android:background="@color/dynamic_title_bottom_line_bg" />
......@@ -269,7 +269,7 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="15dp"
android:text=""
android:textColor="@color/text_trend_defult" />
android:textColor="@color/dynamic_text_trend_defult" />
</RelativeLayout>
<View
......
m-dynamic/src/main/res/layout/item_recommend_trend_ad2.xml → m-dynamic/src/main/res/layout/dynamic_item_recommend_trend_ad2.xml
......@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white">
android:background="@color/dynamic_white">
<RelativeLayout
......@@ -31,8 +31,8 @@
android:id="@+id/item_recommend_trend_user_head_iv"
android:layout_width="45dp"
android:layout_height="45dp"
android:contentDescription="@string/header"
android:src="@drawable/head_place_hold_pic" />
android:contentDescription="@string/dynamic_header"
android:src="@drawable/dynamic_head_place_hold_pic" />
</RelativeLayout>
......@@ -52,7 +52,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:textColor="@color/text_trend_black"
android:textColor="@color/dynamic_text_trend_black"
tools:text="小明" />
<ImageView
......@@ -66,7 +66,7 @@
android:layout_toRightOf="@+id/item_recommend_trend_user_name_tv"
android:contentDescription="@null"
android:scaleType="fitXY"
android:src="@drawable/male" />
android:src="@drawable/dynamic_male" />
</RelativeLayout>
......@@ -80,7 +80,7 @@
android:layout_marginTop="7dp"
android:layout_toEndOf="@id/item_recommend_trend_user_head_rel"
android:layout_toRightOf="@+id/item_recommend_trend_user_head_rel"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp"
tools:text="23分钟前" />
......@@ -108,7 +108,7 @@
android:layout_marginRight="15dp"
android:layout_marginTop="15dp"
android:lineSpacingExtra="3dp"
android:textColor="@color/text_trend_black"
android:textColor="@color/dynamic_text_trend_black"
android:textSize="16sp"
tools:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计此次核试规模将比上一次增加十几倍。对此，外交部回应表示：中方反对朝鲜核试的立场是明确和一贯的。当前半岛形势高度复杂敏感，任何可能加剧半岛局势紧张的举动都是不可取的。希望相关各方都保持冷静克制，负起自己的责任，不要采取进一步相互刺激和加剧局势紧张的行动。" />
......@@ -134,7 +134,7 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:gravity="center_vertical"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
tools:text="2345浏览" />
......
m-dynamic/src/main/res/layout/item_select_topic.xml → m-dynamic/src/main/res/layout/dynamic_item_select_topic.xml
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical" android:layout_width="match_parent"
android:background="@color/white"
android:background="@color/dynamic_white"
android:layout_height="45dp">
<TextView
......@@ -18,5 +18,5 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:src="@drawable/mine_next"/>
android:src="@drawable/dynamic_mine_next"/>
</RelativeLayout>
m-dynamic/src/main/res/layout/item_talk_list.xml → m-dynamic/src/main/res/layout/dynamic_item_talk_list.xml
......@@ -4,7 +4,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:background="@color/white">
android:background="@color/dynamic_white">
<LinearLayout
android:id="@+id/lin_body"
......@@ -28,7 +28,7 @@
android:id="@+id/item_recommend_trend_user_head_iv"
android:layout_width="40dp"
android:layout_height="40dp"
tools:src="@drawable/head_place_hold_pic" />
tools:src="@drawable/dynamic_head_place_hold_pic" />
<TextView
android:id="@+id/text_zixunshi"
......@@ -36,7 +36,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@drawable/bg_radius_line_yellow20"
android:background="@drawable/dynamic_bg_radius_line_yellow20"
android:gravity="center"
android:paddingBottom="1dp"
android:paddingLeft="3dp"
......@@ -45,8 +45,8 @@
android:text="咨询师"
android:layout_alignRight="@id/item_recommend_trend_user_head_iv"
android:layout_alignLeft="@id/item_recommend_trend_user_head_iv"
android:textColor="@color/white"
android:textSize="@dimen/text_size_9"
android:textColor="@color/dynamic_white"
android:textSize="@dimen/dynamic_text_size_9"
android:visibility="gone"
tools:visibility="visible" />
......@@ -56,7 +56,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_centerHorizontal="true"
android:background="@drawable/bg_radius_line_yellow20"
android:background="@drawable/dynamic_bg_radius_line_yellow20"
android:gravity="center"
android:paddingBottom="1dp"
android:paddingLeft="3dp"
......@@ -65,8 +65,8 @@
android:text="官方"
android:layout_alignRight="@id/item_recommend_trend_user_head_iv"
android:layout_alignLeft="@id/item_recommend_trend_user_head_iv"
android:textColor="@color/white"
android:textSize="@dimen/text_size_9"
android:textColor="@color/dynamic_white"
android:textSize="@dimen/dynamic_text_size_9"
android:visibility="gone"
tools:visibility="visible" />
</RelativeLayout>
......@@ -84,7 +84,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_centerVertical="true"
android:textColor="@color/text_trend_black"
android:textColor="@color/dynamic_text_trend_black"
tools:text="小明" />
<ImageView
......@@ -94,7 +94,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/text_userName"
android:src="@drawable/male" />
android:src="@drawable/dynamic_male" />
</RelativeLayout>
......@@ -107,7 +107,7 @@
android:layout_marginLeft="10dp"
android:layout_marginTop="5dp"
android:layout_toRightOf="@+id/item_trend_user_head_rel"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp"
tools:text="23分钟前" />
......@@ -118,10 +118,10 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:background="@drawable/shape_green_border_trend_info_bg"
android:background="@drawable/dynamic_shape_green_border_trend_info_bg"
android:gravity="center"
android:text="私聊"
android:textColor="@color/google_green"
android:textColor="@color/dynamic_google_green"
android:visibility="gone"
tools:visibility="visible" />
......@@ -132,7 +132,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="85dp"
android:background="@drawable/confide_shape_border_trend_info_bg"
android:background="@drawable/dynamic_confide_shape_border_trend_info_bg"
android:gravity="center"
android:text="倾诉"
android:textColor="@color/platform_color_32D296"
......@@ -159,7 +159,7 @@
android:layout_height="wrap_content"
android:layout_marginLeft="65dp"
android:layout_marginRight="10dp"
android:background="@color/f5f5f5"
android:background="@color/dynamic_f5f5f5"
android:orientation="vertical"
android:paddingLeft="8dp"
android:paddingRight="8dp"
......@@ -182,7 +182,7 @@
android:layout_height="wrap_content"
android:layout_gravity="right"
android:text="全部"
android:textColor="@color/text_user"
android:textColor="@color/dynamic_text_user"
android:visibility="gone"
tools:visibility="visible" />
</LinearLayout>
......@@ -202,7 +202,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:layout_toLeftOf="@+id/img_comment_zan"
android:src="@drawable/reply_shang" />
android:src="@drawable/dynamic_reply_shang" />
<ImageView
android:id="@+id/img_comment_zan"
......@@ -211,7 +211,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="20dp"
android:layout_toLeftOf="@+id/img_comment_discuss"
android:src="@drawable/reply_zan" />
android:src="@drawable/dynamic_reply_zan" />
<ImageView
android:id="@+id/img_comment_discuss"
......@@ -219,13 +219,13 @@
android:layout_height="25dp"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:src="@drawable/reply_reply" />
android:src="@drawable/dynamic_reply_reply" />
</RelativeLayout>
<View
android:layout_width="match_parent"
android:layout_height="1dp"
android:background="@color/title_bottom_line_bg"/>
android:background="@color/dynamic_title_bottom_line_bg"/>
</LinearLayout>
<TextView
......@@ -237,7 +237,7 @@
android:layout_marginRight="30dp"
android:gravity="center"
android:text="点击加载更多"
android:textColor="@color/text_trend_black"
android:textColor="@color/dynamic_text_trend_black"
android:visibility="gone"
android:textSize="16sp"/>
......
m-dynamic/src/main/res/layout/item_trend_load_more.xml → m-dynamic/src/main/res/layout/dynamic_item_trend_load_more.xml
......@@ -14,7 +14,7 @@
android:layout_centerInParent="true"
android:gravity="center"
android:textColor="@color/text_trend_black"
android:textColor="@color/dynamic_text_trend_black"
android:textSize="14sp"
android:text="继续加载"/>
</RelativeLayout>
m-dynamic/src/main/res/layout/item_trends_content_list.xml → m-dynamic/src/main/res/layout/dynamic_item_trends_content_list.xml
......@@ -8,7 +8,7 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginTop="20dp"
android:background="@color/white"
android:background="@color/dynamic_white"
android:elevation="1dp"
android:orientation="vertical">
......@@ -26,7 +26,7 @@
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
android:src="@drawable/head_place_hold_pic" />
android:src="@drawable/dynamic_head_place_hold_pic" />
<TextView
......@@ -37,7 +37,7 @@
android:paddingLeft="10dp"
android:paddingTop="3dp"
android:text="小明"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="12sp"
app:layout_constraintLeft_toRightOf="@+id/item_trend_user_head_iv" />
......@@ -47,7 +47,7 @@
android:layout_height="16dp"
android:layout_marginLeft="@dimen/platform_dp_2"
android:paddingTop="6dp"
android:src="@drawable/new_male"
android:src="@drawable/dynamic_new_male"
app:layout_constraintLeft_toRightOf="@+id/item_trend_user_name_tv" />
......@@ -60,7 +60,7 @@
android:paddingLeft="10dp"
android:paddingTop="10dp"
android:text=""
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="10sp"
app:layout_constraintLeft_toRightOf="@+id/item_trend_user_head_iv"
app:layout_constraintTop_toBottomOf="@+id/item_trend_user_name_tv"
......@@ -72,7 +72,7 @@
android:layout_height="wrap_content"
android:paddingTop="7dp"
android:text="来自安卓终端"
android:textColor="@color/text_trend_defult"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="10sp"
app:layout_constraintBaseline_toBaselineOf="@+id/item_trend_time_tv"
app:layout_constraintLeft_toRightOf="@+id/item_trend_time_tv" />
......@@ -87,7 +87,7 @@
android:layout_marginRight="10dp"
android:layout_marginTop="15dp"
android:text="标题"
android:textColor="@color/text_3d3d3d"
android:textColor="@color/dynamic_text_3d3d3d"
android:textSize="15sp" />
<TextView
......@@ -99,7 +99,7 @@
android:layout_marginTop="15dp"
android:lineSpacingExtra="3dp"
android:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计此次核试规模将比上一次增加十几倍。对此，外交部回应表示：中方反对朝鲜核试的立场是明确和一贯的。当前半岛形势高度复杂敏感，任何可能加剧半岛局势紧张的举动都是不可取的。希望相关各方都保持冷静克制，负起自己的责任，不要采取进一步相互刺激和加剧局势紧张的行动。"
android:textColor="@color/text_666666"
android:textColor="@color/dynamic_text_666666"
android:textSize="12sp"
android:visibility="gone"
tools:visibility="visible" />
......@@ -121,7 +121,7 @@
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="15dp"
android:background="@drawable/trend_ad_bg"
android:background="@drawable/dynamic_trend_ad_bg"
android:visibility="gone"
tools:visibility="visible">
......@@ -131,7 +131,7 @@
android:layout_height="40dp"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
android:src="@drawable/default_img" />
android:src="@drawable/dynamic_default_img" />
<ImageView
android:id="@+id/iv_fm"
......@@ -139,7 +139,7 @@
android:layout_height="@dimen/platform_dp_22"
android:layout_centerVertical="true"
android:layout_marginLeft="9dp"
android:src="@drawable/img_trend_fm_play"
android:src="@drawable/dynamic_img_trend_fm_play"
android:visibility="gone"
tools:visibility="visible" />
......@@ -154,7 +154,7 @@
android:ellipsize="end"
android:maxLines="2"
android:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计"
android:textColor="@color/text_666666"
android:textColor="@color/dynamic_text_666666"
android:textSize="12sp" />
</RelativeLayout>
......@@ -188,7 +188,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/text_talk_num"
android:padding="3dp"
android:src="@drawable/comment" />
android:src="@drawable/dynamic_comment" />
<TextView
android:id="@+id/text_talk_num"
......@@ -199,8 +199,8 @@
android:layout_marginLeft="5dp"
android:drawablePadding="5dp"
android:gravity="center_vertical"
android:textColor="@color/text_trend_defult"
android:textSize="@dimen/text_size_12"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="@dimen/dynamic_text_size_12"
tools:text="评论" />
<ImageView
......@@ -210,7 +210,7 @@
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/text_zan_num"
android:padding="3dp"
android:src="@drawable/icon_warm_nor" />
android:src="@drawable/dynamic_icon_warm_nor" />
<TextView
android:id="@+id/text_zan_num"
......@@ -222,8 +222,8 @@
android:layout_toLeftOf="@+id/item_trend_discuss_iv"
android:gravity="center_vertical"
android:minWidth="25dp"
android:textColor="@color/text_trend_defult"
android:textSize="@dimen/text_size_12"
android:textColor="@color/dynamic_text_trend_defult"
android:textSize="@dimen/dynamic_text_size_12"
tools:text="温暖" />
</RelativeLayout>
......
m-dynamic/src/main/res/layout/item_trends_head_recommend_topic.xml → m-dynamic/src/main/res/layout/dynamic_item_trends_head_recommend_topic.xml
......@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white">
android:background="@color/dynamic_white">
<TextView
android:layout_width="wrap_content"
......@@ -35,7 +35,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginLeft="5dp"
android:src="@drawable/mine_next" />
android:src="@drawable/dynamic_mine_next" />
</LinearLayout>
<android.support.v7.widget.RecyclerView
......@@ -52,5 +52,5 @@
android:layout_height="10dp"
android:layout_marginTop="15dp"
android:layout_below="@+id/recommend_topic_rcv"
android:background="@color/defult_bg" />
android:background="@color/dynamic_defult_bg" />
</RelativeLayout>
m-dynamic/src/main/res/layout/item_trends_list.xml → m-dynamic/src/main/res/layout/dynamic_item_trends_list.xml
......@@ -4,7 +4,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/white">
android:background="@color/dynamic_white">
<!--评论布局-->
......@@ -22,7 +22,7 @@
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:background="@color/title_bottom_line_bg" />
android:background="@color/dynamic_title_bottom_line_bg" />
<android.support.v7.widget.RecyclerView
......@@ -41,7 +41,7 @@
android:layout_marginLeft="15dp"
android:layout_marginTop="10dp"
android:text="查看8条评论"
android:textColor="@color/text_user"
android:textColor="@color/dynamic_text_user"
android:visibility="gone" />
</RelativeLayout>
......@@ -63,7 +63,7 @@
android:layout_alignParentTop="true"
android:layout_marginTop="18dp">
<include layout="@layout/include_user_info_part" />
<include layout="@layout/dynamic_include_user_info_part" />
<TextView
android:id="@+id/item_trend_title_tv"
......@@ -74,7 +74,7 @@
android:layout_marginRight="15dp"
android:layout_marginTop="15dp"
android:text="标题"
android:textColor="@color/text_trend_title_black"
android:textColor="@color/dynamic_text_trend_title_black"
android:textSize="18sp" />
<TextView
......@@ -87,7 +87,7 @@
android:layout_marginTop="15dp"
android:lineSpacingExtra="3dp"
android:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计此次核试规模将比上一次增加十几倍。对此，外交部回应表示：中方反对朝鲜核试的立场是明确和一贯的。当前半岛形势高度复杂敏感，任何可能加剧半岛局势紧张的举动都是不可取的。希望相关各方都保持冷静克制，负起自己的责任，不要采取进一步相互刺激和加剧局势紧张的行动。"
android:textColor="@color/text_trend_black"
android:textColor="@color/dynamic_text_trend_black"
android:textSize="16sp"
android:visibility="gone"
tools:visibility="visible" />
......@@ -118,13 +118,13 @@
android:layout_alignParentTop="true"
android:layout_marginRight="5dp"
android:layout_marginTop="5dp"
android:background="@drawable/radian_bg"
android:background="@drawable/dynamic_radian_bg"
android:paddingBottom="10dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:paddingTop="10dp"
android:text="共9张"
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:textSize="15sp"
android:visibility="gone" />
</RelativeLayout>
......@@ -139,7 +139,7 @@
android:layout_marginLeft="15dp"
android:layout_marginRight="15dp"
android:layout_marginTop="15dp"
android:background="@drawable/trend_ad_bg"
android:background="@drawable/dynamic_trend_ad_bg"
android:visibility="gone">
<ImageView
......@@ -148,7 +148,7 @@
android:layout_height="40dp"
android:layout_centerVertical="true"
android:scaleType="centerCrop"
android:src="@drawable/default_img" />
android:src="@drawable/dynamic_default_img" />
<ImageView
android:id="@+id/iv_fm"
......@@ -156,7 +156,7 @@
android:layout_height="@dimen/platform_dp_22"
android:layout_centerVertical="true"
android:layout_marginLeft="9dp"
android:src="@drawable/img_trend_fm_play"
android:src="@drawable/dynamic_img_trend_fm_play"
android:visibility="gone"
tools:visibility="visible" />
......@@ -171,7 +171,7 @@
android:ellipsize="end"
android:maxLines="2"
android:text="外交部回应“朝鲜正准备第六次核试验”】有报道称，朝鲜正在准备进行第六次核试验，预计"
android:textColor="@color/text_666666"
android:textColor="@color/dynamic_text_666666"
android:textSize="12sp" />
</RelativeLayout>
......@@ -185,7 +185,7 @@
android:ellipsize="end"
android:gravity="center_vertical"
android:maxLines="1"
android:textColor="@color/text_user"
android:textColor="@color/dynamic_text_user"
android:textSize="14sp"
tools:text="#表白话题#" />
......@@ -206,7 +206,7 @@
android:layout_alignParentLeft="true"
android:layout_centerVertical="true"
android:text="阅读2345"
android:textColor="@color/text_trend_defult" />
android:textColor="@color/dynamic_text_trend_defult" />
<ImageView
android:id="@+id/item_trend_discuss_iv"
......@@ -214,7 +214,7 @@
android:layout_height="25dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/text_talk_num"
android:src="@drawable/newsfeed_reply" />
android:src="@drawable/dynamic_newsfeed_reply" />
<TextView
android:id="@+id/text_talk_num"
......@@ -227,7 +227,7 @@
android:gravity="center_vertical"
android:minWidth="30dp"
android:text="评论"
android:textColor="@color/text_trend_defult" />
android:textColor="@color/dynamic_text_trend_defult" />
<ImageView
android:id="@+id/item_trend_zan_iv"
......@@ -235,7 +235,7 @@
android:layout_height="25dp"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/text_zan_num"
android:src="@drawable/newsfeed_like" />
android:src="@drawable/dynamic_newsfeed_like" />
<TextView
android:id="@+id/text_zan_num"
......@@ -249,7 +249,7 @@
android:gravity="center_vertical"
android:minWidth="30dp"
android:text="温暖"
android:textColor="@color/text_trend_defult" />
android:textColor="@color/dynamic_text_trend_defult" />
</RelativeLayout>
......
m-dynamic/src/main/res/layout/layout_publish_trend_bottom.xml → m-dynamic/src/main/res/layout/dynamic_layout_publish_trend_bottom.xml
......@@ -8,7 +8,7 @@
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_alignParentBottom="true"
android:background="@drawable/bg_bottom_trend_line">
android:background="@drawable/dynamic_bg_bottom_trend_line">
<ImageView
android:id="@+id/publish_trend_bottom_img_iv"
......@@ -17,7 +17,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="15dp"
android:padding="3dp"
android:src="@drawable/edit_img" />
android:src="@drawable/dynamic_edit_img" />
<ImageView
android:id="@+id/publish_emoji_iv"
......@@ -27,7 +27,7 @@
android:layout_marginLeft="20dp"
android:layout_toRightOf="@+id/publish_trend_bottom_img_iv"
android:padding="3dp"
android:src="@drawable/edict_ico_emoji" />
android:src="@drawable/dynamic_edict_ico_emoji" />
<LinearLayout
android:id="@+id/ll_to_expert"
......@@ -36,7 +36,7 @@
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:layout_toLeftOf="@+id/publish_anonymity_rel"
android:background="@drawable/bg_anonymity_line"
android:background="@drawable/dynamic_bg_anonymity_line"
android:gravity="center"
android:minWidth="98dp"
android:orientation="horizontal"
......@@ -47,7 +47,7 @@
android:id="@+id/iv_to_expert"
android:layout_width="11dp"
android:layout_height="11dp"
android:src="@drawable/checkbox" />
android:src="@drawable/dynamic_checkbox" />
<TextView
android:layout_width="wrap_content"
......@@ -67,7 +67,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="15dp"
android:background="@drawable/bg_anonymity_line"
android:background="@drawable/dynamic_bg_anonymity_line"
android:gravity="center"
android:minWidth="54dp"
android:orientation="horizontal"
......@@ -78,7 +78,7 @@
android:id="@+id/publish_anonymity_iv"
android:layout_width="11dp"
android:layout_height="11dp"
android:src="@drawable/checkbox" />
android:src="@drawable/dynamic_checkbox" />
<TextView
android:layout_width="wrap_content"
......
m-dynamic/src/main/res/layout/looper_item.xml → m-dynamic/src/main/res/layout/dynamic_looper_item.xml
......@@ -19,7 +19,7 @@
android:paddingLeft="15dp"
android:paddingTop="5dp"
android:paddingRight="5dp"
android:background="@drawable/bg_radius_white_20"
android:background="@drawable/dynamic_bg_radius_white_20"
tools:text="置顶 xxxxxx"/>
</LinearLayout>
m-dynamic/src/main/res/layout/nim_sticker_picker_view.xml → m-dynamic/src/main/res/layout/dynamic_nim_sticker_picker_view.xml
......@@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:textSize="13sp"
android:textColor="@color/black"
android:textColor="@color/dynamic_black"
android:maxLines="1"
android:ellipsize="end"
android:gravity="center_horizontal"
......
m-dynamic/src/main/res/layout/popup_notice.xml → m-dynamic/src/main/res/layout/dynamic_popup_notice.xml
......@@ -9,7 +9,7 @@
android:layout_below="@+id/view"
android:layout_centerHorizontal="true"
android:layout_marginTop="-1dp"
android:background="@drawable/background_publish_notice_view">
android:background="@drawable/dynamic_background_publish_notice_view">
<TextView
android:layout_width="wrap_content"
......@@ -19,7 +19,7 @@
android:layout_marginRight="5dp"
android:layout_marginBottom="5dp"
android:text="点击这里可以提问哦"
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
android:textSize="11sp" />
</RelativeLayout>
......@@ -28,6 +28,6 @@
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerHorizontal="true"
android:background="@drawable/background_publish_triangle_view" />
android:background="@drawable/dynamic_background_publish_triangle_view" />
</RelativeLayout>
m-dynamic/src/main/res/layout/share_select_dialog.xml → m-dynamic/src/main/res/layout/dynamic_share_select_dialog.xml
......@@ -10,7 +10,7 @@
android:layout_width="match_parent"
android:layout_height="230dp"
android:orientation="vertical"
android:background="@color/white">
android:background="@color/dynamic_white">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
......@@ -32,14 +32,14 @@
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/pop_weixin"/>
android:src="@drawable/dynamic_pop_weixin"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text=" 微信"
android:textColor="@color/black"/>
android:textColor="@color/dynamic_black"/>
</LinearLayout>
<LinearLayout
android:id="@+id/share_pyq"
......@@ -51,14 +51,14 @@
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/pop_pengyouquan"/>
android:src="@drawable/dynamic_pop_pengyouquan"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text=" 朋友圈"
android:textColor="@color/black"/>
android:textColor="@color/dynamic_black"/>
</LinearLayout>
<LinearLayout
android:id="@+id/share_qqzone"
......@@ -70,14 +70,14 @@
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/pop_qqzone"/>
android:src="@drawable/dynamic_pop_qqzone"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="QQ空间"
android:textColor="@color/black"/>
android:textColor="@color/dynamic_black"/>
</LinearLayout>
<LinearLayout
android:id="@+id/share_qq"
......@@ -89,21 +89,21 @@
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/pop_qq"/>
android:src="@drawable/dynamic_pop_qq"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="QQ"
android:textColor="@color/black"/>
android:textColor="@color/dynamic_black"/>
</LinearLayout>
</LinearLayout>
<View
android:layout_width="match_parent"
android:layout_height="0.5dp"
android:layout_marginTop="10dp"
android:background="@color/title_bottom_line_bg"/>
android:background="@color/dynamic_title_bottom_line_bg"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="80dp"
......@@ -120,14 +120,14 @@
android:layout_width="50dp"
android:layout_height="50dp"
android:layout_gravity="center_horizontal"
android:src="@drawable/pop_home"/>
android:src="@drawable/dynamic_pop_home"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:text="返回首页"
android:textColor="@color/black"/>
android:textColor="@color/dynamic_black"/>
</LinearLayout>
<View
android:layout_width="0dp"
......
m-dynamic/src/main/res/layout/trends_home_banner.xml → m-dynamic/src/main/res/layout/dynamic_trends_home_banner.xml
......@@ -8,8 +8,8 @@
android:layout_width="match_parent"
android:layout_height="160dp"
app:pa_indicator_different_width="14dp"
app:pa_indicator_drawable_selected="@drawable/icon_tip_select"
app:pa_indicator_drawable_unselected="@drawable/icon_tip_unselect"
app:pa_indicator_drawable_selected="@drawable/dynamic_icon_tip_select"
app:pa_indicator_drawable_unselected="@drawable/dynamic_icon_tip_unselect"
app:pa_indicator_height="5dp"
app:pa_indicator_margin="1.25dp"
app:pa_is_selected_same_unselected="false" />
......@@ -18,5 +18,5 @@
android:layout_width="match_parent"
android:layout_height="160dp"
android:scaleType="centerCrop"
android:background="@drawable/trends_banner"/>
android:background="@drawable/dynamic_trends_banner"/>
</FrameLayout>
m-dynamic/src/main/res/layout/ui_thank_head.xml → m-dynamic/src/main/res/layout/dynamic_ui_thank_head.xml
......@@ -15,64 +15,64 @@
android:layout_width="wrap_content"
android:layout_height="100dp"
android:scaleType="fitXY"
android:src="@drawable/thx_red_bg" />
android:src="@drawable/dynamic_thx_red_bg" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/default_dis_size_huge_more"
android:layout_marginTop="@dimen/dynamic_default_dis_size_huge_more"
android:text="向您的热心表达我的谢意"
android:textColor="@color/white"
android:textSize="@dimen/default_text_size_big" />
android:textColor="@color/dynamic_white"
android:textSize="@dimen/dynamic_default_text_size_big" />
<ImageView
android:id="@+id/sdv_head"
android:layout_width="@dimen/head_size_big"
android:layout_height="@dimen/head_size_big"
android:layout_width="@dimen/dynamic_head_size_big"
android:layout_height="@dimen/dynamic_head_size_big"
android:layout_centerHorizontal="true"
android:layout_marginTop="64dp"
android:src="@drawable/head_place_hold_pic"/>
android:src="@drawable/dynamic_head_place_hold_pic"/>
</RelativeLayout>
<com.yidianling.dynamic.thank.view.ThxSelectView
android:id="@+id/tsv_select"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/default_dis_size"
android:layout_marginTop="@dimen/default_dis_size" />
android:layout_marginBottom="@dimen/dynamic_default_dis_size"
android:layout_marginTop="@dimen/dynamic_default_dis_size" />
<com.ydl.ydlcommon.view.RoundCornerButton
android:id="@+id/rcb_submit"
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="@dimen/default_dis_size"
android:layout_margin="@dimen/dynamic_default_dis_size"
android:text="发送"
android:textColor="@color/white"
android:textColor="@color/dynamic_white"
app:pa_round_btn_bg="#EB5835"
app:pa_round_btn_radio_size="@dimen/default_dis_size_micro" />
app:pa_round_btn_radio_size="@dimen/dynamic_default_dis_size_micro" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_dis_size"
android:layout_marginTop="@dimen/default_dis_size"
android:layout_marginLeft="@dimen/dynamic_default_dis_size"
android:layout_marginTop="@dimen/dynamic_default_dis_size"
android:text="留言"
android:textColor="@color/default_text_color_hint"
android:textSize="@dimen/default_text_size_small"
android:textColor="@color/dynamic_default_text_color_hint"
android:textSize="@dimen/dynamic_default_text_size_small"
android:visibility="gone" />
<EditText
android:id="@+id/et_msg"
android:layout_width="match_parent"
android:layout_height="150dp"
android:layout_marginLeft="@dimen/default_dis_size"
android:layout_marginRight="@dimen/default_dis_size"
android:layout_marginTop="@dimen/default_dis_size"
android:background="@drawable/shape_gray_round"
android:layout_marginLeft="@dimen/dynamic_default_dis_size"
android:layout_marginRight="@dimen/dynamic_default_dis_size"
android:layout_marginTop="@dimen/dynamic_default_dis_size"
android:background="@drawable/dynamic_shape_gray_round"
android:gravity="top"
android:padding="@dimen/default_dis_size"
android:padding="@dimen/dynamic_default_dis_size"
android:text="谢谢您的真诚帮助！"
android:visibility="gone" />
......@@ -81,25 +81,25 @@
style="?android:attr/borderlessButtonStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_dis_size"
android:layout_marginRight="@dimen/default_dis_size"
android:layout_marginTop="@dimen/default_dis_size"
android:layout_marginLeft="@dimen/dynamic_default_dis_size"
android:layout_marginRight="@dimen/dynamic_default_dis_size"
android:layout_marginTop="@dimen/dynamic_default_dis_size"
android:text="只留个言感谢"
android:visibility="gone"
app:pa_round_btn_radio_size="@dimen/default_dis_size_micro"
app:pa_round_btn_radio_size="@dimen/dynamic_default_dis_size_micro"
app:pa_round_stroke_color="#D5D5D5"
app:pa_round_stroke_width="1dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/default_dis_size"
android:layout_marginLeft="@dimen/default_dis_size"
android:layout_marginTop="@dimen/default_dis_size_huge_more"
android:layout_marginBottom="@dimen/dynamic_default_dis_size"
android:layout_marginLeft="@dimen/dynamic_default_dis_size"
android:layout_marginTop="@dimen/dynamic_default_dis_size_huge_more"
android:text="TA已收到的感谢" />
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color" />
android:layout_height="@dimen/dynamic_divide_line_stroke_width"
android:background="@color/dynamic_divide_color" />
</LinearLayout>
m-dynamic/src/main/res/layout/ui_thx_select.xml → m-dynamic/src/main/res/layout/dynamic_ui_thx_select.xml
......@@ -8,30 +8,30 @@
android:id="@+id/ll_left"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_dis_size"
android:layout_marginLeft="@dimen/dynamic_default_dis_size"
android:layout_weight="1"
android:background="@drawable/shape_red_round"
android:background="@drawable/dynamic_shape_red_round"
android:gravity="center"
android:orientation="vertical"
android:padding="@dimen/default_dis_size_big">
android:padding="@dimen/dynamic_default_dis_size_big">
<TextView
android:id="@+id/tv_left_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/love_red"
android:drawablePadding="@dimen/default_dis_size_small"
android:drawableLeft="@drawable/dynamic_love_red"
android:drawablePadding="@dimen/dynamic_default_dis_size_small"
android:gravity="center"
android:text="×2"
android:textColor="@color/thx_red_color" />
android:textColor="@color/dynamic_thx_red_color" />
<TextView
android:id="@+id/tv_left_down"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/default_dis_size_small"
android:layout_marginTop="@dimen/dynamic_default_dis_size_small"
android:text="价值2元"
android:textColor="@color/thx_red_color" />
android:textColor="@color/dynamic_thx_red_color" />
</LinearLayout>
......@@ -40,30 +40,30 @@
android:id="@+id/ll_center"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_dis_size"
android:layout_marginLeft="@dimen/dynamic_default_dis_size"
android:layout_weight="1"
android:background="@drawable/shape_red_round"
android:background="@drawable/dynamic_shape_red_round"
android:gravity="center"
android:orientation="vertical"
android:padding="@dimen/default_dis_size_big">
android:padding="@dimen/dynamic_default_dis_size_big">
<TextView
android:id="@+id/tv_center_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/love_red"
android:drawablePadding="@dimen/default_dis_size_small"
android:drawableLeft="@drawable/dynamic_love_red"
android:drawablePadding="@dimen/dynamic_default_dis_size_small"
android:gravity="center"
android:text="×6"
android:textColor="@color/thx_red_color" />
android:textColor="@color/dynamic_thx_red_color" />
<TextView
android:id="@+id/tv_center_down"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/default_dis_size_small"
android:layout_marginTop="@dimen/dynamic_default_dis_size_small"
android:text="价值6元"
android:textColor="@color/thx_red_color" />
android:textColor="@color/dynamic_thx_red_color" />
</LinearLayout>
......@@ -72,31 +72,31 @@
android:id="@+id/ll_right"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/default_dis_size"
android:layout_marginRight="@dimen/default_dis_size"
android:layout_marginLeft="@dimen/dynamic_default_dis_size"
android:layout_marginRight="@dimen/dynamic_default_dis_size"
android:layout_weight="1"
android:background="@drawable/shape_red_round"
android:background="@drawable/dynamic_shape_red_round"
android:gravity="center"
android:orientation="vertical"
android:padding="@dimen/default_dis_size_big">
android:padding="@dimen/dynamic_default_dis_size_big">
<TextView
android:id="@+id/tv_right_up"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:drawableLeft="@drawable/love_red"
android:drawablePadding="@dimen/default_dis_size_small"
android:drawableLeft="@drawable/dynamic_love_red"
android:drawablePadding="@dimen/dynamic_default_dis_size_small"
android:gravity="center"
android:text="×10"
android:textColor="@color/thx_red_color" />
android:textColor="@color/dynamic_thx_red_color" />
<TextView
android:id="@+id/tv_right_down"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/default_dis_size_small"
android:layout_marginTop="@dimen/dynamic_default_dis_size_small"
android:text="价值10元"
android:textColor="@color/thx_red_color" />
android:textColor="@color/dynamic_thx_red_color" />
</LinearLayout>
......
m-dynamic/src/main/res/layout/ui_zan_reply_list.xml → m-dynamic/src/main/res/layout/dynamic_ui_zan_reply_list.xml
......@@ -9,7 +9,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:padding="@dimen/default_dis_size">
android:padding="@dimen/dynamic_default_dis_size">
<RelativeLayout
android:layout_width="50dp"
......@@ -19,7 +19,7 @@
android:id="@+id/sdv_head"
android:layout_width="40dp"
android:layout_height="40dp"
android:src="@drawable/head_place_hold_pic"
android:src="@drawable/dynamic_head_place_hold_pic"
android:layout_centerInParent="true"/>
<RelativeLayout
......@@ -31,7 +31,7 @@
<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/love_h" />
android:src="@drawable/dynamic_love_h" />
<TextView
android:id="@+id/tv_zan_num"
......@@ -40,7 +40,7 @@
android:layout_centerInParent="true"
android:text=""
android:textSize="10sp"
android:textColor="@color/white" />
android:textColor="@color/dynamic_white" />
</RelativeLayout>
</RelativeLayout>
......@@ -49,7 +49,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/default_dis_size"
android:layout_marginLeft="@dimen/dynamic_default_dis_size"
android:orientation="vertical">
<RelativeLayout
......@@ -63,7 +63,7 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:text=""
android:textColor="@color/default_text_color_hint" />
android:textColor="@color/dynamic_default_text_color_hint" />
<TextView
android:id="@+id/tv_time"
......@@ -72,7 +72,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:text="2015-10-10"
android:textColor="@color/default_text_color_hint" />
android:textColor="@color/dynamic_default_text_color_hint" />
</RelativeLayout>
......@@ -80,7 +80,7 @@
android:id="@+id/tv_content"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_marginTop="@dimen/default_dis_size"
android:layout_marginTop="@dimen/dynamic_default_dis_size"
android:layout_weight="1"
android:text="" />
</LinearLayout>
......@@ -88,6 +88,6 @@
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/divide_line_stroke_width"
android:background="@color/divide_color" />
android:layout_height="@dimen/dynamic_divide_line_stroke_width"
android:background="@color/dynamic_divide_color" />
</LinearLayout>
m-dynamic/src/main/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#3F51B5</color>
<color name="colorPrimaryDark">#303F9F</color>
<color name="colorAccent">#FF4081</color>
<color name="green3">#1da1f2</color>
<color name="msg_system_press">#fff7f7f7</color>
<color name="msg_bg_press">#eeeeeeee</color>
<color name="colorDivider">#ebebeb</color>
<color name="dynamic_colorPrimary">#3F51B5</color>
<color name="dynamic_colorPrimaryDark">#303F9F</color>
<color name="dynamic_colorAccent">#FF4081</color>
<color name="dynamic_green3">#1da1f2</color>
<color name="dynamic_msg_system_press">#fff7f7f7</color>
<color name="dynamic_msg_bg_press">#eeeeeeee</color>
<color name="dynamic_colorDivider">#ebebeb</color>
<!-- google color-->
<color name="google_red">#ed412c</color>
<color name="google_blue">#3e82f7</color>
<color name="google_yellow">#fdbd00</color>
<color name="google_green">#1da1f2</color>
<color name="google_green_dark">#1da1f2</color>
<color name="dynamic_google_red">#ed412c</color>
<color name="dynamic_google_blue">#3e82f7</color>
<color name="dynamic_google_yellow">#fdbd00</color>
<color name="dynamic_google_green">#1da1f2</color>
<color name="dynamic_google_green_dark">#1da1f2</color>
<color name="color_grey_d0d0d0">#d0d0d0</color>
<color name="dynamic_color_grey_d0d0d0">#d0d0d0</color>
<!--app主要颜色-->
<color name="white">#ffffff</color>
<color name="theme_title_bar_color">#FFFFFF</color>
<color name="theme_bg">#FAFAFA</color>
<color name="default_button_bg">#1da1f2</color>
<color name="default_text_color">#555555</color>
<color name="default_text_color_hint">#333333</color>
<color name="divide_color">#EDEDED</color>
<color name="place_holder_color">#DDDDDD</color>
<color name="transparent">#00FFFFFF</color>
<color name="price_color">#EC7100</color>
<color name="thx_red_color">#EB5835</color>
<color name="tag_text">#777777</color>
<color name="f5f5f5">#f5f5f5</color>
<color name="fffaec">#fffaec</color>
<color name="black_deep">#FF000000</color>
<color name="dynamic_white">#ffffff</color>
<color name="dynamic_theme_title_bar_color">#FFFFFF</color>
<color name="dynamic_theme_bg">#FAFAFA</color>
<color name="dynamic_default_button_bg">#1da1f2</color>
<color name="dynamic_default_text_color">#555555</color>
<color name="dynamic_default_text_color_hint">#333333</color>
<color name="dynamic_divide_color">#EDEDED</color>
<color name="dynamic_place_holder_color">#DDDDDD</color>
<color name="dynamic_transparent">#00FFFFFF</color>
<color name="dynamic_price_color">#EC7100</color>
<color name="dynamic_thx_red_color">#EB5835</color>
<color name="dynamic_tag_text">#777777</color>
<color name="dynamic_f5f5f5">#f5f5f5</color>
<color name="dynamic_fffaec">#fffaec</color>
<color name="dynamic_black_deep">#FF000000</color>
<!--最后删除-->
<color name="colorTextDefault">#555555</color>
<color name="dynamic_colorTextDefault">#555555</color>
<!--云信　ｂｅｇｉｎ-->
<color name="black">#000000</color>
<color name="grey">#333333</color>
<color name="color_blue_0888ff">#0888ff</color>
<color name="color_gray_d9d9d9">#d9d9d9</color>
<color name="grey_white_has_alpha">#66FAFAFA</color>
<color name="color_black_333333">#333333</color>
<color name="color_grey_999999">#999999</color>
<color name="color_grey_888888">#888888</color>
<color name="color_activity_blue_bg">#f7389fff</color>
<color name="split_line_grey_color_d9d9d9">#D9D9D9</color>
<color name="gray7">#c5c4c4</color>
<color name="GreyWhite">#F7F7F7</color>
<color name="im_list_select_hover">#dbdbdb</color>
<color name="color_b3b3b3">#b3b3b3</color>
<color name="color_green_disable">#1da1f2</color>
<color name="color_green_00d3a9">#1da1f2</color>
<color name="color_black_b3000000">#b3000000</color>
<color name="color_grey_eaeaea">#eaeaea</color>
<color name="color_blue_3a9efb">#3a9efb</color>
<color name="dynamic_black">#000000</color>
<color name="dynamic_grey">#333333</color>
<color name="dynamic_color_blue_0888ff">#0888ff</color>
<color name="dynamic_color_gray_d9d9d9">#d9d9d9</color>
<color name="dynamic_grey_white_has_alpha">#66FAFAFA</color>
<color name="dynamic_color_black_333333">#333333</color>
<color name="dynamic_color_grey_999999">#999999</color>
<color name="dynamic_color_grey_888888">#888888</color>
<color name="dynamic_color_activity_blue_bg">#f7389fff</color>
<color name="dynamic_split_line_grey_color_d9d9d9">#D9D9D9</color>
<color name="dynamic_gray7">#c5c4c4</color>
<color name="dynamic_GreyWhite">#F7F7F7</color>
<color name="dynamic_im_list_select_hover">#dbdbdb</color>
<color name="dynamic_color_b3b3b3">#b3b3b3</color>
<color name="dynamic_color_green_disable">#1da1f2</color>
<color name="dynamic_color_green_00d3a9">#1da1f2</color>
<color name="dynamic_color_black_b3000000">#b3000000</color>
<color name="dynamic_color_grey_eaeaea">#eaeaea</color>
<color name="dynamic_color_blue_3a9efb">#3a9efb</color>
<!-- main bg color -->
<color name="main_bg_color">#FFFFFF</color>
<color name="dynamic_main_bg_color">#FFFFFF</color>
<!-- session -->
<color name="color_message_default_bg">#e9ecf0</color>
<color name="input_panel_text_color_757572">#757572</color>
<color name="color_gray_cbd0d8">#cbd0d8</color>
<color name="dynamic_color_message_default_bg">#e9ecf0</color>
<color name="dynamic_input_panel_text_color_757572">#757572</color>
<color name="dynamic_color_gray_cbd0d8">#cbd0d8</color>
<!-- image picker -->
<color name="color_split_line_d9d9d9">#d9d9d9</color>
<color name="color_split_line_cccccc">#cccccc</color>
<color name="dynamic_color_split_line_d9d9d9">#d9d9d9</color>
<color name="dynamic_color_split_line_cccccc">#cccccc</color>
<!-- contact -->
<color name="contact_list_hover">#d9d9d9</color>
<color name="contact_letter_idx_bg">#33000000</color>
<color name="color_grey_ababab">#ababab</color>
<color name="color_yellow_796413">#796413</color>
<color name="color_red_f04c62">#f04c62</color>
<color name="dynamic_contact_list_hover">#d9d9d9</color>
<color name="dynamic_contact_letter_idx_bg">#33000000</color>
<color name="dynamic_color_grey_ababab">#ababab</color>
<color name="dynamic_color_yellow_796413">#796413</color>
<color name="dynamic_color_red_f04c62">#f04c62</color>
<color name="text_gray">#B6B6B6</color>
<color name="dynamic_text_gray">#B6B6B6</color>
<color name="title_bottom_line_bg">#DDDDDD</color>
<color name="title_green">#1da1f2</color>
<color name="defult_bg">#f3f3f3</color>
<color name="dynamic_title_bottom_line_bg">#DDDDDD</color>
<color name="dynamic_title_green">#1da1f2</color>
<color name="dynamic_defult_bg">#f3f3f3</color>
<!--动态-->
<color name="text_trend_defult">#999999</color>
<color name="text_trend_black">#444444</color>
<color name="text_trend_title_black">#333333</color>
<color name="text_user">#5195cb</color>
<color name="text_3d3d3d">#3d3d3d</color>
<color name="text_666666">#666666</color>
<color name="dynamic_text_trend_defult">#999999</color>
<color name="dynamic_text_trend_black">#444444</color>
<color name="dynamic_text_trend_title_black">#333333</color>
<color name="dynamic_text_user">#5195cb</color>
<color name="dynamic_text_3d3d3d">#3d3d3d</color>
<color name="dynamic_text_666666">#666666</color>
<!--动态顶部title背景变色-->
<color name="trend_transparent">#00ffffff</color>
<color name="trend_gray">#f3f3f3</color>
<color name="dynamic_trend_transparent">#00ffffff</color>
<color name="dynamic_trend_gray">#f3f3f3</color>
<!--消息已读-->
<color name="color_grey_555555">#555555</color>
<color name="color_background">#ECF1F5</color>
<color name="bg_top_msg">#f3f3f3</color>
<color name="dynamic_color_grey_555555">#555555</color>
<color name="dynamic_color_background">#ECF1F5</color>
<color name="dynamic_bg_top_msg">#f3f3f3</color>
<color name="bg_red_pocket">#77000000</color>
<color name="dynamic_bg_red_pocket">#77000000</color>
......
m-dynamic/src/main/res/values/dimens.xml
......@@ -2,93 +2,93 @@
<resources>
<!-- 通用 -->
<dimen name="isetting_item_height">55dip</dimen>
<dimen name="isetting_item_padding_left">15dip</dimen>
<dimen name="isetting_item_padding_right">15dip</dimen>
<dimen name="action_bar_height">48dip</dimen>
<dimen name="split_one_dip">1dip</dimen>
<dimen name="split_one_pixels">1px</dimen>
<dimen name="text_size_9">9sp</dimen>
<dimen name="text_size_10">10sp</dimen>
<dimen name="text_size_12">12sp</dimen>
<dimen name="text_size_13">13sp</dimen>
<dimen name="text_size_14">14sp</dimen>
<dimen name="text_size_15">15sp</dimen>
<dimen name="text_size_16">16sp</dimen>
<dimen name="text_size_17">17sp</dimen>
<dimen name="text_size_18">18sp</dimen>
<dimen name="text_size_20">20sp</dimen>
<dimen name="dynamic_isetting_item_height">55dip</dimen>
<dimen name="dynamic_isetting_item_padding_left">15dip</dimen>
<dimen name="dynamic_isetting_item_padding_right">15dip</dimen>
<dimen name="dynamic_action_bar_height">48dip</dimen>
<dimen name="dynamic_split_one_dip">1dip</dimen>
<dimen name="dynamic_split_one_pixels">1px</dimen>
<dimen name="dynamic_text_size_9">9sp</dimen>
<dimen name="dynamic_text_size_10">10sp</dimen>
<dimen name="dynamic_text_size_12">12sp</dimen>
<dimen name="dynamic_text_size_13">13sp</dimen>
<dimen name="dynamic_text_size_14">14sp</dimen>
<dimen name="dynamic_text_size_15">15sp</dimen>
<dimen name="dynamic_text_size_16">16sp</dimen>
<dimen name="dynamic_text_size_17">17sp</dimen>
<dimen name="dynamic_text_size_18">18sp</dimen>
<dimen name="dynamic_text_size_20">20sp</dimen>
<!-- dialog -->
<dimen name="very_samll_text_size">9sp</dimen>
<dimen name="normal_text_size">16sp</dimen>
<dimen name="big_text_size">17sp</dimen>
<dimen name="light_line_size">1px</dimen>
<dimen name="dialog_text_margin_horizontal">15dip</dimen>
<dimen name="dialog_padding_vertical">20dip</dimen>
<dimen name="custom_dialog_padding_vertical">15dip</dimen>
<dimen name="dark_line_size">3px</dimen>
<dimen name="dynamic_very_samll_text_size">9sp</dimen>
<dimen name="dynamic_normal_text_size">16sp</dimen>
<dimen name="dynamic_big_text_size">17sp</dimen>
<dimen name="dynamic_light_line_size">1px</dimen>
<dimen name="dynamic_dialog_text_margin_horizontal">15dip</dimen>
<dimen name="dynamic_dialog_padding_vertical">20dip</dimen>
<dimen name="dynamic_custom_dialog_padding_vertical">15dip</dimen>
<dimen name="dynamic_dark_line_size">3px</dimen>
<!-- avatar -->
<dimen name="avatar_notification_size">48dip</dimen>
<dimen name="avatar_max_size">60dip</dimen>
<dimen name="avatar_size_default">50dip</dimen>
<dimen name="avatar_size_in_session">40dip</dimen>
<dimen name="avatar_size_in_contact">30dip</dimen>
<dimen name="dynamic_avatar_notification_size">48dip</dimen>
<dimen name="dynamic_avatar_max_size">60dip</dimen>
<dimen name="dynamic_avatar_size_default">50dip</dimen>
<dimen name="dynamic_avatar_size_in_session">40dip</dimen>
<dimen name="dynamic_avatar_size_in_contact">30dip</dimen>
<!-- Default screen margins, per the Android Design guidelines. -->
<dimen name="activity_vertical_margin">16dp</dimen>
<dimen name="dynamic_activity_vertical_margin">16dp</dimen>
<dimen name="dp_4">4dp</dimen>
<dimen name="dp_40">40dp</dimen>
<dimen name="dynamic_dp_4">4dp</dimen>
<dimen name="dynamic_dp_40">40dp</dimen>
<dimen name="sp_14">14sp</dimen>
<dimen name="dynamic_sp_14">14sp</dimen>
<!-- bubble -->
<dimen name="max_text_bubble_width">222dip</dimen>
<dimen name="bottom_component_margin_horizontal">6dip</dimen>
<dimen name="bubble_time_layout_margin_top">18dip</dimen>
<dimen name="bubble_time_layout_margin_bottom">8dip</dimen>
<dimen name="bubble_layout_margin_side">6dip</dimen>
<dimen name="bubble_head_margin_horizontal">8dip</dimen>
<dimen name="bubble_margin_top">2dip</dimen>
<dimen name="mask_sticker_bubble_width">120dip</dimen>
<dimen name="dynamic_max_text_bubble_width">222dip</dimen>
<dimen name="dynamic_bottom_component_margin_horizontal">6dip</dimen>
<dimen name="dynamic_bubble_time_layout_margin_top">18dip</dimen>
<dimen name="dynamic_bubble_time_layout_margin_bottom">8dip</dimen>
<dimen name="dynamic_bubble_layout_margin_side">6dip</dimen>
<dimen name="dynamic_bubble_head_margin_horizontal">8dip</dimen>
<dimen name="dynamic_bubble_margin_top">2dip</dimen>
<dimen name="dynamic_mask_sticker_bubble_width">120dip</dimen>
<!-- message -->
<dimen name="message_bottom_function_viewpager_height">220dp</dimen>
<dimen name="input_panel_image_margin_bottom">3dip</dimen>
<dimen name="input_panel_image_margin_top">20dip</dimen>
<dimen name="dynamic_message_bottom_function_viewpager_height">220dp</dimen>
<dimen name="dynamic_input_panel_image_margin_bottom">3dip</dimen>
<dimen name="dynamic_input_panel_image_margin_top">20dip</dimen>
<!---->
<!--字体大小部分-->
<dimen name="default_text_size_little">10sp</dimen>
<dimen name="default_text_size_small">12sp</dimen>
<dimen name="default_text_size">14sp</dimen>
<dimen name="default_text_size_big">16sp</dimen>
<dimen name="default_text_size_large">18sp</dimen>
<dimen name="dynamic_default_text_size_little">10sp</dimen>
<dimen name="dynamic_default_text_size_small">12sp</dimen>
<dimen name="dynamic_default_text_size">14sp</dimen>
<dimen name="dynamic_default_text_size_big">16sp</dimen>
<dimen name="dynamic_default_text_size_large">18sp</dimen>
<!--距离部分-->
<dimen name="default_dis_size_nano">2dp</dimen>
<dimen name="default_dis_size_micro">4dp</dimen>
<dimen name="default_dis_size_small">6dp</dimen>
<dimen name="default_dis_size">8dp</dimen>
<dimen name="default_dis_size_big">10dp</dimen>
<dimen name="default_dis_size_large">12dp</dimen>
<dimen name="default_dis_size_huge">14dp</dimen>
<dimen name="default_dis_size_huge_more">16dp</dimen>
<dimen name="dynamic_default_dis_size_nano">2dp</dimen>
<dimen name="dynamic_default_dis_size_micro">4dp</dimen>
<dimen name="dynamic_default_dis_size_small">6dp</dimen>
<dimen name="dynamic_default_dis_size">8dp</dimen>
<dimen name="dynamic_default_dis_size_big">10dp</dimen>
<dimen name="dynamic_default_dis_size_large">12dp</dimen>
<dimen name="dynamic_default_dis_size_huge">14dp</dimen>
<dimen name="dynamic_default_dis_size_huge_more">16dp</dimen>
<!--分割线粗细-->
<dimen name="divide_line_stroke_width">1px</dimen>
<dimen name="dynamic_divide_line_stroke_width">1px</dimen>
<dimen name="title_height">45dp</dimen>
<dimen name="title_txt_sp">20sp</dimen>
<dimen name="dynamic_title_height">45dp</dimen>
<dimen name="dynamic_title_txt_sp">20sp</dimen>
<dimen name="topic_banner_iv1_w">236dp</dimen>
<dimen name="topic_banner_iv2_3_w">108dp</dimen>
<dimen name="topic_banner_iv1_h">157dp</dimen>
<dimen name="topic_banner_iv2_3_h">78dp</dimen>
<dimen name="head_size_big">72dp</dimen>
<dimen name="dynamic_topic_banner_iv1_w">236dp</dimen>
<dimen name="dynamic_topic_banner_iv2_3_w">108dp</dimen>
<dimen name="dynamic_topic_banner_iv1_h">157dp</dimen>
<dimen name="dynamic_topic_banner_iv2_3_h">78dp</dimen>
<dimen name="dynamic_head_size_big">72dp</dimen>
</resources>
m-dynamic/src/main/res/values/strings.xml
<resources>
<string name="reset">重置</string>
<string name="confirm">确定</string>
<string name="no_more">没有更多了</string>
<string name="search_hint">搜索话题、咨询师姓名</string>
<string name="need_storage_permission_hint">App正常工作需要内部存储使用权限，请开启</string>
<string name="private_safe_hint">设置手势密码，保障安全隐私</string>
<string name="dynamic_reset">重置</string>
<string name="dynamic_confirm">确定</string>
<string name="dynamic_no_more">没有更多了</string>
<string name="dynamic_search_hint">搜索话题、咨询师姓名</string>
<string name="dynamic_need_storage_permission_hint">App正常工作需要内部存储使用权限，请开启</string>
<string name="dynamic_private_safe_hint">设置手势密码，保障安全隐私</string>
<!--网络提示模块-->
<string name="network_error">请检查网络连接！</string>
<string name="timeout">网络超时！</string>
<string name="httperror">请求失败</string>
<string name="dynamic_network_error">请检查网络连接！</string>
<string name="dynamic_timeout">网络超时！</string>
<string name="dynamic_httperror">请求失败</string>
<!--动态模块-->
<string name="trend_foucused">已关注</string>
<string name="trend_foucus">关注</string>
<string name="trends">动态</string>
<string name="header">头像</string>
<string name="close">关闭</string>
<string name="no_more_data_hint">陛下，就等你分享了呢</string>
<string name="loading_hint">正在加载中…</string>
<string name="dynamic_trend_foucused">已关注</string>
<string name="dynamic_trend_foucus">关注</string>
<string name="dynamic_trends">动态</string>
<string name="dynamic_header">头像</string>
<string name="dynamic_close">关闭</string>
<string name="dynamic_no_more_data_hint">陛下，就等你分享了呢</string>
<string name="dynamic_loading_hint">正在加载中…</string>
<string name="dialog_loading">加载中…</string>
<string name="dynamic_dialog_loading">加载中…</string>
<string name="bindphone">为了及时接收消息通知，请立即绑定手机</string>
<string name="dynamic_bindphone">为了及时接收消息通知，请立即绑定手机</string>
<string name="unknow_size">未知大小</string>
<string name="dynamic_unknow_size">未知大小</string>
<string name="silence_content">因网友举报，你已经被系统禁言，如有疑问，请联系客服小壹处理。</string>
<string name="details">了解详情</string>
<string name="approval">知道了</string>
<string name="input_panel_photo">图 片</string>
<string name="trend_comments_load_error">评论加载失败</string>
<string name="trend_waitting_for_comment">就等你的评论咯~</string>
<string name="dynamic_silence_content">因网友举报，你已经被系统禁言，如有疑问，请联系客服小壹处理。</string>
<string name="dynamic_details">了解详情</string>
<string name="dynamic_approval">知道了</string>
<string name="dynamic_input_panel_photo">图 片</string>
<string name="dynamic_trend_comments_load_error">评论加载失败</string>
<string name="dynamic_trend_waitting_for_comment">就等你的评论咯~</string>
</resources>
m-dynamic/src/main/res/values/styles.xml
......@@ -2,9 +2,9 @@
<style name="AppTheme" parent="baseTheme">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="colorPrimary">@color/dynamic_colorPrimary</item>
<item name="colorPrimaryDark">@color/dynamic_colorPrimaryDark</item>
<item name="colorAccent">@color/dynamic_colorAccent</item>
</style>
<style name="baseTheme" parent="Theme.AppCompat.Light.NoActionBar">
......@@ -33,12 +33,12 @@
<!--自定义分享-->
<style name="transparentFrameWindowStyle" parent="android:style/Theme.Dialog">
<item name="android:windowBackground">@drawable/share_choose_bg</item>
<item name="android:windowBackground">@drawable/dynamic_share_choose_bg</item>
</style>
<style name="main_menu_animstyle">
<item name="android:windowEnterAnimation">@anim/share_dialog_in_anim</item>
<item name="android:windowExitAnimation">@anim/share_dialog_out_anim</item>
<item name="android:windowEnterAnimation">@anim/dynamic_share_dialog_in_anim</item>
<item name="android:windowExitAnimation">@anim/dynamic_share_dialog_out_anim</item>
</style>
......@@ -56,7 +56,7 @@
</style>
<style name="dialog_default_style" parent="@android:style/Theme.Dialog">
<item name="android:windowBackground">@color/transparent</item>
<item name="android:windowBackground">@color/dynamic_transparent</item>
<item name="android:windowFrame">@null</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowIsFloating">true</item>
......
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