Merge remote-tracking branch 'remotes/origin/master' into newAppBarColor

src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java

@@ -991,7 +991,7 @@ public abstract class DrawerActivity extends ToolbarActivity
                     }
                     menuItem.setTitle(Html.fromHtml(
                         "<font color='"
-                            + ThemeUtils.colorToHexString(ContextCompat.getColor(this, R.color.text_color))
+                            + ThemeUtils.colorToHexString(ContextCompat.getColor(this, R.color.drawer_text_color))
                             + "'>" + menuItem.getTitle()
                             + "</font>"));
                 }

src/main/res/values-night/colors.xml

@@ -20,8 +20,9 @@
 -->
 <resources>
 
-    <color name="text_color">#ffffff</color>
+    <color name="text_color">#E3E3E3</color>
     <color name="text_color_inverse">#000000</color>
+    <color name="secondary_text_color">#A5A5A5</color>
     <color name="list_divider_background">#222222</color>
 
     <!-- Colors -->

src/main/res/values/colors.xml

@@ -24,7 +24,8 @@
     <color name="list_item_lastmod_and_filesize_text">@color/secondary_text_color</color>
     <color name="black">#000000</color>
     <color name="white">#ffffff</color>
-    <color name="text_color">#000000</color>
+    <color name="text_color">#333333</color>
+    <color name="drawer_text_color">@color/secondary_text_color</color>
     <color name="text_color_inverse">#ffffff</color>
     <color name="disabled_text">#ff888888</color>
     <color name="list_divider_background">#eeeeee</color>
@@ -33,7 +34,7 @@
     <color name="filelist_icon_background">#DDDDDD</color>
     <color name="dark_background_text_color">#EEEEEE</color>
     <color name="transparent">#00000000</color>
-    <color name="secondary_text_color">#a0a0a0</color>
+    <color name="secondary_text_color">#666666</color>
     <color name="highlight_textColor_Warning">#e53935</color>
 
     <!-- Colors -->

src/main/res/values/dims.xml

@@ -47,7 +47,7 @@
     <dimen name="min_list_item_size">56dp</dimen>
     <dimen name="standard_list_item_size">72dp</dimen>
     <dimen name="two_line_primary_text_size">16sp</dimen>
-    <dimen name="two_line_secondary_text_size">14sp</dimen>
+    <dimen name="two_line_secondary_text_size">12sp</dimen>
     <dimen name="list_item_avatar_icon_margin">20dp</dimen>
     <dimen name="list_item_share_right_margin">12dp</dimen>
     <dimen name="file_list_item_avatar_icon_radius">10dp</dimen>

src/main/res/values/strings.xml

@@ -642,7 +642,7 @@
 
     <string name="empty" translatable="false" />
     <string name="test_server_button">Test server connection</string>
-    <string name="info_separator" translatable="false">,</string>
+    <string name="info_separator" translatable="false">&#160;&#x2022;</string>
     <string name="resharing_is_not_allowed">Resharing is not allowed</string>
     <string name="fallback_weblogin_back">Back</string>
     <string name="fallback_weblogin_text">Revert to old login method</string>

src/test/java/com/nextcloud/client/etm/TestEtmViewModel.kt

@@ -245,7 +245,7 @@ class TestEtmViewModel {
 
         @Test
         fun `start stop test job actions are delegated to job manager`() {
-            vm.startTestJob()
+            vm.startTestJob(true)
             vm.cancelTestJob()
             inOrder(backgroundJobManager).apply {
                 verify(backgroundJobManager).scheduleTestJob()

src/test/java/com/nextcloud/client/jobs/BackgroundJobFactoryTest.kt

@@ -28,9 +28,12 @@ import com.nextcloud.client.account.UserAccountManager
 import com.nextcloud.client.core.Clock
 import com.nextcloud.client.device.DeviceInfo
 import com.nextcloud.client.device.PowerManagementService
+import com.nextcloud.client.logger.Logger
+import com.nextcloud.client.network.ConnectivityService
 import com.nextcloud.client.preferences.AppPreferences
 import com.nhaarman.mockitokotlin2.whenever
 import com.owncloud.android.datamodel.ArbitraryDataProvider
+import com.owncloud.android.datamodel.UploadsStorageManager
 import org.junit.Assert.assertNotNull
 import org.junit.Assert.assertNull
 import org.junit.Before
@@ -74,12 +77,22 @@ class BackgroundJobFactoryTest {
     @Mock
     private lateinit var dataProvider: ArbitraryDataProvider
 
+    @Mock
+    private lateinit var logger: Logger
+
+    @Mock
+    private lateinit var uploadsStorageManager: UploadsStorageManager
+
+    @Mock
+    private lateinit var connectivityService: ConnectivityService
+
     private lateinit var factory: BackgroundJobFactory
 
     @Before
     fun setUp() {
         MockitoAnnotations.initMocks(this)
         factory = BackgroundJobFactory(
+            logger,
             preferences,
             contentResolver,
             clock,
@@ -88,7 +101,9 @@ class BackgroundJobFactoryTest {
             deviceInfo,
             accountManager,
             resources,
-            dataProvider
+            dataProvider,
+            uploadsStorageManager,
+            connectivityService
         )
     }