Commit d3df533d authored by Grigory Fedorov's avatar Grigory Fedorov

Merge remote-tracking branch 'origin/feature/chat_scroll' into feature/chat_scroll

parents 7313c0d6 3ee2175c
...@@ -46,7 +46,7 @@ ...@@ -46,7 +46,7 @@
android:layout_marginLeft="32dp" android:layout_marginLeft="32dp"
android:text="@string/preference_editor" android:text="@string/preference_editor"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" android:textColor="?android:attr/textColorPrimary"
/> />
...@@ -72,7 +72,7 @@ ...@@ -72,7 +72,7 @@
android:layout_marginLeft="32dp" android:layout_marginLeft="32dp"
android:text="@string/preference_about" android:text="@string/preference_about"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" /> android:textColor="?android:attr/textColorPrimary" />
</LinearLayout> </LinearLayout>
...@@ -96,9 +96,9 @@ ...@@ -96,9 +96,9 @@
android:layout_marginLeft="32dp" android:layout_marginLeft="32dp"
android:text="@string/exit" android:text="@string/exit"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="@android:color/black" /> android:textColor="?android:attr/textColorPrimary" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment