From e2fea3a851e0395610449f95bf2eaa7a87e6a1c7 Mon Sep 17 00:00:00 2001
From: Philipp Wo <philipp.wolfmajer@edu.fh-joanneum.at>
Date: Fri, 8 Mar 2019 18:28:36 +0100
Subject: [PATCH] fixed gitignore

---
 gitignore => .gitignore                                      | 4 ++--
 AirKoality/app/.gitignore                                    | 1 -
 AirKoality/app/src/main/AndroidManifest.xml                  | 2 +-
 .../app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml       | 5 -----
 4 files changed, 3 insertions(+), 9 deletions(-)
 rename gitignore => .gitignore (87%)
 delete mode 100644 AirKoality/app/.gitignore
 delete mode 100644 AirKoality/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml

diff --git a/gitignore b/.gitignore
similarity index 87%
rename from gitignore
rename to .gitignore
index b1adfe9..2adfe19 100644
--- a/gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@
 /.idea/navEditor.xml
 /.idea/assetWizardSettings.xml
 .DS_Store
-/build
-/build/
+*/build/
 /captures
 .externalNativeBuild
+AirKoality/app/build/
diff --git a/AirKoality/app/.gitignore b/AirKoality/app/.gitignore
deleted file mode 100644
index 796b96d..0000000
--- a/AirKoality/app/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/build
diff --git a/AirKoality/app/src/main/AndroidManifest.xml b/AirKoality/app/src/main/AndroidManifest.xml
index e4fbb83..7d3a5c2 100644
--- a/AirKoality/app/src/main/AndroidManifest.xml
+++ b/AirKoality/app/src/main/AndroidManifest.xml
@@ -6,7 +6,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
+        android:roundIcon="@mipmap/ic_launcher"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
         tools:ignore="GoogleAppIndexingWarning">
diff --git a/AirKoality/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/AirKoality/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
deleted file mode 100644
index eca70cf..0000000
--- a/AirKoality/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background" />
-    <foreground android:drawable="@drawable/ic_launcher_foreground" />
-</adaptive-icon>
\ No newline at end of file