jarno
/
element-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3530 from vector-im/feature/bma/prepare_release_1.1.10 

Prepare release 1.1.10
This commit is contained in:
Benoit Marty 2021-06-18 21:04:27 +02:00 committed by GitHub
parent be578d7fae c4a6d92481
commit 71a8a948a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
20 changed files with 99 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugBottomSheet.kt
View File

@ -21,12 +21,12 @@ import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import im.vector.lib.ui.styles.databinding.ActivityTestMaterialThemeBinding
import im.vector.lib.ui.styles.databinding.ActivityDebugMaterialThemeBinding
class DebugBottomSheet : BottomSheetDialogFragment() {
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
// Reuse tha Activity layout
val binding = ActivityTestMaterialThemeBinding.inflate(inflater, container, false)
val binding = ActivityDebugMaterialThemeBinding.inflate(inflater, container, false)
return binding.root
}
}

4
library/ui-styles/src/debug/java/im/vector/lib/ui/styles/debug/DebugMaterialThemeActivity.kt
View File

@ -23,14 +23,14 @@ import androidx.appcompat.app.AppCompatActivity
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.google.android.material.snackbar.Snackbar
import im.vector.lib.ui.styles.R
import im.vector.lib.ui.styles.databinding.ActivityTestMaterialThemeBinding
import im.vector.lib.ui.styles.databinding.ActivityDebugMaterialThemeBinding
// Rendering is not the same with VectorBaseActivity
abstract class DebugMaterialThemeActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
val views = ActivityTestMaterialThemeBinding.inflate(layoutInflater)
val views = ActivityDebugMaterialThemeBinding.inflate(layoutInflater)
setContentView(views.root)
setSupportActionBar(views.debugToolbar)

41
library/ui-styles/src/debug/res/layout/activity_test_material_theme.xml → library/ui-styles/src/debug/res/layout/activity_debug_material_theme.xml
View File

@ -263,10 +263,51 @@
style="@style/DebugTextColorDemo.Black"
android:background="?android:textColorLink"
android:text="android:textColorLink" />
</LinearLayout>
</LinearLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?android:colorBackground"
android:padding="8dp"
android:text="Background"
android:textColor="?colorOnBackground" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorPrimary"
android:padding="8dp"
android:text="Primary"
android:textColor="?colorOnPrimary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorSecondary"
android:padding="8dp"
android:text="Secondary"
android:textColor="?colorOnSecondary" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorError"
android:padding="8dp"
android:text="Error"
android:textColor="?colorOnError" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?colorSurface"
android:padding="8dp"
android:text="Surface"
android:textColor="?colorOnSurface" />
<com.google.android.material.textfield.TextInputLayout
style="@style/Widget.MaterialComponents.TextInputLayout.OutlinedBox"
android:layout_width="match_parent"

2
library/ui-styles/src/main/res/values/theme_dark.xml
View File

@ -43,7 +43,7 @@
<item name="vctr_spoiler_background_color">#FFFFFFFF</item>
<!-- Some alias -->
<item name="vctr_header_background">?vctr_content_quinary</item>
<item name="vctr_header_background">?vctr_system</item>
<item name="vctr_list_separator">?vctr_content_quinary</item>
<item name="vctr_list_separator_system">?vctr_system</item>
<item name="vctr_list_separator_on_surface">?vctr_system</item>

2
library/ui-styles/src/main/res/values/theme_light.xml
View File

@ -43,7 +43,7 @@
<item name="vctr_spoiler_background_color">#FF000000</item>
<!-- Some alias -->
<item name="vctr_header_background">?vctr_content_quinary</item>
<item name="vctr_header_background">?vctr_system</item>
<item name="vctr_list_separator">?vctr_content_quinary</item>
<item name="vctr_list_separator_system">?vctr_system</item>
<item name="vctr_list_separator_on_surface">?vctr_system</item>

2
vector/src/main/java/im/vector/app/features/call/dialpad/CallDialPadBottomSheet.kt
View File

@ -71,7 +71,7 @@ class CallDialPadBottomSheet : VectorBaseBottomSheetDialogFragment<BottomSheetCa
} else {
setCallbackToFragment(callback)
}
views.callDialPadClose.setOnClickListener {
views.callDialPadClose.debouncedClicks {
dismiss()
}
}

