From 4c89ac52dbb71a5a875a1ea10ed765b85ee0bd55 Mon Sep 17 00:00:00 2001
From: m_broelemann <marius.broelemann@stud.th-owl.de>
Date: Mon, 7 Dec 2020 09:44:40 +0100
Subject: [PATCH] =?UTF-8?q?Farben=20ge=C3=A4ndert=20und=20diverse=20Button?=
 =?UTF-8?q?s=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/example/aped/MainActivity.java  |  9 +--------
 APED/app/src/main/res/layout/app_bar_main.xml     |  8 +-------
 APED/app/src/main/res/menu/main.xml               | 15 +++++++++++++++
 APED/app/src/main/res/values-night/themes.xml     |  2 +-
 APED/app/src/main/res/values/colors.xml           |  4 ++--
 APED/app/src/main/res/values/strings.xml          | 11 +++++++----
 APED/app/src/main/res/values/themes.xml           |  4 ++--
 7 files changed, 29 insertions(+), 24 deletions(-)

diff --git a/APED/app/src/main/java/com/example/aped/MainActivity.java b/APED/app/src/main/java/com/example/aped/MainActivity.java
index 7649fac..dfee235 100644
--- a/APED/app/src/main/java/com/example/aped/MainActivity.java
+++ b/APED/app/src/main/java/com/example/aped/MainActivity.java
@@ -26,14 +26,7 @@ public class MainActivity extends AppCompatActivity {
         setContentView(R.layout.activity_main);
         Toolbar toolbar = findViewById(R.id.toolbar);
         setSupportActionBar(toolbar);
-        FloatingActionButton fab = findViewById(R.id.fab);
-        fab.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
-                        .setAction("Action", null).show();
-            }
-        });
+
         DrawerLayout drawer = findViewById(R.id.drawer_layout);
         NavigationView navigationView = findViewById(R.id.nav_view);
         // Passing each menu ID as a set of Ids because each
diff --git a/APED/app/src/main/res/layout/app_bar_main.xml b/APED/app/src/main/res/layout/app_bar_main.xml
index 5e735f9..2888485 100644
--- a/APED/app/src/main/res/layout/app_bar_main.xml
+++ b/APED/app/src/main/res/layout/app_bar_main.xml
@@ -22,12 +22,6 @@
 
     <include layout="@layout/content_main" />
 
-    <com.google.android.material.floatingactionbutton.FloatingActionButton
-        android:id="@+id/fab"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="bottom|end"
-        android:layout_margin="@dimen/fab_margin"
-        app:srcCompat="@android:drawable/ic_dialog_email" />
+
 
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/APED/app/src/main/res/menu/main.xml b/APED/app/src/main/res/menu/main.xml
index 412d5f8..1cf67f5 100644
--- a/APED/app/src/main/res/menu/main.xml
+++ b/APED/app/src/main/res/menu/main.xml
@@ -6,4 +6,19 @@
         android:orderInCategory="100"
         android:title="@string/action_settings"
         app:showAsAction="never" />
+    <item
+        android:id="@+id/action_adjust_xml"
+        android:orderInCategory="100"
+        android:title="@string/action_adjust_xml"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/download_adjust_xml"
+        android:orderInCategory="100"
+        android:title="@string/action_download_xml"
+        app:showAsAction="never" />
+    <item
+        android:id="@+id/action_upload_xml"
+        android:orderInCategory="100"
+        android:title="@string/action_upload_xml"
+        app:showAsAction="never" />
 </menu>
\ No newline at end of file
diff --git a/APED/app/src/main/res/values-night/themes.xml b/APED/app/src/main/res/values-night/themes.xml
index 5bfc419..cdc6e2d 100644
--- a/APED/app/src/main/res/values-night/themes.xml
+++ b/APED/app/src/main/res/values-night/themes.xml
@@ -3,7 +3,7 @@
     <style name="Theme.APED" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
         <item name="colorPrimary">@color/purple_200</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimaryVariant">@color/grey</item>
         <item name="colorOnPrimary">@color/black</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>
diff --git a/APED/app/src/main/res/values/colors.xml b/APED/app/src/main/res/values/colors.xml
index f8c6127..51228c8 100644
--- a/APED/app/src/main/res/values/colors.xml
+++ b/APED/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <color name="purple_200">#FFBB86FC</color>
-    <color name="purple_500">#FF6200EE</color>
-    <color name="purple_700">#FF3700B3</color>
+    <color name="red">#ff0006</color>
+    <color name="grey">#5a5458</color>
     <color name="teal_200">#FF03DAC5</color>
     <color name="teal_700">#FF018786</color>
     <color name="black">#FF000000</color>
diff --git a/APED/app/src/main/res/values/strings.xml b/APED/app/src/main/res/values/strings.xml
index dcc8b4c..ff4f39c 100644
--- a/APED/app/src/main/res/values/strings.xml
+++ b/APED/app/src/main/res/values/strings.xml
@@ -3,11 +3,14 @@
     <string name="navigation_drawer_open">Open navigation drawer</string>
     <string name="navigation_drawer_close">Close navigation drawer</string>
     <string name="nav_header_title">APED</string>
-    <string name="nav_header_subtitle">android.studio@android.com</string>
+    <string name="nav_header_subtitle">space for information</string>
     <string name="nav_header_desc">Navigation header</string>
     <string name="action_settings">Settings</string>
+    <string name="action_adjust_xml">Adjust .xml</string>
+    <string name="action_download_xml">Download .xml</string>
+    <string name="action_upload_xml">Upload .xml</string>
 
-    <string name="menu_home">Home</string>
-    <string name="menu_gallery">personalized</string>
-    <string name="menu_slideshow">slideshow</string>
+    <string name="menu_home">all IOs</string>
+    <string name="menu_gallery">your IOs</string>
+    <string name="menu_slideshow">noch zu entfernen</string>
 </resources>
\ No newline at end of file
diff --git a/APED/app/src/main/res/values/themes.xml b/APED/app/src/main/res/values/themes.xml
index d82dfb8..cf6ff74 100644
--- a/APED/app/src/main/res/values/themes.xml
+++ b/APED/app/src/main/res/values/themes.xml
@@ -2,8 +2,8 @@
     <!-- Base application theme. -->
     <style name="Theme.APED" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
         <!-- Primary brand color. -->
-        <item name="colorPrimary">@color/purple_500</item>
-        <item name="colorPrimaryVariant">@color/purple_700</item>
+        <item name="colorPrimary">@color/red</item>
+        <item name="colorPrimaryVariant">@color/grey</item>
         <item name="colorOnPrimary">@color/white</item>
         <!-- Secondary brand color. -->
         <item name="colorSecondary">@color/teal_200</item>