Merge remote-tracking branch 'origin/appbase' into aes
This commit is contained in:
		@@ -1,8 +1,8 @@
 | 
				
			|||||||
#Created by .winboll/winboll_app_build.gradle
 | 
					#Created by .winboll/winboll_app_build.gradle
 | 
				
			||||||
#Mon Mar 24 08:04:35 HKT 2025
 | 
					#Mon Mar 24 14:06:25 HKT 2025
 | 
				
			||||||
stageCount=9
 | 
					stageCount=10
 | 
				
			||||||
libraryProject=libappbase
 | 
					libraryProject=libappbase
 | 
				
			||||||
baseVersion=15.0
 | 
					baseVersion=15.0
 | 
				
			||||||
publishVersion=15.0.8
 | 
					publishVersion=15.0.9
 | 
				
			||||||
buildCount=0
 | 
					buildCount=0
 | 
				
			||||||
baseBetaVersion=15.0.9
 | 
					baseBetaVersion=15.0.10
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,8 +1,8 @@
 | 
				
			|||||||
#Created by .winboll/winboll_app_build.gradle
 | 
					#Created by .winboll/winboll_app_build.gradle
 | 
				
			||||||
#Mon Mar 24 08:04:27 HKT 2025
 | 
					#Mon Mar 24 14:06:10 HKT 2025
 | 
				
			||||||
stageCount=9
 | 
					stageCount=10
 | 
				
			||||||
libraryProject=libappbase
 | 
					libraryProject=libappbase
 | 
				
			||||||
baseVersion=15.0
 | 
					baseVersion=15.0
 | 
				
			||||||
publishVersion=15.0.8
 | 
					publishVersion=15.0.9
 | 
				
			||||||
buildCount=0
 | 
					buildCount=0
 | 
				
			||||||
baseBetaVersion=15.0.9
 | 
					baseBetaVersion=15.0.10
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										41
									
								
								libappbase/src/main/res/drawable/bg_toolbar_log.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										41
									
								
								libappbase/src/main/res/drawable/bg_toolbar_log.xml
									
									
									
									
									
										Normal 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代表右边的阴影宽度。其实也就是相对应的offset,solid中的颜色是阴影的颜色,也可以设置角度等等 --> 
 | 
				
			||||||
 | 
					    <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>
 | 
				
			||||||
@@ -12,7 +12,7 @@
 | 
				
			|||||||
		android:layout_width="match_parent"
 | 
							android:layout_width="match_parent"
 | 
				
			||||||
		android:layout_height="40dp"
 | 
							android:layout_height="40dp"
 | 
				
			||||||
		android:layout_alignParentTop="true"
 | 
							android:layout_alignParentTop="true"
 | 
				
			||||||
		android:background="@drawable/bg_shadow"
 | 
							android:background="@drawable/bg_toolbar_log"
 | 
				
			||||||
		android:id="@+id/viewlogRelativeLayoutToolbar">
 | 
							android:id="@+id/viewlogRelativeLayoutToolbar">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		<Button
 | 
							<Button
 | 
				
			||||||
@@ -72,7 +72,7 @@
 | 
				
			|||||||
		android:layout_below="@+id/viewlogRelativeLayoutToolbar"
 | 
							android:layout_below="@+id/viewlogRelativeLayoutToolbar"
 | 
				
			||||||
		android:id="@+id/viewlogLinearLayout1"
 | 
							android:id="@+id/viewlogLinearLayout1"
 | 
				
			||||||
		android:gravity="center_vertical"
 | 
							android:gravity="center_vertical"
 | 
				
			||||||
		android:background="@drawable/bg_shadow">
 | 
							android:background="@drawable/bg_toolbar_log">
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		<CheckBox
 | 
							<CheckBox
 | 
				
			||||||
			android:layout_width="wrap_content"
 | 
								android:layout_width="wrap_content"
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user