Unverified Commit d81d971c authored by Valere's avatar Valere Committed by GitHub
Browse files

Merge pull request #3302 from vector-im/feature/bca/spaces_admin_manage

Feature/bca/spaces admin manage
parents e6d4f9a1 723f7cc3
......@@ -50,7 +50,7 @@
android:id="@+id/formSwitchDivider"
android:layout_width="0dp"
android:layout_height="1dp"
android:background="?riotx_header_panel_border_mobile"
android:background="?vctr_list_divider_color"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />
......
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/itemPublicRoomLayout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?riotx_background"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/selectableItemBackground"
android:minHeight="50dp">
<ImageView
android:id="@+id/itemAddRoomRoomAvatar"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginStart="16dp"
android:contentDescription="@string/avatar"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@tools:sample/avatars" />
<TextView
android:id="@+id/itemAddRoomRoomNameText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="17dp"
android:layout_marginEnd="4dp"
android:ellipsize="end"
android:maxLines="2"
android:textColor="?riotx_text_primary"
android:textSize="15sp"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/itemManageRoomSuggested"
app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomAvatar"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
tools:text="@sample/matrix.json/data/roomName" />
<TextView
android:id="@+id/itemManageRoomSuggested"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="4dp"
android:layout_marginEnd="8dp"
android:ellipsize="end"
android:maxLines="1"
android:textColor="?riotx_text_secondary"
android:textSize="12sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/itemAddRoomRoomCheckBox"
app:layout_constraintStart_toEndOf="@id/itemAddRoomRoomNameText"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
android:text="@string/space_suggested" />
<ImageView
android:id="@+id/itemAddRoomRoomCheckBox"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_marginEnd="16dp"
android:contentDescription="@string/a11y_checked"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/itemManageRoomSuggested"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/ic_checkbox_on" />
</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_delete"
android:title="@string/delete"
android:icon="@drawable/ic_delete_unsent_messages"
app:showAsAction="always" />
<item
android:id="@+id/action_mark_as_suggested"
android:title="@string/space_mark_as_suggested"
app:showAsAction="ifRoom" />
<item
android:id="@+id/action_mark_as_not_suggested"
android:title="@string/space_mark_as_not_suggested"
app:showAsAction="ifRoom" />
</menu>
\ No newline at end of file
......@@ -3356,4 +3356,10 @@
<string name="user_invites_you">%s invites you</string>
<string name="looking_for_someone_not_in_space">Looking for someone not in %s?</string>
<string name="space_settings_manage_rooms">Manage rooms</string>
<string name="make_this_space_public">Make this space public</string>
<string name="space_suggested">Suggested</string>
<string name="space_mark_as_suggested">Mark as suggested</string>
<string name="space_mark_as_not_suggested">Mark as not suggested</string>
<string name="space_manage_rooms_and_spaces">Manage rooms and spaces</string>
</resources>
......@@ -11,6 +11,13 @@
<item name="android:background">?riotx_background</item>
</style>
<style name="ActionModeTheme" parent="Widget.AppCompat.ActionMode">
<item name="background">?riotx_background</item>
<item name="titleTextStyle">@style/Vector.Toolbar.Title</item>
<item name="subtitleTextStyle">@style/Vector.Toolbar.SubTitle</item>
<item name="actionMenuTextColor">?colorOnPrimary</item>
</style>
<style name="VectorToolbarStyle" parent="VectorToolbarStyleWithPadding">
<item name="contentInsetStartWithNavigation">0dp</item>
</style>
......@@ -65,7 +72,7 @@
<!-- actionbar icons color -->
<style name="Vector.ActionBarTheme" parent="ThemeOverlay.MaterialComponents.ActionBar">
<item name="colorControlNormal">@android:color/white</item>
<item name="colorControlNormal">?android:attr/textColorPrimary</item>
</style>
<!-- custom action bar -->
......
......@@ -181,6 +181,8 @@
<!-- chat effect -->
<item name="vctr_chat_effect_snow_background">@android:color/transparent</item>
<item name="actionModeStyle">@style/ActionModeTheme</item>
</style>
<style name="AppTheme.Dark" parent="AppTheme.Base.Dark" />
......
......@@ -183,6 +183,9 @@
<!-- chat effect -->
<item name="vctr_chat_effect_snow_background">@color/black_alpha</item>
<item name="actionModeStyle">@style/ActionModeTheme</item>
</style>
<style name="AppTheme.Light" parent="AppTheme.Base.Light" />
......
......@@ -7,6 +7,7 @@
<im.vector.app.core.preference.VectorSwitchPreference
android:defaultValue="false"
android:key="SETTINGS_DEVELOPER_MODE_PREFERENCE_KEY"
android:icon="@drawable/ic_verification_glasses"
android:summary="@string/settings_developer_mode_summary"
android:title="@string/settings_developer_mode" />
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment