Add separator line between logging and timeline items

babybuddy · May 29, 2024 · 64cd0b1 · 64cd0b1
1 parent baedf11
commit 64cd0b1
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 11 deletions.
diff --git a/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControllersV2.kt b/app/src/main/java/eu/pkgsoftware/babybuddywidgets/timers/TimerControllersV2.kt
@@ -71,15 +71,6 @@ abstract class LoggingControls(val childId: Int) {
     open fun postInit() {}
 }
 
-val ACTIVITIES = listOf(
-    BabyBuddyClient.EVENTS.CHANGE,
-    BabyBuddyClient.EVENTS.NOTE,
-    BabyBuddyClient.ACTIVITIES.SLEEP,
-    BabyBuddyClient.ACTIVITIES.FEEDING,
-    BabyBuddyClient.ACTIVITIES.TUMMY_TIME,
-    BabyBuddyClient.ACTIVITIES.PUMPING,
-)
-
 interface TimerBase {
     fun updateTimer(timer: Timer?)
 }

diff --git a/app/src/main/res/layout/baby_manager.xml b/app/src/main/res/layout/baby_manager.xml
@@ -178,7 +178,45 @@
                 android:id="@+id/loggingEditors"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-                android:orientation="vertical"></LinearLayout>
+                android:orientation="vertical">
+
+            </LinearLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="4dp"
+                android:layout_marginTop="16dp"
+                android:gravity="center"
+                android:orientation="horizontal">
+
+                <FrameLayout
+                    android:id="@+id/leftTimelineTitleLine"
+                    style="@style/SeparatorLine"
+                    android:layout_width="wrap_content"
+                    android:layout_height="4dp"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1">
+
+                </FrameLayout>
+
+                <TextView
+                    android:id="@+id/timelineTitle"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="0"
+                    android:text="Timeline" />
+
+                <FrameLayout
+                    android:id="@+id/rightTimelineTitleLine"
+                    style="@style/SeparatorLine"
+                    android:layout_width="wrap_content"
+                    android:layout_height="4dp"
+                    android:layout_margin="10dp"
+                    android:layout_weight="1">
+
+                </FrameLayout>
+            </LinearLayout>
 
             <LinearLayout
                 android:id="@+id/innerTimeline"

diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
@@ -41,4 +41,8 @@
     <style name="TutorialArrow">
         <item name="android:backgroundTint">@color/light_tutorial_highlight</item>
     </style>
+
+    <style name="SeparatorLine">
+        <item name="android:background">@color/semi_transparent_light_background</item>
+    </style>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -116,7 +116,6 @@
     <string name="cancel_timer_warning_stop">Stop</string>
     <string name="cancel_timer_warning_keep">Keep</string>
 
-
     <!--- Store activities: Conflicts -->
     <string name="conflicting_activity_title">Overlapping time entries</string>
     <string name="conflicting_activity_text">

diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
@@ -43,4 +43,8 @@
     <style name="TutorialArrow">
         <item name="android:backgroundTint">@color/dark_tutorial_highlight</item>
     </style>
+
+    <style name="SeparatorLine">
+        <item name="android:background">@color/semi_transparent_dark_background</item>
+    </style>
 </resources>