From 227b7a272476db3acfd88190af2bd1a6f1387895 Mon Sep 17 00:00:00 2001
From: Javi Pacheco <javi@47deg.com>
Date: Fri, 25 Nov 2016 10:28:52 +0100
Subject: [PATCH] Clock removed in moment bar and dark theme fixed

---
 .../res/layout-v17/moment_bar_view_panel.xml  | 47 -------------------
 .../app/src/main/res/layout/edit_moment.xml   |  2 +-
 .../main/res/layout/moment_bar_view_panel.xml |  4 --
 .../app/src/main/res/values-es/strings.xml    |  4 --
 modules/app/src/main/res/values/strings.xml   |  5 --
 .../src/main/res/values/styles_actions.xml    |  5 ++
 .../src/main/res/xml/preferences_moments.xml  |  6 ---
 .../editmoment/EditMomentUiActions.scala      |  6 ++-
 .../ui/components/layouts/TopBarLayout.scala  | 16 +------
 .../app/ui/launcher/jobs/LauncherJobs.scala   |  1 -
 .../commons/NineCardsPreferences.scala        |  8 ----
 11 files changed, 11 insertions(+), 93 deletions(-)
 delete mode 100644 modules/app/src/main/res/layout-v17/moment_bar_view_panel.xml

diff --git a/modules/app/src/main/res/layout-v17/moment_bar_view_panel.xml b/modules/app/src/main/res/layout-v17/moment_bar_view_panel.xml
deleted file mode 100644
index eda09413a..000000000
--- a/modules/app/src/main/res/layout-v17/moment_bar_view_panel.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        style="@style/LauncherMomentPanel"
-        android:id="@+id/launcher_moment_panel">
-
-    <LinearLayout
-            android:id="@+id/launcher_moment_content"
-            style="@style/LauncherMomentInfoContent">
-
-        <FrameLayout
-            android:id="@+id/launcher_moment_icon_content"
-            style="@style/LauncherMomentIconContent">
-
-            <cards.nine.app.ui.components.widgets.TintableImageView
-                style="@style/LauncherMomentIcon"
-                android:id="@+id/launcher_moment_icon"/>
-
-        </FrameLayout>
-
-        <TextView
-                style="@style/LauncherMomentText"
-                android:id="@+id/launcher_moment_text"/>
-
-        <TextClock
-                style="@style/LauncherMomentClock"
-                android:id="@+id/launcher_moment_text_clock"/>
-
-    </LinearLayout>
-
-    <cards.nine.app.ui.components.widgets.TintableImageView
-        style="@style/LauncherMomentUnpin"
-        android:id="@+id/launcher_moment_unpin"/>
-
-    <cards.nine.app.ui.components.widgets.TintableImageView
-        style="@style/LauncherMomentWeather"
-        android:id="@+id/launcher_moment_weather"/>
-
-    <cards.nine.app.ui.components.widgets.TintableImageView
-            style="@style/LauncherMomentGoogleButton"
-            android:id="@+id/launcher_moment_google_icon"/>
-
-    <cards.nine.app.ui.components.widgets.TintableImageView
-            style="@style/LauncherMomentMicButton"
-            android:id="@+id/launcher_moment_mic_icon"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/modules/app/src/main/res/layout/edit_moment.xml b/modules/app/src/main/res/layout/edit_moment.xml
index d1afee9d4..cc7e451d3 100644
--- a/modules/app/src/main/res/layout/edit_moment.xml
+++ b/modules/app/src/main/res/layout/edit_moment.xml
@@ -49,7 +49,7 @@
 
                 <TextView
                     android:id="@+id/edit_moment_name_message"
-                    style="@style/EditMomentHeaderCollectionName"/>
+                    style="@style/EditMomentHeaderSpecificMessageName"/>
 
             </LinearLayout>
 
