From 4352e31e0475ca05f0dc729b1f7923825b502bb2 Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Thu, 3 Jan 2019 20:41:22 +0200
Subject: [PATCH] Accent color change

---
 .../activities/ingredients/IngredientsActivity.java         | 3 ++-
 .../java/gr/auth/databases/flavours/base/BaseActivity.java  | 2 +-
 .../app/src/main/res/values/colors.xml                      | 6 +++---
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/ingredients/IngredientsActivity.java b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/ingredients/IngredientsActivity.java
index 45d082f..d30aa4e 100644
--- a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/ingredients/IngredientsActivity.java
+++ b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/activities/ingredients/IngredientsActivity.java
@@ -46,8 +46,9 @@ public class IngredientsActivity extends BaseActivity implements IngredientsAdap
             actionbar.setHomeAsUpIndicator(R.drawable.ic_menu_black_24dp);
         }
 
-        FAB = findViewById(R.id.ingredients_fab);
         createDrawer();
+
+        FAB = findViewById(R.id.ingredients_fab);
         FAB.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/base/BaseActivity.java b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/base/BaseActivity.java
index e55fe99..40c6aea 100644
--- a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/base/BaseActivity.java
+++ b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/java/gr/auth/databases/flavours/base/BaseActivity.java
@@ -97,7 +97,7 @@ public abstract class BaseActivity extends AppCompatActivity {
     protected static final int HOME_ID = 0;
     protected static final int DIETS_ID = 1;
     protected static final int INGREDIENTS_ID = 2;
-    protected static final int LOG_ID = 4;
+    protected static final int LOG_ID = 3;
 
     private AccountHeader accountHeader;
     private ProfileDrawerItem profileDrawerItem;
diff --git a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/colors.xml b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/colors.xml
index f127af3..5a129dd 100644
--- a/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/colors.xml
+++ b/UI/AndroidApp/flavoursWithoutBorders/app/src/main/res/values/colors.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="colorPrimary">#4caf50</color>
-    <color name="colorPrimaryDark">#357a38</color>
-    <color name="colorAccent">#ff9100</color>
+    <color name="colorPrimary">#4CAF50</color>
+    <color name="colorPrimaryDark">#357A38</color>
+    <color name="colorAccent">#FFC400</color>
     <color name="colorBackground">#EFEFEF</color>
     <color name="iron">#F6F8Fa</color>
     <color name="textPrimary">#303030</color>