Skip to content

Commit

Permalink
Replace library bottom sheet with native M3 one
Browse files Browse the repository at this point in the history
  • Loading branch information
cyb3rko committed Dec 6, 2022
1 parent 1ce1a55 commit 5860114
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 11 deletions.
16 changes: 6 additions & 10 deletions app/src/main/java/com/cyb3rko/logviewerforopenhab/Utils.kt
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,15 @@ package com.cyb3rko.logviewerforopenhab
import android.app.Activity
import android.content.*
import android.net.Uri
import android.text.Html
import android.text.method.LinkMovementMethod
import android.view.View
import android.view.inputmethod.InputMethodManager
import android.widget.Toast
import androidx.appcompat.app.AppCompatActivity
import androidx.drawerlayout.widget.DrawerLayout
import androidx.fragment.app.Fragment
import androidx.fragment.app.FragmentActivity
import androidx.navigation.findNavController
import com.afollestad.materialdialogs.MaterialDialog
import com.afollestad.materialdialogs.bottomsheets.BottomSheet
import com.cyb3rko.logviewerforopenhab.modals.PolicyBottomSheet
import com.google.android.material.navigation.NavigationView

internal const val PRIVACY_POLICY = "privacy_policy"
Expand Down Expand Up @@ -148,12 +146,10 @@ internal fun hideConnections(activity: Activity?) {
}

internal fun showLicenseDialog(context: Context?, type: String) {
MaterialDialog(context!!, BottomSheet()).show {
@Suppress("DEPRECATION")
message(0, Html.fromHtml(context.assets.open("$type.html").bufferedReader().use { it.readText() })) {
messageTextView.movementMethod = LinkMovementMethod.getInstance()
}
}
PolicyBottomSheet(type).show(
(context as FragmentActivity).supportFragmentManager,
PolicyBottomSheet.TAG
)
}

fun setToolbarVisibility(activity: Activity?, visibility: Int) {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.cyb3rko.logviewerforopenhab.modals

import android.os.Bundle
import android.text.Html
import android.text.method.LinkMovementMethod
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import com.cyb3rko.logviewerforopenhab.R
import com.google.android.material.bottomsheet.BottomSheetDialogFragment
import com.google.android.material.textview.MaterialTextView

class PolicyBottomSheet(private val policyType: String) : BottomSheetDialogFragment() {
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
val view = inflater.inflate(R.layout.bottom_sheet_policy, container, false)
val messageView = view.findViewById<MaterialTextView>(R.id.message_view)
messageView.text = Html.fromHtml(
requireContext().assets.open("$policyType.html").bufferedReader().use { it.readText() }
)
messageView.movementMethod = LinkMovementMethod.getInstance()
return view
}

companion object {
const val TAG = "Policy Bottom Sheet"
}
}
17 changes: 17 additions & 0 deletions app/src/main/res/layout/bottom_sheet_policy.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<com.google.android.material.textview.MaterialTextView
android:id="@+id/message_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="14sp"
android:layout_marginTop="24dp"
android:layout_marginStart="24dp"
android:layout_marginEnd="24dp" />

</ScrollView>
1 change: 0 additions & 1 deletion app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
<!-- <item name="android:textColorSecondary">@color/textColorSecondary</item>-->
<item name="cardColor">@color/cardColor</item>

<item name="md_corner_radius">10dp</item>
<item name="switchPreferenceCompatStyle">@style/Preference.SwitchPreferenceCompat</item>
</style>

Expand Down

0 comments on commit 5860114

Please sign in to comment.