diff --git a/aes/src/main/res/drawable-night/bg_frame.xml b/aes/src/main/res/drawable-night/bg_frame.xml new file mode 100644 index 0000000..bf2fe54 --- /dev/null +++ b/aes/src/main/res/drawable-night/bg_frame.xml @@ -0,0 +1,32 @@ + + + + + + + + + + + + + + + + diff --git a/aes/src/main/res/drawable/bg_frame.xml b/aes/src/main/res/drawable/bg_frame.xml index 75b2b94..2f208a6 100644 --- a/aes/src/main/res/drawable/bg_frame.xml +++ b/aes/src/main/res/drawable/bg_frame.xml @@ -12,11 +12,7 @@ android:angle="270" android:endColor="#0F000000" android:startColor="#0F000000" /> - + @@ -31,11 +27,7 @@ android:angle="270" android:endColor="#0FFFFFFF" android:startColor="#FFFFFFFF" /> - + diff --git a/aes/src/main/res/layout/activity_about.xml b/aes/src/main/res/layout/activity_about.xml index e003607..5cbe3fd 100644 --- a/aes/src/main/res/layout/activity_about.xml +++ b/aes/src/main/res/layout/activity_about.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" android:background="@drawable/bg_container_border"> + android:layout_height="match_parent" android:background="@drawable/bg_container_border"> + android:layout_height="match_parent" android:background="@drawable/bg_container_border"> + + + + + diff --git a/appbase/src/main/res/values/attrs.xml b/appbase/src/main/res/values/attrs.xml index 511b66c..1c8802a 100644 --- a/appbase/src/main/res/values/attrs.xml +++ b/appbase/src/main/res/values/attrs.xml @@ -1,5 +1,6 @@ + diff --git a/appbase/src/main/res/values/styles.xml b/appbase/src/main/res/values/styles.xml index bfb751e..be91a4e 100644 --- a/appbase/src/main/res/values/styles.xml +++ b/appbase/src/main/res/values/styles.xml @@ -1,13 +1,14 @@ - diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/ASupportToolbar.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/ASupportToolbar.java index c384919..0c55384 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/ASupportToolbar.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/ASupportToolbar.java @@ -49,6 +49,10 @@ public class ASupportToolbar extends Toolbar { // 工具栏描边 int nStroke = 5; + TypedArray taBorder = getContext().obtainStyledAttributes(new int[]{R.attr.borderCornerRadius}); + float cornerRadius = taBorder.getDimension(0, 6 * getResources().getDisplayMetrics().density); + taBorder.recycle(); + //分别为开始颜色,中间夜色,结束颜色 int colors0[] = { mEndColor , mCenterColor, mStartColor}; GradientDrawable gradientDrawable0; @@ -57,7 +61,7 @@ public class ASupportToolbar extends Toolbar { gradientDrawable0.setShape(GradientDrawable.RECTANGLE); gradientDrawable0.setColors(colors0); //添加颜色组 gradientDrawable0.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变 - gradientDrawable0.setCornerRadius(20); + gradientDrawable0.setCornerRadius(cornerRadius); int colors1[] = { mCenterColor , mCenterColor, mCenterColor }; GradientDrawable gradientDrawable1; @@ -66,7 +70,7 @@ public class ASupportToolbar extends Toolbar { gradientDrawable1.setShape(GradientDrawable.RECTANGLE); gradientDrawable1.setColors(colors1); //添加颜色组 gradientDrawable1.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变 - gradientDrawable1.setCornerRadius(20); + gradientDrawable1.setCornerRadius(cornerRadius); int colors2[] = { mEndColor, mCenterColor, mStartColor }; GradientDrawable gradientDrawable2; @@ -75,7 +79,7 @@ public class ASupportToolbar extends Toolbar { gradientDrawable2.setShape(GradientDrawable.RECTANGLE); gradientDrawable2.setColors(colors2); //添加颜色组 gradientDrawable2.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变 - gradientDrawable2.setCornerRadius(20); + gradientDrawable2.setCornerRadius(cornerRadius); ld = new LayerDrawable(array); //参数为上面的Drawable数组 ld.setLayerInset(2, nStroke * 2, nStroke * 2, getWidth() + nStroke * 2, getHeight() + nStroke * 2); diff --git a/libaes/src/main/java/cc/winboll/studio/libaes/views/AToolbar.java b/libaes/src/main/java/cc/winboll/studio/libaes/views/AToolbar.java index 39b9249..dac29ae 100644 --- a/libaes/src/main/java/cc/winboll/studio/libaes/views/AToolbar.java +++ b/libaes/src/main/java/cc/winboll/studio/libaes/views/AToolbar.java @@ -51,6 +51,10 @@ public class AToolbar extends Toolbar { // 工具栏描边 int nStroke = 5; + TypedArray taBorder = getContext().obtainStyledAttributes(new int[]{R.attr.borderCornerRadius}); + float cornerRadius = taBorder.getDimension(0, 6 * getResources().getDisplayMetrics().density); + taBorder.recycle(); + //分别为开始颜色,中间夜色,结束颜色 int colors0[] = { mEndColor , mCenterColor, mStartColor}; GradientDrawable gradientDrawable0; @@ -59,7 +63,7 @@ public class AToolbar extends Toolbar { gradientDrawable0.setShape(GradientDrawable.RECTANGLE); gradientDrawable0.setColors(colors0); //添加颜色组 gradientDrawable0.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变 - gradientDrawable0.setCornerRadius(20); + gradientDrawable0.setCornerRadius(cornerRadius); int colors1[] = { mCenterColor , mCenterColor, mCenterColor }; GradientDrawable gradientDrawable1; @@ -68,7 +72,7 @@ public class AToolbar extends Toolbar { gradientDrawable1.setShape(GradientDrawable.RECTANGLE); gradientDrawable1.setColors(colors1); //添加颜色组 gradientDrawable1.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变 - gradientDrawable1.setCornerRadius(20); + gradientDrawable1.setCornerRadius(cornerRadius); int colors2[] = { mEndColor, mCenterColor, mStartColor }; GradientDrawable gradientDrawable2; @@ -77,7 +81,7 @@ public class AToolbar extends Toolbar { gradientDrawable2.setShape(GradientDrawable.RECTANGLE); gradientDrawable2.setColors(colors2); //添加颜色组 gradientDrawable2.setGradientType(GradientDrawable.LINEAR_GRADIENT);//设置线性渐变 - gradientDrawable2.setCornerRadius(20); + gradientDrawable2.setCornerRadius(cornerRadius); ld = new LayerDrawable(array); //参数为上面的Drawable数组 diff --git a/libaes/src/main/res/drawable/acard_frame_main.xml b/libaes/src/main/res/drawable/acard_frame_main.xml index f8780ff..ee332b2 100644 --- a/libaes/src/main/res/drawable/acard_frame_main.xml +++ b/libaes/src/main/res/drawable/acard_frame_main.xml @@ -13,11 +13,7 @@ android:startColor="@color/colorACardShadow" android:centerColor="@color/colorACardShadow" android:endColor="@color/colorACardShadow"/> - + @@ -32,11 +28,7 @@ android:startColor="@color/colorACardFrame" android:centerColor="@color/colorACardFrame" android:endColor="@color/colorACardFrame"/> - + @@ -52,11 +44,7 @@ android:startColor="@color/colorACardBackgroung" android:centerColor="@color/colorACardBackgroung" android:endColor="@color/colorACardBackgroung"/> - + diff --git a/libaes/src/main/res/drawable/atoolbar_frame.xml b/libaes/src/main/res/drawable/atoolbar_frame.xml index 280f018..198e122 100644 --- a/libaes/src/main/res/drawable/atoolbar_frame.xml +++ b/libaes/src/main/res/drawable/atoolbar_frame.xml @@ -13,11 +13,7 @@ android:startColor="?attr/attrAToolbarEndColor" android:centerColor="?attr/attrAToolbarCenterColor" android:endColor="?attr/attrAToolbarStartColor"/> - + @@ -32,11 +28,7 @@ android:startColor="?attr/attrAToolbarCenterColor" android:centerColor="?attr/attrAToolbarCenterColor" android:endColor="?attr/attrAToolbarCenterColor"/> - + @@ -52,11 +44,7 @@ android:startColor="?attr/attrAToolbarStartColor" android:centerColor="?attr/attrAToolbarCenterColor" android:endColor="?attr/attrAToolbarEndColor"/> - + diff --git a/libaes/src/main/res/drawable/bg_container_border.xml b/libaes/src/main/res/drawable/bg_container_border.xml new file mode 100644 index 0000000..09c5bdf --- /dev/null +++ b/libaes/src/main/res/drawable/bg_container_border.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/libaes/src/main/res/drawable/bg_shadow.xml b/libaes/src/main/res/drawable/bg_shadow.xml index 6d3d898..0cafd81 100644 --- a/libaes/src/main/res/drawable/bg_shadow.xml +++ b/libaes/src/main/res/drawable/bg_shadow.xml @@ -12,11 +12,7 @@ android:angle="270" android:endColor="#0F000000" android:startColor="#0F000000" /> - + @@ -31,11 +27,7 @@ android:angle="270" android:endColor="@color/colorAccent" android:startColor="@color/colorAccent" /> - + diff --git a/libaes/src/main/res/drawable/ohpcts_frame.xml b/libaes/src/main/res/drawable/ohpcts_frame.xml index caf8c6d..77eacff 100644 --- a/libaes/src/main/res/drawable/ohpcts_frame.xml +++ b/libaes/src/main/res/drawable/ohpcts_frame.xml @@ -9,7 +9,7 @@ android:startColor="@color/colorOHPCTSBackground" android:centerColor="@color/colorOHPCTSBackground" android:endColor="@color/colorOHPCTSBackground"/> - + @@ -22,7 +22,7 @@ android:startColor="@color/colorOHPCTSSecondaryProgress" android:centerColor="@color/colorOHPCTSSecondaryProgress" android:endColor="@color/colorOHPCTSSecondaryProgress"/> - + @@ -36,7 +36,7 @@ android:startColor="@color/colorOHPCTSProgress" android:centerColor="@color/colorOHPCTSProgress" android:endColor="@color/colorOHPCTSProgress"/> - + diff --git a/libaes/src/main/res/layout/activity_about.xml b/libaes/src/main/res/layout/activity_about.xml index 7d2a2ca..337d98e 100644 --- a/libaes/src/main/res/layout/activity_about.xml +++ b/libaes/src/main/res/layout/activity_about.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" android:background="@drawable/bg_container_border"> + android:id="@+id/aboutviewroot_ll" android:background="@drawable/bg_container_border" /> diff --git a/libaes/src/main/res/layout/activity_drawer.xml b/libaes/src/main/res/layout/activity_drawer.xml index cd1723d..9ce0a85 100644 --- a/libaes/src/main/res/layout/activity_drawer.xml +++ b/libaes/src/main/res/layout/activity_drawer.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="wrap_content" android:background="@drawable/bg_container_border"> + android:layout_height="match_parent" android:background="@drawable/bg_container_border"> + android:id="@+id/activitydrawerLinearLayout1" android:background="@drawable/bg_container_border" /> + android:layout_height="match_parent" android:background="@drawable/bg_container_border"> + android:layout_weight="1.0" android:background="@drawable/bg_container_border"> + android:id="@+id/activitydrawerfragmentFrameLayout1" android:background="@drawable/bg_container_border" /> + android:layout_height="match_parent" android:background="@drawable/bg_container_border"> + android:layout_height="match_parent" android:background="@drawable/bg_container_border"> + android:id="@+id/activitytestaboutfragmentFrameLayout1" android:background="@drawable/bg_container_border" /> diff --git a/libaes/src/main/res/layout/activity_testasupporttoolbar.xml b/libaes/src/main/res/layout/activity_testasupporttoolbar.xml index a92a8ca..c8214e7 100644 --- a/libaes/src/main/res/layout/activity_testasupporttoolbar.xml +++ b/libaes/src/main/res/layout/activity_testasupporttoolbar.xml @@ -4,7 +4,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" android:background="@drawable/bg_container_border"> + android:layout_height="match_parent" android:background="@drawable/bg_container_border"> @@ -22,14 +21,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:layout_marginBottom="20dp"> + android:layout_marginBottom="20dp" android:background="@drawable/bg_container_border"> + android:textSize="14sp" /> + android:textSize="14sp" /> @@ -53,7 +50,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:gravity="end"> + android:gravity="end" android:background="@drawable/bg_container_border">