TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-02-21 10:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix TabLayout ripple (#1210)

Browse Source
This commit is contained in:
Andrew 2023-05-24 11:23:19 +09:30 committed by GitHub
parent a8e77659b3
commit 95a165aa05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,7 +11,6 @@
android:layout_height="match_parent" > android:layout_height="match_parent" >
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
style="@style/Widget.Session.TabLayout"
android:id="@+id/tabLayout" android:id="@+id/tabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tab_bar_height" /> android:layout_height="@dimen/tab_bar_height" />

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

@ -12,7 +12,6 @@
android:layout_height="match_parent" > android:layout_height="match_parent" >
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
style="@style/Widget.Session.TabLayout"
android:id="@+id/tabLayout" android:id="@+id/tabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tab_bar_height" /> android:layout_height="@dimen/tab_bar_height" />

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

@ -6,7 +6,6 @@
android:layout_height="match_parent" > android:layout_height="match_parent" >
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
style="@style/Widget.Session.TabLayout"
android:id="@+id/tabLayout" android:id="@+id/tabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tab_bar_height" /> android:layout_height="@dimen/tab_bar_height" />

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

@ -47,7 +47,6 @@
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout" android:id="@+id/tabLayout"
style="@style/Widget.Session.TabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tab_bar_height" android:layout_height="@dimen/tab_bar_height"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

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

@ -48,7 +48,6 @@
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/tabLayout" android:id="@+id/tabLayout"
style="@style/Widget.Session.TabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="@dimen/tab_bar_height" android:layout_height="@dimen/tab_bar_height"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

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

@ -28,7 +28,6 @@
android:id="@+id/tab_layout" android:id="@+id/tab_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:theme="@style/Widget.Session.TabLayout"
app:tabRippleColor="@color/cell_selected" app:tabRippleColor="@color/cell_selected"
app:tabIndicatorColor="?colorAccent" app:tabIndicatorColor="?colorAccent"
android:scrollbars="horizontal"/> android:scrollbars="horizontal"/>

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

@ -21,7 +21,6 @@
<org.thoughtcrime.securesms.components.ControllableTabLayout <org.thoughtcrime.securesms.components.ControllableTabLayout
android:id="@+id/tab_layout" android:id="@+id/tab_layout"
style="@style/Widget.Session.TabLayout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top"/> android:layout_gravity="top"/>

1
app/src/main/res/values/styles.xml
View File

@ -56,7 +56,6 @@
<item name="elevation">1dp</item> <item name="elevation">1dp</item>
<item name="tabIndicatorColor">@color/transparent</item> <item name="tabIndicatorColor">@color/transparent</item>
<item name="tabIndicatorHeight">@dimen/accent_line_thickness</item> <item name="tabIndicatorHeight">@dimen/accent_line_thickness</item>
<item name="tabRippleColor">@color/cell_selected</item>
<item name="tabTextAppearance">@style/TextAppearance.Session.Tab</item> <item name="tabTextAppearance">@style/TextAppearance.Session.Tab</item>
</style> </style>

4
app/src/main/res/values/themes.xml
View File

@ -303,6 +303,8 @@
<item name="dividerHorizontal">?dividerVertical</item> <item name="dividerHorizontal">?dividerVertical</item>
<item name="message_received_background_color">#F2F2F2</item> <item name="message_received_background_color">#F2F2F2</item>
<item name="colorAccent">@color/classic_accent</item> <item name="colorAccent">@color/classic_accent</item>
<item name="colorControlHighlight">?android:colorControlHighlight</item>
<item name="tabStyle">@style/Widget.Session.TabLayout</item>
</style> </style>
<style name="Ocean"> <style name="Ocean">
@ -310,6 +312,8 @@
<item name="dividerHorizontal">?dividerVertical</item> <item name="dividerHorizontal">?dividerVertical</item>
<item name="message_received_background_color">#F2F2F2</item> <item name="message_received_background_color">#F2F2F2</item>
<item name="colorAccent">@color/ocean_accent</item> <item name="colorAccent">@color/ocean_accent</item>
<item name="colorControlHighlight">?android:colorControlHighlight</item>
<item name="tabStyle">@style/Widget.Session.TabLayout</item>
</style> </style>
<style name="Classic.Dark"> <style name="Classic.Dark">