App Lounge: Load actual TOS from HTML in WebView (df6572fc) · Commits · e / os / App Lounge

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,11 @@ class TOSFragment : Fragment(R.layout.fragment_tos) {

		private val viewModel: TOSViewModel by viewModels()

		companion object {
		private const val mimeType = "text/html"
		private const val encoding = "UTF-8"
		}

		override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
		super.onViewCreated(view, savedInstanceState)
		_binding = FragmentTosBinding.bind(view)
		@@ -35,6 +40,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.toolbar.setNavigationOnClickListener {
		view.findNavController().navigateUp()
		}

+90 −115

Original line number	Diff line number	Diff line
		@@ -41,38 +41,14 @@
		android:layout_height="match_parent"
		android:orientation="vertical">

		<ScrollView
		<WebView
		android:id="@+id/TOSWebView"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:layout_height="0dp"
		android:layout_marginStart="16dp"
		android:layout_marginEnd="16dp"
		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:layout_width="match_parent"
		android:layout_height="25dp"
		android:layout_marginTop="20dp"
		android:layout_marginBottom="30dp"
		android:text="@string/tos_title"
		android:textColor="?android:textColorPrimary"
		android:textSize="24sp"
		android:textStyle="bold" />

		<com.google.android.material.textview.MaterialTextView
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:lineSpacingExtra="4dp"
		android:text="@string/lorem_ipsum"
		android:textColor="?android:textColorPrimary"
		android:textSize="14sp" />
		</LinearLayout>
		</ScrollView>
		android:layout_marginTop="16dp"
		android:layout_weight="1" />

		<View
		android:id="@+id/divider"
		@@ -83,8 +59,7 @@
		<androidx.constraintlayout.widget.ConstraintLayout
		android:id="@+id/TOSButtons"
		android:layout_width="match_parent"
		android:layout_height="150dp"
		android:layout_weight="1"
		android:layout_height="70dp"
		android:orientation="horizontal">

		<Button

0 → 100644

+231 −0

File added.

Preview size limit exceeded, changes collapsed.

+144 −144

File changed.

Contains only whitespace changes.