fyf
/
ChaBaiDao
1
0
Fork 0
Código Issues 0 Pull requests 0 Versões 0 Wiki Atividade
Ver código fonte

现场调试改动0222

调味吧台(白底)
fyf 1 ano atrás
pai
aeb9d7ea40
commit
d52ab27432
7 arquivos alterados com 103 adições e 40 exclusões
Visão dividida
Opções de diferenças
Mostrar estatísticas Baixar arquivo de patch Baixar arquivo de diferenças
  1. +11
    -0
      app/src/main/res/drawable/switch_custom_thumb_off1.xml
  2. +11
    -0
      app/src/main/res/drawable/switch_custom_thumb_on1.xml
  3. +5
    -0
      app/src/main/res/drawable/switch_custom_thumb_selector1.xml
  4. +13
    -0
      app/src/main/res/drawable/switch_custom_track_off1.xml
  5. +13
    -0
      app/src/main/res/drawable/switch_custom_track_on1.xml
  6. +5
    -0
      app/src/main/res/drawable/switch_custom_track_selector1.xml
  7. +45
    -40
      app/src/main/res/layout/from/layout/activity_sdkz.xml

+ 11
- 0
app/src/main/res/drawable/switch_custom_thumb_off1.xml Ver arquivo

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#AAA" />
<size
android:width="36dp"
android:height="20dp" />
<stroke
android:width="1dp"
android:color="#00000000" />
</shape>

+ 11
- 0
app/src/main/res/drawable/switch_custom_thumb_on1.xml Ver arquivo

@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#25a5ce" />
<size
android:width="36dp"
android:height="20dp" />
<stroke
android:width="1dp"
android:color="#00000000" />
</shape>

+ 5
- 0
app/src/main/res/drawable/switch_custom_thumb_selector1.xml Ver arquivo

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/switch_custom_thumb_on1" android:state_checked="true" />
<item android:drawable="@drawable/switch_custom_thumb_off1" android:state_checked="false" />
</selector>

+ 13
- 0
app/src/main/res/drawable/switch_custom_track_off1.xml Ver arquivo

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#8BC5C5C5" />
<size
android:width="140dp"
android:height="40dp">
</size>
<!-- <stroke-->
<!-- android:width="2dp"-->
<!-- android:color="#00000000" />-->
<!-- <corners android:radius="0dp" />-->
</shape>

+ 13
- 0
app/src/main/res/drawable/switch_custom_track_on1.xml Ver arquivo

@@ -0,0 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#B6D6FE" />
<size
android:width="140dp"
android:height="40dp">
</size>
<!-- <stroke-->
<!-- android:width="0dp"-->
<!-- android:color="#00000000" />-->
<!-- <corners android:radius="0dp" />-->
</shape>

+ 5
- 0
app/src/main/res/drawable/switch_custom_track_selector1.xml Ver arquivo

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/switch_custom_track_on1" android:state_checked="true" />
<item android:drawable="@drawable/switch_custom_track_off1" android:state_checked="false" />
</selector>

+ 45
- 40
app/src/main/res/layout/from/layout/activity_sdkz.xml Ver arquivo

@@ -102,7 +102,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp">
android:layout_marginTop="20dp"
android:layout_marginLeft="5dp">
<Switch
android:id="@+id/Switch_1"
android:layout_width="wrap_content"
@@ -115,8 +116,9 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"
/>
<Switch
android:id="@+id/Switch_2"
android:layout_width="wrap_content"
@@ -129,8 +131,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_3"
android:layout_width="wrap_content"
@@ -143,8 +145,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_4"
android:layout_width="wrap_content"
@@ -157,8 +159,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_5"
android:layout_width="wrap_content"
@@ -171,8 +173,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
</TableRow>

<!-- Table2-->
@@ -180,7 +182,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp">
android:layout_marginTop="20dp"
android:layout_marginLeft="5dp">
<Switch
android:id="@+id/Switch_6"
android:layout_width="wrap_content"
@@ -193,8 +196,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_7"
android:layout_width="wrap_content"
@@ -207,8 +210,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_8"
android:layout_width="wrap_content"
@@ -221,8 +224,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_9"
android:layout_width="wrap_content"
@@ -235,8 +238,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_10"
android:layout_width="wrap_content"
@@ -249,8 +252,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
</TableRow>

<!-- Table3-->
@@ -258,7 +261,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp">
android:layout_marginTop="20dp"
android:layout_marginLeft="5dp">
<Switch
android:id="@+id/Switch_11"
android:layout_width="wrap_content"
@@ -271,8 +275,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_12"
android:layout_width="wrap_content"
@@ -285,8 +289,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_13"
android:layout_width="wrap_content"
@@ -299,8 +303,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_14"
android:layout_width="wrap_content"
@@ -313,8 +317,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_15"
android:layout_width="wrap_content"
@@ -327,8 +331,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
</TableRow>

<!-- Table4-->
@@ -336,7 +340,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_margin="5dp">
android:layout_marginTop="20dp"
android:layout_marginLeft="5dp">
<Switch
android:id="@+id/Switch_16"
android:layout_width="wrap_content"
@@ -349,8 +354,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_17"
android:layout_width="wrap_content"
@@ -363,8 +368,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
<Switch
android:id="@+id/Switch_18"
android:layout_width="wrap_content"
@@ -377,8 +382,8 @@
android:showText="true"
android:switchTextAppearance="@style/myTextAppearance"
android:textColor="@color/white"
android:thumb="@drawable/switch_custom_thumb_selector"
android:track="@drawable/switch_custom_track_selector"/>
android:thumb="@drawable/switch_custom_thumb_selector1"
android:track="@drawable/switch_custom_track_selector1"/>
</TableRow>
</TableLayout>
</LinearLayout>


Escrever Pré-visualização
Carregando…
Cancelar
Salvar