TheArchive/session-android
1
0
Fork 0
mirror of https://github.com/oxen-io/session-android.git synced 2025-12-07 23:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into disable-unblock

Browse Source
This commit is contained in:
Andrew
2023-05-22 14:55:55 +09:30
committed by GitHub
parent 30d748e147 a8e77659b3
commit d505109aa3
12 changed files with 90 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/res/drawable/conversation_pinned_background.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?colorCellRipple">
android:color="?android:colorControlHighlight">
<item>
<color android:color="?conversation_pinned_background_color" />

2
app/src/main/res/drawable/conversation_unread_background.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?colorCellRipple">
android:color="?android:colorControlHighlight">
<item>
<color android:color="?conversation_unread_background_color" />

2
app/src/main/res/drawable/conversation_view_background.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?colorCellRipple">
android:color="?android:colorControlHighlight">
<item>
<color android:color="?colorCellBackground" />

2
app/src/main/res/drawable/mention_candidate_view_background.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?mention_candidates_view_background_ripple">
android:color="?android:colorControlHighlight">
<item>
<color android:color="?mention_candidates_view_background" />

2
app/src/main/res/drawable/setting_button_background.xml
View File

@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="?colorCellRipple">
android:color="?android:colorControlHighlight">
<item>
<color android:color="?colorCellBackground" />

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

@@ -7,7 +7,6 @@
android:paddingHorizontal="@dimen/medium_spacing"
android:paddingVertical="@dimen/small_spacing"
android:gravity="center_vertical"
android:background="?selectableItemBackground"
android:id="@+id/backgroundContainer">
<include layout="@layout/view_profile_picture"
android:id="@+id/profilePictureView"

17
app/src/main/res/layout/dialog_change_avatar.xml Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout
android:orientation="vertical"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="wrap_content"
android:layout_width="match_parent">
<include layout="@layout/view_profile_picture"
android:layout_margin="30dp"
android:id="@+id/profile_picture_view"
android:layout_gravity="center"
android:layout_width="@dimen/large_profile_picture_size"
android:layout_height="@dimen/large_profile_picture_size"
android:layout_marginTop="@dimen/medium_spacing"
android:contentDescription="@string/AccessibilityId_profile_picture" />
</FrameLayout>

2
app/src/main/res/values/attrs.xml
View File

@@ -150,7 +150,6 @@
<attr name="conversation_shadow_main" format="color|reference"/>
<attr name="default_background_start" format="color|reference"/>
<attr name="default_background_end" format="color|reference"/>
<attr name="colorCellRipple" format="color|reference"/>
<attr name="colorCellBackground" format="color|reference" />
<attr name="colorSettingsBackground" format="color|reference" />
<attr name="colorDividerBackground" format="color|reference" />
@@ -176,7 +175,6 @@
<attr name="input_bar_lock_view_background" format="color|reference"/>
<attr name="input_bar_lock_view_border" format="color|reference"/>
<attr name="mention_candidates_view_background" format="color|reference"/>
<attr name="mention_candidates_view_background_ripple" format="color|reference"/>
<attr name="scroll_to_bottom_button_background" format="color|reference"/>
<attr name="scroll_to_bottom_button_border" format="color|reference"/>
<attr name="conversation_unread_count_indicator_background" format="color|reference"/>

3
app/src/main/res/values/strings.xml
View File

@@ -769,6 +769,9 @@
<string name="activity_join_public_chat_scan_qr_code_explanation">Scan the QR code of the open group you\'d like to join</string>
<string name="fragment_enter_chat_url_edit_text_hint">Enter an open group URL</string>
<string name="activity_settings_title">Settings</string>
<string name="activity_settings_set_display_picture">Set display picture</string>
<string name="activity_settings_upload">Upload</string>
<string name="activity_settings_remove">Remove</string>
<string name="activity_settings_display_name_edit_text_hint">Enter a display name</string>
<string name="activity_settings_display_name_missing_error">Please pick a display name</string>
<string name="activity_settings_display_name_too_long_error">Please pick a shorter display name</string>

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

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:tools="http://schemas.android.com/tools">
<resources>
<!-- Session -->
<style name="Widget.Session.ActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid">
@@ -83,38 +83,38 @@
<style name="Widget.Session.Button.Common.ProminentFilled">
<item name="android:background">@drawable/prominent_filled_button_medium_background</item>
<item name="android:textColor">@color/black</item>
<item name="android:drawableTint" tools:ignore="NewApi">?android:textColorPrimary</item>
<item name="android:drawableTint">?android:textColorPrimary</item>
</style>
<style name="Widget.Session.Button.Common.ProminentOutline">
<item name="android:background">@drawable/prominent_outline_button_medium_background</item>
<item name="android:textColorPrimary">?attr/prominentButtonColor</item>
<item name="android:drawableTint" tools:ignore="NewApi">?attr/prominentButtonColor</item>
<item name="android:textColor">?attr/prominentButtonColor</item>
<item name="android:drawableTint">?attr/prominentButtonColor</item>
</style>
<style name="Widget.Session.Button.Common.UnimportantFilled">
<item name="android:background">@drawable/unimportant_filled_button_medium_background</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:drawableTint" tools:ignore="NewApi">?android:textColorPrimary</item>
<item name="android:drawableTint">?android:textColorPrimary</item>
</style>
<style name="Widget.Session.Button.Common.UnimportantOutline">
<item name="android:background">@drawable/unimportant_outline_button_medium_background</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:drawableTint" tools:ignore="NewApi">?android:textColorPrimary</item>
<item name="android:drawableTint">?android:textColorPrimary</item>
</style>
<style name="Widget.Session.Button.Common.UnimportantDestructive">
<item name="android:background">@drawable/unimportant_outline_button_medium_background</item>
<item name="android:textColor">?android:textColorPrimary</item>
<item name="android:backgroundTint" tools:ignore="NewApi">@color/destructive</item>
<item name="android:drawableTint" tools:ignore="NewApi">@color/destructive</item>
<item name="android:backgroundTint">@color/destructive</item>
<item name="android:drawableTint">@color/destructive</item>
</style>
<style name="Widget.Session.Button.Common.DestructiveOutline">
<item name="android:background">@drawable/destructive_outline_button_medium_background</item>
<item name="android:textColor">@color/button_destructive</item>
<item name="android:drawableTint" tools:ignore="NewApi">?android:textColorPrimary</item>
<item name="android:drawableTint">?android:textColorPrimary</item>
</style>
<style name="Widget.Session.Button.Dialog" parent="">

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

