Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
286297aa38
5 changed files with 84 additions and 12 deletions
7
app/src/main/res/drawable/invert_all_boxes.xml
Normal file
7
app/src/main/res/drawable/invert_all_boxes.xml
Normal file
|
@ -0,0 +1,7 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
|
||||
|
||||
<path android:fillAlpha="0.6" android:fillColor="@android:color/white" android:pathData="M8,16h12V4H8V16zM10.4,9.09l2.07,2.08L17.6,6L19,7.41L12.47,14L9,10.5L10.4,9.09z" android:strokeAlpha="0.3"/>
|
||||
|
||||
<path android:fillColor="@android:color/white" android:pathData="M20,2H8C6.9,2 6,2.9 6,4v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2zM20,16H8V4h12V16zM12.47,14L9,10.5l1.4,-1.41l2.07,2.08L17.6,6L19,7.41L12.47,14zM4,20h14v2H4c-1.1,0 -2,-0.9 -2,-2V6h2V20z"/>
|
||||
|
||||
</vector>
|
5
app/src/main/res/drawable/tick_all_boxes.xml
Normal file
5
app/src/main/res/drawable/tick_all_boxes.xml
Normal file
|
@ -0,0 +1,5 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
|
||||
|
||||
<path android:fillColor="@android:color/white" android:pathData="M20,2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L22,4c0,-1.1 -0.9,-2 -2,-2zM12.47,14L9,10.5l1.4,-1.41 2.07,2.08L17.6,6 19,7.41 12.47,14zM4,6L2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6z"/>
|
||||
|
||||
</vector>
|
5
app/src/main/res/drawable/untick_all_boxes.xml
Normal file
5
app/src/main/res/drawable/untick_all_boxes.xml
Normal file
|
@ -0,0 +1,5 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android" android:height="24dp" android:tint="#000000" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
|
||||
|
||||
<path android:fillColor="@android:color/white" android:pathData="M20,4v12H8V4H20M20,2H8C6.9,2 6,2.9 6,4v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2L20,2zM12.47,14L9,10.5l1.4,-1.41l2.07,2.08L17.6,6L19,7.41L12.47,14zM4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6z"/>
|
||||
|
||||
</vector>
|
|
@ -1,5 +1,6 @@
|
|||
<!-- custom_dialog_layout.xml -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
|
@ -16,15 +17,30 @@
|
|||
android:textColor="?attr/colorOnBackground"
|
||||
android:textSize="16sp" />
|
||||
|
||||
<ScrollView
|
||||
<FrameLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/checkboxContainer"
|
||||
<ScrollView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical" />
|
||||
</ScrollView>
|
||||
android:layout_height="wrap_content">
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/checkboxContainer"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical" />
|
||||
</ScrollView>
|
||||
|
||||
<ImageButton
|
||||
android:id="@+id/toggleButton"
|
||||
android:layout_width="48dp"
|
||||
android:layout_height="48dp"
|
||||
android:layout_gravity="bottom|end"
|
||||
android:layout_marginEnd="5dp"
|
||||
android:background="@null"
|
||||
android:src="@drawable/untick_all_boxes"
|
||||
app:tint="?attr/colorPrimary" />
|
||||
</FrameLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue