Merge pull request #16472 from wordpress-mobile/issue/16469-adjust-fe…

…ature-introduction-max-ems [Blogging prompts v1] Adjust feature introduction ems
wordpress-mobile · May 25, 2022 · 0b754c2 · 0b754c2
2 parents 572edb0 + b75628a
commit 0b754c2
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 14 deletions.
diff --git a/WordPress/src/main/res/layout/blogging_prompts_onboarding_dialog_content_view.xml b/WordPress/src/main/res/layout/blogging_prompts_onboarding_dialog_content_view.xml
@@ -17,20 +17,20 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/content_top">
 
-        <include
-            android:id="@+id/prompt_card"
-            layout="@layout/my_site_blogging_promp_card"
+        <View
+            android:id="@+id/card_cover_view"
             android:layout_width="0dp"
-            android:layout_height="wrap_content"
+            android:layout_height="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <View
-            android:id="@+id/card_cover_view"
+        <include
+            android:id="@+id/prompt_card"
+            layout="@layout/my_site_blogging_promp_card"
             android:layout_width="0dp"
-            android:layout_height="0dp"
+            android:layout_height="wrap_content"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -40,9 +40,10 @@
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/content_top"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:gravity="center"
+        android:maxEms="70"
         android:textAppearance="?attr/textAppearanceBody1"
         app:layout_constraintBottom_toTopOf="@+id/prompt_card_container"
         app:layout_constraintEnd_toEndOf="parent"
@@ -53,10 +54,11 @@
 
     <com.google.android.material.textview.MaterialTextView
         android:id="@+id/content_bottom"
-        android:layout_width="wrap_content"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginTop="@dimen/margin_extra_medium_large"
         android:gravity="center"
+        android:maxEms="70"
         android:textAppearance="?attr/textAppearanceBody1"
         app:layout_constraintBottom_toTopOf="@+id/content_note"
         app:layout_constraintEnd_toEndOf="parent"
@@ -78,7 +80,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/content_bottom"
-        tools:text="@string/blogging_prompts_onboarding_content_note" />
-
+        tools:text="@string/blogging_prompts_onboarding_content_note_content" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/config/detekt/baseline.xml b/config/detekt/baseline.xml
@@ -270,9 +270,6 @@
     <ID>MaxLineLength:StoryMediaSaveUploadBridge.kt$StoryMediaSaveUploadBridge.&lt;no name provided&gt;$// here we change the ids on the actual StoryFrameItems, and also update the flattened / composed image</ID>
     <ID>MaxLineLength:WPWebViewUsageCategory.kt$WPWebViewUsageCategory$*</ID>
     <ID>MaxLineLength:XPostsCapabilityChecker.kt$XPostsCapabilityChecker$// suggestions, but because the response will almost always be empty, it's not an expensive call.</ID>
-    <ID>MaximumLineLength:org.wordpress.android.ui.bloggingprompts.onboarding.BloggingPromptsOnboardingViewModel.kt:47</ID>
-    <ID>MaximumLineLength:org.wordpress.android.workers.reminder.PromptReminderNotifier.kt:43</ID>
-    <ID>MaximumLineLength:org.wordpress.android.viewmodel.main.WPMainActivityViewModel.kt:220</ID>
     <ID>MemberNameEqualsClassName:ActivityLogTypeFilterViewModel.kt$ActivityLogTypeFilterViewModel.Action$lateinit var action: (() -&gt; Unit)</ID>
     <ID>MultiLineIfElse:org.wordpress.android.ui.posts.PostDatePickerDialogFragment.kt:51</ID>
     <ID>MultiLineIfElse:org.wordpress.android.ui.posts.PostDatePickerDialogFragment.kt:53</ID>