Merge remote-tracking branch 'origin/appbase' into aes

This commit is contained in:
ZhanGSKen 2025-03-24 14:28:13 +08:00
commit 803d1afc18
4 changed files with 51 additions and 10 deletions

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Mon Mar 24 08:04:35 HKT 2025
stageCount=9
#Mon Mar 24 14:06:25 HKT 2025
stageCount=10
libraryProject=libappbase
baseVersion=15.0
publishVersion=15.0.8
publishVersion=15.0.9
buildCount=0
baseBetaVersion=15.0.9
baseBetaVersion=15.0.10

View File

@ -1,8 +1,8 @@
#Created by .winboll/winboll_app_build.gradle
#Mon Mar 24 08:04:27 HKT 2025
stageCount=9
#Mon Mar 24 14:06:10 HKT 2025
stageCount=10
libraryProject=libappbase
baseVersion=15.0
publishVersion=15.0.8
publishVersion=15.0.9
buildCount=0
baseBetaVersion=15.0.9
baseBetaVersion=15.0.10

View File

@ -0,0 +1,41 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<!-- 阴影部分 -->
<!-- 个人觉得更形象的表达top代表下边的阴影高度left代表右边的阴影宽度。其实也就是相对应的offsetsolid中的颜色是阴影的颜色也可以设置角度等等 -->
<item
android:left="2dp"
android:top="2dp"
android:right="2dp"
android:bottom="2dp">
<shape android:shape="rectangle" >
<gradient
android:angle="270"
android:endColor="@color/colorPrimary"
android:startColor="@color/colorPrimary" />
<corners
android:bottomLeftRadius="6dip"
android:bottomRightRadius="6dip"
android:topLeftRadius="6dip"
android:topRightRadius="6dip" />
</shape>
</item>
<!-- 背景部分 -->
<!-- 形象的表达bottom代表背景部分在上边缘超出阴影的高度right代表背景部分在左边超出阴影的宽度相对应的offset -->
<item
android:left="3dp"
android:top="3dp"
android:right="3dp"
android:bottom="5dp">
<shape android:shape="rectangle" >
<gradient
android:angle="270"
android:endColor="@color/colorPrimary"
android:startColor="@color/colorPrimary" />
<corners
android:bottomLeftRadius="6dip"
android:bottomRightRadius="6dip"
android:topLeftRadius="6dip"
android:topRightRadius="6dip" />
</shape>
</item>
</layer-list>

View File

@ -12,7 +12,7 @@
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_alignParentTop="true"
android:background="@drawable/bg_shadow"
android:background="@drawable/bg_toolbar_log"
android:id="@+id/viewlogRelativeLayoutToolbar">
<Button
@ -72,7 +72,7 @@
android:layout_below="@+id/viewlogRelativeLayoutToolbar"
android:id="@+id/viewlogLinearLayout1"
android:gravity="center_vertical"
android:background="@drawable/bg_shadow">
android:background="@drawable/bg_toolbar_log">
<CheckBox
android:layout_width="wrap_content"