Feature/HTML support in profile #99

eadm · 2017-09-07T14:48:13Z

YouTrack task: #APPS-1457

Description List:

Add support of html code to ProfileFragment in user description section
Content displayed with WebView but if it is not needed content will be displayed with TextView

KirillMakarov · 2017-09-11T17:42:02Z

Due to changes at CI some gradle tasks were changed. I will fix it for this PR.

codecov · 2017-09-13T21:03:48Z

Codecov Report

Merging #99 into development will decrease coverage by <.01%.
The diff coverage is 0%.

@@               Coverage Diff                @@
##             development     #99      +/-   ##
================================================
- Coverage           1.68%   1.68%   -0.01%     
  Complexity           122     122              
================================================
  Files                497     497              
  Lines              19381   19398      +17     
  Branches            2766    2770       +4     
================================================
  Hits                 327     327              
- Misses             18981   18998      +17     
  Partials              73      73

Impacted Files	Coverage Δ	Complexity Δ
...tepic/droid/ui/custom/LatexSupportableWebView.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...rc/main/java/org/stepic/droid/util/HtmlHelper.java	`37.64% <0%> (-1.38%)`	`9 <0> (ø)`
...a/org/stepic/droid/ui/fragments/ProfileFragment.kt	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ba1e390...5a15193. Read the comment docs.

KirillMakarov

The web doesn't support LaTeX in the profile info. And we should not use the LaTeX webview for showing the profile info. The best appropriate solution here is to use TextResolver#fromHtml method and simple textview. It will be lightweight and cover 99.9% cases of the platform.

KirillMakarov · 2017-09-13T21:14:09Z

app/src/main/java/org/stepic/droid/ui/fragments/ProfileFragment.kt

@@ -283,7 +286,19 @@ class ProfileFragment : FragmentBase(),
                shortBioFirstHeader.setText(R.string.short_bio_and_info)
                shortBioFirstText.text = shortBio
                shortBioSecondHeader.setText(R.string.user_info)
-                shortBioSecondText.text = information
+
+                val (description, isNeedWebView, _) = textResolver.resolveStepText(information)


information can be in shortBioFirstText, when it is not blank, but shortBio is blank

KirillMakarov · 2017-09-13T21:16:08Z

app/src/main/java/org/stepic/droid/ui/fragments/ProfileFragment.kt

@@ -35,6 +36,8 @@ import org.stepic.droid.ui.util.TimeIntervalUtil
 import org.stepic.droid.ui.util.initCenteredToolbar
 import org.stepic.droid.util.AppConstants
 import org.stepic.droid.util.ProfileSettingsHelper
+import org.stepic.droid.util.resolvers.CoursePropertyResolver


why is it used here?

KirillMakarov · 2017-09-13T21:18:48Z

app/src/main/res/layout/fragment_profile_new.xml

-                        tools:text="Lalala it is info"
-                        tools:visibility="visible"/>
+                        android:paddingTop="4dp">
+                        <org.stepic.droid.ui.custom.LatexSupportableWebView


use LatexSupportableEnhancedFrameLayout. It is encapsulation of this logic

codecov-io · 2017-09-14T11:22:48Z

Codecov Report

Merging #99 into development will decrease coverage by <.01%.
The diff coverage is 0%.

@@               Coverage Diff                @@
##             development     #99      +/-   ##
================================================
- Coverage           1.68%   1.68%   -0.01%     
  Complexity           122     122              
================================================
  Files                497     497              
  Lines              19381   19386       +5     
  Branches            2766    2772       +6     
================================================
  Hits                 327     327              
- Misses             18981   18986       +5     
  Partials              73      73

Impacted Files	Coverage Δ	Complexity Δ
...p/src/main/java/org/stepic/droid/fonts/FontType.kt	`0% <ø> (ø)`	`0 <0> (ø)`	⬇️
...ui/custom/LatexSupportableEnhancedFrameLayout.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...n/java/org/stepic/droid/fonts/FontsProviderImpl.kt	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...tepic/droid/ui/custom/LatexSupportableWebView.java	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️
...rc/main/java/org/stepic/droid/util/HtmlHelper.java	`39.02% <0%> (ø)`	`9 <0> (ø)`	⬇️
...a/org/stepic/droid/ui/fragments/ProfileFragment.kt	`0% <0%> (ø)`	`0 <0> (ø)`	⬇️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update ba1e390...cbfa343. Read the comment docs.

KirillMakarov · 2017-09-14T13:39:11Z

app/src/main/java/org/stepic/droid/ui/custom/LatexSupportableEnhancedFrameLayout.java

-            String coloredText = "<font color='" + hexColor + "'>" + text + "</font>";
-            setTextWebViewOnlyForLaTeX(coloredText);
+            String coloredText = "<font color='" + hexColor + "'>" + textResult.getText() + "</font>";
+            setTextWebView(coloredText, HtmlHelper.hasLaTeX(text) && allowLaTeX, fontPath);


allowLaTeX is more simple check, please reorder and make it the first

