Skip to content

Commit bcc9531

Browse files
0xpr030xpr03
committed
Change main button layout & introduce buttons
Signed-off-by: Aron Heinecke <aron.heinecke@t-online.de>
1 parent 68ac7be commit bcc9531

File tree

7 files changed

+68
-0
lines changed

7 files changed

+68
-0
lines changed

‎app/src/main/res/drawable/ic_edit_white_24dp.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="@color/colorWhite"
8+
android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
9+
</vector>

‎app/src/main/res/drawable/ic_file_download_white_24dp.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="@color/colorWhite"
8+
android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
9+
</vector>

‎app/src/main/res/drawable/ic_file_upload_white_24dp.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="@color/colorWhite"
8+
android:pathData="M9,16h6v-6h4l-7,-7 -7,7h4zM5,18h14v2L5,20z"/>
9+
</vector>

‎app/src/main/res/drawable/ic_info_outline_white_24dp.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="@color/colorWhite"
8+
android:pathData="M11,17h2v-6h-2v6zM12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8zM11,9h2L13,7h-2v2z"/>
9+
</vector>

‎app/src/main/res/drawable/ic_play_arrow_white_24dp.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="@color/colorWhite"
8+
android:pathData="M8,5v14l11,-7z"/>
9+
</vector>

‎app/src/main/res/drawable/ic_send_white_24dp.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24.0"
5+
android:viewportHeight="24.0">
6+
<path
7+
android:fillColor="@color/colorWhite"
8+
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
9+
</vector>

‎app/src/main/res/layout/activity_main.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@
1919
android:layout_marginTop="8dp"
2020
android:onClick="continueSession"
2121
android:text="@string/Main_btn_Resume_Session"
22+
android:drawableStart="@drawable/ic_play_arrow_white_24dp"
23+
style="@style/Widget.AppCompat.Button.Colored"
2224
app:layout_constraintHorizontal_bias="0.0"
2325
app:layout_constraintLeft_toLeftOf="parent"
2426
app:layout_constraintRight_toRightOf="parent"
@@ -33,6 +35,8 @@
3335
android:layout_marginTop="8dp"
3436
android:onClick="showTrainer"
3537
android:text="@string/Main_btn_New_Session"
38+
android:drawableStart="@drawable/ic_send_white_24dp"
39+
style="@style/Widget.AppCompat.Button.Colored"
3640
app:layout_constraintHorizontal_bias="0.0"
3741
app:layout_constraintLeft_toLeftOf="parent"
3842
app:layout_constraintRight_toRightOf="parent"
@@ -47,6 +51,8 @@
4751
android:layout_marginTop="8dp"
4852
android:onClick="showEditTable"
4953
android:text="@string/Main_btn_Edit_List"
54+
android:drawableStart="@drawable/ic_edit_white_24dp"
55+
style="@style/Widget.AppCompat.Button.Colored"
5056
app:layout_constraintLeft_toLeftOf="parent"
5157
app:layout_constraintRight_toRightOf="parent"
5258
app:layout_constraintTop_toBottomOf="@+id/bNewTable" />
@@ -60,6 +66,7 @@
6066
android:layout_marginTop="8dp"
6167
android:onClick="showNewTable"
6268
android:text="@string/Main_btn_New_List"
69+
style="@style/Widget.AppCompat.Button.Colored"
6370
app:layout_constraintLeft_toLeftOf="parent"
6471
app:layout_constraintRight_toRightOf="parent"
6572
app:layout_constraintTop_toBottomOf="@+id/bTrainerEnter" />
@@ -73,6 +80,7 @@
7380
android:layout_marginTop="8dp"
7481
android:onClick="showDeleteTable"
7582
android:text="@string/Main_btn_Delete_List"
83+
style="@style/Widget.AppCompat.Button.Colored"
7684
app:layout_constraintHorizontal_bias="0.0"
7785
app:layout_constraintLeft_toLeftOf="parent"
7886
app:layout_constraintRight_toRightOf="parent"
@@ -87,6 +95,8 @@
8795
android:layout_marginRight="8dp"
8896
android:onClick="showAbout"
8997
android:text="@string/Main_btn_About"
98+
android:drawableStart="@drawable/ic_info_outline_white_24dp"
99+
style="@style/Widget.AppCompat.Button.Colored"
90100
app:layout_constraintBottom_toBottomOf="parent"
91101
app:layout_constraintLeft_toLeftOf="parent"
92102
app:layout_constraintRight_toRightOf="parent" />
@@ -100,6 +110,8 @@
100110
android:layout_marginTop="8dp"
101111
android:onClick="showExport"
102112
android:text="@string/Main_btn_Export"
113+
android:drawableStart="@drawable/ic_file_upload_white_24dp"
114+
style="@style/Widget.AppCompat.Button.Colored"
103115
app:layout_constraintLeft_toLeftOf="parent"
104116
app:layout_constraintRight_toRightOf="parent"
105117
app:layout_constraintTop_toBottomOf="@+id/bDeleteTable" />
@@ -113,6 +125,8 @@
113125
android:layout_marginTop="8dp"
114126
android:onClick="showImport"
115127
android:text="@string/Main_btn_Import"
128+
android:drawableStart="@drawable/ic_file_download_white_24dp"
129+
style="@style/Widget.AppCompat.Button.Colored"
116130
app:layout_constraintVertical_bias="0"
117131
app:layout_constraintBottom_toTopOf="@+id/button"
118132
app:layout_constraintLeft_toLeftOf="parent"

0 commit comments

Comments
 (0)