diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 51ddbd0..fa84452 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -39,4 +39,6 @@ dependencies { testImplementation("junit:junit:4.13.2") androidTestImplementation("androidx.test.ext:junit:1.1.5") androidTestImplementation("androidx.test.espresso:espresso-core:3.5.1") -} \ No newline at end of file + implementation("androidx.swiperefreshlayout:swiperefreshlayout:1.1.0") + +} diff --git a/app/build/outputs/apk/debug/app-debug.apk b/app/build/outputs/apk/debug/app-debug.apk index 1fc319f..82132fa 100644 Binary files a/app/build/outputs/apk/debug/app-debug.apk and b/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/app/src/main/java/info/burguillos/bi/MainActivity.java b/app/src/main/java/info/burguillos/bi/MainActivity.java index 451df54..7d18d14 100644 --- a/app/src/main/java/info/burguillos/bi/MainActivity.java +++ b/app/src/main/java/info/burguillos/bi/MainActivity.java @@ -2,6 +2,10 @@ package info.burguillos.bi; import android.webkit.WebView; import android.webkit.WebViewClient; +import android.util.Log; + +import android.view.ViewTreeObserver; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; import androidx.appcompat.app.AppCompatActivity; @@ -9,15 +13,39 @@ import android.os.Bundle; public class MainActivity extends AppCompatActivity { + private WebView webView; + private SwipeRefreshLayout swipeRefreshLayout; + private ViewTreeObserver.OnScrollChangedListener mOnScrollChangedListener; + boolean isReloading = true; + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - WebView webView = findViewById(R.id.web); + webView = findViewById(R.id.web); + swipeRefreshLayout = findViewById(R.id.swipeContainer); + + swipeRefreshLayout.setOnRefreshListener( new SwipeRefreshLayout.OnRefreshListener() { + @Override + public void onRefresh() { + Log.w("BurguillosInfo", "hola"); + webView.reload(); + } + }); + webView.loadUrl("https://burguillos.info"); webView.getSettings().setJavaScriptEnabled(true); - webView.setWebViewClient(new WebViewClient()); + webView.setWebViewClient(new WebViewClient() { + public void onPageFinished(WebView view, String url) { + swipeRefreshLayout.setRefreshing(false); + swipeRefreshLayout.setEnabled(true); + } + + public void onPageStarted(WebView view, String url) { + swipeRefreshLayout.setEnabled(false); + } + }); } @Override diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 0787a1a..bf30247 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,12 +5,24 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context=".MainActivity"> - - + app:layout_behavior="@string/appbar_scrolling_view_behavior"> + + + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index aed405b..cf59098 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - b_info_android + Burguillos.info