KirillMakarov · 2017-09-14T13:40:47Z

app/src/main/java/org/stepic/droid/util/HtmlHelper.java

@@ -153,19 +155,22 @@ private static Long parseCourseIdFromNotification(String htmlRaw) {


    public static String buildMathPage(CharSequence body, int widthPx, String baseUrl) {
+        @SuppressLint("DefaultLocale")


use Locale.getDefault() instead of SupressLint

KirillMakarov · 2017-09-14T13:41:07Z

app/src/main/java/org/stepic/droid/util/HtmlHelper.java

        String preBody = String.format(PRE_BODY, MathJaxScript, DefaultFontStyle, widthPx, baseUrl);
        String result = preBody + body + POST_BODY;
        return result;
    }

    public static String buildPageWithAdjustingTextAndImage(CharSequence body, int widthPx, String baseUrl) {
+        @SuppressLint("DefaultLocale")


use Locale.getDefault() instead of SupressLint

KirillMakarov · 2017-09-14T13:41:13Z

app/src/main/java/org/stepic/droid/util/HtmlHelper.java

-        String preBody = String.format(PRE_BODY, " ", RobotoLightFontStyle, widthPx, baseUrl);
+    public static String buildPageWithCustomFont(CharSequence body, String fontPath, int widthPx, String baseUrl) {
+        @SuppressLint("DefaultLocale")
+        String preBody = String.format(PRE_BODY, " ", String.format(CustomFontStyle, fontPath), widthPx, baseUrl);


use Locale.getDefault() instead of SupressLint

KirillMakarov · 2017-09-14T13:42:23Z

app/src/main/res/layout/fragment_profile_new.xml

@@ -218,7 +217,7 @@
                        fontPath="fonts/Roboto-Light.ttf"
                        android:layout_width="match_parent"
                        android:layout_height="wrap_content"
-                        android:lineSpacingExtra="3.3sp"
+                        android:lineSpacingMultiplier="1.6"


why have we changed it?

to match with WebView line spacing which is 1.6 em

KirillMakarov · 2017-09-14T13:44:45Z

app/src/main/res/layout/fragment_profile_new.xml

                        android:paddingBottom="@dimen/guideline_standard_padding"
                        android:paddingLeft="32dp"
                        android:paddingRight="32dp"
-                        android:paddingTop="4dp"
-                        android:textSize="14sp"


We should set 14sp to the new view too. For example, we can create custom attr for LatexSupportableEnhancedFrameLayout

It is set in ProfileFragment#onViewCreated

eadm added 3 commits September 7, 2017 15:38

thin font for WebView

5497117

replaced secondBioText textView in ProfileFragment with webView

16a9190

show webView only if it needed

9cfed76

eadm added the bug label Sep 7, 2017

eadm self-assigned this Sep 7, 2017

eadm requested a review from KirillMakarov September 7, 2017 14:48

eadm changed the title ~~Feature/html support in profile~~ Feature/HTML support in profile Sep 7, 2017

Merge branch 'development' into feature/html_support_in_profile

a444c60

KirillMakarov suggested changes Sep 13, 2017

View reviewed changes

show bio logic refactor

5a15193

eadm added 3 commits September 14, 2017 14:52

add light font

c4da56b

use LatexSupportableEnhancedFrameLayout

63addc9

clean up

c860d04

KirillMakarov suggested changes Sep 14, 2017

View reviewed changes

KirillMakarov approved these changes Sep 14, 2017

View reviewed changes

default locale in HtmlHelper & optimisation

cbfa343

eadm merged commit 001e052 into development Sep 14, 2017

eadm deleted the feature/html_support_in_profile branch September 14, 2017 14:37

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/HTML support in profile #99

Feature/HTML support in profile #99

eadm commented Sep 7, 2017

KirillMakarov commented Sep 11, 2017

codecov bot commented Sep 13, 2017 •

edited

KirillMakarov left a comment

KirillMakarov Sep 13, 2017

KirillMakarov Sep 13, 2017

KirillMakarov Sep 13, 2017

codecov-io commented Sep 14, 2017 •

edited

KirillMakarov Sep 14, 2017

KirillMakarov Sep 14, 2017

KirillMakarov Sep 14, 2017

KirillMakarov Sep 14, 2017

KirillMakarov Sep 14, 2017

eadm Sep 14, 2017

KirillMakarov Sep 14, 2017

eadm Sep 14, 2017

		@@ -153,19 +155,22 @@ private static Long parseCourseIdFromNotification(String htmlRaw) {


		public static String buildMathPage(CharSequence body, int widthPx, String baseUrl) {
		@SuppressLint("DefaultLocale")

Feature/HTML support in profile #99

Feature/HTML support in profile #99

Conversation

eadm commented Sep 7, 2017

KirillMakarov commented Sep 11, 2017

codecov bot commented Sep 13, 2017 • edited

Codecov Report

KirillMakarov left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Sep 14, 2017 • edited

Codecov Report

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov bot commented Sep 13, 2017 •

edited

codecov-io commented Sep 14, 2017 •

edited