Skip to content

Add Navigation Drawer #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 18 commits into from
Apr 14, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ dependencies {
implementation(libs.material)
implementation(libs.androidx.activity)
implementation(libs.androidx.preference.ktx)
implementation(libs.androidx.lifecycle.livedata.ktx)
implementation(libs.androidx.lifecycle.viewmodel.ktx)
implementation(libs.androidx.navigation.fragment.ktx)
implementation(libs.androidx.navigation.ui.ktx)
implementation(libs.okhttp)
implementation(libs.retrofit)
implementation(libs.retrofit.gson)
Expand Down
2 changes: 1 addition & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
-keepclassmembers class org.cssnr.zipline.MainActivity$MyWebViewClient {
-keepclassmembers class org.cssnr.zipline.HomeFragment$MyWebViewClient {
public *;
}

Expand Down
201 changes: 201 additions & 0 deletions app/src/main/java/org/cssnr/zipline/HomeFragment.kt
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
package org.cssnr.zipline

import android.annotation.SuppressLint
import android.content.Context.MODE_PRIVATE
import android.content.Intent
import android.os.Bundle
import android.util.Log
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.webkit.WebResourceError
import android.webkit.WebResourceRequest
import android.webkit.WebResourceResponse
import android.webkit.WebView
import android.webkit.WebViewClient
import androidx.core.content.edit
import androidx.core.net.toUri
import androidx.fragment.app.Fragment
import org.cssnr.zipline.databinding.FragmentHomeBinding

class HomeFragment : Fragment() {

private var _binding: FragmentHomeBinding? = null
private val binding get() = _binding!!

private var webViewState: Bundle = Bundle()
private lateinit var ziplineUrl: String

override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View {
Log.d("HomeFragment", "onCreateView: $savedInstanceState")
_binding = FragmentHomeBinding.inflate(inflater, container, false)
val root: View = binding.root
return root
}

override fun onDestroyView() {
Log.d("HomeFragment", "onDestroyView")
// Destroy WebView
binding.webView.apply {
loadUrl("about:blank")
stopLoading()
clearHistory()
removeAllViews()
destroy()
}
super.onDestroyView()
_binding = null
}

@SuppressLint("SetJavaScriptEnabled")
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
Log.d("HomeFragment", "onViewCreated: $savedInstanceState")

Log.d("onViewCreated", "webViewState.size: ${webViewState.size()}")
// TODO: Not sure when this method is triggered...
if (savedInstanceState != null) {
Log.i("onViewCreated", "SETTING webViewState FROM savedInstanceState")
webViewState =
savedInstanceState.getBundle("webViewState") ?: Bundle() // Ensure non-null
}
Log.d("onViewCreated", "webViewState.size: ${webViewState.size()}")

val sharedPreferences = context?.getSharedPreferences("default_preferences", MODE_PRIVATE)
ziplineUrl = sharedPreferences?.getString("ziplineUrl", "").toString()
val ziplineToken = sharedPreferences?.getString("ziplineToken", null)
Log.d("onViewCreated", "ziplineUrl: $ziplineUrl")
Log.d("onViewCreated", "ziplineToken: $ziplineToken")

binding.webView.apply {
webViewClient = MyWebViewClient()
settings.domStorageEnabled = true
settings.javaScriptEnabled = true
settings.allowFileAccess = true
settings.allowContentAccess = true
settings.loadWithOverviewMode = true // prevent loading images zoomed in
settings.useWideViewPort = true // prevent loading images zoomed in

if (webViewState.size() > 0) {
Log.d("webView.apply", "RESTORE STATE")
restoreState(webViewState)
} else {
Log.d("webView.apply", "LOAD URL: $ziplineUrl")
loadUrl(ziplineUrl)
}
}

// //val webView = view.findViewById<WebView>(R.id.web_view)
// //webView.loadUrl(ziplineUrl.toString())
// //binding.webView.loadUrl(ziplineUrl.toString())
// if (savedInstanceState != null) {
// Log.d("onViewCreated", "restoreState: $savedInstanceState")
// binding.webView.restoreState(savedInstanceState)
// } else {
// Log.d("onViewCreated", "webView.loadUrl: $ziplineUrl")
// binding.webView.loadUrl(ziplineUrl.toString())
// }
}

fun loadUrl(url: String) {
Log.d("HomeFragment", "binding.webView.loadUrl: $url")
binding.webView.loadUrl(url)
}

override fun onSaveInstanceState(outState: Bundle) {
Log.d("HomeFragment", "onSaveInstanceState1: $outState")
super.onSaveInstanceState(outState)
_binding?.webView?.saveState(outState)
outState.putBundle("webViewState", webViewState)
}

// override fun onSaveInstanceState(outState: Bundle) {
// Log.d("HomeFragment", "onSaveInstanceState1: $outState")
// super.onSaveInstanceState(outState)
// Log.d("HomeFragment", "onSaveInstanceState2: $outState")
// binding.webView?.saveState(outState)
// Log.d("HomeFragment", "onSaveInstanceState3: $outState")
//
// webViewState.let {
// Log.d("HomeFragment", "outState.putBundle: $it")
// outState.putBundle("webViewState", it)
// }
// Log.d("HomeFragment", "DONE")
// }

override fun onPause() {
Log.d("HomeFragment", "ON PAUSE")
super.onPause()
binding.webView.onPause()
binding.webView.pauseTimers()

Log.d("onPause", "webViewState.size: ${webViewState.size()}")
binding.webView.saveState(webViewState)
Log.d("onPause", "webViewState.size: ${webViewState.size()}")
}

override fun onResume() {
Log.d("HomeFragment", "ON RESUME")
super.onResume()
binding.webView.onResume()
binding.webView.resumeTimers()
}

inner class MyWebViewClient : WebViewClient() {
override fun shouldOverrideUrlLoading(view: WebView, request: WebResourceRequest): Boolean {
val url = request.url.toString()
Log.d("shouldOverrideUrlLoading", "url: $url")
Log.d("shouldOverrideUrlLoading", "ziplineUrl: $ziplineUrl")

if (ziplineUrl.isNotEmpty() && url.startsWith(ziplineUrl)) {
Log.d("shouldOverrideUrlLoading", "FALSE - in app")
return false
}

val intent = Intent(Intent.ACTION_VIEW, url.toUri())
view.context.startActivity(intent)
Log.d("shouldOverrideUrlLoading", "TRUE - in browser")
return true
}

override fun doUpdateVisitedHistory(view: WebView, url: String, isReload: Boolean) {
Log.d("doUpdateVisitedHistory", "url: $url")
if (url.endsWith("/auth/login") == true) {
Log.d("doUpdateVisitedHistory", "LOGOUT: url: $url")

val sharedPreferences =
view.context.getSharedPreferences("default_preferences", MODE_PRIVATE)
//sharedPreferences.edit { putString("ziplineToken", "") }
sharedPreferences.edit { remove("ziplineToken") }
Log.d("doUpdateVisitedHistory", "REMOVE: ziplineToken")

//view.destroy()
view.loadUrl("about:blank")

parentFragmentManager.beginTransaction()
.replace(R.id.main, SetupFragment())
.commit()
}
}

override fun onReceivedError(
view: WebView,
request: WebResourceRequest,
errorResponse: WebResourceError
) {
Log.d("onReceivedError", "ERROR: " + errorResponse.errorCode)
}

override fun onReceivedHttpError(
view: WebView,
request: WebResourceRequest,
errorResponse: WebResourceResponse
) {
Log.d("onReceivedHttpError", "ERROR: " + errorResponse.statusCode)
}
}
}
Loading
Loading