mirrors/nextcloud-android
1
0
Fork 0
mirror of https://github.com/nextcloud/android.git synced 2024-11-23 21:55:48 +03:00
Code Issues Projects Releases Packages Wiki Activity

use primary color on primary button

Browse source 
swipe container without margin

Signed-off-by: tobiasKaminsky <tobias@kaminsky.me>
This commit is contained in:
tobiasKaminsky 2019-03-11 12:00:44 +01:00
parent 1a5beb4328
commit d6fbe864a1
No known key found for this signature in database
GPG key ID: 0E00D4D47D0C5AF7
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/main/java/com/owncloud/android/ui/activity/FirstRunActivity.java
View file

@ -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)) {

5
src/main/res/layout/first_run_activity.xml
View file

@ -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"