From 471d669d21f8c8bb2098c282c057628cc2474918 Mon Sep 17 00:00:00 2001
From: Jannik <badric@hotmail.de>
Date: Tue, 23 Aug 2016 09:58:07 +0200
Subject: [PATCH] Widgets and other stuff

Widgets have now a new style, a new color, a new center of gravity.
Optimized size is applied to all widgets, and there texts.
A reset time bug after the break menu was found and solved
---
 .../BreakReminder.java                        |  9 +++++--
 app/src/main/res/drawable/white_circle.xml    |  7 +++++
 app/src/main/res/layout/activity_break.xml    |  2 ++
 app/src/main/res/layout/app_widget2x1.xml     | 17 ++++++------
 app/src/main/res/layout/app_widget2x2.xml     | 27 +++++++++----------
 app/src/main/res/layout/app_widget3x3.xml     | 27 +++++++++----------
 app/src/main/res/layout/app_widget4x4.xml     | 27 +++++++++----------
 7 files changed, 63 insertions(+), 53 deletions(-)
 create mode 100644 app/src/main/res/drawable/white_circle.xml

diff --git a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java
index c3aa01c..22e4b4a 100644
--- a/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java
+++ b/app/src/main/java/orgprivacy_friendly_apps/secuso/privacyfriendlybreakreminder/BreakReminder.java
@@ -348,8 +348,6 @@ public class BreakReminder extends AppCompatActivity
 
                             ct_text.setText(bufferZeroMinute + (millisUntilFinished / 1000) / 60 + ":" + bufferZeroSecond + millisUntilFinished / 1000 % 60);
 
-                            //Fixme Update widgets
-
                             updateWidgets(bufferZeroMinute + (millisUntilFinished / 1000) / 60 + ":" + bufferZeroSecond + millisUntilFinished / 1000 % 60);
 
                             //Show how much time is left
@@ -404,6 +402,13 @@ public class BreakReminder extends AppCompatActivity
                                 notificationManager.cancel(1000);
                             }
                             startBreak();
+
+                            String workTime = "" + sharedPrefs.getInt("work_value", 0);
+                            if(workTime.length() == 1)
+                                workTime = "0" + workTime;
+
+                            ct_text.setText(workTime + ":00");
+                            updateWidgets(workTime + ":00");
                         }
                     }.start();
                     isRunning = true;
diff --git a/app/src/main/res/drawable/white_circle.xml b/app/src/main/res/drawable/white_circle.xml
new file mode 100644
index 0000000..1e1234c
--- /dev/null
+++ b/app/src/main/res/drawable/white_circle.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="oval">
+    <corners android:radius="80dip"/>
+    <stroke android:color="@color/white" android:width="2dip"/>
+    <solid android:color="@android:color/transparent"/>
+</shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_break.xml b/app/src/main/res/layout/activity_break.xml
index eca00b1..9e9fa4c 100644
--- a/app/src/main/res/layout/activity_break.xml
+++ b/app/src/main/res/layout/activity_break.xml
@@ -29,6 +29,7 @@
         android:text="@string/break_play_stop"
         android:id="@+id/button_playStopBreak"
         android:layout_below="@+id/textViewBreak"
+        android:background="@drawable/button_normal"
         android:layout_centerHorizontal="true" />
 
     <Button
@@ -38,6 +39,7 @@
         android:text="@string/break_cancel"
         android:id="@+id/button_cancel"
         android:layout_alignParentBottom="true"
+        android:background="@drawable/button_normal"
         android:layout_centerHorizontal="true" />
 
 
diff --git a/app/src/main/res/layout/app_widget2x1.xml b/app/src/main/res/layout/app_widget2x1.xml
index 72a2e3a..1781e3f 100644
--- a/app/src/main/res/layout/app_widget2x1.xml
+++ b/app/src/main/res/layout/app_widget2x1.xml
@@ -2,23 +2,23 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="16dp"
-    android:weightSum="1">
+    android:weightSum="1"
+    android:gravity="center|center_horizontal|center_vertical">
 
 
     <RelativeLayout
-        android:layout_width="95dp"
-        android:layout_height="wrap_content"
-        android:background="#000000">
+        android:layout_width="110dp"
+        android:layout_height="48dp"
+        android:background="@drawable/white_circle">
 
         <TextView
             android:id="@+id/appwidget_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="#000000"
             android:text="@string/profile_name"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffff"
-            android:textSize="15sp"
+            android:textColor="@color/white"
+            android:textSize="12sp"
             android:layout_alignParentTop="true"
             android:layout_centerHorizontal="true"
             android:gravity="center" />
