From 96a3cbc40a5cf52896debdfe0619e793b1e6d909 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20Schw=C3=B6rer?= <mailport@mikescher.de>
Date: Mon, 22 Oct 2018 01:32:21 +0200
Subject: [PATCH] colors

---
 .../view/SettingsFragment.java                |  5 +--
 .../src/main/res/layout/fragment_settings.xml | 34 ++++++++++++++++---
 android/app/src/main/res/values/colors.xml    |  1 +
 3 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/SettingsFragment.java b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/SettingsFragment.java
index 8cf6cd3..e8ba65b 100644
--- a/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/SettingsFragment.java
+++ b/android/app/src/main/java/com/blackforestbytes/simplecloudnotifier/view/SettingsFragment.java
@@ -1,7 +1,6 @@
 package com.blackforestbytes.simplecloudnotifier.view;
 
 import android.media.AudioManager;
-import android.net.Uri;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -101,7 +100,9 @@ public class SettingsFragment extends Fragment
             prefAppEnabled.setChecked(s.Enabled);
             prefAppEnabled.setOnCheckedChangeListener((a,b) -> onUpdate());
 
-            prefLocalCacheSize.setAdapter(new ArrayAdapter<>(v.getContext(), android.R.layout.simple_spinner_item, SCNSettings.CHOOSABLE_CACHE_SIZES));
+            ArrayAdapter<Integer> plcsa = new ArrayAdapter<>(v.getContext(), android.R.layout.simple_spinner_item, SCNSettings.CHOOSABLE_CACHE_SIZES);
+            plcsa.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+            prefLocalCacheSize.setAdapter(plcsa);
             prefLocalCacheSize.setSelection(getCacheSizeIndex(s.LocalCacheSize));
             prefLocalCacheSize.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener()
             {
diff --git a/android/app/src/main/res/layout/fragment_settings.xml b/android/app/src/main/res/layout/fragment_settings.xml
index 8175d1c..a876dea 100644
--- a/android/app/src/main/res/layout/fragment_settings.xml
+++ b/android/app/src/main/res/layout/fragment_settings.xml
@@ -25,7 +25,7 @@
                 android:layout_height="wrap_content">
 
                 <TextView
-                    android:background="#bdc3c7"
+                    android:background="@color/colorHeader"
                     android:textSize="16sp"
                     android:padding="4dp"
                     android:text="@string/str_common_settings"
@@ -88,7 +88,33 @@
 
                 </androidx.constraintlayout.widget.ConstraintLayout>
 
+                <View
+                    android:layout_width="match_parent"
+                    android:layout_height="1dp"
+                    android:layout_marginBottom="2dp"
+                    android:layout_marginTop="2dp"
+                    android:background="#c0c0c0"/>
+
+                <androidx.constraintlayout.widget.ConstraintLayout
+                    android:layout_marginStart="4dp"
+                    android:layout_marginEnd="4dp"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:minHeight="48dp">
+
+                    <Button
+                        android:id="@+id/prefUpgradeAccount"
+                        android:text="Upgrade account"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        app:layout_constraintBottom_toBottomOf="parent"
+                        app:layout_constraintEnd_toEndOf="parent"
+                        app:layout_constraintTop_toTopOf="parent" />
+
+                </androidx.constraintlayout.widget.ConstraintLayout>
+
             </LinearLayout>
+
         </androidx.cardview.widget.CardView>
 
         <androidx.cardview.widget.CardView
@@ -102,7 +128,7 @@
                 android:layout_height="wrap_content">
 
                 <TextView
-                    android:background="#bdc3c7"
+                    android:background="@color/colorHeader"
                     android:textSize="16sp"
                     android:padding="4dp"
                     android:text="@string/str_header_prio0"
@@ -299,7 +325,7 @@
                 android:layout_height="wrap_content">
 
                 <TextView
-                    android:background="#bdc3c7"
+                    android:background="@color/colorHeader"
                     android:textSize="16sp"
                     android:padding="4dp"
                     android:text="@string/str_header_prio1"
@@ -496,7 +522,7 @@
                 android:layout_height="wrap_content">
 
                 <TextView
-                    android:background="#bdc3c7"
+                    android:background="@color/colorHeader"
                     android:textSize="16sp"
                     android:padding="4dp"
                     android:text="@string/str_header_prio2"
diff --git a/android/app/src/main/res/values/colors.xml b/android/app/src/main/res/values/colors.xml
index 8a287f0..a6124cb 100644
--- a/android/app/src/main/res/values/colors.xml
+++ b/android/app/src/main/res/values/colors.xml
@@ -3,6 +3,7 @@
     <color name="colorPrimary">#3F51B5</color>
     <color name="colorPrimaryDark">#303F9F</color>
     <color name="colorAccent">#FF4081</color>
+    <color name="colorHeader">#67809F</color>
 
     <color name="colorBlack">#000</color>
 </resources>