From dccd9dcb97ff34da42abf932c51edc46e39e4c6a Mon Sep 17 00:00:00 2001
From: LucasGGamerM <lucassggabriel@gmail.com>
Date: Fri, 30 Dec 2022 19:42:16 -0300
Subject: [PATCH] Editing the InstanceRulesFragment for allowing a more
 coherent color scheme

---
 .../fragments/onboarding/InstanceRulesFragment.java        | 7 ++++---
 mastodon/src/main/res/layout/fragment_onboarding_rules.xml | 1 +
 mastodon/src/main/res/layout/item_list_header_simple.xml   | 1 -
 mastodon/src/main/res/layout/item_server_rule.xml          | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
index c3ab13586..4c0bf0135 100644
--- a/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
+++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/onboarding/InstanceRulesFragment.java
@@ -2,6 +2,7 @@ package org.joinmastodon.android.fragments.onboarding;
 
 import android.annotation.SuppressLint;
 import android.app.Activity;
+import android.content.res.Resources;
 import android.os.Build;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -65,7 +66,7 @@ public class InstanceRulesFragment extends ToolbarFragment{
 		adapter.addAdapter(new SingleViewRecyclerAdapter(headerView));
 		adapter.addAdapter(new ItemsAdapter());
 		list.setAdapter(adapter);
-		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorM3SurfaceVariant, 1, 56, 0, DividerItemDecoration.NOT_FIRST));
+		list.addItemDecoration(new DividerItemDecoration(getActivity(), R.attr.colorPollVoted, 1, 56, 0, DividerItemDecoration.NOT_FIRST));
 
 		btn=view.findViewById(R.id.btn_next);
 		btn.setOnClickListener(v->onButtonClick());
@@ -77,8 +78,8 @@ public class InstanceRulesFragment extends ToolbarFragment{
 	@Override
 	public void onViewCreated(View view, Bundle savedInstanceState){
 		super.onViewCreated(view, savedInstanceState);
-		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
-		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+//		setStatusBarColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
+//		view.setBackgroundColor(UiUtils.getThemeColor(getActivity(), R.attr.colorM3Background));
 	}
 
 //	@Override
diff --git a/mastodon/src/main/res/layout/fragment_onboarding_rules.xml b/mastodon/src/main/res/layout/fragment_onboarding_rules.xml
index 1ccbf4afd..b531e4c79 100644
--- a/mastodon/src/main/res/layout/fragment_onboarding_rules.xml
+++ b/mastodon/src/main/res/layout/fragment_onboarding_rules.xml
@@ -26,6 +26,7 @@
 			android:layout_marginBottom="16dp"
 			android:minWidth="145dp"
 			style="@style/Widget.Mastodon.M3.Button.Filled"
+			android:visibility="gone"
 			android:text="@string/i_agree" />
 
 	</LinearLayout>
diff --git a/mastodon/src/main/res/layout/item_list_header_simple.xml b/mastodon/src/main/res/layout/item_list_header_simple.xml
index 0caf3ec73..6b8b358bd 100644
--- a/mastodon/src/main/res/layout/item_list_header_simple.xml
+++ b/mastodon/src/main/res/layout/item_list_header_simple.xml
@@ -4,7 +4,6 @@
 	android:layout_width="match_parent"
 	android:layout_height="wrap_content"
 	android:textAppearance="@style/m3_body_large"
-	android:textColor="?colorM3OnSurface"
 	android:paddingStart="56dp"
 	android:paddingTop="12dp"
 	android:paddingEnd="24dp"
diff --git a/mastodon/src/main/res/layout/item_server_rule.xml b/mastodon/src/main/res/layout/item_server_rule.xml
index ad25fbc1d..9930af222 100644
--- a/mastodon/src/main/res/layout/item_server_rule.xml
+++ b/mastodon/src/main/res/layout/item_server_rule.xml
@@ -15,7 +15,7 @@
 		android:layout_width="24dp"
 		android:layout_height="24dp"
 		android:layout_marginEnd="16dp"
-		android:textColor="?colorM3Primary"
+		android:textColor="?android:colorAccent"
 		android:fontFamily="sans-serif-condensed"
 		android:textStyle="bold"
 		android:textSize="22dp"