diff --git a/modules/app/src/main/res/layout/moment_bar_view_panel.xml b/modules/app/src/main/res/layout/moment_bar_view_panel.xml
index 71839febc..c7eeaf035 100644
--- a/modules/app/src/main/res/layout/moment_bar_view_panel.xml
+++ b/modules/app/src/main/res/layout/moment_bar_view_panel.xml
@@ -22,10 +22,6 @@
             style="@style/LauncherMomentText"
             android:id="@+id/launcher_moment_text"/>
 
-        <DigitalClock
-            style="@style/LauncherMomentClock"
-            android:id="@+id/launcher_moment_text_digital_clock"/>
-
     </LinearLayout>
 
     <cards.nine.app.ui.components.widgets.TintableImageView
diff --git a/modules/app/src/main/res/values-es/strings.xml b/modules/app/src/main/res/values-es/strings.xml
index 3e8842151..edb534ad3 100644
--- a/modules/app/src/main/res/values-es/strings.xml
+++ b/modules/app/src/main/res/values-es/strings.xml
@@ -21,8 +21,6 @@
     <string name="move">Mover</string>
     <string name="delete">Eliminar</string>
 
-    <string name="atHour">a las</string>
-
     <string name="itemAddedToCollectionSuccessful">Tarjeta añadida a %1$s</string>
 
     <!-- Menu -->
@@ -557,8 +555,6 @@
 
     <string name="momentsPrefTitle">Momentos</string>
     <string name="momentsPrefSummary">Configura opciones para tus Momentos</string>
-    <string name="showClockTitle">Mostrar reloj</string>
-    <string name="showClockSummary">La hora es mostrada en la barra del Momento</string>
 
     <string name="showMicSearchTitle">Mostrar micro</string>
     <string name="showMicSearchSummary">Micro es mostrado en la barra del Momento</string>
diff --git a/modules/app/src/main/res/values/strings.xml b/modules/app/src/main/res/values/strings.xml
index 0541ad275..5cf76c655 100644
--- a/modules/app/src/main/res/values/strings.xml
+++ b/modules/app/src/main/res/values/strings.xml
@@ -25,8 +25,6 @@
     <string name="move">Move</string>
     <string name="delete">Delete</string>
 
-    <string name="atHour">at</string>
-
     <string name="itemAddedToCollectionSuccessful">Item added to <xliff:g id="collection" example="Social">%1$s</xliff:g></string>
 
     <!-- Menu -->
@@ -571,9 +569,6 @@
     <string name="momentsPrefTitle">Moments</string>
     <string name="momentsPrefSummary">Configure options for your Moments</string>
 
-    <string name="showClockTitle">Show Clock</string>
-    <string name="showClockSummary">Clock is now shown in the Moment bar</string>
-
     <string name="showMicSearchTitle">Show Mic Search</string>
     <string name="showMicSearchSummary">Mic Search icon is now shown in the Moment bar</string>
 
diff --git a/modules/app/src/main/res/values/styles_actions.xml b/modules/app/src/main/res/values/styles_actions.xml
index da84a2622..cfaa65879 100644
--- a/modules/app/src/main/res/values/styles_actions.xml
+++ b/modules/app/src/main/res/values/styles_actions.xml
@@ -408,6 +408,11 @@
         <item name="android:layout_margin">@dimen/padding_large</item>
     </style>
 
+    <style name="EditMomentHeaderSpecificMessageName" parent="EditMomentHeaderName">
+        <item name="android:lines">1</item>
+        <item name="android:ellipsize">end</item>
+    </style>
+
     <style name="EditMomentHeaderSpecificMessage">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
diff --git a/modules/app/src/main/res/xml/preferences_moments.xml b/modules/app/src/main/res/xml/preferences_moments.xml
index 2dae5c3df..99372b588 100644
--- a/modules/app/src/main/res/xml/preferences_moments.xml
+++ b/modules/app/src/main/res/xml/preferences_moments.xml
@@ -4,12 +4,6 @@
 
     <PreferenceCategory android:title="@string/momentsPrefTitle">
 
