mirror of
https://github.com/oxen-io/session-android.git
synced 2023-12-14 02:53:01 +01:00
7a773016da
* feat: start new app theming feature * feat: add some theming colours * refactor: start refactoring themes and colours to use dynamic attributes * feat: adding more colours and switching over default colours to be theme based instead of hard-coded or day/night specific * refactor: take a look at ocean light and logo colour * feat: global search colours for light and dark ocean * feat: more styling * feat: adding themes to conversation activity and refactoring the base theme to apply over the top of the activity's theme so it retains noActionBar etc * feat: add dynamic accent color * docs: add todo for changing how accent colour is applied * feat: update new theming to use override primary style so that the regular colorAccent attribute can be used in existing layouts * feat: coordinating styles across layouts, fixing up pinned icons and naming for conversation list items * refactor: re-styling layouts to match new themes and attributes. Need to figure out action mode close button * refactor: remove @color/text and replace with ?android:textColorPrimary to override in themes * refactor: add context theme wrapper to bottom sheet dialog that references accent color * fix: input bar bug fix and preference activity themes * refactor: new settings menu options * fix: crash for PNModeActivity.kt refactor: move ordering in seed dialog to match designs, copy changes to match new settings menu * feat: add new appearance settings activity * refactor: title and VM changes * fix: correct override * feat: add theme appearance screen UI features and start VM implementation. re-add legacy theme utils to get default for migration * fix: compile errors and missing themes from emoji features * refactor: remove background shape alteration and old bottom sheet styles, re-add the theme mode attr * feat: appearance screen wired up, just need to refresh theme * feat: add theme state recreation and fix match system settings option * refactor: add bottom margin * feat: explore custom preference category * feat: add the customized session theme for CorrectedPreferenceFragment * feat: replace AppProtectionPreferenceFragment to extend ListSummaryPreferenceFragment * refactor: change drawable style and remove explicit dividers * refactor: remove divider in CorrectedPreferenceFragment * feat: add theme state check on resume, might be jarring currently * feat: add preference divider elements for settings menu * refactor: settings menu redesigns * refactor: change led preference to integer and refactor TextSecurePreferences.kt * feat: add scroll parcel to save/restore hierarchy on restart with appearance changes * feat: add the conversations blocked contacts and refactor preference order and copy * feat: add blocked contacts activity, basic layout and vm * feat: add unblock DB functions and storage protocol, start working on the DB query state flow, might have to just implement recipient on modified listener * feat: add blocked contacts and notif recipient listeners * feat: add recipient db reader * feat: add blocked contact interactions and fix a theming crash for notifications * feat: introduce better equals and hashcode implementations to recipient, replace home diff util content check with hashcode-based comparison * feat: add settings menu vectors * fix: preview compile error * refactor: migrating settings menu to new designs * feat: help menu * refactor: simplify link opening * refactor: remove space * feat: refactor preferences and start theming for light mode options * refactor: fixing dark and light modes with dialogs * refactor: popup dialogs use proper themes now * refactor: alert dialogs and media edit fragments use attribute references * refactor: use input bar button attribute instead color control normal in vector tint * refactor: transparency, dialog fixes, notification fix * refactor: attrs and styles for buttons * fix: use prominent button color on the outline button's border * fix: fix the trash * refactor: remove the appearance * refactor: avatar placeholder generation, chips and element border styles * refactor: use colors instead of style references * refactor: theming changes to match designs and feedback * refactor: the titles are bold and the categories are tertiary coloured now * fix: appearance settings match preferences, search bottom bar uses themed attributes * refactor: increase setting button height * Update clear all data dialog * Update seed dialog * refactor: more qa feedback changes * feat: add new TLs and fa-rIR TLs * Update notification content dialog * Fix message requests clear all button text color * feat: re-add screenshot observer * refactor: make send tint accent color * feat: add unread background differences * fix: change unread count indicator * build: upgrade build numbers * Fix message requests popupmenu background color * fix: crash from attr reference in color attribute * build: upgrade build number * fix: message bubbles, thumbnail backgrounds, search bar visibility with input bar, attachment buttons * fix: tertiary text for keyboard page search view * fix: emoji overflow colour differences * fix: reaction pill dialog background is now correct colour * Add style to reactions tab layout * fix: appearance activity reverting primary color at correct time * fix: show call privacy warning every time instead of just once * fix: gradient background(?) and audio autoplay disable * fix: crash in all media containing documents * fix: reaction dialog heading fixes * Add style to reactions tab layout * fix: remove gradient backgrounds * fix: adding new reaction normal text attribute to try correct the tab layout * fix: ocean dark unread/read colours * build; update build number * build: update build number Co-authored-by: charles <charles@oxen.io>
266 lines
No EOL
12 KiB
XML
266 lines
No EOL
12 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:theme="@style/Theme.Session.CallActivity"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
android:keepScreenOn="true"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
xmlns:tools="http://schemas.android.com/tools">
|
|
|
|
<FrameLayout
|
|
android:id="@+id/remote_parent"
|
|
android:background="@color/black"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintTop_toTopOf="parent">
|
|
|
|
<FrameLayout
|
|
android:id="@+id/remote_renderer"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"
|
|
android:layout_gravity="center"/>
|
|
</FrameLayout>
|
|
<ImageView
|
|
android:id="@+id/remote_recipient"
|
|
app:layout_constraintStart_toStartOf="@id/remote_parent"
|
|
app:layout_constraintEnd_toEndOf="@id/remote_parent"
|
|
app:layout_constraintTop_toTopOf="@id/remote_parent"
|
|
app:layout_constraintBottom_toBottomOf="@id/remote_parent"
|
|
app:layout_constraintVertical_bias="0.4"
|
|
android:layout_width="@dimen/extra_large_profile_picture_size"
|
|
android:layout_height="@dimen/extra_large_profile_picture_size"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/back_arrow"
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
app:layout_constraintLeft_toLeftOf="parent"
|
|
android:background="@drawable/call_controls_background"
|
|
android:elevation="8dp"
|
|
android:layout_marginLeft="@dimen/small_spacing"
|
|
android:layout_marginTop="@dimen/small_spacing"
|
|
android:src="@drawable/ic_baseline_arrow_back_24"
|
|
android:scaleType="centerInside"
|
|
android:layout_width="@dimen/medium_profile_picture_size"
|
|
android:layout_height="@dimen/medium_profile_picture_size"
|
|
app:tint="@color/call_action_foreground" />
|
|
|
|
<TextView
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
android:layout_marginHorizontal="@dimen/massive_spacing"
|
|
android:layout_marginTop="@dimen/medium_spacing"
|
|
android:textAlignment="center"
|
|
android:id="@+id/remote_recipient_name"
|
|
android:textStyle="bold"
|
|
tools:text="@tools:sample/full_names"
|
|
android:ellipsize="end"
|
|
android:textSize="20sp"
|
|
android:layout_width="0dp"
|
|
android:layout_height="wrap_content"/>
|
|
|
|
<com.github.ybq.android.spinkit.SpinKitView
|
|
android:id="@+id/remote_loading_view"
|
|
style="@style/SpinKitView.ThreeBounce"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:layout_gravity="center"
|
|
android:foregroundGravity="center"
|
|
android:visibility="gone"
|
|
app:SpinKit_Color="@color/core_white"
|
|
app:layout_constraintEnd_toEndOf="@+id/remote_recipient"
|
|
app:layout_constraintStart_toStartOf="@+id/remote_recipient"
|
|
app:layout_constraintTop_toBottomOf="@id/remote_recipient"
|
|
tools:visibility="visible" />
|
|
|
|
<TextView
|
|
android:visibility="gone"
|
|
app:layout_constraintTop_toBottomOf="@+id/remote_loading_view"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
android:text="@string/WebRtcCallActivity_Reconnecting"
|
|
android:id="@+id/reconnecting_text"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"/>
|
|
|
|
<TextView
|
|
android:id="@+id/sessionCallText"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:text="@string/WebRtcCallActivity_Session_Call"
|
|
android:textColor="?android:textColorPrimary"
|
|
android:textSize="11sp"
|
|
app:layout_constraintBottom_toTopOf="@+id/controlGroupBarrier"
|
|
android:layout_marginBottom="@dimen/small_spacing"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
/>
|
|
|
|
<TextView
|
|
android:id="@+id/callTime"
|
|
android:textSize="@dimen/medium_font_size"
|
|
android:textColor="?android:textColorPrimary"
|
|
tools:text="@tools:sample/date/hhmmss"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintBottom_toTopOf="@+id/sessionCallText"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"/>
|
|
|
|
<FrameLayout
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintTop_toTopOf="parent"
|
|
app:layout_constraintDimensionRatio="h,9:16"
|
|
android:layout_marginHorizontal="@dimen/large_spacing"
|
|
android:layout_marginVertical="@dimen/massive_spacing"
|
|
app:layout_constraintWidth_percent="0.2"
|
|
android:layout_height="0dp"
|
|
android:layout_width="0dp">
|
|
<FrameLayout
|
|
android:elevation="8dp"
|
|
android:id="@+id/local_renderer"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent"/>
|
|
<com.github.ybq.android.spinkit.SpinKitView
|
|
android:id="@+id/local_loading_view"
|
|
style="@style/SpinKitView.Large.ThreeBounce"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
app:SpinKit_Color="?android:textColorPrimary"
|
|
android:layout_gravity="center"
|
|
tools:visibility="visible"
|
|
android:visibility="gone" />
|
|
</FrameLayout>
|
|
|
|
<ImageView
|
|
android:id="@+id/endCallButton"
|
|
android:background="@drawable/circle_tintable"
|
|
android:src="@drawable/ic_baseline_call_end_24"
|
|
android:padding="@dimen/medium_spacing"
|
|
android:foregroundTint="@color/call_action_foreground"
|
|
android:backgroundTint="@color/destructive"
|
|
android:layout_width="@dimen/large_button_height"
|
|
android:layout_height="@dimen/large_button_height"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
android:layout_marginBottom="@dimen/large_spacing"
|
|
/>
|
|
|
|
<ImageView
|
|
android:id="@+id/switchCameraButton"
|
|
android:background="@drawable/call_controls_background"
|
|
android:src="@drawable/ic_baseline_flip_camera_android_24"
|
|
android:padding="@dimen/medium_spacing"
|
|
app:tint="@color/call_action_foreground"
|
|
android:layout_width="@dimen/large_button_height"
|
|
android:layout_height="@dimen/large_button_height"
|
|
app:layout_constraintBottom_toTopOf="@+id/endCallButton"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
android:layout_marginBottom="@dimen/large_spacing"
|
|
app:layout_constraintHorizontal_bias="0.1"
|
|
/>
|
|
|
|
<ImageView
|
|
android:id="@+id/enableCameraButton"
|
|
android:background="@drawable/circle_tintable"
|
|
android:backgroundTint="@color/state_list_call_action_background"
|
|
app:tint="@color/state_list_call_action_foreground"
|
|
android:src="@drawable/ic_baseline_videocam_24"
|
|
android:padding="@dimen/medium_spacing"
|
|
android:layout_width="@dimen/large_button_height"
|
|
android:layout_height="@dimen/large_button_height"
|
|
app:layout_constraintBottom_toTopOf="@+id/endCallButton"
|
|
app:layout_constraintStart_toEndOf="@id/switchCameraButton"
|
|
app:layout_constraintEnd_toStartOf="@id/microphoneButton"
|
|
android:layout_marginBottom="@dimen/large_spacing"
|
|
/>
|
|
|
|
<ImageView
|
|
android:id="@+id/microphoneButton"
|
|
android:layout_width="@dimen/large_button_height"
|
|
android:layout_height="@dimen/large_button_height"
|
|
android:padding="@dimen/medium_spacing"
|
|
android:src="@drawable/ic_baseline_mic_off_24"
|
|
android:layout_marginBottom="@dimen/large_spacing"
|
|
app:layout_constraintBottom_toTopOf="@+id/endCallButton"
|
|
android:background="@drawable/circle_tintable"
|
|
android:backgroundTint="@color/state_list_call_action_mic_background"
|
|
app:tint="@color/call_action_foreground"
|
|
app:layout_constraintEnd_toStartOf="@id/speakerPhoneButton"
|
|
app:layout_constraintStart_toEndOf="@id/enableCameraButton"/>
|
|
|
|
<ImageView
|
|
android:id="@+id/speakerPhoneButton"
|
|
android:background="@drawable/circle_tintable"
|
|
android:backgroundTint="@color/state_list_call_action_background"
|
|
app:tint="@color/state_list_call_action_foreground"
|
|
android:src="@drawable/ic_baseline_volume_up_24"
|
|
android:padding="@dimen/medium_spacing"
|
|
android:layout_width="@dimen/large_button_height"
|
|
android:layout_height="@dimen/large_button_height"
|
|
app:layout_constraintBottom_toTopOf="@+id/endCallButton"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
android:layout_marginBottom="@dimen/large_spacing"
|
|
app:layout_constraintHorizontal_bias="0.9"
|
|
/>
|
|
|
|
<ImageView
|
|
android:background="@drawable/circle_tintable"
|
|
android:src="@drawable/ic_baseline_call_24"
|
|
android:padding="@dimen/medium_spacing"
|
|
android:foregroundTint="@color/call_action_foreground"
|
|
android:backgroundTint="?colorAccent"
|
|
android:layout_width="@dimen/large_button_height"
|
|
android:layout_height="@dimen/large_button_height"
|
|
android:layout_marginBottom="@dimen/very_large_spacing"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintHorizontal_bias="0.75"
|
|
android:gravity="center"
|
|
android:id="@+id/acceptCallButton"/>
|
|
|
|
<ImageView
|
|
android:background="@drawable/circle_tintable"
|
|
android:src="@drawable/ic_baseline_call_end_24"
|
|
android:padding="@dimen/medium_spacing"
|
|
android:foregroundTint="@color/call_action_foreground"
|
|
android:backgroundTint="@color/destructive"
|
|
android:layout_width="@dimen/large_button_height"
|
|
android:layout_height="@dimen/large_button_height"
|
|
android:layout_marginBottom="@dimen/very_large_spacing"
|
|
app:layout_constraintBottom_toBottomOf="parent"
|
|
app:layout_constraintEnd_toEndOf="parent"
|
|
app:layout_constraintStart_toStartOf="parent"
|
|
app:layout_constraintHorizontal_bias="0.25"
|
|
android:id="@+id/declineCallButton"/>
|
|
|
|
<androidx.constraintlayout.widget.Group
|
|
android:id="@+id/controlGroup"
|
|
android:layout_width="0dp"
|
|
android:layout_height="0dp"
|
|
app:constraint_referenced_ids="enableCameraButton,endCallButton,switchCameraButton,speakerPhoneButton,microphoneButton"
|
|
/>
|
|
|
|
<androidx.constraintlayout.widget.Group
|
|
android:layout_width="0dp"
|
|
android:layout_height="0dp"
|
|
android:id="@+id/incomingControlGroup"
|
|
app:constraint_referenced_ids="acceptCallButton,declineCallButton"/>
|
|
|
|
<androidx.constraintlayout.widget.Barrier
|
|
android:id="@+id/controlGroupBarrier"
|
|
app:barrierDirection="top"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:orientation="horizontal"
|
|
app:constraint_referenced_ids="switchCameraButton,enableCameraButton,microphoneButton,speakerPhoneButton,acceptCallButton,declineCallButton"
|
|
/>
|
|
|
|
</androidx.constraintlayout.widget.ConstraintLayout> |