@@ -29,10 +29,9 @@
             android:layout_height="wrap_content"
             android:layout_below="@+id/appwidget_text"
             android:layout_centerHorizontal="true"
-            android:background="#000000"
             android:text="@string/break_reminder_time"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffff"
+            android:textColor="@color/white"
             android:textSize="20sp"
             android:gravity="center" />
     </RelativeLayout>
diff --git a/app/src/main/res/layout/app_widget2x2.xml b/app/src/main/res/layout/app_widget2x2.xml
index 52c8b26..35d2b4c 100644
--- a/app/src/main/res/layout/app_widget2x2.xml
+++ b/app/src/main/res/layout/app_widget2x2.xml
@@ -2,39 +2,38 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="16dp"
-    android:weightSum="1">
+    android:weightSum="1"
+    android:gravity="center|center_horizontal|center_vertical">
 
 
     <RelativeLayout
         android:layout_width="110dp"
         android:layout_height="110dp"
-        android:background="#000000">
+        android:background="@drawable/white_circle">
 
         <TextView
             android:id="@+id/appwidget_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="#000000"
             android:text="@string/profile_name"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffff"
-            android:textSize="25sp"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:gravity="center" />
+            android:textColor="@color/white"
+            android:textSize="16dp"
+            android:gravity="center"
+            android:layout_above="@+id/time"
+            android:layout_centerHorizontal="true" />
 
         <TextView
             android:id="@+id/time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/appwidget_text"
-            android:layout_centerHorizontal="true"
-            android:background="#000000"
             android:text="@string/break_reminder_time"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffff"
-            android:textSize="40sp"
+            android:textColor="@color/white"
+            android:textSize="30dp"
             android:textIsSelectable="false"
-            android:gravity="center" />
+            android:gravity="center"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_widget3x3.xml b/app/src/main/res/layout/app_widget3x3.xml
index b582182..a33e51a 100644
--- a/app/src/main/res/layout/app_widget3x3.xml
+++ b/app/src/main/res/layout/app_widget3x3.xml
@@ -2,39 +2,38 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="16dp"
-    android:weightSum="1">
+    android:weightSum="1"
+    android:gravity="center|center_horizontal|center_vertical">
 
 
     <RelativeLayout
         android:layout_width="180dp"
         android:layout_height="180dp"
-        android:background="#000000">
+        android:background="@drawable/white_circle">
 
         <TextView
             android:id="@+id/appwidget_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="#000000"
             android:text="@string/profile_name"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffff"
-            android:textSize="40sp"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:gravity="center" />
+            android:textColor="@color/white"
+            android:textSize="25dp"
+            android:gravity="center"
+            android:layout_above="@+id/time"
+            android:layout_centerHorizontal="true" />
 
         <TextView
             android:id="@+id/time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/appwidget_text"
-            android:layout_centerHorizontal="true"
-            android:background="#000000"
             android:text="@string/break_reminder_time"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffff"
-            android:textSize="60sp"
+            android:textColor="@color/white"
+            android:textSize="60dp"
             android:textIsSelectable="false"
-            android:gravity="center" />
+            android:gravity="bottom"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_widget4x4.xml b/app/src/main/res/layout/app_widget4x4.xml
index d6a51e3..a21688e 100644
--- a/app/src/main/res/layout/app_widget4x4.xml
+++ b/app/src/main/res/layout/app_widget4x4.xml
@@ -2,39 +2,38 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="16dp"
-    android:weightSum="1">
+    android:weightSum="1"
+    android:gravity="center|center_horizontal|center_vertical">
 
 
     <RelativeLayout
         android:layout_width="250dp"
         android:layout_height="250dp"
-        android:background="#000000">
+        android:background="@drawable/white_circle">
 
         <TextView
             android:id="@+id/appwidget_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="#000000"
             android:text="@string/profile_name"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffff"
-            android:textSize="60sp"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:gravity="center" />
+            android:textColor="@color/white"
+            android:textSize="35dp"
+            android:gravity="center"
+            android:layout_above="@+id/time"
+            android:layout_centerHorizontal="true" />
 
         <TextView
             android:id="@+id/time"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/appwidget_text"
-            android:layout_centerHorizontal="true"
-            android:background="#000000"
             android:text="@string/break_reminder_time"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:textColor="#ffffff"
-            android:textSize="100sp"
+            android:textColor="@color/white"
+            android:textSize="90dp"
             android:textIsSelectable="false"
-            android:gravity="center" />
+            android:gravity="center"
+            android:layout_centerVertical="true"
+            android:layout_centerHorizontal="true" />
     </RelativeLayout>
 </LinearLayout>
\ No newline at end of file