,
protected TextView balanceAvailableAboutTx;
private View triggerPriceRela;
protected View btnTransfer;
+ protected ImageView imgDrawer;
public void setDefalutCoinPair(CoinPairBean coinpair){
// coinPairBean = coinpair;
@@ -257,7 +259,9 @@ public abstract class BaseTradeFragment,
//标题栏
topBar = viewFinder.find(R.id.topBar);
- topBar.setTitleRightDrawable(R.mipmap.icon_drawer);
+ imgDrawer = viewFinder.find(R.id.img_drawer);
+// topBar.setTitleRightImage(R.mipmap.icon_drawer);
+ imgDrawer.setImageResource(R.mipmap.icon_drawer);
topBar.setRightImg(R.mipmap.icon_kline);
topBar.setRightOnClickListener(new View.OnClickListener() {
@@ -315,11 +319,12 @@ public abstract class BaseTradeFragment
,
editAmount.addTextChangedListener(new AmountTextWatcher());
bookTitleAmount = headerView.findViewById(R.id.title_amount);
bookTitlePrice = headerView.findViewById(R.id.title_price);
- ShadowDrawable.setShadow(priceLimitedView);
- ShadowDrawable.setShadow(priceMarketTx);
- ShadowDrawable.setShadow(editPriceRela);
- ShadowDrawable.setShadow(editAmountRela);
+// ShadowDrawable.setShadow(priceLimitedView);
+// ShadowDrawable.setShadow(priceMarketTx);
+// ShadowDrawable.setShadow(editPriceRela);
+// ShadowDrawable.setShadow(editAmountRela);
tabLayout = headerView.findViewById(R.id.tabLayout);
+ tabLayout.setTabTextColors(SkinColorUtil.getAds(this.getActivity()), SkinColorUtil.getFont1(this.getActivity()));
balanceAvailableTx = headerView.findViewById(R.id.balance_available);
balanceAvailableAboutTx = headerView.findViewById(R.id.balance_available_about);
@@ -757,13 +762,16 @@ public abstract class BaseTradeFragment
,
@Override
public void onResume() {
super.onResume();
- topBar.setTitleRightDrawable(R.mipmap.icon_drawer);
+// topBar.setTitleRightDrawable(R.mipmap.icon_drawer);
+// topBar.setLeftImg(R.mipmap.icon_drawer);
+ tabLayout.setTabTextColors(SkinColorUtil.getAds(this.getActivity()), SkinColorUtil.getFont1(this.getActivity()));
+ imgDrawer.setImageResource(R.mipmap.icon_drawer);
switchBuySellTab(isBuyMode);
- ShadowDrawable.setShadow(priceLimitedView);
- ShadowDrawable.setShadow(priceMarketTx);
- ShadowDrawable.setShadow(editPriceRela);
- ShadowDrawable.setShadow(editAmountRela);
+// ShadowDrawable.setShadow(priceLimitedView);
+// ShadowDrawable.setShadow(priceMarketTx);
+// ShadowDrawable.setShadow(editPriceRela);
+// ShadowDrawable.setShadow(editAmountRela);
}
PriceAddRunnable priceAddRunnable = new PriceAddRunnable();
@@ -1098,20 +1106,20 @@ public abstract class BaseTradeFragment
,
isBuyMode = isBuyModeParam;
editAmount.setText("");
if (isBuyMode) {
- buyTabTx.setTextColor(getResources().getColor(R.color.green));
+ buyTabTx.setTextColor(getResources().getColor(R.color.white));
sellTabTx.setTextColor(getResources().getColor(CommonUtil.isBlackMode() ? R.color.dark_night : R.color.dark));
// buyTabRela.setBackgroundResource(R.drawable.bg_corner_rect_green);
// sellTabRela.setBackgroundResource(R.color.white);
- ShadowDrawable.setShadow(tab);
- buySellTabBg.setBackgroundResource(R.drawable.bg_corner_rect_green);
+// ShadowDrawable.setShadow(tab);
+ buySellTabBg.setBackgroundResource(R.drawable.bg_corner_green);
//AnimalUtils.transAnimRun(buySellTabBg, buySellTabBg.getWidth(), 0);
} else {
buyTabTx.setTextColor(getResources().getColor(CommonUtil.isBlackMode() ? R.color.dark_night : R.color.dark));
- sellTabTx.setTextColor(getResources().getColor(R.color.red));
+ sellTabTx.setTextColor(getResources().getColor(R.color.white));
// sellTabRela.setBackgroundResource(R.drawable.bg_corner_rect_red);
// buyTabRela.setBackgroundResource(R.color.white);
- ShadowDrawable.setShadow(tab);
- buySellTabBg.setBackgroundResource(R.drawable.bg_corner_rect_red);
+// ShadowDrawable.setShadow(tab);
+ buySellTabBg.setBackgroundResource(R.drawable.bg_corner_red);
//AnimalUtils.transAnimRun(buySellTabBg, 0, buySellTabBg.getWidth());
}
@@ -1139,7 +1147,7 @@ public abstract class BaseTradeFragment
,
sellTabTx.setTextColor(getResources().getColor(CommonUtil.isBlackMode() ? R.color.dark_night : R.color.dark));
// buyTabRela.setBackgroundResource(R.drawable.bg_corner_rect_green);
// sellTabRela.setBackgroundResource(R.color.white);
- ShadowDrawable.setShadow(tab);
+// ShadowDrawable.setShadow(tab);
buySellTabBg.setBackgroundResource(R.drawable.bg_corner_rect_green);
//AnimalUtils.transAnimRun(buySellTabBg, buySellTabBg.getWidth(), 0);
} else {
@@ -1147,7 +1155,7 @@ public abstract class BaseTradeFragment
,
sellTabTx.setTextColor(getResources().getColor(R.color.red));
// sellTabRela.setBackgroundResource(R.drawable.bg_corner_rect_red);
// buyTabRela.setBackgroundResource(R.color.white);
- ShadowDrawable.setShadow(tab);
+// ShadowDrawable.setShadow(tab);
buySellTabBg.setBackgroundResource(R.drawable.bg_corner_rect_red);
//AnimalUtils.transAnimRun(buySellTabBg, 0, buySellTabBg.getWidth());
}
diff --git a/app/src/main/java/io/bhex/app/trade/ui/FuturesCloseOrderPopDialog.java b/app/src/main/java/io/bhex/app/trade/ui/FuturesCloseOrderPopDialog.java
index cb906830e39098d357114adc42a3085f96fb6a2f..cb745b86856c6d700dc65409f9593113d6fd5f35 100644
--- a/app/src/main/java/io/bhex/app/trade/ui/FuturesCloseOrderPopDialog.java
+++ b/app/src/main/java/io/bhex/app/trade/ui/FuturesCloseOrderPopDialog.java
@@ -116,7 +116,7 @@ public class FuturesCloseOrderPopDialog {
ViewPager viewPager = mContentView.findViewById(R.id.createOrderVp);
SkinTabLayout tab = mContentView.findViewById(R.id.tabText);
- tab.setTabTextColors(mContext.getResources().getColor(CommonUtil.isBlackMode() ? R.color.dark_night : R.color.dark),mContext.getResources().getColor(R.color.blue));
+ tab.setTabTextColors(mContext.getResources().getColor(CommonUtil.isBlackMode() ? R.color.dark_night : R.color.dark),mContext.getResources().getColor(R.color.green));
String exchangeId = "";
diff --git a/app/src/main/java/io/bhex/app/trade/ui/HomeTradeFragment.java b/app/src/main/java/io/bhex/app/trade/ui/HomeTradeFragment.java
index 415af018102c2287956e8aa9160df92b181beee0..01566e2ee75912a095f5b76a665f8d9ed8eac80d 100644
--- a/app/src/main/java/io/bhex/app/trade/ui/HomeTradeFragment.java
+++ b/app/src/main/java/io/bhex/app/trade/ui/HomeTradeFragment.java
@@ -145,7 +145,7 @@ public class HomeTradeFragment extends BaseFragment1) {
tab.setVisibility(View.VISIBLE);
- tabline.setVisibility(View.VISIBLE);
+ tabline.setVisibility(View.GONE);
}else{
tab.setVisibility(View.GONE);
tabline.setVisibility(View.GONE);
@@ -275,7 +275,7 @@ public class HomeTradeFragment extends BaseFragment1) {
- progress =1;
+ if (progress > 1) {
+ progress = 1;
}
- if (progress<0) {
- progress =0;
+ if (progress < 0) {
+ progress = 0;
}
mProgress = progress;
invalidate();
}
- public float getStepProgress(){
+ public float getStepProgress() {
return mProgress;
}
@@ -185,8 +197,8 @@ public class StepView extends View {
}
private void updateConfig() {
- startX = foreBigRadius;
- stopX = viewWidth - foreBigRadius;
+ startX = foreAlphaBigRadius;
+ stopX = viewWidth - foreAlphaBigRadius;
centerY = viewHeight / 2;
progressViewTotalLength = stopX - startX;
perStepX = (progressViewTotalLength) / (mStepNum - 1);
@@ -235,12 +247,36 @@ public class StepView extends View {
//绘制大圆
paint.setColor(bgSmallCircleColor);
canvas.drawCircle(progressWidth, cy, foreBigRadius, paint);
-// canvas.drawCircle(progressWidth, cy, foreBigRadius+1, paint);
paint.setColor(foreBigCircleColor);
+ paint.setAlpha(50);
+ canvas.drawCircle(progressWidth, cy, foreAlphaBigRadius, paint);
+ paint.setColor(foreBigCircleColor);
+ paint.setAlpha(255);
canvas.drawCircle(progressWidth, cy, foreBigRadius, paint);
paint.setColor(foreSmallCircleColor);
canvas.drawCircle(progressWidth, cy, foreSmallRadius, paint);
+ paint.setStrokeWidth(foreVerticalLineWidth);
+ paint.setColor(foreVerticalLineColor);
+ float x1 = progressWidth - (foreBigRadius / 2);
+ float y1 = cy - (foreBigRadius / 3);
+ float y2 = cy + (foreBigRadius / 3);
+ lines[0] = x1;
+ lines[1] = y1;
+ lines[2] = x1;
+ lines[3] = y2;
+
+ lines[4] = progressWidth;
+ lines[5] = cy - (foreBigRadius * 0.75f);
+ lines[6] = progressWidth;
+ lines[7] = cy + (foreBigRadius * 0.75f);
+
+ lines[8] = x1 + foreBigRadius;
+ lines[9] = y1;
+ lines[10] = x1 + foreBigRadius;
+ lines[11] = y2;
+ canvas.drawLines(lines, paint);
+
}
@@ -326,7 +362,6 @@ public class StepView extends View {
}
-
/**
* 更新进度
*
@@ -351,9 +386,10 @@ public class StepView extends View {
/**
* 设置触摸监听
+ *
* @param listener
*/
- public void setStepTouchListener(StepTouchListener listener){
+ public void setStepTouchListener(StepTouchListener listener) {
mTouchListener = listener;
}
@@ -362,6 +398,7 @@ public class StepView extends View {
*/
public interface StepTouchListener {
void onTouchDown();
+
void onTouchUp();
}
diff --git a/app/src/main/java/io/bhex/app/view/index/IndexView.java b/app/src/main/java/io/bhex/app/view/index/IndexView.java
index 092570dfc1d37e28c5faa0ebe6f02acb704b49f6..36b2311e31ad77da2650a23c7bb8db336f3d7dec 100644
--- a/app/src/main/java/io/bhex/app/view/index/IndexView.java
+++ b/app/src/main/java/io/bhex/app/view/index/IndexView.java
@@ -50,7 +50,7 @@ public class IndexView extends View {
super(context, attrs, defStyle);
mNormalTextColor = SkinColorUtil.getDark(context);
- mPressedTextColor = SkinColorUtil.getColor(context, R.color.blue);
+ mPressedTextColor = SkinColorUtil.getColor(context, R.color.green);
mPaint.setTypeface(Typeface.DEFAULT);
mPaint.setAntiAlias(true);
diff --git a/app/src/main/res-night/color/bottom_tab_text_color_night.xml b/app/src/main/res-night/color/bottom_tab_text_color_night.xml
new file mode 100644
index 0000000000000000000000000000000000000000..1cf7a2c50e470356fba50cdcde2072b318fa6033
--- /dev/null
+++ b/app/src/main/res-night/color/bottom_tab_text_color_night.xml
@@ -0,0 +1,8 @@
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res-night/drawable/bg_corner_half_rect_red_night.xml b/app/src/main/res-night/drawable/bg_corner_half_rect_red_night.xml
new file mode 100644
index 0000000000000000000000000000000000000000..59b300382f9004d5524f5a6889eb7d5ecbc3c1b4
--- /dev/null
+++ b/app/src/main/res-night/drawable/bg_corner_half_rect_red_night.xml
@@ -0,0 +1,40 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res-night/drawable/btn_clear_night.xml b/app/src/main/res-night/drawable/btn_clear_night.xml
index 17756813c1623766d8915b2973df9af57f9c3f89..4c02093895c50a12120177380e7b8a6c51003a78 100644
--- a/app/src/main/res-night/drawable/btn_clear_night.xml
+++ b/app/src/main/res-night/drawable/btn_clear_night.xml
@@ -1,8 +1,8 @@
- -
+
-
@@ -17,20 +17,24 @@
-
-
-
-
+
+
+
+
- -
+
diff --git a/app/src/main/res-night/drawable/main_tab_market_night.xml b/app/src/main/res-night/drawable/main_tab_market_night.xml
index 28d1c7f054f90d56a11d84ad25efe5465d9c8c0a..580983927d9a971db718811b879c81854eb58452 100644
--- a/app/src/main/res-night/drawable/main_tab_market_night.xml
+++ b/app/src/main/res-night/drawable/main_tab_market_night.xml
@@ -1,8 +1,8 @@
- - @dimen/sp_18
- @color/dark80_night
-
+
+
-
+
+
+
+