mirror of
https://github.com/oxen-io/session-android.git
synced 2025-02-19 21:28:26 +00:00
Fix TabLayout ripple (#1210)
This commit is contained in:
parent
a8e77659b3
commit
95a165aa05
@ -11,7 +11,6 @@
|
||||
android:layout_height="match_parent" >
|
||||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
style="@style/Widget.Session.TabLayout"
|
||||
android:id="@+id/tabLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/tab_bar_height" />
|
||||
|
@ -12,7 +12,6 @@
|
||||
android:layout_height="match_parent" >
|
||||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
style="@style/Widget.Session.TabLayout"
|
||||
android:id="@+id/tabLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/tab_bar_height" />
|
||||
|
@ -6,7 +6,6 @@
|
||||
android:layout_height="match_parent" >
|
||||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
style="@style/Widget.Session.TabLayout"
|
||||
android:id="@+id/tabLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/tab_bar_height" />
|
||||
|
@ -47,7 +47,6 @@
|
||||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
android:id="@+id/tabLayout"
|
||||
style="@style/Widget.Session.TabLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/tab_bar_height"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
@ -48,7 +48,6 @@
|
||||
|
||||
<com.google.android.material.tabs.TabLayout
|
||||
android:id="@+id/tabLayout"
|
||||
style="@style/Widget.Session.TabLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="@dimen/tab_bar_height"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
|
@ -28,7 +28,6 @@
|
||||
android:id="@+id/tab_layout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:theme="@style/Widget.Session.TabLayout"
|
||||
app:tabRippleColor="@color/cell_selected"
|
||||
app:tabIndicatorColor="?colorAccent"
|
||||
android:scrollbars="horizontal"/>
|
||||
|
@ -21,7 +21,6 @@
|
||||
|
||||
<org.thoughtcrime.securesms.components.ControllableTabLayout
|
||||
android:id="@+id/tab_layout"
|
||||
style="@style/Widget.Session.TabLayout"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top"/>
|
||||
|
@ -56,7 +56,6 @@
|
||||
<item name="elevation">1dp</item>
|
||||
<item name="tabIndicatorColor">@color/transparent</item>
|
||||
<item name="tabIndicatorHeight">@dimen/accent_line_thickness</item>
|
||||
<item name="tabRippleColor">@color/cell_selected</item>
|
||||
<item name="tabTextAppearance">@style/TextAppearance.Session.Tab</item>
|
||||
</style>
|
||||
|
||||
|
@ -303,6 +303,8 @@
|
||||
<item name="dividerHorizontal">?dividerVertical</item>
|
||||
<item name="message_received_background_color">#F2F2F2</item>
|
||||
<item name="colorAccent">@color/classic_accent</item>
|
||||
<item name="colorControlHighlight">?android:colorControlHighlight</item>
|
||||
<item name="tabStyle">@style/Widget.Session.TabLayout</item>
|
||||
</style>
|
||||
|
||||
<style name="Ocean">
|
||||
@ -310,6 +312,8 @@
|
||||
<item name="dividerHorizontal">?dividerVertical</item>
|
||||
<item name="message_received_background_color">#F2F2F2</item>
|
||||
<item name="colorAccent">@color/ocean_accent</item>
|
||||
<item name="colorControlHighlight">?android:colorControlHighlight</item>
|
||||
<item name="tabStyle">@style/Widget.Session.TabLayout</item>
|
||||
</style>
|
||||
|
||||
<style name="Classic.Dark">
|
||||
|
Loading…
x
Reference in New Issue
Block a user