2
vector/src/main/java/im/vector/app/features/spaces/SpaceSettingsMenuBottomSheet.kt
View File

@ -128,7 +128,7 @@ class SpaceSettingsMenuBottomSheet : VectorBaseBottomSheetDialogFragment<BottomS
isLastAdmin = isAdmin && otherAdminCount == 0
}.disposeOnDestroyView()
views.spaceBetaTag.setOnClickListener {
views.spaceBetaTag.debouncedClicks {
bugReporter.openBugReportScreen(requireActivity(), ReportType.SPACE_BETA_FEEDBACK)
}

4
vector/src/main/java/im/vector/app/features/widgets/permissions/RoomWidgetPermissionBottomSheet.kt
View File

@ -64,8 +64,8 @@ class RoomWidgetPermissionBottomSheet :
}
private fun setupViews() {
views.widgetPermissionDecline.setOnClickListener { doDecline() }
views.widgetPermissionContinue.setOnClickListener { doAccept() }
views.widgetPermissionDecline.debouncedClicks { doDecline() }
views.widgetPermissionContinue.debouncedClicks { doAccept() }
}
override fun invalidate() = withState(viewModel) { state ->

2
vector/src/main/res/drawable/ic_baseline_perm_contact_calendar_24.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?colorControlNormal"
android:fillColor="#F00"
android:pathData="M19,3h-1L18,1h-2v2L8,3L8,1L6,1v2L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM12,6c1.66,0 3,1.34 3,3s-1.34,3 -3,3 -3,-1.34 -3,-3 1.34,-3 3,-3zM18,18L6,18v-1c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1z"/>
</vector>

2
vector/src/main/res/drawable/ic_pause.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?colorControlNormal"
android:fillColor="#F00"
android:pathData="M6,19h4L10,5L6,5v14zM14,5v14h4L18,5h-4z"/>
</vector>

2
vector/src/main/res/drawable/ic_play_arrow.xml
View File

@ -4,6 +4,6 @@
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="?colorControlNormal"
android:fillColor="#F00"
android:pathData="M8,5v14l11,-7z"/>
</vector>

11
vector/src/main/res/drawable/rounded_rect_shape_16.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:width="40dp" android:height="40dp"/>
<solid android:color="?vctr_header_background" />
<corners android:radius="16dp" />
</shape>

2
vector/src/main/res/drawable/rounded_rect_shape_8.xml
View File

@ -4,7 +4,7 @@
<size android:width="40dp" android:height="40dp"/>
<solid android:color="?vctr_header_background" />
<solid android:color="?vctr_system" />
<corners android:radius="8dp" />

11
vector/src/main/res/drawable/rounded_rect_stroke_8.xml
View File

@ -1,11 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<size android:width="40dp" android:height="40dp"/>
<stroke android:width="1dp" android:color="?vctr_header_background" />
<corners android:radius="8dp" />
</shape>

2
vector/src/main/res/layout/fragment_login_terms.xml
View File

@ -55,6 +55,8 @@
<Button
android:id="@+id/loginTermsSubmit"
style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="36dp"
android:text="@string/accept"
app:layout_constraintBottom_toBottomOf="parent"

2
vector/src/main/res/layout/fragment_login_terms_2.xml
View File

@ -59,6 +59,8 @@
<Button
android:id="@+id/loginTermsSubmit"
style="@style/Widget.Vector.Button.Login"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="36dp"
android:text="@string/accept"
app:layout_constraintBottom_toBottomOf="parent"

74
vector/src/main/res/layout/fragment_user_code_show.xml
View File

@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- Source: https://www.figma.com/file/X4XTH9iS2KGJ2wFKDqkyed/Compound?node-id=2857%3A321 -->
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@ -62,35 +63,14 @@
</com.google.android.material.appbar.AppBarLayout>
<ImageView
android:id="@+id/showUserCodeAvatar"
android:layout_width="60dp"
android:layout_height="60dp"
android:layout_marginStart="@dimen/layout_horizontal_margin"
android:contentDescription="@string/avatar"
android:elevation="4dp"
android:transitionName="profile"
app:layout_constraintBottom_toBottomOf="@id/showUserCodeCardTopBarrier"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/showUserCodeCardTopBarrier"
tools:src="@sample/user_round_avatars" />
<androidx.constraintlayout.widget.Barrier
android:id="@+id/showUserCodeCardTopBarrier"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:barrierDirection="top"
app:constraint_referenced_ids="showUserCodeCard" />
<com.google.android.material.card.MaterialCardView
android:id="@+id/showUserCodeCard"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="50dp"
android:layout_marginTop="81dp"
android:padding="16dp"
app:cardCornerRadius="20dp"
app:cardCornerRadius="8dp"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/appBarLayout"
@ -98,9 +78,7 @@
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minWidth="300dp"
android:paddingTop="40dp">
android:layout_height="wrap_content">
<TextView
android:id="@+id/showUserCodeCardNameText"
@ -108,6 +86,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="50dp"
android:layout_marginEnd="16dp"
android:maxLines="1"
android:singleLine="true"
@ -127,7 +106,7 @@
android:maxLines="1"
android:singleLine="true"
android:textAlignment="center"
android:textColor="?vctr_content_secondary"
android:textColor="?vctr_content_tertiary"
app:layout_constraintTop_toBottomOf="@id/showUserCodeCardNameText"
tools:text="@sample/users.json/data/id" />
@ -139,23 +118,44 @@
<!-- android:contentDescription="@string/a11y_qr_code_for_verification"-->
<!-- tools:src="@color/vctr_header_panel_background_black" />-->
<im.vector.app.core.ui.views.QrCodeImageView
android:id="@+id/showUserCodeQRImage"
android:layout_width="260dp"
android:layout_height="260dp"
android:layout_gravity="center"
android:layout_marginTop="10dp"
android:layout_marginBottom="@dimen/layout_vertical_margin"
<com.google.android.material.card.MaterialCardView
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_marginTop="16dp"
android:layout_marginBottom="32dp"
android:backgroundTint="@color/palette_white"
app:cardCornerRadius="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/showUserCodeCardUserIdText"
tools:src="@drawable/ic_qr_code_add" />
app:layout_constraintWidth_percent="0.8">
<im.vector.app.core.ui.views.QrCodeImageView
android:id="@+id/showUserCodeQRImage"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:src="@drawable/ic_qr_code_add" />
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.card.MaterialCardView>
<ImageView
android:id="@+id/showUserCodeAvatar"
android:layout_width="76dp"
android:layout_height="76dp"
android:contentDescription="@string/avatar"
android:elevation="4dp"
android:transitionName="profile"
app:layout_constraintBottom_toTopOf="@id/showUserCodeCard"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="@id/showUserCodeCard"
tools:src="@sample/user_round_avatars" />
<TextView
android:id="@+id/showUserCodeInfoText"
style="@style/Widget.Vector.TextView.Body"
@ -166,7 +166,7 @@
android:layout_marginEnd="16dp"
android:text="@string/user_code_info_text"
android:textAlignment="center"
android:textColor="?vctr_content_secondary"
android:textColor="?vctr_content_primary"
app:layout_constraintEnd_toEndOf="@id/showUserCodeCard"
app:layout_constraintStart_toStartOf="@id/showUserCodeCard"
app:layout_constraintTop_toBottomOf="@id/showUserCodeCard" />
@ -175,7 +175,7 @@
android:id="@+id/showUserCodeShareButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:layout_marginTop="24dp"
android:minWidth="130dp"
android:text="@string/user_code_share"
app:icon="@drawable/ic_share"

1
vector/src/main/res/layout/item_attachment_miniature_preview.xml
View File

@ -23,6 +23,7 @@
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_gravity="center"
android:alpha="0.75"
android:contentDescription="@string/a11y_video"
app:srcCompat="@drawable/ic_play_arrow"
app:tint="@android:color/white"

2
vector/src/main/res/layout/item_contact_action.xml
View File

@ -18,7 +18,7 @@
android:importantForAccessibility="no"
android:padding="10dp"
app:tint="?vctr_content_secondary"
tools:src="@drawable/ic_invite_people" />
tools:src="@drawable/ic_baseline_perm_contact_calendar_24" />
<TextView
android:id="@+id/actionTitleText"

2
vector/src/main/res/layout/item_profile_section.xml
View File

@ -5,7 +5,7 @@
style="@style/Widget.Vector.TextView.Title"
android:layout_width="match_parent"
android:layout_height="56dp"
android:background="?vctr_list_separator_system"
android:background="?vctr_header_background"
android:gravity="bottom"
android:paddingStart="16dp"
android:paddingEnd="16dp"