Leaf-WAI/assistant-android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

部分UI修改

Browse Source
This commit is contained in:
kehaoyuan
2018-08-25 09:45:39 +08:00
parent 5209e5b463
commit bec06bfbf4
29 changed files with 160 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/com/gh/common/util/NewsUtils.java
View File

@ -156,7 +156,7 @@ public class NewsUtils {
} else {
textView.setText(String.format(Locale.getDefault(), "%d小时前", hour));
}
} else if (day >= today - 86400 * 1000 && day < today) {
} else if (day >= today - 86400 * 1000 * 100 && day < today) {
format.applyPattern("HH:mm");
textView.setText("昨天 ");
} else {

12
app/src/main/java/com/gh/common/view/GridDivider.java
View File

@ -20,6 +20,8 @@ public class GridDivider extends RecyclerView.ItemDecoration {
private int mDividerHight = 1;
private int mGridCount;
private boolean mIsFilterLast;
/*
int dividerHight 分割线的线宽
int dividerColor 分割线的颜色
@ -32,6 +34,15 @@ public class GridDivider extends RecyclerView.ItemDecoration {
mColorPaint.setColor(dividerColor);
}
public GridDivider(Context context, int dividerHight, int gridCount, int dividerColor, boolean isFilterLast) {
this(context);
mDividerHight = dividerHight;
mGridCount = gridCount;
mColorPaint = new Paint();
mColorPaint.setColor(dividerColor);
mIsFilterLast = isFilterLast;
}
public GridDivider(Context context) {
final TypedArray ta = context.obtainStyledAttributes(ATRRS);
this.mDividerDarwable = ta.getDrawable(0);
@ -60,6 +71,7 @@ public class GridDivider extends RecyclerView.ItemDecoration {
final int childCount = parent.getChildCount();
for (int i = 0; i < childCount; i++) {
if (mIsFilterLast && i == childCount - 1) continue;
final View child = parent.getChildAt(i);
RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child.getLayoutParams();

13
app/src/main/java/com/gh/gamecenter/adapter/MessageDetailAdapter.java
View File

@ -45,7 +45,6 @@ import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import java.util.Timer;
import java.util.TimerTask;
@ -244,15 +243,13 @@ public class MessageDetailAdapter extends BaseRecyclerAdapter<ViewHolder> {
private void initNewsDigestViewHolder(final NewsDigestViewHolder viewHolder) {
if (mConcernEntity.getViews() != 0) {
viewHolder.read.setText(String.format(Locale.getDefault(), "阅读 %d", mConcernEntity.getViews()));
viewHolder.readNum.setText(String.valueOf(mConcernEntity.getViews()));
}
if (mConcernEntity.getCommentnum() != 0) {
if (mConcernEntity.getCommentnum() > 999) {
viewHolder.commentnum.setText(R.string.thousand);
} else {
viewHolder.commentnum.setText(String.valueOf(mConcernEntity.getCommentnum()));
}
if (mConcernEntity.getCommentnum() > 999) {
viewHolder.commentnum.setText(R.string.thousand);
} else {
viewHolder.commentnum.setText(String.valueOf(mConcernEntity.getCommentnum()));
}
if (mConcernEntity.getBrief() != null) {

18
app/src/main/java/com/gh/gamecenter/adapter/viewholder/NewsDigestViewHolder.java
View File

@ -29,20 +29,22 @@ public class NewsDigestViewHolder extends BaseRecyclerViewHolder<ConcernEntity>
public TextView content;
@BindView(R.id.news_digest_ll_img)
public LinearLayout imgLayout;
@BindView(R.id.news_digest_read)
public TextView read;
@BindView(R.id.news_digest_read_icon)
public View readIcon;
@BindView(R.id.news_digest_read_num)
public TextView readNum;
@BindView(R.id.news_digest_comment)
public LinearLayout comment;
@BindView(R.id.news_digest_commentnum)
public TextView commentnum;
@BindView(R.id.news_digest_share)
public ImageView share;
@BindView(R.id.news_digest_line1)
public View line1;
@BindView(R.id.news_digest_line2)
public View line2;
@BindView(R.id.news_digest_libao)
public View libaoIcon;
@BindView(R.id.news_digest_hint)
public ImageView iconHint;
@BindView(R.id.news_digest_libao_hint)
public TextView mLibaoHint;
@BindView(R.id.news_digest_count_container)
public View countContainer;
public NewsDigestViewHolder(View itemView) {
super(itemView);

50
app/src/main/java/com/gh/gamecenter/info/ConcernAdapter.java
View File

@ -42,7 +42,6 @@ import org.json.JSONObject;
import java.util.ArrayList;
import java.util.List;
import java.util.Locale;
import io.reactivex.ObservableEmitter;
import io.reactivex.ObservableOnSubscribe;
@ -370,13 +369,10 @@ class ConcernAdapter extends BaseRecyclerAdapter<ViewHolder> {
viewHolder.content.setText(StringUtils.buildString(concernEntity.getName(), "（限", PlatformUtils.getInstance(mContext)
.getPlatformName(concernEntity.getPlatform()), "版）\n礼包内容：", content));
}
viewHolder.comment.setVisibility(View.INVISIBLE);
viewHolder.share.setVisibility(View.INVISIBLE);
viewHolder.line1.setVisibility(View.INVISIBLE);
viewHolder.line2.setVisibility(View.INVISIBLE);
viewHolder.read.setVisibility(View.VISIBLE);
viewHolder.imgLayout.setVisibility(View.GONE);
viewHolder.libaoIcon.setVisibility(View.VISIBLE);
viewHolder.iconHint.setImageResource(R.drawable.ic_libao);
viewHolder.countContainer.setVisibility(View.GONE);
viewHolder.mLibaoHint.setVisibility(View.VISIBLE);
for (LibaoStatusEntity libaoStatusEntity : libaoStatusList) {
if (TextUtils.isEmpty(libaoStatusEntity.getBeforeStatus())) {
@ -385,9 +381,9 @@ class ConcernAdapter extends BaseRecyclerAdapter<ViewHolder> {
if (libaoStatusEntity.getId().equals(concernEntity.getId())) {
if ("finish".equals(libaoStatusEntity.getStatus())) {
viewHolder.read.setText(R.string.libao_finish);
viewHolder.mLibaoHint.setText(R.string.libao_finish);
} else {
viewHolder.read.setText("点击查看");
viewHolder.mLibaoHint.setText("点击查看");
}
MeEntity userData = concernEntity.getMe();
if (userData != null && userData.getUserDataLibaoList() != null && userData.getUserDataLibaoList().size() > 0) {
@ -396,10 +392,10 @@ class ConcernAdapter extends BaseRecyclerAdapter<ViewHolder> {
libaoStatusEntity.setBeforeStatus(libaoStatusEntity.getStatus());
if ("ling".equals(userDataLibaoEntity.getType())) { // 拿最后一次领取的状态判断
libaoStatusEntity.setStatus("linged");
viewHolder.read.setText(R.string.libao_linged);
viewHolder.mLibaoHint.setText(R.string.libao_linged);
} else {
libaoStatusEntity.setStatus("taoed");
viewHolder.read.setText(R.string.libao_taoed);
viewHolder.mLibaoHint.setText(R.string.libao_taoed);
}
libaoStatusEntity.setCode(userDataLibaoEntity.getCode());
}
@ -408,12 +404,13 @@ class ConcernAdapter extends BaseRecyclerAdapter<ViewHolder> {
return;
}
viewHolder.line1.setVisibility(View.VISIBLE);
viewHolder.line2.setVisibility(View.VISIBLE);
viewHolder.comment.setVisibility(View.VISIBLE);
viewHolder.share.setVisibility(View.VISIBLE);
viewHolder.libaoIcon.setVisibility(View.GONE);
viewHolder.countContainer.setVisibility(View.VISIBLE);
if (concernEntity.getLink() != null) {
viewHolder.iconHint.setImageResource(R.drawable.ic_link);
} else {
viewHolder.iconHint.setImageResource(R.drawable.concern_message_icon);
}
if (concernEntity.getBrief() != null) {
viewHolder.content.setText(Html.fromHtml(concernEntity.getBrief()));
viewHolder.content.setMaxLines(100);
@ -433,24 +430,17 @@ class ConcernAdapter extends BaseRecyclerAdapter<ViewHolder> {
}
int views = concernEntity.getViews();
if (views == 0) {
viewHolder.read.setVisibility(View.INVISIBLE);
} else {
viewHolder.read.setVisibility(View.VISIBLE);
viewHolder.read.setText(String.format(Locale.getDefault(), "阅读 %d", views));
}
viewHolder.readIcon.setVisibility(View.VISIBLE);
viewHolder.readNum.setText(String.valueOf(views));
int commentnum = concernEntity.getCommentnum();
if (commentnum == 0) {
viewHolder.commentnum.setVisibility(View.GONE);
viewHolder.commentnum.setVisibility(View.VISIBLE);
if (commentnum > 999) {
viewHolder.commentnum.setText(R.string.thousand);
} else {
viewHolder.commentnum.setVisibility(View.VISIBLE);
if (commentnum > 999) {
viewHolder.commentnum.setText(R.string.thousand);
} else {
viewHolder.commentnum.setText(String.valueOf(commentnum));
}
viewHolder.commentnum.setText(String.valueOf(commentnum));
}
}
private void initFooterViewHolder(FooterViewHolder viewHolder) {

62
app/src/main/java/com/gh/gamecenter/qa/column/detail/AskColumnDetailActivity.kt
View File

@ -4,10 +4,7 @@ import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.support.v4.app.Fragment
import android.view.View
import android.view.ViewGroup
import android.widget.EditText
import android.widget.LinearLayout
import android.view.MenuItem
import com.gh.base.BaseActivity
import com.gh.base.OnViewClickListener
import com.gh.base.adapter.FragmentAdapter
@ -21,16 +18,14 @@ import com.gh.gamecenter.qa.column.detail.recommends.RecommendsFragment
import com.gh.gamecenter.qa.column.detail.unanswered.UnansweredFragment
import com.gh.gamecenter.qa.entity.AskTagGroupsEntity
import com.gh.gamecenter.qa.search.AskSearchActivity
import kotterknife.bindView
import java.util.*
class AskColumnDetailActivity : BaseActivity() {
var mBinding: ActivityAskColumnDetailBinding? = null
private val mBarQuestionBtn by bindView<View>(R.id.bar_question_btn)
private val mBarSearchEdit by bindView<EditText>(R.id.bar_search_edit)
private val mBarBack by bindView<View>(R.id.bar_back)
var mColumnEntity: AskTagGroupsEntity? = null
var mQuestionTag: String? = null
override fun getLayoutId(): Int {
return R.layout.activity_ask_column_detail
@ -38,28 +33,18 @@ class AskColumnDetailActivity : BaseActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val columnEntity = intent.getParcelableExtra<AskTagGroupsEntity>(EntranceUtils.KEY_ASK_COLUMN_TAG)
val questionTag = intent.getStringExtra(EntranceUtils.KEY_ASK_TAG)
// if (!questionTag.isNullOrEmpty()) setNavigationTitle(questionTag)
setToolbarMenu(R.menu.menu_search)
val menuItem = getMenuItem(R.id.menu_search)
menuItem?.setIcon(R.drawable.ic_column_search)
// init SearchBar
mBarBack.setOnClickListener { finish() }
mBarQuestionBtn.visibility = View.INVISIBLE
mBarQuestionBtn.layoutParams = LinearLayout.LayoutParams(DisplayUtils.dip2px(20F), ViewGroup.LayoutParams.MATCH_PARENT)
mBarSearchEdit.hint = "专栏内搜索"
mBarSearchEdit.isFocusable = false
mBarSearchEdit.setOnClickListener({
if (!questionTag.isNullOrEmpty()) {
startActivity(AskSearchActivity.getQuestionTagSearchIntent(this, questionTag))
} else {
startActivity(AskSearchActivity.getColumnSearchIntent(this, columnEntity.id))
}
})
mColumnEntity = intent.getParcelableExtra(EntranceUtils.KEY_ASK_COLUMN_TAG)
mQuestionTag = intent.getStringExtra(EntranceUtils.KEY_ASK_TAG)
if (!mQuestionTag.isNullOrEmpty()) setNavigationTitle(mQuestionTag)
mBinding = ActivityAskColumnDetailBinding.bind(mContentView)
mBinding?.columnDetailDes?.setExpendText("...更多")
mBinding?.columnDetailTabRecommends?.isChecked = true
mBinding?.entity = columnEntity
mBinding?.entity = mColumnEntity
mBinding?.clickListener = OnViewClickListener { v, position ->
when (v.id) {
R.id.column_detail_tab_recommends -> {
@ -83,12 +68,12 @@ class AskColumnDetailActivity : BaseActivity() {
mBinding?.columnDetailViewpager?.currentItem = position as Int
}
// mBinding?.columnDetailAppbar?.addOnOffsetChangedListener({ _, verticalOffset ->
// if (questionTag.isNullOrEmpty()) {
// if (Math.abs(verticalOffset) > DisplayUtils.dip2px(42F)) setNavigationTitle(columnEntity.name)
// else setNavigationTitle("")
// }
// })
mBinding?.columnDetailAppbar?.addOnOffsetChangedListener({ _, verticalOffset ->
if (mQuestionTag.isNullOrEmpty()) {
if (Math.abs(verticalOffset) > DisplayUtils.dip2px(35F)) setNavigationTitle(mColumnEntity?.name)
else setNavigationTitle("")
}
})
// set fragment
val fragmentList = ArrayList<Fragment>()
@ -98,8 +83,8 @@ class AskColumnDetailActivity : BaseActivity() {
// add fragment argument
val argument = Bundle()
argument.putParcelable(EntranceUtils.KEY_ASK_COLUMN_TAG, columnEntity)
argument.putString(EntranceUtils.KEY_ASK_TAG, questionTag)
argument.putParcelable(EntranceUtils.KEY_ASK_COLUMN_TAG, mColumnEntity)
argument.putString(EntranceUtils.KEY_ASK_TAG, mQuestionTag)
argument.putParcelable(EntranceUtils.KEY_COMMUNITY_DATA, intent.getParcelableExtra(EntranceUtils.KEY_COMMUNITY_DATA))
for (fragment in fragmentList) fragment.arguments = argument
@ -111,6 +96,17 @@ class AskColumnDetailActivity : BaseActivity() {
}
}
override fun onMenuItemClick(item: MenuItem?): Boolean {
if (item?.itemId == R.id.menu_search) {
if (!mQuestionTag.isNullOrEmpty()) {
startActivity(AskSearchActivity.getQuestionTagSearchIntent(this, mQuestionTag))
} else {
startActivity(AskSearchActivity.getColumnSearchIntent(this, mColumnEntity?.id))
}
}
return super.onMenuItemClick(item)
}
companion object {
fun getIntentByColumn(context: Context, entity: AskTagGroupsEntity, community: CommunityEntity): Intent {

32
app/src/main/java/com/gh/gamecenter/qa/search/AskSearchActivity.java
View File

@ -45,13 +45,15 @@ public class AskSearchActivity extends BaseActivity {
@BindView(R.id.ask_search_shadow)
View mSearchShadow;
@BindView(R.id.bar_question_btn)
View questionBtn;
TextView questionBtn;
private AskSearchFragment mAskAskSearchFragment;
private String mSearchKey;
private String mPostedKey;
private String mColumnId;
private String mQuestionTag;
public static Intent getIntent(Context context) {
return new Intent(context, AskSearchActivity.class);
@ -97,17 +99,17 @@ public class AskSearchActivity extends BaseActivity {
super.onCreate(savedInstanceState);
mAskAskSearchFragment = new AskSearchFragment();
Bundle args = new Bundle();
String columnId = getIntent().getStringExtra(EntranceUtils.KEY_COLUMN_ID);
String questionTag = getIntent().getStringExtra(EntranceUtils.KEY_QUESTION_TAG);
args.putString(EntranceUtils.KEY_COLUMN_ID, columnId);
args.putString(EntranceUtils.KEY_QUESTION_TAG, questionTag);
mColumnId = getIntent().getStringExtra(EntranceUtils.KEY_COLUMN_ID);
mQuestionTag = getIntent().getStringExtra(EntranceUtils.KEY_QUESTION_TAG);
args.putString(EntranceUtils.KEY_COLUMN_ID, mColumnId);
args.putString(EntranceUtils.KEY_QUESTION_TAG, mQuestionTag);
mAskAskSearchFragment.setArguments(args);
getSupportFragmentManager().beginTransaction().replace(
R.id.layout_fragment_content, mAskAskSearchFragment).commitAllowingStateLoss();
if (!TextUtils.isEmpty(columnId) || !TextUtils.isEmpty(questionTag)) {
questionBtn.setVisibility(View.INVISIBLE);
questionBtn.getLayoutParams().width = DisplayUtils.dip2px(20);
if (!TextUtils.isEmpty(mColumnId) || !TextUtils.isEmpty(mQuestionTag)) {
questionBtn.setText("搜索");
mSearchEt.setHint("标签内搜索");
}
mSearchEt.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@ -115,7 +117,7 @@ public class AskSearchActivity extends BaseActivity {
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
if (actionId == EditorInfo.IME_ACTION_SEARCH) {
Util_System_Keyboard.hideSoftKeyboard(AskSearchActivity.this);
search();
mBaseHandler.sendEmptyMessageDelayed(1, 300);
}
return false;
}
@ -153,16 +155,26 @@ public class AskSearchActivity extends BaseActivity {
if (v.getId() == R.id.bar_search_delete) {
mSearchCancel.setVisibility(View.GONE);
mSearchEt.setText("");
} else if (v.getId() == R.id.search_questions_skip || v.getId() == R.id.bar_question_btn) {
} else if (v.getId() == R.id.search_questions_skip) {
CheckLoginUtils.checkLogin(this, () -> {
startActivityForResult(QuestionEditActivity.Companion.getIntent(this, mSearchKey), QUESTION_REQUEST_CODE);
});
} else if (v.getId() == R.id.bar_question_btn) {
if (!TextUtils.isEmpty(mColumnId) || !TextUtils.isEmpty(mQuestionTag)) {
mBaseHandler.sendEmptyMessageDelayed(1, 300);
} else {
CheckLoginUtils.checkLogin(this, () -> {
startActivityForResult(QuestionEditActivity.Companion.getIntent(this, mSearchKey), QUESTION_REQUEST_CODE);
});
}
} else if (v.getId() == R.id.bar_back) {
finish();
}
}
private void search() {
if (mSearchKey == null) return;
if (mAskAskSearchFragment != null) {
mAskAskSearchFragment.search(mSearchKey);
}

2
app/src/main/java/com/gh/gamecenter/qa/select/OpenedFragment.kt
View File

@ -24,7 +24,7 @@ class OpenedFragment : ListFragment<AskGameSelectEntity, OpenedViewModel>() {
}
override fun getItemDecoration(): RecyclerView.ItemDecoration {
return GridDivider(context, 2, 2, ContextCompat.getColor(context!!, R.color.cutting_line))
return GridDivider(context, 2, 2, ContextCompat.getColor(context!!, R.color.cutting_line), true)
}
override fun provideListAdapter(): OpenedAdapter {

BIN
app/src/main/res/drawable-hdpi/kc_checkbox_select.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 991 B

BIN
app/src/main/res/drawable-hdpi/kc_checkbox_unselect.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 691 B

After

Width:  |  Height:  |  Size: 792 B

BIN
app/src/main/res/drawable-nodpi/splash_01.webp
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 69 KiB

After

Width:  |  Height:  |  Size: 82 KiB

BIN
app/src/main/res/drawable-xhdpi/ic_column_search.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 883 B

BIN
app/src/main/res/drawable-xhdpi/ic_read.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 880 B

BIN
app/src/main/res/drawable-xhdpi/menu_more_report.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.0 KiB

After

Width:  |  Height:  |  Size: 956 B

BIN
app/src/main/res/drawable-xxhdpi/personal_home_icon.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

6
app/src/main/res/layout/activity_ask_column_detail.xml
View File

@ -18,7 +18,7 @@
android:layout_height = "match_parent"
android:orientation = "vertical" >
<include layout = "@layout/ask_search_actionbar" />
<include layout = "@layout/reuse_toolbar" />
<android.support.design.widget.CoordinatorLayout
android:layout_width = "match_parent"
@ -84,12 +84,9 @@
android:textSize = "12sp" />
</RelativeLayout >
</RelativeLayout >
</LinearLayout >
<LinearLayout
android:id = "@+id/column_detail_tabbar"
android:layout_width = "270dp"
@ -149,7 +146,6 @@
android:textColor = "@color/tabbar_textcolor_selector"
android:textSize = "12sp" />
</LinearLayout >
</android.support.design.widget.AppBarLayout >
<com.lightgame.view.NoScrollableViewPager

13
app/src/main/res/layout/activity_kaifu_patch.xml
View File

@ -136,12 +136,11 @@
android:background = "@android:color/white"
android:enabled = "false"
android:gravity = "center"
android:hint = "点击填写"
android:maxLength = "4"
android:maxLines = "2"
android:text = "@{entity.remark}"
android:textColor = "@color/title"
android:textColorHint = "@color/title"
android:textColor = "@color/hint"
android:textColorHint = "@color/hint"
android:textSize = "12sp" />
</LinearLayout >
@ -188,8 +187,8 @@
android:gravity = "center"
android:maxLines = "2"
android:text = "@{entity.note}"
android:textColor = "@color/title"
android:textColorHint = "@color/title"
android:textColor = "@color/hint"
android:textColorHint = "@color/hint"
android:textSize = "12sp" />
<TextView
@ -200,8 +199,8 @@
android:gravity = "center"
android:maxLines = "2"
android:text = "@{entity.remark}"
android:textColor = "@color/title"
android:textColorHint = "@color/title"
android:textColor = "@color/hint"
android:textColorHint = "@color/hint"
android:textSize = "12sp" />
</LinearLayout >

4
app/src/main/res/layout/answer_comment_item.xml
View File

@ -42,8 +42,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id="@+id/comment_user_badge"
android:layout_width="@dimen/badge_width"
android:layout_height="@dimen/badge_height"
android:layout_width="15dp"
android:layout_height="15dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
tools:src="@drawable/ic_discover_select" />

4
app/src/main/res/layout/ask_answer_item.xml
View File

@ -28,8 +28,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id = "@+id/ask_answer_item_user_badge"
android:layout_width = "@dimen/badge_width"
android:layout_height = "@dimen/badge_height"
android:layout_width = "10dp"
android:layout_height = "10dp"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true" />

4
app/src/main/res/layout/ask_questions_hot_item.xml
View File

@ -35,8 +35,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id = "@+id/ask_item_user_badge"
android:layout_width = "@dimen/badge_width"
android:layout_height = "@dimen/badge_height"
android:layout_width = "6.7dp"
android:layout_height = "6.7dp"
android:layout_alignParentBottom = "true"
android:layout_alignParentRight = "true" />
</RelativeLayout >

4
app/src/main/res/layout/comment_item.xml
View File

@ -38,8 +38,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id = "@+id/comment_user_badge"
android:layout_width = "@dimen/badge_width"
android:layout_height = "@dimen/badge_height"
android:layout_width = "15dp"
android:layout_height = "15dp"
android:layout_alignParentBottom = "true"
android:layout_alignParentRight = "true"
tools:src = "@drawable/ic_discover_select"/>

4
app/src/main/res/layout/followers_or_fans_item.xml
View File

@ -35,8 +35,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id = "@+id/questionsinvite_item_badge"
imageUrl = "@{entity.auth.icon}"
android:layout_width = "@dimen/badge_width"
android:layout_height = "@dimen/badge_height"
android:layout_width = "15dp"
android:layout_height = "15dp"
android:layout_alignParentBottom = "true"
android:layout_alignParentRight = "true" />
</RelativeLayout >

4
app/src/main/res/layout/fragment_answer_detail.xml
View File

@ -140,8 +140,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id = "@+id/answer_detail_badge"
android:layout_width = "@dimen/badge_width"
android:layout_height = "@dimen/badge_height"
android:layout_width = "10dp"
android:layout_height = "10dp"
android:layout_alignParentBottom = "true"
android:layout_alignParentRight = "true" />

4
app/src/main/res/layout/message_item.xml
View File

@ -34,8 +34,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id = "@+id/message_user_badge"
imageUrl = "@{messageEntity.userEntity.auth.icon}"
android:layout_width = "@dimen/badge_width"
android:layout_height = "@dimen/badge_height"
android:layout_width = "13dp"
android:layout_height = "13dp"
android:layout_alignParentBottom = "true"
android:layout_alignParentRight = "true" />
</RelativeLayout>

4
app/src/main/res/layout/message_kefu_item.xml
View File

@ -29,8 +29,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id = "@+id/message_user_badge"
android:layout_width = "@dimen/badge_width"
android:layout_height = "@dimen/badge_height"
android:layout_width = "13dp"
android:layout_height = "13dp"
android:layout_alignParentBottom = "true"
android:layout_alignParentRight = "true" />
</RelativeLayout>

40
app/src/main/res/layout/news_digest_item.xml
View File

@ -49,12 +49,10 @@
</LinearLayout >
<ImageView
android:id = "@+id/news_digest_libao"
android:id = "@+id/news_digest_hint"
android:layout_width = "15dp"
android:layout_height = "15dp"
android:layout_alignParentRight = "true"
android:src = "@drawable/ic_libao"
android:visibility = "gone" />
android:layout_alignParentRight = "true" />
</RelativeLayout >
@ -79,7 +77,19 @@
android:paddingLeft = "20dp"
android:paddingRight = "20dp" />
<TextView
android:id = "@+id/news_digest_libao_hint"
android:layout_width = "wrap_content"
android:layout_height = "wrap_content"
android:layout_marginBottom = "12dp"
android:layout_marginLeft = "20dp"
android:layout_marginTop = "6dp"
android:textColor = "@color/hint"
android:textSize = "12sp"
android:visibility = "gone" />
<LinearLayout
android:id = "@+id/news_digest_count_container"
android:layout_width = "match_parent"
android:layout_height = "wrap_content"
android:layout_marginBottom = "6dp"
@ -87,14 +97,28 @@
android:gravity = "center"
android:orientation = "horizontal" >
<TextView
<LinearLayout
android:id = "@+id/news_digest_read"
android:layout_width = "0dp"
android:layout_height = "wrap_content"
android:layout_weight = "1"
android:gravity = "center"
android:textColor = "@color/hint"
android:textSize = "12sp" />
android:gravity = "center" >
<ImageView
android:id = "@+id/news_digest_read_icon"
android:layout_width = "wrap_content"
android:layout_height = "wrap_content"
android:layout_marginRight = "6dp"
android:src = "@drawable/ic_read" />
<TextView
android:id = "@+id/news_digest_read_num"
android:layout_width = "wrap_content"
android:layout_height = "wrap_content"
android:textColor = "@color/hint"
android:textSize = "12sp" />
</LinearLayout >
<View
android:id = "@+id/news_digest_line1"

4
app/src/main/res/layout/questionsinvite_item.xml
View File

@ -23,8 +23,8 @@
<com.facebook.drawee.view.SimpleDraweeView
android:id = "@+id/questionsinvite_item_badge"
android:layout_width = "@dimen/badge_width"
android:layout_height = "@dimen/badge_height"
android:layout_width = "15dp"
android:layout_height = "15dp"
android:layout_alignParentBottom = "true"
android:layout_alignParentRight = "true" />

4
app/src/main/res/values/dimens.xml
View File

@ -9,7 +9,7 @@
<dimen name = "tab_layout_height" >45dp</dimen >
<dimen name = "badge_height" >12dp</dimen>
<dimen name = "badge_width" >12dp</dimen>
<!--<dimen name = "badge_height" >12dp</dimen>-->
<!--<dimen name = "badge_width" >12dp</dimen>-->
</resources >

2
app/src/main/res/values/strings.xml
View File

@ -568,7 +568,7 @@
<string name = "media_image_hint" >找不到图片管理器</string >
<string name = "personal_home" >个人主页</string >
<string name = "userinfo_introduce" >个性签名</string >
<string name = "introduce_hint" >介绍下自己吧..</string >
<string name = "introduce_hint" >介绍下自己吧</string >
<string name = "myself" >自己</string >
<string name = "suggestion_game_name">游戏名字<Data ><![CDATA[<font color="#ff4147">*</font>]]></Data ></string>