Merge branch 'lab03-compose-update'

VIAUAD02 · Sep 8, 2024 · 39429ff · 39429ff
2 parents 742b460 + 5321a99
commit 39429ff
Show file tree

Hide file tree

Showing 14 changed files with 614 additions and 3 deletions.
diff --git a/.gitignore b/.gitignore
@@ -16,7 +16,6 @@
 *.war
 *.nar
 *.ear
-*.zip
 *.tar.gz
 *.rar
 
@@ -159,7 +158,6 @@ dist
 *.war
 *.nar
 *.ear
-*.zip
 *.tar.gz
 *.rar
 

diff --git a/docs/laborok/03-android-ui-adv/assets/MainActivityLayout.png b/docs/laborok/03-android-ui-adv/assets/MainActivityLayout.png
diff --git a/docs/laborok/03-android-ui-adv/assets/MainScreen.png b/docs/laborok/03-android-ui-adv/assets/MainScreen.png
diff --git a/docs/laborok/03-android-ui-adv/assets/MainScreen_TopBar.png b/docs/laborok/03-android-ui-adv/assets/MainScreen_TopBar.png
diff --git a/docs/laborok/03-android-ui-adv/assets/MainScreen_empty.png b/docs/laborok/03-android-ui-adv/assets/MainScreen_empty.png
diff --git a/docs/laborok/03-android-ui-adv/assets/MainScreen_empty_list.png b/docs/laborok/03-android-ui-adv/assets/MainScreen_empty_list.png
diff --git a/docs/laborok/03-android-ui-adv/assets/MainScreen_scaffold.png b/docs/laborok/03-android-ui-adv/assets/MainScreen_scaffold.png
diff --git a/docs/laborok/03-android-ui-adv/assets/SnackBarShowsCorrectly.png b/docs/laborok/03-android-ui-adv/assets/SnackBarShowsCorrectly.png
diff --git a/docs/laborok/03-android-ui-adv/assets/menu.png b/docs/laborok/03-android-ui-adv/assets/menu.png
diff --git a/docs/laborok/03-android-ui-adv/assets/sample_screen.png b/docs/laborok/03-android-ui-adv/assets/sample_screen.png
diff --git a/docs/laborok/03-android-ui-adv/downloads/expense.png b/docs/laborok/03-android-ui-adv/downloads/expense.png
diff --git a/docs/laborok/03-android-ui-adv/downloads/income.png b/docs/laborok/03-android-ui-adv/downloads/income.png
diff --git a/docs/laborok/03-android-ui-adv/downloads/res.zip b/docs/laborok/03-android-ui-adv/downloads/res.zip
diff --git a/docs/laborok/03-android-ui-adv/index.md b/docs/laborok/03-android-ui-adv/index.md
-Original file line number
+Diff line change
@@ Expand Up / @@ -16,7 +16,6 @@ @@
     *.war
     *.nar
     *.ear
-    *.zip
     *.tar.gz
     *.rar
@@ Expand Down Expand Up / @@ -159,7 +158,6 @@ dist @@
     *.war
     *.nar
     *.ear
-    *.zip
     *.tar.gz
     *.rar
@@ Expand Down @@