Skip to content

Commit

Permalink
code 统一修改布局命名
Browse files Browse the repository at this point in the history
  • Loading branch information
CatherineFXX committed Oct 19, 2017
1 parent 74eade3 commit b594e20
Show file tree
Hide file tree
Showing 17 changed files with 9 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class TSCombinationButton extends FrameLayout {

public TSCombinationButton(Context context, AttributeSet attrs) {
super(context, attrs);
LayoutInflater.from(context).inflate(R.layout.view_combination_button, this);
LayoutInflater.from(context).inflate(R.layout.ts_view_combination_button, this);
mCombinedButtonImgLeft = findViewById(R.id.iv_left_img);
mCombinedButtonImgRight = findViewById(R.id.iv_right_img);
mCombinedButtonLeftText = findViewById(R.id.tv_left_text);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
import android.graphics.drawable.Drawable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.widget.FrameLayout;
Expand Down Expand Up @@ -40,7 +39,7 @@ public TSLoadingButton(Context context, AttributeSet attrs) {
}

private void init(Context context, AttributeSet attrs) {
LayoutInflater.from(context).inflate(R.layout.view_loading_button, this);
LayoutInflater.from(context).inflate(R.layout.ts_view_loading_button, this);
mContainer = findViewById(R.id.rl_container);
mTvText = findViewById(R.id.tv_text);
mIvLoad = findViewById(R.id.iv_load);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public TSInfoInputEditText(Context context, AttributeSet attrs) {
}

private void init(Context context, AttributeSet attrs) {
LayoutInflater.from(context).inflate(R.layout.view_info_input, this);
LayoutInflater.from(context).inflate(R.layout.ts_view_info_input, this);
mTvFlagRequired = findViewById(R.id.tv_flag_required);
mTvLeftText = findViewById(R.id.tv_left_text);
mEditInput = findViewById(R.id.edit_input);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ public TSInputLimitView(Context context, AttributeSet attrs, int defStyleAttr) {
}

private void init(final Context context, AttributeSet attrs) {
LayoutInflater.from(context).inflate(R.layout.view_input_limit_viewgroup, this);
LayoutInflater.from(context).inflate(R.layout.ts_view_input_limit_viewgroup, this);
mTvLimitTip = findViewById(R.id.tv_limit_tip);
mBtSend = findViewById(R.id.bt_send);
mEtContent = findViewById(R.id.et_content);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ public CBuilder parentView(View parentView) {

@Override
public TSCenterAlertPopWindow build() {
contentViewId = R.layout.ppw_for_center_alert;
contentViewId = R.layout.ts_ppw_for_center_alert;
isWrap = true;
return new TSCenterAlertPopWindow(this);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ public CBuilder parentView(View parentView) {

@Override
public TSCenterOnlyPopWindow build() {
contentViewId = R.layout.ppw_for_center_only;
contentViewId = R.layout.ts_ppw_for_center_only;
isWrap = true;
return new TSCenterOnlyPopWindow(this);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package com.zhiyicx.tsui.widget.view;

import android.content.Context;
import android.content.res.TypedArray;
import android.support.annotation.DrawableRes;
import android.support.annotation.Nullable;
import android.text.TextUtils;
import android.util.AttributeSet;
import android.view.View;
import android.widget.ImageView;
Expand Down Expand Up @@ -107,7 +105,7 @@ public TSEmptyView(Context context, @Nullable AttributeSet attrs, int defStyleAt

private void init(Context context, AttributeSet attrs) {
this.mContext = context;
View view = View.inflate(mContext, R.layout.view_empty, this);
View view = View.inflate(mContext, R.layout.ts_view_empty, this);
mLlContent = view.findViewById(R.id.ll_content);
mIvError = view.findViewById(R.id.iv_error_layout);
mTvError = view.findViewById(R.id.tv_error_layout);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ public TSUserAvatarView(@NonNull Context context, @Nullable AttributeSet attrs,
}

private void init(AttributeSet attrs) {
LayoutInflater.from(getContext()).inflate(R.layout.view_user_avater, this);
LayoutInflater.from(getContext()).inflate(R.layout.ts_view_user_avater, this);
if (attrs != null) {
TypedArray array = getContext().obtainStyledAttributes(attrs,
R.styleable.TSUserAvatarView);
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion tsuidemo/src/main/res/layout/activity_ts_imageview.xml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
android:id="@+id/empty_hint"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/ll_avatar"
android:layout_below="@id/ll_avatar"
android:layout_margin="@dimen/tsui_default_10"
android:text="缺省页,可以设置不同改的状态以及对应的文字图片"/>

Expand Down

0 comments on commit b594e20

Please sign in to comment.