2020-06-09 05:58:01 +02:00
|
|
|
<?xml version="1.0" encoding="utf-8"?>
|
2020-10-06 05:10:57 +02:00
|
|
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
2020-08-14 11:26:56 +02:00
|
|
|
xmlns:tools="http://schemas.android.com/tools"
|
2020-10-06 05:10:57 +02:00
|
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
2021-07-09 03:14:21 +02:00
|
|
|
tools:context="org.thoughtcrime.securesms.groups.EditClosedGroupActivity">
|
2020-06-09 05:58:01 +02:00
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/mainContentContainer"
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:orientation="vertical">
|
|
|
|
|
|
|
|
<RelativeLayout
|
2020-08-14 06:52:15 +02:00
|
|
|
android:id="@+id/ctnGroupNameSection"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="wrap_content"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:padding="@dimen/large_spacing"
|
|
|
|
android:gravity="center">
|
2020-06-09 05:58:01 +02:00
|
|
|
|
2020-08-14 11:26:56 +02:00
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/cntGroupNameEdit"
|
|
|
|
android:layout_width="match_parent"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:layout_height="wrap_content"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:gravity="center"
|
2020-08-14 11:26:56 +02:00
|
|
|
android:orientation="horizontal"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:visibility="invisible"
|
2020-08-20 08:47:15 +02:00
|
|
|
tools:visibility="invisible">
|
2020-08-14 11:26:56 +02:00
|
|
|
|
|
|
|
<ImageView
|
|
|
|
android:id="@+id/btnCancelGroupNameEdit"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:layout_width="24dp"
|
|
|
|
android:layout_height="24dp"
|
2020-08-20 08:47:15 +02:00
|
|
|
android:src="@drawable/ic_baseline_clear_24"/>
|
2020-08-14 11:26:56 +02:00
|
|
|
|
|
|
|
<EditText
|
|
|
|
style="@style/SessionEditText"
|
|
|
|
android:id="@+id/edtGroupName"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:layout_width="wrap_content"
|
2020-08-14 11:26:56 +02:00
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="center"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:layout_marginStart="@dimen/small_spacing"
|
|
|
|
android:layout_marginEnd="@dimen/small_spacing"
|
2020-08-14 11:26:56 +02:00
|
|
|
android:textAlignment="center"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:paddingTop="12dp"
|
|
|
|
android:paddingBottom="12dp"
|
2020-08-14 11:26:56 +02:00
|
|
|
android:inputType="text"
|
|
|
|
android:singleLine="true"
|
|
|
|
android:imeOptions="actionDone"
|
|
|
|
android:hint="@string/activity_edit_closed_group_edit_text_hint" />
|
|
|
|
|
|
|
|
<ImageView
|
|
|
|
android:id="@+id/btnSaveGroupNameEdit"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:layout_width="24dp"
|
|
|
|
android:layout_height="24dp"
|
2020-08-14 11:26:56 +02:00
|
|
|
android:layout_gravity="center"
|
2020-08-20 08:47:15 +02:00
|
|
|
android:src="@drawable/ic_baseline_done_24"/>
|
2020-08-14 11:26:56 +02:00
|
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/cntGroupNameDisplay"
|
|
|
|
android:layout_width="match_parent"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:layout_height="wrap_content"
|
2020-08-14 11:26:56 +02:00
|
|
|
android:gravity="center"
|
|
|
|
android:visibility="visible"
|
2020-08-20 08:47:15 +02:00
|
|
|
tools:visibility="visible">
|
2020-08-14 11:26:56 +02:00
|
|
|
|
|
|
|
<TextView
|
|
|
|
android:id="@+id/lblGroupNameDisplay"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_gravity="center"
|
New app theming (#913)
* 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>
2022-10-12 08:05:55 +02:00
|
|
|
android:textColor="?android:textColorPrimary"
|
2020-08-14 11:26:56 +02:00
|
|
|
android:textSize="@dimen/very_large_font_size"
|
|
|
|
android:textStyle="bold"
|
|
|
|
android:textAlignment="center"
|
|
|
|
android:paddingStart="24dp"
|
|
|
|
android:paddingEnd="0dp"
|
2020-08-20 08:47:15 +02:00
|
|
|
android:drawableEnd="@drawable/ic_baseline_edit_24"
|
2020-08-14 11:26:56 +02:00
|
|
|
android:drawablePadding="@dimen/small_spacing"
|
|
|
|
tools:text="SomeGroupName"/>
|
2020-08-18 02:05:24 +02:00
|
|
|
|
2020-08-14 11:26:56 +02:00
|
|
|
</LinearLayout>
|
2020-06-22 07:49:18 +02:00
|
|
|
|
2020-06-09 05:58:01 +02:00
|
|
|
</RelativeLayout>
|
|
|
|
|
|
|
|
<View
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="1px"
|
2020-08-24 05:34:34 +02:00
|
|
|
android:background="?android:dividerHorizontal" />
|
2020-06-09 05:58:01 +02:00
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:layout_width="match_parent"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:orientation="horizontal">
|
2020-06-09 05:58:01 +02:00
|
|
|
|
|
|
|
<TextView
|
2020-08-18 02:05:24 +02:00
|
|
|
android:layout_width="0dp"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:layout_height="wrap_content"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:layout_marginStart="@dimen/medium_spacing"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:layout_marginTop="@dimen/small_spacing"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:layout_marginEnd="@dimen/small_spacing"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:layout_marginBottom="@dimen/small_spacing"
|
|
|
|
android:layout_weight="1"
|
|
|
|
android:text="@string/activity_edit_closed_group_edit_members"
|
New app theming (#913)
* 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>
2022-10-12 08:05:55 +02:00
|
|
|
android:textColor="?android:textColorPrimary"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:textSize="@dimen/medium_font_size" />
|
|
|
|
|
|
|
|
<Button
|
|
|
|
android:id="@+id/addMembersClosedGroupButton"
|
2020-08-24 08:46:12 +02:00
|
|
|
style="@style/Widget.Session.Button.Common.ProminentOutline"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:layout_width="wrap_content"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:layout_height="@dimen/small_button_height"
|
|
|
|
android:layout_marginTop="@dimen/small_spacing"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:layout_marginEnd="@dimen/medium_spacing"
|
|
|
|
android:layout_marginStart="@dimen/small_spacing"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:layout_marginBottom="@dimen/small_spacing"
|
2020-08-18 02:05:24 +02:00
|
|
|
android:paddingStart="@dimen/medium_spacing"
|
|
|
|
android:paddingEnd="@dimen/medium_spacing"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:text="@string/activity_edit_closed_group_add_members" />
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
2020-08-18 02:05:24 +02:00
|
|
|
<View
|
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="1px"
|
2020-08-24 05:34:34 +02:00
|
|
|
android:background="?android:dividerHorizontal" />
|
2020-08-18 02:05:24 +02:00
|
|
|
|
2020-08-19 02:06:26 +02:00
|
|
|
<androidx.recyclerview.widget.RecyclerView
|
2020-12-04 06:00:52 +01:00
|
|
|
android:id="@+id/rvUserList"
|
2020-06-09 05:58:01 +02:00
|
|
|
android:layout_width="match_parent"
|
2020-08-24 08:46:12 +02:00
|
|
|
android:layout_height="match_parent"
|
|
|
|
tools:listitem="@layout/view_user"/>
|
2020-06-09 05:58:01 +02:00
|
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
|
|
|
<LinearLayout
|
|
|
|
android:id="@+id/emptyStateContainer"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:gravity="center_horizontal"
|
|
|
|
android:orientation="vertical"
|
|
|
|
android:layout_centerInParent="true">
|
|
|
|
|
|
|
|
</LinearLayout>
|
|
|
|
|
2020-10-06 05:10:57 +02:00
|
|
|
<RelativeLayout
|
2020-12-04 06:00:52 +01:00
|
|
|
android:id="@+id/loaderContainer"
|
2020-10-06 05:10:57 +02:00
|
|
|
android:layout_width="match_parent"
|
|
|
|
android:layout_height="match_parent"
|
|
|
|
android:background="#A4000000"
|
|
|
|
android:visibility="gone"
|
|
|
|
android:alpha="0">
|
|
|
|
|
|
|
|
<com.github.ybq.android.spinkit.SpinKitView
|
|
|
|
style="@style/SpinKitView.Large.ThreeBounce"
|
|
|
|
android:layout_width="wrap_content"
|
|
|
|
android:layout_height="wrap_content"
|
|
|
|
android:layout_marginTop="8dp"
|
|
|
|
android:layout_centerInParent="true"
|
|
|
|
app:SpinKit_Color="@android:color/white" />
|
|
|
|
|
|
|
|
</RelativeLayout>
|
|
|
|
|
2020-06-09 05:58:01 +02:00
|
|
|
</RelativeLayout>
|