@@ -319,7 +319,6 @@
<item name="colorPrimaryDark">@color/classic_dark_0</item>
<item name="colorControlNormal">?android:textColorPrimary</item>
<item name="colorControlActivated">?colorAccent</item>
<item name="android:colorControlHighlight">?colorAccent</item>
<item name="android:textColorPrimary">@color/classic_dark_6</item>
<item name="android:textColorSecondary">?android:textColorPrimary</item>
<item name="android:textColorTertiary">@color/classic_dark_5</item>
@@ -334,7 +333,7 @@
<item name="colorCellBackground">@color/classic_dark_1</item>
<item name="colorSettingsBackground">@color/classic_dark_1</item>
<item name="colorDividerBackground">@color/classic_dark_3</item>
<item name="colorCellRipple">@color/classic_dark_3</item>
<item name="android:colorControlHighlight">@color/classic_dark_3</item>
<item name="actionBarPopupTheme">@style/Dark.Popup</item>
<item name="actionBarWidgetTheme">@null</item>
<item name="actionBarTheme">@style/ThemeOverlay.AppCompat.Dark.ActionBar</item>
@@ -382,7 +381,6 @@
<item name="input_bar_lock_view_background">@color/classic_dark_2</item>
<item name="input_bar_lock_view_border">@color/classic_dark_3</item>
<item name="mention_candidates_view_background">@color/classic_dark_2</item>
<item name="mention_candidates_view_background_ripple">@color/classic_dark_3</item>
<item name="scroll_to_bottom_button_background">@color/classic_dark_1</item>
<item name="scroll_to_bottom_button_border">@color/classic_dark_3</item>
<item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item>
@@ -397,7 +395,6 @@
<item name="colorPrimaryDark">@color/classic_light_6</item>
<item name="colorControlNormal">?android:textColorPrimary</item>
<item name="colorControlActivated">?colorAccent</item>
<item name="android:colorControlHighlight">?colorAccent</item>
<item name="android:textColorPrimary">@color/classic_light_0</item>
<item name="android:textColorSecondary">@color/classic_light_1</item>
<item name="android:textColorTertiary">@color/classic_light_1</item>
@@ -408,7 +405,7 @@
<item name="colorCellBackground">@color/classic_light_6</item>
<item name="colorSettingsBackground">@color/classic_light_5</item>
<item name="colorDividerBackground">@color/classic_light_3</item>
<item name="colorCellRipple">@color/classic_light_3</item>
<item name="android:colorControlHighlight">@color/classic_light_3</item>
<item name="bottomSheetDialogTheme">@style/Classic.Light.BottomSheet</item>
<item name="android:actionMenuTextColor">?android:textColorPrimary</item>
<item name="popupTheme">?actionBarPopupTheme</item>
@@ -467,7 +464,6 @@
<item name="input_bar_lock_view_background">@color/classic_light_4</item>
<item name="input_bar_lock_view_border">@color/classic_light_2</item>
<item name="mention_candidates_view_background">?colorCellBackground</item>
<item name="mention_candidates_view_background_ripple">?colorCellRipple</item>
<item name="scroll_to_bottom_button_background">@color/classic_light_4</item>
<item name="scroll_to_bottom_button_border">@color/classic_light_2</item>
<item name="conversation_unread_count_indicator_background">@color/classic_dark_4</item>
@@ -482,7 +478,6 @@
<item name="colorPrimaryDark">@color/ocean_dark_2</item>
<item name="colorControlNormal">@color/ocean_dark_7</item>
<item name="colorControlActivated">?colorAccent</item>
<item name="android:colorControlHighlight">?colorAccent</item>
<item name="android:textColorPrimary">@color/ocean_dark_7</item>
<item name="android:textColorSecondary">@color/ocean_dark_5</item>
<item name="android:textColorTertiary">@color/ocean_dark_5</item>
@@ -496,7 +491,7 @@
<item name="colorCellBackground">@color/ocean_dark_3</item>
<item name="colorSettingsBackground">@color/ocean_dark_1</item>
<item name="colorDividerBackground">@color/ocean_dark_4</item>
<item name="colorCellRipple">@color/ocean_dark_4</item>
<item name="android:colorControlHighlight">@color/ocean_dark_4</item>
<item name="bottomSheetDialogTheme">@style/Ocean.Dark.BottomSheet</item>
<item name="popupTheme">?actionBarPopupTheme</item>
<item name="actionMenuTextColor">?android:textColorPrimary</item>
@@ -549,7 +544,6 @@
<item name="input_bar_lock_view_background">?colorPrimary</item>
<item name="input_bar_lock_view_border">?colorPrimary</item>
<item name="mention_candidates_view_background">@color/ocean_dark_2</item>
<item name="mention_candidates_view_background_ripple">@color/ocean_dark_3</item>
<item name="scroll_to_bottom_button_background">@color/ocean_dark_4</item>
<item name="scroll_to_bottom_button_border">?colorPrimary</item>
<item name="conversation_unread_count_indicator_background">@color/ocean_dark_4</item>
@@ -564,7 +558,6 @@
<item name="colorPrimaryDark">@color/ocean_light_6</item>
<item name="colorControlNormal">@color/ocean_light_1</item>
<item name="colorControlActivated">?colorAccent</item>
<item name="android:colorControlHighlight">?colorAccent</item>
<item name="android:textColorPrimary">@color/ocean_light_1</item>
<item name="android:textColorSecondary">@color/ocean_light_2</item>
<item name="android:textColorTertiary">@color/ocean_light_2</item>
@@ -578,7 +571,7 @@
<item name="colorCellBackground">@color/ocean_light_5</item>
<item name="colorSettingsBackground">@color/ocean_light_6</item>
<item name="colorDividerBackground">@color/ocean_light_3</item>
<item name="colorCellRipple">@color/ocean_light_4</item>
<item name="android:colorControlHighlight">@color/ocean_light_4</item>
<item name="bottomSheetDialogTheme">@style/Ocean.Light.BottomSheet</item>
<item name="actionBarPopupTheme">@style/Light.Popup</item>
<item name="popupTheme">?actionBarPopupTheme</item>
@@ -633,7 +626,6 @@
<item name="input_bar_lock_view_background">@color/ocean_light_5</item>
<item name="input_bar_lock_view_border">@color/ocean_light_1</item>
<item name="mention_candidates_view_background">?colorCellBackground</item>
<item name="mention_candidates_view_background_ripple">?colorCellRipple</item>
<item name="scroll_to_bottom_button_background">?input_bar_button_background_opaque</item>
<item name="scroll_to_bottom_button_border">?input_bar_button_background_opaque_border</item>
<item name="conversation_unread_count_indicator_background">?colorAccent</item>