-        <CheckBoxPreference
-            android:key="showClockMoment"
-            android:defaultValue="false"
-            android:title="@string/showClockTitle"
-            android:summary="@string/showClockSummary"/>
-
         <CheckBoxPreference
             android:key="showMicSearchMoment"
             android:defaultValue="false"
diff --git a/modules/app/src/main/scala/cards/nine/app/ui/commons/dialogs/editmoment/EditMomentUiActions.scala b/modules/app/src/main/scala/cards/nine/app/ui/commons/dialogs/editmoment/EditMomentUiActions.scala
index d99e77247..d3d98e587 100644
--- a/modules/app/src/main/scala/cards/nine/app/ui/commons/dialogs/editmoment/EditMomentUiActions.scala
+++ b/modules/app/src/main/scala/cards/nine/app/ui/commons/dialogs/editmoment/EditMomentUiActions.scala
@@ -19,15 +19,15 @@ import cards.nine.app.ui.components.widgets.tweaks.TintableImageViewTweaks._
 import cards.nine.commons._
 import cards.nine.commons.ops.ColorOps._
 import cards.nine.commons.services.TaskService.{TaskService, _}
-import cards.nine.models.types.{CarMoment, MusicMoment, OutAndAboutMoment, SportMoment}
 import cards.nine.models.types.theme.{DrawerIconColor, DrawerTextColor}
+import cards.nine.models.types.{CarMoment, MusicMoment, OutAndAboutMoment}
 import cards.nine.models.{Collection, Moment, MomentTimeSlot}
 import com.fortysevendeg.ninecardslauncher.R
 import macroid.FullDsl._
 import macroid._
+import macroid.extras.ImageViewTweaks._
 import macroid.extras.ResourcesExtras._
 import macroid.extras.TextViewTweaks._
-import macroid.extras.ImageViewTweaks._
 import macroid.extras.UIActionsExtras._
 import macroid.extras.ViewGroupTweaks._
 import macroid.extras.ViewTweaks._
@@ -84,6 +84,8 @@ trait EditMomentUiActions
       (addHourAction <~ tivDefaultColor(iconColor) <~ On.click(Ui(addHour()))) ~
       (nameWifi <~ tvColor(textColor)) ~
       (nameHour <~ tvColor(textColor)) ~
+      (messageName <~ tvColor(textColor)) ~
+      (messageText <~ tvColor(textColor)) ~
       (nameLinkCollection <~ tvColor(textColor)) ~
       (momentCollection <~
         tvColor(textColor) <~
diff --git a/modules/app/src/main/scala/cards/nine/app/ui/components/layouts/TopBarLayout.scala b/modules/app/src/main/scala/cards/nine/app/ui/components/layouts/TopBarLayout.scala
index 1e10eb755..b230324cb 100644
--- a/modules/app/src/main/scala/cards/nine/app/ui/components/layouts/TopBarLayout.scala
+++ b/modules/app/src/main/scala/cards/nine/app/ui/components/layouts/TopBarLayout.scala
@@ -61,12 +61,6 @@ class TopBarLayout(context: Context, attrs: AttributeSet, defStyle: Int)
 
   lazy val momentText = findView(TR.launcher_moment_text)
 
-  // Lower to API 17
-  lazy val momentDigitalClock = Option(findView(TR.launcher_moment_text_digital_clock))
-
-  // API 17 and more
-  lazy val momentClock = Option(findView(TR.launcher_moment_text_clock))
-
   lazy val momentUnpin = findView(TR.launcher_moment_unpin)
 
   lazy val momentWeather = findView(TR.launcher_moment_weather)
@@ -129,8 +123,6 @@ class TopBarLayout(context: Context, attrs: AttributeSet, defStyle: Int)
       (momentIconContent <~ vBackground(iconBackground)) ~
       (momentIcon <~ tivDefaultColor(iconColor) <~ tivPressedColor(iconColor)) ~
       (momentText <~ tvSizeResource(sizeRes)) ~
-      (momentDigitalClock <~ tvSizeResource(sizeRes)) ~
-      (momentClock <~ tvSizeResource(sizeRes)) ~
       (collectionsSearchPanel <~
         vBackgroundBoxWorkspace(theme.get(SearchBackgroundColor))) ~
       (collectionsBurgerIcon <~
@@ -161,11 +153,7 @@ class TopBarLayout(context: Context, attrs: AttributeSet, defStyle: Int)
     }
 
   def reloadMoment(moment: NineCardsMoment)(implicit navigationJobs: NavigationJobs, launcherJobs: LauncherJobs, theme: NineCardsTheme): Ui[Any] = {
-    val showClock = ShowClockMoment.readValue
     val showMicSearch = ShowMicSearchMoment.readValue
-    val text = if (showClock) {
-      s"${moment.getName} ${resGetString(R.string.atHour)}"
-    } else moment.getName
 
     def unpinTweak = if (persistMoment.getPersistMoment.contains(moment)) {
       vVisible +
@@ -193,12 +181,10 @@ class TopBarLayout(context: Context, attrs: AttributeSet, defStyle: Int)
         val bundle = navigationJobs.navigationUiActions.dom.createBundle(resGetColor(R.color.collection_fab_button_item_1), momentMap)
         navigationJobs.launchEditMoment(bundle).resolveAsync()
       } ~ Ui(true))) ~
