Skip to content

T
TangKuPos
Commit 7123fa39 authored by 姜敏's avatar 姜敏
Browse files
Options

Merge remote-tracking branch 'origin/master'

parents af240109 337b9f37
Hide whitespace changes
Inline Side-by-side
Showing with 38375 additions and 668 deletions
.idea/dictionaries/Eurus.xml
View file @ 7123fa39
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
<w>baozheng</w> <w>baozheng</w>
<w>caocao</w> <w>caocao</w>
<w>guanyu</w> <w>guanyu</w>
<w>huanggai</w>
<w>inputer</w> <w>inputer</w>
<w>likui</w> <w>likui</w>
<w>mawu</w> <w>mawu</w>
......
app/src/main/AndroidManifest.xml
View file @ 7123fa39
...@@ -20,17 +20,17 @@ ...@@ -20,17 +20,17 @@
android:label="@string/main_title" android:label="@string/main_title"
android:launchMode="singleTask" android:launchMode="singleTask"
android:windowSoftInputMode="adjustUnspecified|stateHidden" > android:windowSoftInputMode="adjustUnspecified|stateHidden" >
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity> </activity>
<activity <activity
android:name=".ui.splash.SplashActivity" android:name=".ui.splash.SplashActivity"
android:configChanges="keyboard|orientation|screenSize|keyboardHidden" android:configChanges="keyboard|orientation|screenSize|keyboardHidden"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN"/>
<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity> </activity>
<activity <activity
......
app/src/main/assets/province.json 0 → 100644
View file @ 7123fa39
This source diff could not be displayed because it is too large. You can view the blob instead.
app/src/main/java/com/xingdata/zzdpos/App.java
View file @ 7123fa39
...@@ -69,8 +69,8 @@ public class App extends Application { ...@@ -69,8 +69,8 @@ public class App extends Application {
.callback(this) .callback(this)
.start(); .start();
// 初始化异常处理 // 初始化异常处理
initEx(); // initEx();
//初始化Fragment框架 //初始化Fragment框架
initFragment(); initFragment();
...@@ -147,16 +147,14 @@ public class App extends Application { ...@@ -147,16 +147,14 @@ public class App extends Application {
} }
public static void reStartApp() { public static void reStartApp() {
// 重启 // 重启
Intent intent = new Intent(instance.getApplicationContext(), SplashActivity Intent intent = new Intent(instance.getApplicationContext(), SplashActivity
.class); .class);
@SuppressLint("WrongConstant") PendingIntent restartIntent = PendingIntent.getActivity @SuppressLint("WrongConstant") PendingIntent restartIntent = PendingIntent.getActivity
(instance (instance
.getApplicationContext(), 0, intent, .getApplicationContext(), 0, intent,
Intent.FLAG_ACTIVITY_NEW_TASK); Intent.FLAG_ACTIVITY_NEW_TASK);
AlarmManager mgr = (AlarmManager) instance.getSystemService(Context AlarmManager mgr = (AlarmManager) instance.getSystemService(Context
.ALARM_SERVICE); .ALARM_SERVICE);
mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 1, restartIntent); // mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 1, restartIntent); //
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/BindingCounterFragment.java
View file @ 7123fa39
...@@ -4,10 +4,6 @@ import android.view.View; ...@@ -4,10 +4,6 @@ import android.view.View;
import android.widget.AdapterView; import android.widget.AdapterView;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import java.util.ArrayList;
import java.util.List;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
...@@ -16,6 +12,10 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog; ...@@ -16,6 +12,10 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.dialog.PromptDialog; import com.xingdata.zzdpos.ui.dialog.PromptDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter; import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.login.fragment.bean.Shops; import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList;
import java.util.List;
/** /**
* 绑定款台界面 * 绑定款台界面
...@@ -39,6 +39,13 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter, ...@@ -39,6 +39,13 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
@Override @Override
public void initView() { public void initView() {
mViewBinding.icTitle.tvTitle.setText("绑定款台");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
if (LoginPresenter.userStoreInfo.getMerchant() != null) { if (LoginPresenter.userStoreInfo.getMerchant() != null) {
mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName mViewBinding.tvNickname.setText(LoginPresenter.userStoreInfo.getMerchant().getMerName
()); ());
...@@ -94,7 +101,7 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter, ...@@ -94,7 +101,7 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
} }
break; break;
case R.id.ll_new_counter: { case R.id.ll_new_counter: {
isNewCounterCount= 0; isNewCounterCount = 0;
setNewCounter(true); setNewCounter(true);
} }
...@@ -109,7 +116,6 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter, ...@@ -109,7 +116,6 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
/** /**
* 设置新增款台或者绑定款台的ui信息 * 设置新增款台或者绑定款台的ui信息
*
*/ */
private void setNewCounter(Boolean b) { private void setNewCounter(Boolean b) {
if (b) { if (b) {
...@@ -129,7 +135,8 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter, ...@@ -129,7 +135,8 @@ public class BindingCounterFragment extends BaseFragment<LoginPresenter,
mShops = shops; mShops = shops;
setType(); setType();
} }
private void setType(){
private void setType() {
if (mShops != null && mShops.getCashers() != null && mShops.getCashers().size() > 0) { if (mShops != null && mShops.getCashers() != null && mShops.getCashers().size() > 0) {
isNewCounterCount = 1; isNewCounterCount = 1;
} else { } else {
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/ChoiceStoreFragment.java
View file @ 7123fa39
...@@ -11,6 +11,7 @@ import com.xingdata.zzdpos.databinding.FragmentChoiceStoreBinding; ...@@ -11,6 +11,7 @@ import com.xingdata.zzdpos.databinding.FragmentChoiceStoreBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter; import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.login.fragment.bean.Shops; import com.xingdata.zzdpos.ui.login.fragment.bean.Shops;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
...@@ -33,7 +34,13 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter, ...@@ -33,7 +34,13 @@ public class ChoiceStoreFragment extends BaseFragment<LoginPresenter,
@Override @Override
public void initView() { public void initView() {
mViewBinding.icTitle.tvTitle.setText("绑定款台");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
mViewBinding.setOnClickListener(view -> { mViewBinding.setOnClickListener(view -> {
switch (view.getId()) { switch (view.getId()) {
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/CreateStoreFragment.java
View file @ 7123fa39
...@@ -15,6 +15,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog; ...@@ -15,6 +15,7 @@ import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter; import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean; import com.xingdata.zzdpos.ui.login.fragment.bean.StoreAddressJsonBean;
import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean; import com.xingdata.zzdpos.ui.login.fragment.bean.StoreTypeJsonBean;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.ArrayList; import java.util.ArrayList;
...@@ -46,6 +47,13 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter, ...@@ -46,6 +47,13 @@ public class CreateStoreFragment extends BaseFragment<LoginPresenter,
@Override @Override
public void initView() { public void initView() {
mViewBinding.icTitle.tvTitle.setText("创建门店");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
if (startway == 1) { if (startway == 1) {
mViewBinding.etNickname.setVisibility(View.VISIBLE); mViewBinding.etNickname.setVisibility(View.VISIBLE);
mViewBinding.tvNickname.setVisibility(View.GONE); mViewBinding.tvNickname.setVisibility(View.GONE);
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/InputPasswordFragment.java
View file @ 7123fa39
...@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.login.fragment; ...@@ -2,6 +2,7 @@ package com.xingdata.zzdpos.ui.login.fragment;
import android.text.InputFilter; import android.text.InputFilter;
import android.text.InputType; import android.text.InputType;
import android.view.View;
import com.blankj.utilcode.util.ToastUtils; import com.blankj.utilcode.util.ToastUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
...@@ -10,6 +11,7 @@ import com.xingdata.zzdpos.base.BaseFragment; ...@@ -10,6 +11,7 @@ import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentInputPasswordBinding; import com.xingdata.zzdpos.databinding.FragmentInputPasswordBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter; import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
/** /**
* 输入密码界面 * 输入密码界面
...@@ -32,6 +34,13 @@ public class InputPasswordFragment extends BaseFragment<LoginPresenter, ...@@ -32,6 +34,13 @@ public class InputPasswordFragment extends BaseFragment<LoginPresenter,
@Override @Override
public void initView() { public void initView() {
mViewBinding.icTitle.tvTitle.setText("输入密码");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
InputFilter[] inputFilter = new InputFilter[]{new InputFilter.LengthFilter(6)}; InputFilter[] inputFilter = new InputFilter[]{new InputFilter.LengthFilter(6)};
mViewBinding.etOnePassword.setInputType(InputType.TYPE_CLASS_NUMBER | InputType mViewBinding.etOnePassword.setInputType(InputType.TYPE_CLASS_NUMBER | InputType
.TYPE_NUMBER_VARIATION_PASSWORD); .TYPE_NUMBER_VARIATION_PASSWORD);
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SignInFragment.java
View file @ 7123fa39
...@@ -45,7 +45,6 @@ public class SignInFragment extends BaseFragment<LoginPresenter, ...@@ -45,7 +45,6 @@ public class SignInFragment extends BaseFragment<LoginPresenter,
.TYPE_NUMBER_VARIATION_PASSWORD); .TYPE_NUMBER_VARIATION_PASSWORD);
mViewBinding.etPwd.setFilters(inputFilter); mViewBinding.etPwd.setFilters(inputFilter);
if (SPUtils.getInstance().getInt(C.SP_KEY.IS_SHOW_SIGNUP_BTN) != 0) { if (SPUtils.getInstance().getInt(C.SP_KEY.IS_SHOW_SIGNUP_BTN) != 0) {
mViewBinding.tvSignUp.setVisibility mViewBinding.tvSignUp.setVisibility
(View.INVISIBLE); (View.INVISIBLE);
......
app/src/main/java/com/xingdata/zzdpos/ui/login/fragment/SmsCodeFragment.java
View file @ 7123fa39
package com.xingdata.zzdpos.ui.login.fragment; package com.xingdata.zzdpos.ui.login.fragment;
import android.view.View;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentSmsCodeBinding; import com.xingdata.zzdpos.databinding.FragmentSmsCodeBinding;
import com.xingdata.zzdpos.ui.dialog.LoadingDialog; import com.xingdata.zzdpos.ui.dialog.LoadingDialog;
import com.xingdata.zzdpos.ui.login.LoginPresenter; import com.xingdata.zzdpos.ui.login.LoginPresenter;
import com.xingdata.zzdpos.util.OnClickListener;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
...@@ -39,6 +42,13 @@ public class SmsCodeFragment extends BaseFragment<LoginPresenter, ...@@ -39,6 +42,13 @@ public class SmsCodeFragment extends BaseFragment<LoginPresenter,
@Override @Override
public void initView() { public void initView() {
mViewBinding.icTitle.tvTitle.setText("发送验证码");
mViewBinding.icTitle.setOnClickListener(new OnClickListener() {
@Override
protected void myOnClickListener(View v) {
pop();
}
});
// mViewBinding.tvTwo.setOnClickListener(view -> mPresenter.checkSmsCode("","")); // mViewBinding.tvTwo.setOnClickListener(view -> mPresenter.checkSmsCode("",""));
mViewBinding.setOnClickListener(view -> { mViewBinding.setOnClickListener(view -> {
switch (view.getId()) { switch (view.getId()) {
...@@ -51,7 +61,7 @@ public class SmsCodeFragment extends BaseFragment<LoginPresenter, ...@@ -51,7 +61,7 @@ public class SmsCodeFragment extends BaseFragment<LoginPresenter,
case R.id.btn_next: { case R.id.btn_next: {
mLoadingDialog.show((BaseActivity) getActivity()); mLoadingDialog.show((BaseActivity) getActivity());
mPresenter.checkSmsCode(mViewBinding.etPhone.getText().toString(), mPresenter.checkSmsCode(mViewBinding.etPhone.getText().toString(),
mViewBinding.etSmsCode.getText().toString(),mLoadingDialog); mViewBinding.etSmsCode.getText().toString(), mLoadingDialog);
// start(mPresenter.inputPasswordFragment); // start(mPresenter.inputPasswordFragment);
} }
......
app/src/main/java/com/xingdata/zzdpos/ui/payment/PaymentActivity.java
View file @ 7123fa39
...@@ -3,9 +3,12 @@ package com.xingdata.zzdpos.ui.payment; ...@@ -3,9 +3,12 @@ package com.xingdata.zzdpos.ui.payment;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseActivity; import com.xingdata.zzdpos.base.BaseActivity;
import com.xingdata.zzdpos.databinding.ActivityPaymentBinding; import com.xingdata.zzdpos.databinding.ActivityPaymentBinding;
import com.xingdata.zzdpos.ui.payment.fragment.PaymentFragment;
public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaymentBinding> implements PaymentContract.View { public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaymentBinding> implements PaymentContract.View {
private PaymentFragment mPaymentFragment = new PaymentFragment();
@Override @Override
public int getLayoutId() { public int getLayoutId() {
return R.layout.activity_payment; return R.layout.activity_payment;
...@@ -13,6 +16,7 @@ public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaym ...@@ -13,6 +16,7 @@ public class PaymentActivity extends BaseActivity<PaymentPresenter, ActivityPaym
@Override @Override
public void initView() { public void initView() {
loadRootFragment(R.id.f_payment, mPaymentFragment);
} }
} }
app/src/main/java/com/xingdata/zzdpos/ui/payment/fragment/CalculatorFragment.java deleted 100644 → 0
View file @ af240109
//package com.xingdata.zzdpos.ui.payment.fragment;
//
//import com.xingdata.zzdpos.base.BaseFragment;
//import com.xingdata.zzdpos.ui.payment.PaymentPresenter;
//
///**
// * Created by Eurus on 2017/12/21.
// */
//
//public class CalculatorFragment extends BaseFragment<PaymentPresenter,> {
//}
app/src/main/java/com/xingdata/zzdpos/ui/payment/fragment/PaymentFragment.java 0 → 100644
View file @ 7123fa39
package com.xingdata.zzdpos.ui.payment.fragment;
import com.blankj.utilcode.util.LogUtils;
import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.FragmentPaymentBinding;
import com.xingdata.zzdpos.ui.payment.PaymentPresenter;
import com.xingdata.zzdpos.ui.payment.view.CalculatorView;
import com.xingdata.zzdpos.util.ConvertUtil;
public class PaymentFragment extends BaseFragment<PaymentPresenter, FragmentPaymentBinding> {
private CalculatorView mCalculatorView = new CalculatorView();
@Override
public int getLayoutId() {
return R.layout.fragment_payment;
}
@Override
public void initView() {
loadRootFragment(R.id.f_inputer, mCalculatorView);
mCalculatorView.setmOnResultChangeListener((exp, result) -> {
LogUtils.e(exp + "\n" + result);
mViewBinding.tvExp.setText(exp);
mViewBinding.tvResult.setText(ConvertUtil.fenToYuan(result));
});
mCalculatorView.setmOnSettleClickListener(result -> {
LogUtils.e(ConvertUtil.fenToYuan(result));
});
}
}
app/src/main/java/com/xingdata/zzdpos/ui/payment/view/CalculatorView.java
View file @ 7123fa39
...@@ -2,7 +2,9 @@ package com.xingdata.zzdpos.ui.payment.view; ...@@ -2,7 +2,9 @@ package com.xingdata.zzdpos.ui.payment.view;
import android.view.View; import android.view.View;
import android.widget.TextView;
import com.blankj.utilcode.util.LogUtils;
import com.xingdata.zzdpos.R; import com.xingdata.zzdpos.R;
import com.xingdata.zzdpos.base.BaseFragment; import com.xingdata.zzdpos.base.BaseFragment;
import com.xingdata.zzdpos.databinding.ViewCalculatorBinding; import com.xingdata.zzdpos.databinding.ViewCalculatorBinding;
...@@ -16,9 +18,19 @@ import java.util.regex.Pattern; ...@@ -16,9 +18,19 @@ import java.util.regex.Pattern;
public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculatorBinding> { public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculatorBinding> {
private String mExp; private String mExp;
private String mValue;
private String mLast;
private OnResultChangeListener mOnResultChangeListener; private OnResultChangeListener mOnResultChangeListener;
private onSettleClickListener mOnSettleClickListener; private onSettleClickListener mOnSettleClickListener;
public CalculatorView() {
mExp = "";
mValue = "";
mLast = "";
}
public interface OnResultChangeListener { public interface OnResultChangeListener {
void onResultChange(String exp, Long result); void onResultChange(String exp, Long result);
} }
...@@ -36,16 +48,6 @@ public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculato ...@@ -36,16 +48,6 @@ public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculato
public void initView() { public void initView() {
View.OnClickListener mOnClickListener = view -> { View.OnClickListener mOnClickListener = view -> {
switch (view.getId()) { switch (view.getId()) {
case R.id.btn_add:
break;
case R.id.btn_sub:
break;
case R.id.btn_mul:
break;
case R.id.btn_div:
break;
case R.id.btn_point:
break;
case R.id.btn_del: case R.id.btn_del:
delete(); delete();
break; break;
...@@ -55,20 +57,48 @@ public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculato ...@@ -55,20 +57,48 @@ public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculato
case R.id.btn_settle: case R.id.btn_settle:
settle(); settle();
break; break;
default:
LogUtils.e("mExp : " + mExp + "\nmValue : " + mValue + "\nmLast" + mLast);
if (view instanceof TextView) {
String str = ((TextView) view).getText().toString();
String[] mExps = mExp.split("[+\\-×÷]");
if (mExps.length > 1) mValue = mExps[mExps.length - 1];
else mValue = mExp;
if (mLast.matches("[+\\-×÷.]") && str.matches("[+\\-×÷.]")) return;
if (mValue.length() > 0 && str.matches("[+\\-×÷]")) {
mValue = "";
} else {
if (mValue.length() == 0 && str.matches("[+\\-×÷]")) return;
if (mValue.contains(".") && str.matches("[+\\-×÷.]")) return;
if (mValue.split("[.]").length > 1 && mValue.split("[.]")[1].length() > 2)
return;
if (mValue.length() == 0 && str.equals(".")) mExp += "0";
}
mLast = str;
mExp += str;
}
break;
} }
if (mOnResultChangeListener != null) { if (mOnResultChangeListener != null) {
mOnResultChangeListener.onResultChange(mExp, ConvertUtil.yuanToFen(parseExp(mExp))); mOnResultChangeListener.onResultChange(mExp, ConvertUtil.yuanToFen(parseExp(mExp)));
} }
}; };
mViewBinding.setOnClick(mOnClickListener); mViewBinding.setOnClick(mOnClickListener);
} }
/** /**
* 删除 * 删除
*/ */
private void delete() { private void delete() {
mExp = mExp.substring(0, mExp.length() - 1); if (mExp.length() > 0) {
mExp = mExp.substring(0, mExp.length() - 1);
mLast = mExp.substring(mExp.length() - 1, mExp.length());
}
} }
/** /**
...@@ -104,12 +134,11 @@ public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculato ...@@ -104,12 +134,11 @@ public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculato
.replaceAll("×", "*").replaceAll("÷", "/"); .replaceAll("×", "*").replaceAll("÷", "/");
String minExp = "^((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?]))[+\\-*/]((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?]))$"; String minExp = "^((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?]))[+\\-*/]((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?]))$";
if (exp.matches(minExp)) { if (exp.matches(minExp)) {
String result = calculate(exp); return calculate(exp);
return Double.parseDouble(result) >= 0 ? result : "[" + result + "]"; } else if (exp.matches("[0-9.]+")) {
} else if (exp.matches("[0-9]+")) {
return exp; return exp;
} else if (exp.length() == 0) { } else if (exp.length() == 0) {
return "0"; return "0.0";
} }
String noParentheses = "^[^()]+$"; String noParentheses = "^[^()]+$";
String priorOperatorExp = "(((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?]))[*/]((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?])))"; String priorOperatorExp = "(((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?]))[*/]((\\d+(\\.\\d+)?)|(\\[-\\d+(\\.\\d+)?])))";
...@@ -123,7 +152,6 @@ public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculato ...@@ -123,7 +152,6 @@ public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculato
} else { } else {
patt = Pattern.compile(operatorExp); patt = Pattern.compile(operatorExp);
mat = patt.matcher(exp); mat = patt.matcher(exp);
if (mat.find()) { if (mat.find()) {
String tempMinExp = mat.group(); String tempMinExp = mat.group();
exp = exp.replaceFirst(operatorExp, parseExp(tempMinExp)); exp = exp.replaceFirst(operatorExp, parseExp(tempMinExp));
...@@ -131,7 +159,7 @@ public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculato ...@@ -131,7 +159,7 @@ public class CalculatorView extends BaseFragment<PaymentPresenter, ViewCalculato
} }
return parseExp(exp); return parseExp(exp);
} }
String minParentheses = "\\([^\\(\\)]+\\)"; String minParentheses = "\\([^()]+\\)";
Pattern patt = Pattern.compile(minParentheses); Pattern patt = Pattern.compile(minParentheses);
Matcher mat = patt.matcher(exp); Matcher mat = patt.matcher(exp);
if (mat.find()) { if (mat.find()) {
......
app/src/main/res/drawable/blue_border.xml
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" > <shape xmlns:android="http://schemas.android.com/apk/res/android" >
<corners android:radius="@dimen/all_shape_radius" /> <corners android:radius="@dimen/all_radius" />
<solid android:color="@color/blue" /> <solid android:color="@color/blue_mawu" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/gra_border.xml
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" > <shape xmlns:android="http://schemas.android.com/apk/res/android" >
<corners android:radius="@dimen/all_shape_radius" /> <corners android:radius="@dimen/all_radius" />
<solid android:color="@color/gray" /> <solid android:color="@color/gray_huanggai" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/gray_line.xml 0 → 100644
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="line">
<stroke
android:width="2dp"
android:color="@color/gray_huanggai"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/selector_gradient_gray_button_background.xml
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_blue_round_rectangle_strokeless" android:state_pressed="true" /> <item android:drawable="@drawable/shape_red_round_rectangle_strokeless" android:state_pressed="true" />
<item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_enabled="false" /> <item android:drawable="@drawable/shape_gray_round_rectangle_stroke" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gradient_gray_round_rectangle_stroke" /> <item android:drawable="@drawable/shape_gradient_gray_round_rectangle_stroke" />
......
app/src/main/res/drawable/selector_gradient_gray_button_background_noradius.xml 0 → 100644
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_red_round_rectangle_strokeless_noradius" android:state_pressed="true" />
<item android:drawable="@drawable/shape_gray_round_rectangle_stroke_noradius" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gradient_gray_round_rectangle_stroke_noradius" />
</selector>
\ No newline at end of file
app/src/main/res/drawable/selector_gradient_blue_button_background.xml → app/src/main/res/drawable/selector_gradient_red_button_background.xml
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_blue_round_rectangle_strokeless" android:state_pressed="true" /> <item android:drawable="@drawable/shape_red_round_rectangle_strokeless" android:state_pressed="true" />
<item android:drawable="@drawable/shape_grey_round_rectangle_strokeless" android:state_enabled="false" /> <item android:drawable="@drawable/shape_grey_round_rectangle_strokeless" android:state_enabled="false" />
<item android:drawable="@drawable/shape_gradient_blue_round_rectangle" /> <item android:drawable="@drawable/shape_gradient_red_round_rectangle" />
</selector> </selector>
\ No newline at end of file
app/src/main/res/drawable/selector_gradient_red_button_background_noradius.xml 0 → 100644
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/shape_red_round_rectangle_strokeless_noradius" android:state_pressed="true"/>
<item android:drawable="@drawable/shape_grey_round_rectangle_strokeless_noradius" android:state_enabled="false"/>
<item android:drawable="@drawable/shape_gradient_red_round_rectangle_noradius"/>
</selector>
\ No newline at end of file
app/src/main/res/drawable/shape_gradient_blue_round_rectangle.xml → app/src/main/res/drawable/shape_gradient_gray_round_rectangle_stroke_noradius.xml
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" />
<stroke <stroke
android:width="@dimen/all_line_width" android:width="@dimen/all_slight_line_width"
android:color="@color/passive_stroke" /> android:color="@color/passive_stroke" />
<gradient <gradient
android:angle="90" android:angle="90"
android:endColor="@color/positive_gradient_end" android:endColor="@color/passive_gradient_end"
android:startColor="@color/positive_gradient_start" /> android:startColor="@color/passive_gradient_start" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/shape_gradient_red_round_rectangle.xml 0 → 100644
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius"/>
<stroke
android:width="@dimen/all_line_width"
android:color="@color/red_guanyu"/>
<gradient
android:angle="90"
android:endColor="@color/red_guanyu"
android:startColor="@color/red_guanyu"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_gradient_red_round_rectangle_noradius.xml 0 → 100644
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="@dimen/all_line_width"
android:color="@color/red_guanyu"/>
<gradient
android:angle="90"
android:endColor="@color/red_guanyu"
android:startColor="@color/red_guanyu"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_gray_round_rectangle_stroke.xml
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" /> <corners android:radius="@dimen/all_shape_radius"/>
<stroke <stroke
android:width="@dimen/edit_border" android:width="@dimen/edit_border"
android:color="@color/gary" /> android:color="@color/gary"/>
<solid android:color="@color/lyt_main_bg" /> <solid android:color="@color/lyt_main_bg"/>
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/shape_gray_round_rectangle_stroke_noradius.xml 0 → 100644
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<stroke
android:width="@dimen/edit_border"
android:color="@color/gary"/>
<solid android:color="@color/lyt_main_bg"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_grey_round_rectangle_strokeless.xml
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" /> <corners android:radius="@dimen/all_shape_radius" />
<solid android:color="@color/gray" /> <solid android:color="@color/gray" />
......
app/src/main/res/drawable/shape_blue_round_rectangle_strokeless.xml → app/src/main/res/drawable/shape_grey_round_rectangle_strokeless_noradius.xml
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"> <shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius" /> <solid android:color="@color/gray" />
<solid android:color="@color/pressed_solid" />
</shape> </shape>
\ No newline at end of file
app/src/main/res/drawable/shape_red_round_rectangle_strokeless.xml 0 → 100644
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<corners android:radius="@dimen/all_shape_radius"/>
<solid android:color="@color/red_guanyu"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/shape_red_round_rectangle_strokeless_noradius.xml 0 → 100644
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/red_guanyu"/>
</shape>
\ No newline at end of file
app/src/main/res/drawable/singleline.xml 0 → 100644
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
<item>
<shape>
<solid android:color="@color/gray_huanggai"/>
</shape>
</item>
<item android:bottom="1dp">
<shape>
<solid android:color="@color/appBack"/>
</shape>
</item>
</layer-list>
\ No newline at end of file
app/src/main/res/layout/activity_error_dialog.xml
View file @ 7123fa39
...@@ -111,7 +111,7 @@ ...@@ -111,7 +111,7 @@
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
android:background="@drawable/selector_gradient_blue_button_background" android:background="@drawable/selector_gradient_red_button_background"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="@{ok}" android:text="@{ok}"
android:textColor="@color/white"/> android:textColor="@color/white"/>
......
app/src/main/res/layout/activity_payment.xml
View file @ 7123fa39
...@@ -13,40 +13,9 @@ ...@@ -13,40 +13,9 @@
android:title="收款" android:title="收款"
android:titleTextColor="@color/white" /> android:titleTextColor="@color/white" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3"
android:background="@color/store_product_bg"
android:orientation="vertical">
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/white"
android:gravity="end|center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="小计:" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="40.00"
android:textColor="@color/deep_red" />
</LinearLayout>
<FrameLayout <FrameLayout
android:id="@+id/f_payment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp" android:layout_height="match_parent" />
android:layout_weight="7" />
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/dialog_prompt.xml
View file @ 7123fa39
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<Button <Button
android:id="@+id/btn_custom" android:id="@+id/btn_custom"
style="@style/button_positive" style="@style/button_positive_noradius"
android:layout_width="@dimen/dialog_button_width" android:layout_width="@dimen/dialog_button_width"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/all_margin" android:layout_marginBottom="@dimen/all_margin"
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
<Button <Button
android:id="@+id/btn_cancel" android:id="@+id/btn_cancel"
style="@style/button_positive_bg_gray" style="@style/button_positive_bg_gray_noradius"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
<Button <Button
android:id="@+id/btn_ok" android:id="@+id/btn_ok"
style="@style/button_positive" style="@style/button_positive_noradius"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="1"
......
app/src/main/res/layout/fragment_binding_counter.xml
View file @ 7123fa39
...@@ -8,31 +8,25 @@ ...@@ -8,31 +8,25 @@
</data> </data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="@dimen/all_margin" android:background="@color/appBack"
android:background="@color/appBack" >
android:orientation="vertical">'
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView <include
android:id="@+id/iv_logo" android:id="@+id/ic_title"
android:layout_width="wrap_content" layout="@layout/title"/>
android:layout_height="wrap_content"
android:src="@mipmap/create_store_logo"/>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_below="@+id/ic_title"
android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="vertical"> android:orientation="vertical"
android:visibility="visible">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -43,21 +37,18 @@ ...@@ -43,21 +37,18 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" style="@style/textView_title"
android:layout_height="wrap_content" android:text="@string/binding_counter_tv_nickname"/>
android:padding="@dimen/et_padding"
android:text="@string/binding_counter_tv_nickname"
android:textColor="@color/white"/>
<TextView <TextView
android:id="@+id/tv_nickname" android:id="@+id/tv_nickname"
android:layout_width="@dimen/counter_tv_width" android:layout_width="match_parent"
android:layout_height="@dimen/counter_input_height" android:layout_height="@dimen/counter_input_height"
android:gravity="center_vertical" android:layout_marginLeft="@dimen/all_margin_left"
android:padding="@dimen/et_padding" android:gravity="center|left"
android:text="北京浙星信息技术有限公司" android:text="北京浙星信息技术有限公司"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
...@@ -69,21 +60,18 @@ ...@@ -69,21 +60,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" style="@style/textView_title"
android:layout_height="wrap_content" android:text="@string/binding_counter_tv_in_store"/>
android:padding="@dimen/et_padding"
android:text="@string/binding_counter_tv_in_store"
android:textColor="@color/white"/>
<TextView <TextView
android:id="@+id/tv_in_storename" android:id="@+id/tv_in_storename"
android:layout_width="@dimen/counter_tv_width" android:layout_width="match_parent"
android:layout_height="@dimen/counter_input_height" android:layout_height="@dimen/counter_input_height"
android:gravity="center_vertical" android:layout_marginLeft="@dimen/all_margin_left"
android:padding="@dimen/et_padding" android:gravity="center|left"
android:text="丰台万达店" android:text="丰台万达店"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
...@@ -95,21 +83,18 @@ ...@@ -95,21 +83,18 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" style="@style/textView_title"
android:layout_height="wrap_content" android:text="@string/binding_counter_tv_store_address"/>
android:padding="@dimen/et_padding"
android:text="@string/binding_counter_tv_store_address"
android:textColor="@color/white"/>
<TextView <TextView
android:id="@+id/tv_storetype" android:id="@+id/tv_storetype"
android:layout_width="@dimen/counter_tv_width" android:layout_width="match_parent"
android:layout_height="@dimen/counter_input_height" android:layout_height="@dimen/counter_input_height"
android:layout_marginLeft="@dimen/all_margin_left"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="@dimen/et_padding"
android:text="北京市丰台区万达广场一区" android:text="北京市丰台区万达广场一区"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
...@@ -122,175 +107,169 @@ ...@@ -122,175 +107,169 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical"
android:visibility="visible"
>
<TextView <RelativeLayout
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:layout_marginLeft="@dimen/all_margin_left">
android:text="@string/binding_counter_tv_binding_counter"
android:textColor="@color/white"/>
<org.angmarch.views.NiceSpinner <TextView
android:id="@+id/counter_spinner" style="@style/textView_title"
android:layout_width="@dimen/nicespinner_width" android:layout_marginLeft="0dp"
android:layout_height="@dimen/counter_input_height" android:text="@string/binding_counter_tv_binding_counter"/>
android:background="@drawable/transparent_border"
android:gravity="center_vertical"
android:paddingLeft="@dimen/et_padding" <LinearLayout
android:text="" android:id="@+id/ll_new_counter"
android:textSize="@dimen/et_textsize"/> android:layout_width="@dimen/new_counter_btn_width"
android:layout_height="@dimen/new_counter_btn_height"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@drawable/blue_border"
android:gravity="center"
android:onClick="@{onClickListener}"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/bindingcounter_addcounter_befor"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/new_counter_btn_margin_left"
android:text="@string/binding_counter_tv_new_counter"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
</RelativeLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_new_counter" android:layout_width="match_parent"
android:layout_width="@dimen/new_counter_btn_width" android:layout_height="wrap_content"
android:layout_height="@dimen/new_counter_btn_height" android:layout_marginLeft="@dimen/all_margin_left">
android:layout_marginLeft="@dimen/new_counter_btn_margin_left"
android:background="@drawable/blue_border" <org.angmarch.views.NiceSpinner
android:gravity="center" android:id="@+id/counter_spinner"
android:onClick="@{onClickListener}" android:layout_width="@dimen/et_width"
android:orientation="horizontal"> android:layout_height="@dimen/counter_input_height"
android:background="@drawable/transparent_border"
<ImageView android:gravity="center_vertical"
android:layout_width="wrap_content" android:text=""
android:layout_height="wrap_content"
android:src="@mipmap/bindingcounter_addcounter_befor"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/new_counter_btn_margin_left"
android:text="@string/binding_counter_tv_new_counter"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_already_new_counter" android:id="@+id/ll_already_new_counter"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:visibility="gone"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical"
android:visibility="gone">
<TextView <TextView
android:layout_width="@dimen/item_title_width" style="@style/textView_title"
android:layout_height="wrap_content" android:text="@string/binding_counter_tv_binding_counter"/>
android:padding="@dimen/et_padding"
android:text="@string/binding_counter_tv_binding_counter"
android:textColor="@color/white"/>
<TextView
android:id="@+id/tv_counter"
android:layout_width="@dimen/nicespinner_width"
android:layout_height="@dimen/counter_input_height"
android:gravity="center_vertical"
android:paddingLeft="@dimen/et_padding"
android:textColor="@color/white"
android:textStyle="bold"
android:text="10号款台（新增）"
android:textSize="@dimen/et_textsize"/>
<LinearLayout <RelativeLayout
android:layout_width="@dimen/new_counter_btn_width" android:layout_width="match_parent"
android:layout_height="@dimen/new_counter_btn_height" android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/new_counter_btn_margin_left" android:layout_marginLeft="@dimen/all_margin_left">
android:background="@drawable/gra_border"
android:gravity="center"
android:onClick="@{onClickListener}"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/bindingcounter_addcounter"/>
<TextView <TextView
android:layout_width="wrap_content" android:id="@+id/tv_counter"
android:layout_height="wrap_content" android:layout_width="match_parent"
android:layout_marginLeft="@dimen/new_counter_btn_margin_left" android:layout_height="@dimen/counter_input_height"
android:text="@string/binding_counter_tv_new_counter" android:layout_centerVertical="true"
android:gravity="center_vertical"
android:text="10号款台（新增）"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"
</LinearLayout> android:textStyle="bold"/>
<LinearLayout
android:layout_width="@dimen/new_counter_btn_width"
android:layout_height="@dimen/new_counter_btn_height"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@drawable/gra_border"
android:gravity="center"
android:onClick="@{onClickListener}"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/bindingcounter_addcounter"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/new_counter_btn_margin_left"
android:text="@string/binding_counter_tv_new_counter"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/bar_margin"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="@dimen/item_title_width"
android:layout_height="wrap_content"
android:textColor="@color/white"/>
<View
android:layout_width="@dimen/counter_tv_width"
android:layout_height="@dimen/all_line_width"
android:background="@color/blue"></View>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/bar_margin"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="@dimen/item_title_width"
android:layout_height="wrap_content"
android:textColor="@color/white"/>
<RelativeLayout
android:layout_width="@dimen/counter_tv_width"
android:layout_height="wrap_content">
<Button
android:id="@+id/btn_last"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentLeft="true"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}"
android:visibility="gone"
android:text="@string/login_createstorefragment_btn_last"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"
/>
<Button
android:id="@+id/btn_next"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentRight="true"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginRight="@dimen/all_margin_left">
<Button
android:id="@+id/btn_next"
style="@style/button_positive"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentRight="true"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
<Button
android:id="@+id/btn_last"
style="@style/button_positive"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentLeft="true"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_last"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"
android:visibility="gone"
/>
</RelativeLayout>
<TextView <TextView
android:id="@+id/tv_two" android:id="@+id/tv_two"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="绑定款台界面" android:text="绑定款台界面"
android:textColor="@color/white"/> android:textColor="@color/white"
android:visibility="gone"/>
</LinearLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_choice_store.xml
View file @ 7123fa39
...@@ -9,56 +9,44 @@ ...@@ -9,56 +9,44 @@
</data> </data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:padding="@dimen/all_margin" android:background="@color/appBack">
android:background="@color/appBack"
android:orientation="vertical">'
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/create_store_logo"/>
</LinearLayout>
<include
android:id="@+id/ic_title"
layout="@layout/title"/>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:layout_below="@+id/ic_title"
android:orientation="vertical"> android:orientation="vertical"
>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/center_height" android:layout_height="wrap_content"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" style="@style/textView_title"
android:layout_height="wrap_content"
android:padding="@dimen/et_padding"
android:text="@string/binding_counter_tv_nickname" android:text="@string/binding_counter_tv_nickname"
android:textColor="@color/white"/> />
<TextView <TextView
android:id="@+id/tv_nickname" android:id="@+id/tv_nickname"
android:layout_width="@dimen/counter_tv_width" android:layout_width="match_parent"
android:layout_height="@dimen/counter_input_height" android:layout_height="@dimen/counter_input_height"
android:layout_marginLeft="@dimen/all_margin_left"
android:gravity="center_vertical" android:gravity="center_vertical"
android:padding="@dimen/et_padding"
android:text="北京浙星信息技术有限公司" android:text="北京浙星信息技术有限公司"
android:textColor="@color/white" android:textColor="@color/white"
android:textSize="@dimen/et_textsize" android:textSize="@dimen/et_textsize"
...@@ -70,115 +58,119 @@ ...@@ -70,115 +58,119 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <RelativeLayout
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:layout_marginLeft="@dimen/all_margin_left">
android:text="@string/choice_store_tv_in_store"
android:textColor="@color/white"/>
<org.angmarch.views.NiceSpinner <TextView
android:id="@+id/store_spinner" style="@style/textView_title"
android:layout_width="@dimen/nicespinner_width" android:layout_centerVertical="true"
android:layout_height="@dimen/counter_input_height" android:layout_marginLeft="0dp"
android:background="@drawable/blue_border" android:text="@string/choice_store_tv_in_store"/>
android:gravity="center_vertical"
android:paddingLeft="@dimen/et_padding" <LinearLayout
android:text="123" android:id="@+id/ll_new_store"
android:textSize="@dimen/et_textsize"/> android:layout_width="@dimen/new_counter_btn_width"
android:layout_height="@dimen/new_counter_btn_height"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/all_margin_left"
android:background="@drawable/blue_border"
android:gravity="center"
android:onClick="@{onClickListener}"
android:orientation="horizontal">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/bindingcounter_addcounter_befor"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/new_counter_btn_margin_left"
android:text="@string/choice_store_tv_new_store"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
</RelativeLayout>
<LinearLayout <LinearLayout
android:id="@+id/ll_new_store" android:layout_width="match_parent"
android:layout_width="@dimen/new_counter_btn_width" android:layout_height="wrap_content"
android:layout_height="@dimen/new_counter_btn_height" android:layout_marginLeft="@dimen/all_margin_left"
android:layout_marginLeft="@dimen/new_counter_btn_margin_left" android:layout_marginTop="@dimen/all_padding">
android:background="@drawable/blue_border"
android:gravity="center" <org.angmarch.views.NiceSpinner
android:onClick="@{onClickListener}" android:id="@+id/store_spinner"
android:orientation="horizontal"> android:layout_width="@dimen/nicespinner_width"
android:layout_height="@dimen/counter_input_height"
<ImageView android:background="@drawable/blue_border"
android:layout_width="wrap_content" android:gravity="center_vertical"
android:layout_height="wrap_content" android:paddingLeft="@dimen/et_padding"
android:src="@mipmap/bindingcounter_addcounter_befor"/> android:text="123"
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/new_counter_btn_margin_left"
android:text="@string/choice_store_tv_new_store"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/> android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
<LinearLayout </LinearLayout>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/bar_margin"
android:gravity="center"
android:orientation="horizontal">
<TextView <LinearLayout
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textColor="@color/white"/> android:layout_alignParentBottom="true"
android:layout_marginBottom="@dimen/all_margin"
android:layout_marginTop="@dimen/bar_margin"
android:gravity="center"
android:orientation="horizontal">
<View <TextView
android:layout_width="@dimen/counter_tv_width" android:layout_width="@dimen/item_title_width"
android:layout_height="@dimen/all_line_width" android:layout_height="wrap_content"
android:background="@color/blue"></View> android:layout_alignParentEnd="true"
</LinearLayout> android:layout_centerVertical="true"
android:textColor="@color/white"
android:visibility="gone"/>
<LinearLayout <RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/bar_margin" android:layout_marginLeft="@dimen/all_margin_left"
android:gravity="center" android:layout_marginRight="@dimen/all_margin_left">
android:orientation="horizontal">
<TextView
android:layout_width="@dimen/item_title_width"
android:layout_height="wrap_content"
android:textColor="@color/white"/>
<RelativeLayout
android:layout_width="@dimen/counter_tv_width"
android:layout_height="wrap_content">
<Button
android:id="@+id/btn_last"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentLeft="true"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_last"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"
android:visibility="invisible"/>
<Button
android:id="@+id/btn_next"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentRight="true"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</RelativeLayout>
</LinearLayout>
<Button
android:id="@+id/btn_next"
style="@style/button_positive"
android:layout_width="match_parent"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentRight="true"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
<Button
android:id="@+id/btn_last"
style="@style/button_positive"
android:layout_width="match_parent"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentLeft="true"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_last"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"
android:visibility="invisible"/>
</RelativeLayout>
</LinearLayout> </LinearLayout>
<TextView <TextView
...@@ -187,7 +179,8 @@ ...@@ -187,7 +179,8 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:gravity="center"
android:text="绑定款台界面" android:text="绑定款台界面"
android:textColor="@color/white"/> android:textColor="@color/white"
android:visibility="gone"/>
</LinearLayout> </RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_create_store.xml
View file @ 7123fa39
...@@ -9,49 +9,42 @@ ...@@ -9,49 +9,42 @@
</data> </data>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/appBack" android:background="@color/appBack">
android:orientation="vertical"
android:padding="@dimen/all_margin">'
<LinearLayout <include
android:layout_width="match_parent" android:id="@+id/ic_title"
android:layout_height="wrap_content" layout="@layout/title"></include>
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/all_margin"
android:src="@mipmap/create_store_logo"/>
</LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center" android:layout_below="@+id/ic_title"
android:layout_marginTop="@dimen/all_padding"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_nickname" android:text="@string/login_createstorefragment_tv_nickname"
android:textColor="@color/white"/> android:textColor="@color/white"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/tv_nickname" android:id="@+id/tv_nickname"
android:layout_width="@dimen/et_width" android:layout_width="@dimen/et_width"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="left"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_et_nickname_hint" android:hint="@string/login_createstorefragment_et_nickname_hint"
...@@ -66,19 +59,12 @@ ...@@ -66,19 +59,12 @@
<com.xingdata.zzdpos.view.ContainsEmojiEditText <com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/et_nickname" android:id="@+id/et_nickname"
android:layout_width="@dimen/et_width" style="@style/editText"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:ems="10" android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_et_nickname_hint" android:hint="@string/login_createstorefragment_et_nickname_hint"
android:lines="1" android:lines="1"
android:maxLength="11" android:maxLength="11"
android:padding="@dimen/et_padding" android:singleLine="true"/>
android:saveEnabled="false"
android:singleLine="true"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -86,30 +72,25 @@ ...@@ -86,30 +72,25 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_storename" android:text="@string/login_createstorefragment_tv_storename"
android:textColor="@color/white"/> android:textColor="@color/white"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<com.xingdata.zzdpos.view.ContainsEmojiEditText <com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/et_storename" android:id="@+id/et_storename"
android:layout_width="@dimen/et_width" style="@style/editText"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:ems="10" android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_et_storename_hint" android:hint="@string/login_createstorefragment_et_storename_hint"
android:lines="1" android:lines="1"
android:maxLength="11" android:maxLength="11"
android:padding="@dimen/et_padding" android:singleLine="true"/>
android:saveEnabled="false"
android:singleLine="true"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -148,29 +129,26 @@ ...@@ -148,29 +129,26 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/et_padding"
android:text="@string/login_createstorefragment_tv_storeaddress" android:text="@string/login_createstorefragment_tv_storeaddress"
android:textColor="@color/white"/> android:textColor="@color/white"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<TextView <TextView
android:id="@+id/tv_storeaddress" android:id="@+id/tv_storeaddress"
android:layout_width="@dimen/et_width" style="@style/editText"
android:layout_height="wrap_content" android:drawablePadding="@dimen/all_padding"
android:background="@drawable/transparent_border"
android:drawableRight="@mipmap/createstore_drop_down" android:drawableRight="@mipmap/createstore_drop_down"
android:ems="10" android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_tv_storeaddress_hint" android:hint="@string/login_createstorefragment_tv_storeaddress_hint"
android:maxLength="11" android:maxLength="11"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"/>
android:padding="@dimen/et_padding"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"/>
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
...@@ -178,98 +156,59 @@ ...@@ -178,98 +156,59 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="@dimen/item_title_margin" android:layout_marginTop="@dimen/item_title_margin"
android:gravity="center" android:gravity="center"
android:orientation="horizontal"> android:orientation="vertical">
<TextView <TextView
android:layout_width="@dimen/item_title_width" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="@dimen/et_padding" android:padding="@dimen/et_padding"
android:textColor="@color/white"/> android:text="@string/login_createstorefragment_tv_storeaddressmessage"
android:textColor="@color/white"
android:textSize="@dimen/text_three_title"
android:textStyle="bold"/>
<com.xingdata.zzdpos.view.ContainsEmojiEditText <com.xingdata.zzdpos.view.ContainsEmojiEditText
android:id="@+id/tv_storedetailedaddress" android:id="@+id/tv_storedetailedaddress"
android:layout_width="@dimen/et_width" style="@style/editText"
android:layout_height="wrap_content"
android:background="@drawable/transparent_border"
android:ems="15" android:ems="15"
android:gravity="center_vertical"
android:hint="@string/login_createstorefragment_et_storedetailedaddress_hint" android:hint="@string/login_createstorefragment_et_storedetailedaddress_hint"
android:lines="1" android:lines="1"
android:maxLength="30" android:maxLength="30"
android:padding="@dimen/et_padding" android:singleLine="true"/>
android:saveEnabled="false"
android:singleLine="true"
android:textColorHint="@color/hint"
android:textSize="@dimen/et_textsize"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/bar_margin"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="@dimen/item_title_width"
android:layout_height="wrap_content"
android:textColor="@color/white"/>
<View
android:layout_width="@dimen/et_width"
android:layout_height="@dimen/all_line_width"
android:background="@color/blue"></View>
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/bar_margin"
android:gravity="center"
android:orientation="horizontal">
<TextView
android:layout_width="@dimen/item_title_width"
android:layout_height="wrap_content"
android:textColor="@color/white"/>
<RelativeLayout
android:layout_width="@dimen/et_width"
android:layout_height="wrap_content">
<Button
android:id="@+id/btn_last"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentLeft="true"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_last"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
<Button
android:id="@+id/btn_next"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentRight="true"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
<RelativeLayout
<org.angmarch.views.NiceSpinner android:layout_width="match_parent"
android:id="@+id/nice_spinner"
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_alignParentBottom="true"
android:text="123"/> android:layout_marginBottom="@dimen/all_margin"
</LinearLayout> android:padding="@dimen/all_padding">
<Button
android:id="@+id/btn_last"
style="@style/button_positive"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentLeft="true"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_last"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
<Button
android:id="@+id/btn_next"
style="@style/button_positive"
android:layout_width="@dimen/create_store_btn_width"
android:layout_height="@dimen/create_store_btn_height"
android:layout_alignParentRight="true"
android:onClick="@{onClickListener}"
android:text="@string/login_createstorefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
</RelativeLayout>
</RelativeLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_input_password.xml
View file @ 7123fa39
...@@ -14,68 +14,75 @@ ...@@ -14,68 +14,75 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/appBack" android:background="@color/appBack"
android:gravity="center" android:gravity="center"
android:orientation="vertical">' android:orientation="vertical">
<include android:id="@+id/ic_title" layout="@layout/title"/>
<ImageView <LinearLayout
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/login_logo"/>
<RelativeLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_marginTop="@dimen/et_margin_logo"> android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/login_logo"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/et_margin_logo">
<EditText
android:id="@+id/et_one_password"
style="@style/editText"
android:background="@drawable/transparent_border"
android:digits="1234567890"
android:ems="10"
android:hint="@string/login_smscodefragment_et_one_input_password_hint"
android:inputType="textPassword"
android:maxLength="11"/>
</RelativeLayout>
<EditText <EditText
android:id="@+id/et_one_password" android:id="@+id/et_two_password"
style="@style/editText" style="@style/editText"
android:background="@drawable/transparent_border" android:layout_marginTop="@dimen/et_margin_edittext"
android:digits="1234567890" android:digits="1234567890"
android:ems="10" android:ems="10"
android:hint="@string/login_smscodefragment_et_one_input_password_hint" android:hint="@string/login_smscodefragment_et_two_input_password_hint"
android:inputType="textPassword" android:inputType="textPassword"
android:maxLength="11"/> android:maxLength="8"
/>
</RelativeLayout>
<Button
<EditText android:id="@+id/btn_next"
android:id="@+id/et_two_password" style="@style/button"
style="@style/editText" android:layout_marginTop="@dimen/et_margin_logo"
android:layout_marginTop="@dimen/et_margin_edittext"
android:digits="1234567890"
android:ems="10"
android:hint="@string/login_smscodefragment_et_two_input_password_hint"
android:inputType="textPassword"
android:maxLength="8"
/>
<Button
android:id="@+id/btn_next"
style="@style/view_base"
android:layout_marginTop="@dimen/et_margin_logo"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}"
android:text="@string/login_smscodefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
<RelativeLayout
style="@style/view_base"
android:layout_marginTop="@dimen/et_margin_logo">
<TextView
android:id="@+id/tv_existing_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:text="已有账号 >" android:text="@string/login_smscodefragment_btn_next"
android:textColor="@color/white"/> />
</RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/et_margin_logo">
<TextView
android:id="@+id/tv_existing_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}"
android:text="已有账号 >"
android:textColor="@color/white"/>
</RelativeLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/fragment_payment.xml 0 → 100644
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?>
<layout>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="3"
android:background="@color/store_product_bg"
android:orientation="vertical">
<TextView
android:id="@+id/tv_exp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end|center_vertical"
android:textColor="@color/white_caocao" />
<TextView
android:id="@+id/tv_result"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="end|center_vertical"
android:textColor="@color/white_caocao" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:background="@color/white"
android:gravity="end|center_vertical"
android:orientation="horizontal">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="小计:" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="40.00"
android:textColor="@color/deep_red" />
</LinearLayout>
<FrameLayout
android:id="@+id/f_inputer"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="7" />
</LinearLayout>
</layout>
\ No newline at end of file
app/src/main/res/layout/fragment_sms_code.xml
View file @ 7123fa39
...@@ -13,97 +13,102 @@ ...@@ -13,97 +13,102 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/appBack" android:background="@color/appBack"
android:gravity="center" android:orientation="vertical">
android:orientation="vertical">'
<ImageView <include android:id="@+id/ic_title" layout="@layout/title"></include>
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/login_logo"/>
<RelativeLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/et_height" android:layout_height="match_parent"
android:layout_marginTop="@dimen/et_margin_logo"> android:gravity="center"
android:orientation="vertical">
<ImageView
android:id="@+id/iv_logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@mipmap/login_logo"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="@dimen/et_height"
android:layout_marginTop="@dimen/et_margin_logo">
<EditText
android:id="@+id/et_phone"
style="@style/editText"
android:digits="1234567890"
android:ems="10"
android:gravity="center_vertical"
android:hint="@string/login_et_phone_hint"
android:inputType="phone|number"
android:maxLength="11"/>
<LinearLayout
android:layout_width="@dimen/smscodefragment_drop_get_sms_width"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="@dimen/all_margin_left"
android:orientation="horizontal">
<View
android:layout_width="@dimen/all_line_width"
android:layout_height="match_parent"
android:background="@color/blue"></View>
<TextView
android:id="@+id/tv_getsms"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:onClick="@{onClickListener}"
android:paddingBottom="@dimen/et_padding"
android:paddingTop="@dimen/et_padding"
android:text="@string/login_smscodefragment_tv_get_sms"
android:textColor="@color/blue"/>
</LinearLayout>
</RelativeLayout>
<EditText <EditText
android:id="@+id/et_phone" android:id="@+id/et_sms_code"
style="@style/editText" style="@style/editText"
android:layout_marginTop="@dimen/all_margin"
android:digits="1234567890" android:digits="1234567890"
android:ems="10" android:ems="10"
android:gravity="center_vertical" android:hint="@string/login_smscodefragment_et_input_sms_hint"
android:hint="@string/login_et_phone_hint"
android:inputType="phone|number" android:inputType="phone|number"
android:maxLength="11"/> android:maxLength="11"
/>
<LinearLayout <Button
android:layout_width="@dimen/smscodefragment_drop_get_sms_width" android:id="@+id/btn_next"
android:layout_height="wrap_content" style="@style/button"
android:layout_alignParentRight="true" android:layout_marginTop="@dimen/et_margin_logo"
android:layout_centerVertical="true" android:onClick="@{onClickListener}"
android:layout_marginRight="@dimen/all_margin_left" android:text="@string/login_smscodefragment_btn_next"
android:orientation="horizontal"> />
<View <RelativeLayout
android:layout_width="@dimen/all_line_width" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:background="@color/blue"></View> android:layout_marginTop="@dimen/et_margin_logo">
<TextView <TextView
android:id="@+id/tv_getsms" android:id="@+id/tv_existing_account"
android:layout_width="match_parent" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/all_margin_left"
android:onClick="@{onClickListener}" android:onClick="@{onClickListener}"
android:paddingBottom="@dimen/et_padding" android:text="已有账号 >"
android:paddingTop="@dimen/et_padding" android:textColor="@color/white"/>
android:text="@string/login_smscodefragment_tv_get_sms" </RelativeLayout>
android:textColor="@color/blue"/> </LinearLayout>
</LinearLayout>
</RelativeLayout>
<EditText
android:id="@+id/et_sms_code"
style="@style/editText"
android:layout_marginTop="@dimen/all_margin"
android:digits="1234567890"
android:ems="10"
android:hint="@string/login_smscodefragment_et_input_sms_hint"
android:inputType="phone|number"
android:maxLength="11"
/>
<Button
android:id="@+id/btn_next"
style="@style/view_base"
android:layout_marginTop="@dimen/et_margin_logo"
android:background="@drawable/blue_border"
android:onClick="@{onClickListener}"
android:text="@string/login_smscodefragment_btn_next"
android:textColor="@color/white"
android:textSize="@dimen/et_textsize"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/et_margin_logo">
<TextView
android:id="@+id/tv_existing_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/all_margin_left"
android:layout_alignParentRight="true"
android:onClick="@{onClickListener}"
android:text="已有账号 >"
android:textColor="@color/white"/>
</RelativeLayout>
</LinearLayout> </LinearLayout>
</layout> </layout>
\ No newline at end of file
app/src/main/res/layout/title.xml 0 → 100644
View file @ 7123fa39
<?xml version="1.0" encoding="utf-8"?>
<layout>
<data>
<variable
name="onClickListener"
type="com.xingdata.zzdpos.util.OnClickListener"/>
</data>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@drawable/singleline"
android:orientation="horizontal">
<ImageView
android:id="@+id/iv_back"
android:layout_width="@dimen/title_height"
android:layout_height="match_parent"
android:gravity="center"
android:onClick="@{onClickListener}"
android:padding="16dp"
android:src="@mipmap/back_white"/>
<TextView
android:id="@+id/tv_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="标题"
android:textColor="@color/white"
android:textSize="@dimen/text_secondary_title"
android:textStyle="bold"/>
</RelativeLayout>
</layout>
\ No newline at end of file
app/src/main/res/values/colors.xml
View file @ 7123fa39
...@@ -120,6 +120,7 @@ ...@@ -120,6 +120,7 @@
<color name="red_guanyu">#b4282d</color> <color name="red_guanyu">#b4282d</color>
<color name="red_xishi">#e57b7b</color> <color name="red_xishi">#e57b7b</color>
<color name="gray_zhouyu">#f1f3f7</color> <color name="gray_zhouyu">#f1f3f7</color>
<color name="gray_huanggai">#afb9c3</color>
<color name="white_caocao">#ffffff</color> <color name="white_caocao">#ffffff</color>
<color name="black_zhangfei">#233142</color> <color name="black_zhangfei">#233142</color>
<color name="black_baozheng">#121212</color> <color name="black_baozheng">#121212</color>
......
app/src/main/res/values/dimens.xml
View file @ 7123fa39
<resources> <resources>
<!--ALL--> <!--ALL-->
<dimen name="all_shape_radius">3dp</dimen> <dimen name="all_shape_radius">3dp</dimen>
<dimen name="all_radius">100dp</dimen>
<dimen name="all_line_width">0.5dp</dimen> <dimen name="all_line_width">0.5dp</dimen>
<dimen name="all_slight_line_width">0.5dp</dimen> <dimen name="all_slight_line_width">0.5dp</dimen>
<dimen name="all_margin">18dp</dimen> <dimen name="all_margin">18dp</dimen>
...@@ -30,6 +31,8 @@ ...@@ -30,6 +31,8 @@
<dimen name="text_primary_title">28sp</dimen> <dimen name="text_primary_title">28sp</dimen>
<!--二级标题--> <!--二级标题-->
<dimen name="text_secondary_title">20sp</dimen> <dimen name="text_secondary_title">20sp</dimen>
<!--三级标题-->
<dimen name="text_three_title">18sp</dimen>
<!--标题控件宽度--> <!--标题控件宽度-->
<dimen name="title_width">84dp</dimen> <dimen name="title_width">84dp</dimen>
<!--Dialog--> <!--Dialog-->
...@@ -39,7 +42,7 @@ ...@@ -39,7 +42,7 @@
<dimen name="dialog_padding">12sp</dimen> <dimen name="dialog_padding">12sp</dimen>
<dimen name="dialog_button_width">190dp</dimen> <dimen name="dialog_button_width">190dp</dimen>
<!--提示对话框--> <!--提示对话框-->
<dimen name="prompt_dialog_width">450dp</dimen> <dimen name="prompt_dialog_width">300dp</dimen>
<dimen name="prompt_dialog_height">250dp</dimen> <dimen name="prompt_dialog_height">250dp</dimen>
<dimen name="prompt_dialog_logo_size">64dp</dimen> <dimen name="prompt_dialog_logo_size">64dp</dimen>
<!--商品页面--> <!--商品页面-->
...@@ -91,22 +94,23 @@ ...@@ -91,22 +94,23 @@
<dimen name="smscodefragment_drop_get_sms_width">84dp</dimen> <dimen name="smscodefragment_drop_get_sms_width">84dp</dimen>
<!--创建门店界面--> <!--创建门店界面-->
<dimen name="item_title_width">80dp</dimen> <dimen name="item_title_width">80dp</dimen>
<dimen name="item_title_margin">15dp</dimen> <dimen name="item_title_margin">5dp</dimen>
<dimen name="bar_margin">15dp</dimen> <dimen name="bar_margin">15dp</dimen>
<dimen name="create_store_btn_width">110dp</dimen> <dimen name="create_store_btn_width">110dp</dimen>
<dimen name="create_store_btn_height">40dp</dimen> <dimen name="create_store_btn_height">44dp</dimen>
<!--绑定款台界面--> <!--绑定款台界面-->
<dimen name="new_counter_btn_width">150dp</dimen> <dimen name="new_counter_btn_width">120dp</dimen>
<dimen name="new_counter_btn_height">40dp</dimen> <dimen name="new_counter_btn_height">30dp</dimen>
<dimen name="new_counter_btn_margin_left">10dp</dimen> <dimen name="new_counter_btn_margin_left">10dp</dimen>
<dimen name="bingding_counter_btn_width">110dp</dimen> <dimen name="bingding_counter_btn_width">110dp</dimen>
<dimen name="bingding_counter_btn_height">40dp</dimen> <dimen name="bingding_counter_btn_height">40dp</dimen>
<dimen name="nicespinner_width">430dp</dimen> <dimen name="nicespinner_width">280dp</dimen>
<dimen name="nicespinner_height">40dp</dimen> <dimen name="nicespinner_height">40dp</dimen>
<dimen name="counter_bar_width">350dp</dimen> <dimen name="counter_bar_width">350dp</dimen>
<dimen name="counter_input_height">45dp</dimen> <dimen name="counter_input_height">43dp</dimen>
<dimen name="counter_tv_width">590dp</dimen> <dimen name="counter_input_select">35dp</dimen>
<dimen name="center_height">230dp</dimen> <dimen name="counter_tv_width">400dp</dimen>
<dimen name="center_height">380dp</dimen>
<!-- 副屏 --> <!-- 副屏 -->
......
app/src/main/res/values/strings.xml
View file @ 7123fa39
...@@ -227,6 +227,7 @@ ...@@ -227,6 +227,7 @@
<string name="login_createstorefragment_tv_storename">门店名称</string> <string name="login_createstorefragment_tv_storename">门店名称</string>
<string name="login_createstorefragment_tv_storetype">门店类型</string> <string name="login_createstorefragment_tv_storetype">门店类型</string>
<string name="login_createstorefragment_tv_storeaddress">门店地址</string> <string name="login_createstorefragment_tv_storeaddress">门店地址</string>
<string name="login_createstorefragment_tv_storeaddressmessage">详细地址</string>
<string name="login_createstorefragment_tv_storetype_hint">请选择门店类别（连锁/超市）</string> <string name="login_createstorefragment_tv_storetype_hint">请选择门店类别（连锁/超市）</string>
<string name="login_createstorefragment_tv_storeaddress_hint">请选择门店地址（省/市/县）</string> <string name="login_createstorefragment_tv_storeaddress_hint">请选择门店地址（省/市/县）</string>
<string name="login_createstorefragment_et_nickname_hint">请输入昵称</string> <string name="login_createstorefragment_et_nickname_hint">请输入昵称</string>
......
app/src/main/res/values/styles.xml
View file @ 7123fa39
...@@ -240,13 +240,19 @@ ...@@ -240,13 +240,19 @@
</style> </style>
<style name="button_positive" parent="android:ButtonBar"> <style name="button_positive" parent="android:ButtonBar">
<item name="android:background">@drawable/selector_gradient_blue_button_background</item> <item name="android:background">@drawable/selector_gradient_red_button_background</item>
<item name="android:textColor">@color/white</item>
<item name="android:gravity">center</item>
<item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item>
</style>
<style name="button_positive_noradius" parent="android:ButtonBar">
<item name="android:background">@drawable/selector_gradient_red_button_background_noradius</item>
<item name="android:textColor">@color/white</item> <item name="android:textColor">@color/white</item>
<item name="android:gravity">center</item> <item name="android:gravity">center</item>
<item name="android:focusable">false</item> <item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item> <item name="android:focusableInTouchMode">false</item>
</style> </style>
<style name="button_positive_bg_gray" parent="android:ButtonBar"> <style name="button_positive_bg_gray" parent="android:ButtonBar">
<item name="android:background">@drawable/selector_gradient_gray_button_background</item> <item name="android:background">@drawable/selector_gradient_gray_button_background</item>
<item name="android:textColor">@color/blue</item> <item name="android:textColor">@color/blue</item>
...@@ -254,7 +260,13 @@ ...@@ -254,7 +260,13 @@
<item name="android:focusable">false</item> <item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item> <item name="android:focusableInTouchMode">false</item>
</style> </style>
<style name="button_positive_bg_gray_noradius" parent="android:ButtonBar">
<item name="android:background">@drawable/selector_gradient_gray_button_background_noradius</item>
<item name="android:textColor">@color/blue</item>
<item name="android:gravity">center</item>
<item name="android:focusable">false</item>
<item name="android:focusableInTouchMode">false</item>
</style>
<style name="xuline_margin"> <style name="xuline_margin">
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:layout_height">1dp</item> <item name="android:layout_height">1dp</item>
...@@ -273,7 +285,7 @@ ...@@ -273,7 +285,7 @@
<style name="view_base" parent="android:ButtonBar"> <style name="view_base" parent="android:ButtonBar">
<item name="android:layout_height">@dimen/et_height</item> <item name="android:layout_height">@dimen/et_height</item>
<item name="android:layout_width">match_parent</item> <item name="android:layout_width">match_parent</item>
<item name="android:gravity">center_vertical</item> <item name="android:gravity">center</item>
<item name="android:layout_marginLeft">@dimen/all_margin_left</item> <item name="android:layout_marginLeft">@dimen/all_margin_left</item>
<item name="android:layout_marginRight">@dimen/all_margin_left</item> <item name="android:layout_marginRight">@dimen/all_margin_left</item>
</style> </style>
...@@ -282,8 +294,26 @@ ...@@ -282,8 +294,26 @@
<item name=" android:background">@drawable/transparent_border</item> <item name=" android:background">@drawable/transparent_border</item>
<item name="android:padding">@dimen/et_padding</item> <item name="android:padding">@dimen/et_padding</item>
<item name=" android:saveEnabled">false</item> <item name=" android:saveEnabled">false</item>
<item name="android:gravity">center|left</item>
<item name="android:textSize">@dimen/et_textsize</item> <item name="android:textSize">@dimen/et_textsize</item>
<item name="android:textColorHint">@color/hint</item> <item name="android:textColorHint">@color/hint</item>
</style> </style>
<style name="button" parent="view_base">
<item name=" android:background">@drawable/red_border</item>
<item name=" android:saveEnabled">false</item>
<item name="android:textSize">@dimen/et_textsize</item>
<item name=" android:textColor">@color/white</item>
<item name="android:textColorHint">@color/hint</item>
</style>
<style name="textView_title">
<item name="android:layout_height">@dimen/et_height</item>
<item name="android:layout_width">match_parent</item>
<item name="android:layout_marginLeft">@dimen/all_margin_left</item>
<item name="android:textSize">@dimen/text_three_title</item>
<item name="android:background">@color/transparent</item>
<item name=" android:textColor">@color/gary</item>
<item name="android:gravity">center|left</item>
</style>
</resources> </resources>
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