From d6fbe864a1ed42aa89d0fbee29ff741d481c56b8 Mon Sep 17 00:00:00 2001
From: tobiasKaminsky <tobias@kaminsky.me>
Date: Mon, 11 Mar 2019 12:00:44 +0100
Subject: [PATCH] use primary color on primary button swipe container without
 margin

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
---
 .../owncloud/android/ui/activity/FirstRunActivity.java    | 8 +++-----
 src/main/res/layout/first_run_activity.xml                | 5 +++--
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/owncloud/android/ui/activity/FirstRunActivity.java b/src/main/java/com/owncloud/android/ui/activity/FirstRunActivity.java
index db63ba8b7c..848aa677dd 100644
--- a/src/main/java/com/owncloud/android/ui/activity/FirstRunActivity.java
+++ b/src/main/java/com/owncloud/android/ui/activity/FirstRunActivity.java
@@ -35,20 +35,18 @@ import android.view.ViewGroup;
 import android.widget.Button;
 import android.widget.LinearLayout;
 import android.widget.TextView;
-
+import androidx.viewpager.widget.ViewPager;
 import com.nextcloud.client.preferences.AppPreferences;
+import com.nextcloud.client.preferences.PreferenceManager;
 import com.owncloud.android.MainApp;
 import com.owncloud.android.R;
 import com.owncloud.android.authentication.AccountUtils;
 import com.owncloud.android.authentication.AuthenticatorActivity;
-import com.nextcloud.client.preferences.PreferenceManager;
 import com.owncloud.android.features.FeatureItem;
 import com.owncloud.android.ui.adapter.FeaturesViewAdapter;
 import com.owncloud.android.ui.whatsnew.ProgressIndicator;
 import com.owncloud.android.utils.DisplayUtils;
 
-import androidx.viewpager.widget.ViewPager;
-
 /**
  * Activity displaying general feature after a fresh install.
  */
@@ -73,7 +71,7 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
 
         Button loginButton = findViewById(R.id.login);
         loginButton.setBackgroundColor(Color.WHITE);
-        loginButton.setTextColor(Color.BLACK);
+        loginButton.setTextColor(getResources().getColor(R.color.primary));
 
         loginButton.setOnClickListener(v -> {
             if (getIntent().getBooleanExtra(EXTRA_ALLOW_CLOSE, false)) {
diff --git a/src/main/res/layout/first_run_activity.xml b/src/main/res/layout/first_run_activity.xml
index 25cd64d047..1202ae9aac 100644
--- a/src/main/res/layout/first_run_activity.xml
+++ b/src/main/res/layout/first_run_activity.xml
@@ -28,9 +28,10 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="@dimen/standard_margin"
         android:layout_weight="1"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:layout_marginBottom="@dimen/standard_margin"
+        android:layout_marginTop="@dimen/standard_margin">
 
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/contentPanel"