-      (momentDigitalClock <~ (if (showClock) vVisible else vGone)) ~
-      (momentClock <~ (if (showClock) vVisible else vGone)) ~
       (momentIcon <~
         ivSrc(moment.getIconCollectionDetail)) ~
       (momentText <~
-        tvText(text)) ~
+        tvText(moment.getName)) ~
       (momentUnpin <~ unpinTweak) ~
       (momentWeather <~ weatherTweak) ~
       (momentGoogleIcon <~
diff --git a/modules/app/src/main/scala/cards/nine/app/ui/launcher/jobs/LauncherJobs.scala b/modules/app/src/main/scala/cards/nine/app/ui/launcher/jobs/LauncherJobs.scala
index 1001de3f2..56be6e09e 100644
--- a/modules/app/src/main/scala/cards/nine/app/ui/launcher/jobs/LauncherJobs.scala
+++ b/modules/app/src/main/scala/cards/nine/app/ui/launcher/jobs/LauncherJobs.scala
@@ -293,7 +293,6 @@ class LauncherJobs(
           AppDrawerSelectItemsInScroller.name)).nonEmpty
 
     def uiAction(prefKey: String): TaskService[Unit] = prefKey match {
-      case ShowClockMoment.name => topBarUiActions.reloadMomentTopBar()
       case ShowMicSearchMoment.name => topBarUiActions.reloadMomentTopBar()
       case ShowWeatherMoment.name => topBarUiActions.reloadMomentTopBar()
       case GoogleLogo.name => topBarUiActions.reloadTopBar()
diff --git a/modules/app/src/main/scala/cards/nine/app/ui/preferences/commons/NineCardsPreferences.scala b/modules/app/src/main/scala/cards/nine/app/ui/preferences/commons/NineCardsPreferences.scala
index a035df4c7..504645c93 100644
--- a/modules/app/src/main/scala/cards/nine/app/ui/preferences/commons/NineCardsPreferences.scala
+++ b/modules/app/src/main/scala/cards/nine/app/ui/preferences/commons/NineCardsPreferences.scala
@@ -61,14 +61,6 @@ sealed trait NineCardsPreferenceValue[T]
 
 // Moments Preferences
 
-case object ShowClockMoment
-  extends NineCardsPreferenceValue[Boolean] {
-  override val name: String = "showClockMoment"
-  override val default: Boolean = false
-
-  override def readValueWith(context: Context): Boolean = getBoolean(context, name, default)
-}
-
 case object ShowMicSearchMoment
   extends NineCardsPreferenceValue[Boolean] {
   override val name: String = "showMicSearchMoment"