Mastodon
/
fedilab-Android-App
mirror of https://codeberg.org/tom79/Fedilab
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix colors

This commit is contained in:
tom79 2019-11-12 19:33:07 +01:00
parent 66053eb3a9
commit e43fbde6b8
3 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/app/fedilab/android/fragments/ContentSettingsFragment.java
View File

@ -267,19 +267,6 @@ public class ContentSettingsFragment extends Fragment implements OnRetrieveRemot
style = R.style.Dialog;
}
switch (theme) {
case Helper.THEME_LIGHT:
containerFrame.setBackgroundColor(ContextCompat.getColor(context, R.color.white));
break;
case Helper.THEME_DARK:
containerFrame.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC1));
break;
case Helper.THEME_BLACK:
containerFrame.setBackgroundColor(ContextCompat.getColor(context, R.color.black));
break;
default:
containerFrame.setBackgroundColor(ContextCompat.getColor(context, R.color.mastodonC1));
}
LinearLayout settings_timeline = rootView.findViewById(R.id.settings_timeline);
LinearLayout settings_notifications = rootView.findViewById(R.id.settings_notifications);
LinearLayout settings_admin = rootView.findViewById(R.id.settings_admin);

1
app/src/main/res/layout/activity_settings.xml
View File

@ -4,7 +4,6 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:fitsSystemWindows="true"
tools:context="app.fedilab.android.activities.SettingsActivity"
android:layout_margin="@dimen/fab_margin"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content">

5
app/src/main/res/layout/fragment_settings_reveal.xml
View File

@ -17,6 +17,7 @@
android:layout_marginLeft="@dimen/fab_margin"
android:layout_marginEnd="@dimen/fab_margin"
android:layout_marginRight="@dimen/fab_margin"
android:layout_marginBottom="20dp"
android:paddingLeft="@dimen/drawer_padding"
android:paddingRight="@dimen/drawer_padding"
android:scrollbars="none"
@ -1906,7 +1907,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp" />
/>
</LinearLayout>
<EditText
@ -1940,7 +1941,6 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:layout_weight="1"
android:maxLines="2"
android:textColor="?colorAccent"
@ -2497,7 +2497,6 @@
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_marginStart="20dp"
android:layout_marginLeft="20dp"
android:contentDescription="@string/toot_visibility_tilte"
android:padding="5dp"
android:src="@drawable/ic_public" />