Commit 5f1f8376 authored by Romain Hunault's avatar Romain Hunault
Browse files

Merge branch '3949-Background_color_issue' into 'master'

3949-Background_color_issue

See merge request !81
parents 1d46def6 011f56fb
Pipeline #140812 passed with stages
in 2 minutes and 48 seconds
......@@ -25,7 +25,6 @@
android:layout_height="match_parent"
tools:context=".MainActivity">
<FrameLayout
android:id="@+id/frame_layout"
android:layout_width="match_parent"
......
......@@ -23,7 +23,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceListItemSmall"
android:gravity="center_vertical"
android:background="@color/colorBackground"
android:background="@color/colorForeground"
android:textColor="@color/colorTextPrimary"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
......
......@@ -43,9 +43,6 @@
android:layout_height="wrap_content"
android:text="@string/games_categories_title" />
</com.google.android.material.tabs.TabLayout>
<androidx.viewpager.widget.ViewPager
......
......@@ -23,8 +23,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<foundation.e.apps.utils.CustomNestedScrollView
android:id="@+id/scroll_view"
android:layout_width="match_parent"
......
......@@ -15,13 +15,14 @@
~ along with this program. If not, see <https://www.gnu.org/licenses/>.
-->
<resources>
<resources xmlns:tools="http://schemas.android.com/tools">
<!-- Base application theme. -->
<style name="BaseTheme" parent="Theme.AppCompat.DayNight.NoActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
<item name="android:windowBackground">@color/colorBackground</item>
<item name="android:textColorPrimary">@color/colorTextPrimary</item>
<item name="android:textColorSecondary">@color/colorTextSecondary</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
......@@ -31,6 +32,7 @@
<item name="colorControlNormal">@color/colorInstall</item>
<item name="colorControlActivated">@color/colorInstall</item>
<item name="android:navigationBarColor">@color/colorNavigationBarBackground</item>
<item name="android:navigationBarDividerColor" tools:targetApi="o_mr1">@color/colorNavigationBarBackground</item>
<item name="android:statusBarColor">@color/colorNavigationBarBackground</item>
<item name="toolbarNavigationButtonStyle">@style/Toolbar.Button.Navigation.Tinted</item>
</style>
......@@ -38,7 +40,7 @@
<style name="AppTheme1" parent="android:Theme">
<item name="android:windowDisablePreview">true</item>
</style>
<style name="AppTheme" parent="BaseTheme"></style>
<style name="AppTheme" parent="BaseTheme" />
<style name="SearchSuggestionTheme" parent="Widget.AppCompat.Light.AutoCompleteTextView">
<item name="android:popupBackground">@color/colorBackground</item>
......
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