diff options
| -rw-r--r-- | org.fox.epube/build.gradle | 20 | ||||
| -rw-r--r-- | org.fox.epube/src/main/java/org/fox/epube/Application.java | 20 | ||||
| -rw-r--r-- | org.fox.epube/src/main/java/org/fox/epube/MainActivity.java | 45 | ||||
| -rw-r--r-- | org.fox.epube/src/main/res/layout/activity_main.xml | 15 | ||||
| -rw-r--r-- | org.fox.epube/src/main/res/layout/toolbar.xml | 2 | ||||
| -rw-r--r-- | org.fox.epube/src/main/res/values-night/themes.xml | 3 |
6 files changed, 49 insertions, 56 deletions
diff --git a/org.fox.epube/build.gradle b/org.fox.epube/build.gradle index bd0e328..d21761f 100644 --- a/org.fox.epube/build.gradle +++ b/org.fox.epube/build.gradle @@ -12,7 +12,7 @@ android { //noinspection ExpiredTargetSdkVersion targetSdkVersion 31 compileSdk 35 - versionCode 14 + versionCode getGitVersionCode() versionName getVersion() buildConfigField "String", "EPUBE_BASE_URL", "\"https://epube-dev.fakecake.org\"" } @@ -58,10 +58,18 @@ android { } +def getGitVersionCode() { + return new Date(getGitTimestamp()).format('yyyyMMdd').toInteger() +} + +def getGitTimestampFormatted() { + return new Date(getGitTimestamp()).format('YY.MM') +} + def getGitTimestamp() { // gitlab CI iso-8601 timestamp if (System.getenv("CI_COMMIT_TIMESTAMP")) { - return Date.parse("yyyy-MM-dd'T'HH:mm:ssXXX", System.getenv("CI_COMMIT_TIMESTAMP")).format('YY.MM') + return Date.parse("yyyy-MM-dd'T'HH:mm:ssXXX", System.getenv("CI_COMMIT_TIMESTAMP")).getTime(); } // try to get version from git repo in current dir @@ -72,7 +80,7 @@ def getGitTimestamp() { standardOutput = stdout } - return new Date(stdout.toString().trim().toLong() * 1000).format('YY.MM') + return stdout.toString().trim().toLong() * 1000; } catch (ignored) { return 0; @@ -100,7 +108,7 @@ def getGitCommitHash() { } def getVersion() { - return getGitTimestamp() + '-' + getGitCommitHash(); + return getGitTimestampFormatted() + '-' + getGitCommitHash(); } dependencies { @@ -110,10 +118,6 @@ dependencies { implementation 'androidx.appcompat:appcompat-resources:1.7.0' implementation 'com.google.android.material:material:1.12.0' implementation 'androidx.webkit:webkit:1.13.0' - implementation 'com.evernote:android-state:1.4.1' - compileOnly 'com.evernote:android-state:1.4.1' - annotationProcessor 'com.evernote:android-state:1.4.1' - implementation 'com.github.livefront:bridge:v1.1.1' } java { toolchain { diff --git a/org.fox.epube/src/main/java/org/fox/epube/Application.java b/org.fox.epube/src/main/java/org/fox/epube/Application.java index 982b1d5..b9b81a6 100644 --- a/org.fox.epube/src/main/java/org/fox/epube/Application.java +++ b/org.fox.epube/src/main/java/org/fox/epube/Application.java @@ -2,16 +2,12 @@ package org.fox.epube; import android.os.Bundle; -import com.evernote.android.state.StateSaver; -import com.livefront.bridge.Bridge; -import com.livefront.bridge.SavedStateHandler; +import androidx.annotation.NonNull; +import androidx.annotation.Nullable; import java.net.CookieHandler; import java.net.CookieManager; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - public class Application extends android.app.Application { private static Application m_singleton; @@ -22,18 +18,6 @@ public class Application extends android.app.Application { CookieManager cookieManager = new CookieManager(); CookieHandler.setDefault(cookieManager); - Bridge.initialize(getApplicationContext(), new SavedStateHandler() { - @Override - public void saveInstanceState(@NonNull Object target, @NonNull Bundle state) { - StateSaver.saveInstanceState(target, state); - } - - @Override - public void restoreInstanceState(@NonNull Object target, @Nullable Bundle state) { - StateSaver.restoreInstanceState(target, state); - } - }); - m_singleton = this; } diff --git a/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java b/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java index 7823a29..8c1ea9e 100644 --- a/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java +++ b/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java @@ -5,8 +5,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.Configuration; -import android.graphics.Color; -import android.graphics.drawable.ColorDrawable; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; @@ -28,13 +26,11 @@ import android.webkit.WebViewClient; import android.widget.ProgressBar; import android.widget.Toast; -import com.livefront.bridge.Bridge; - +import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; -import androidx.appcompat.widget.Toolbar; import androidx.webkit.WebViewAssetLoader; -import com.evernote.android.state.State; +import com.google.android.material.appbar.AppBarLayout; public class MainActivity extends AppCompatActivity implements NetworkStateReceiver.NetworkStateReceiverListener { @@ -48,15 +44,23 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei private NetworkStateReceiver m_networkStateReceiver; private String m_baseUrl; - @State protected boolean m_offlineMode; - @State protected AppPage m_currentPage = AppPage.PAGE_UNKNOWN; - @State protected String m_lastVisitedURL; + protected boolean m_offlineMode; + protected AppPage m_currentPage = AppPage.PAGE_UNKNOWN; + protected String m_lastVisitedURL; @SuppressLint("SetJavaScriptEnabled") @Override protected void onCreate(Bundle savedInstanceState) { + EdgeToEdge.enable(this); + super.onCreate(savedInstanceState); + if (savedInstanceState != null) { + m_offlineMode = savedInstanceState.getBoolean("m_offlineMode"); + m_currentPage = AppPage.valueOf(savedInstanceState.getString("m_currentPage")); + m_lastVisitedURL = savedInstanceState.getString("m_lastVisitedURL"); + } + m_baseUrl = BuildConfig.EPUBE_BASE_URL; startNetworkBroadcastReceiver(this); @@ -157,8 +161,6 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei m_web.addJavascriptInterface(new WebAppInterface(this), "EpubeApp"); m_web.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY); - Bridge.restoreInstanceState(this, savedInstanceState); - if (savedInstanceState == null || m_lastVisitedURL == null) { m_web.loadUrl(m_baseUrl + "/index.php"); } else { @@ -362,10 +364,12 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei runOnUiThread(new Runnable() { @Override public void run() { - if (getSupportActionBar().isShowing()) - getSupportActionBar().hide(); + View abl = findViewById(R.id.appbarlayout); + + if (abl.getVisibility() == View.VISIBLE) + abl.setVisibility(View.GONE); else - getSupportActionBar().show(); + abl.setVisibility(View.VISIBLE); } }); } @@ -395,10 +399,9 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei runOnUiThread(new Runnable() { @Override public void run() { - if (show) - getSupportActionBar().show(); - else - getSupportActionBar().hide(); + View abl = findViewById(R.id.appbarlayout); + + abl.setVisibility(show ? View.VISIBLE : View.GONE); } }); } @@ -462,9 +465,9 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei public void onSaveInstanceState(Bundle out) { super.onSaveInstanceState(out); - Log.d(TAG, "onSaveInstanceState"); - - Bridge.saveInstanceState(this, out); + out.putBoolean("m_offlineMode", m_offlineMode); + out.putString("m_currentPage", m_currentPage.toString()); + out.putString("m_lastVisitedURL", m_lastVisitedURL); } @Override diff --git a/org.fox.epube/src/main/res/layout/activity_main.xml b/org.fox.epube/src/main/res/layout/activity_main.xml index 1df9dc7..e15bcda 100644 --- a/org.fox.epube/src/main/res/layout/activity_main.xml +++ b/org.fox.epube/src/main/res/layout/activity_main.xml @@ -1,12 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" + xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:animateLayoutChanges="true" - tools:context=".MainActivity"> - - <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + android:fitsSystemWindows="true"> <WebView android:id="@+id/webview_main" @@ -14,6 +13,15 @@ android:layout_height="match_parent" > </WebView> + <com.google.android.material.appbar.AppBarLayout + android:layout_width="match_parent" + android:id="@+id/appbarlayout" + android:layout_height="wrap_content"> + + <include layout="@layout/toolbar" android:id="@+id/toolbar" /> + + </com.google.android.material.appbar.AppBarLayout> + <ProgressBar android:id="@+id/loading_progress" style="@style/Widget.AppCompat.ProgressBar.Horizontal" @@ -21,5 +29,4 @@ android:layout_gravity="bottom" android:visibility="gone" android:layout_height="wrap_content" /> - </FrameLayout> \ No newline at end of file diff --git a/org.fox.epube/src/main/res/layout/toolbar.xml b/org.fox.epube/src/main/res/layout/toolbar.xml index ad6213c..9592da3 100644 --- a/org.fox.epube/src/main/res/layout/toolbar.xml +++ b/org.fox.epube/src/main/res/layout/toolbar.xml @@ -3,8 +3,6 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/toolbar" - android:elevation="4dp" android:layout_height="wrap_content" android:layout_width="match_parent" - android:background="?colorSurfaceContainer" android:minHeight="?attr/actionBarSize"/> \ No newline at end of file diff --git a/org.fox.epube/src/main/res/values-night/themes.xml b/org.fox.epube/src/main/res/values-night/themes.xml index f1b98d6..f694812 100644 --- a/org.fox.epube/src/main/res/values-night/themes.xml +++ b/org.fox.epube/src/main/res/values-night/themes.xml @@ -1,8 +1,5 @@ <resources> <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar"> - <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:windowLightStatusBar">false</item> - <item name="colorPrimary">@color/md_theme_primary</item> <item name="colorOnPrimary">@color/md_theme_onPrimary</item> <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item> |
