Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6111438 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

App Lounge: Use native methods to load HTML 



Signed-off-by: Aayush Gupta's avatarAayush Gupta <theimpulson@e.email>
parent e17bf39c

app/src/main/java/foundation/e/apps/setup/tos/TOSFragment.kt

+5 −1
Original line number Diff line number Diff line 
package foundation.e.apps.setup.tos



import android.os.Bundle

import android.text.Html

import android.view.View

import androidx.fragment.app.Fragment

import androidx.fragment.app.viewModels
@@ -42,7 +43,10 @@ class TOSFragment : Fragment(R.layout.fragment_tos) { 


        val tosHtml = resources.openRawResource(R.raw.terms_of_use)

        val tosHtmlData = tosHtml.reader().readText()

        binding.TOSWebView.loadData(tosHtmlData, mimeType, encoding)

        binding.TOSTextView.text = Html.fromHtml(

            tosHtmlData,

            Html.FROM_HTML_MODE_COMPACT and Html.FROM_HTML_SEPARATOR_LINE_BREAK_HEADING

        )



        binding.toolbar.setNavigationOnClickListener {

            view.findNavController().navigateUp()

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

+20 −5
Original line number Diff line number Diff line
@@ -41,14 +41,29 @@ 
        android:layout_height="match_parent"

        android:orientation="vertical">



        <WebView

            android:id="@+id/TOSWebView"

        <ScrollView

            android:layout_width="match_parent"

            android:layout_height="0dp"

            android:layout_marginTop="20dp"

            android:layout_marginStart="16dp"

            android:layout_marginEnd="16dp"

            android:layout_marginTop="16dp"

            android:layout_weight="1" />

            android:layout_weight="1">



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="vertical"

                android:paddingBottom="10dp">



                <com.google.android.material.textview.MaterialTextView

                    android:id="@+id/TOSTextView"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:lineSpacingExtra="4dp"

                    android:textColor="?android:textColorPrimary"

                    android:textSize="15sp" />

            </LinearLayout>

        </ScrollView>



        <View

            android:id="@+id/divider"