diff options
| author | Andrew Dolgov <fox@fakecake.org> | 2025-05-22 09:30:08 +0300 |
|---|---|---|
| committer | Andrew Dolgov <fox@fakecake.org> | 2025-05-22 09:30:08 +0300 |
| commit | fc7adaedd45a30f48dac60ccc71ae241719a52a1 (patch) | |
| tree | e04a762b710ebe03519f616dd2095e2ce261d002 | |
| parent | 0c6f99278fa82283a519d8add34b26f307a1b1c2 (diff) | |
| download | the-epube-android-fc7adaedd45a30f48dac60ccc71ae241719a52a1.tar.gz the-epube-android-fc7adaedd45a30f48dac60ccc71ae241719a52a1.tar.xz | |
switch to model/observable, misc updates
| -rw-r--r-- | .editorconfig | 18 | ||||
| -rw-r--r-- | build.gradle | 4 | ||||
| -rw-r--r-- | org.fox.epube/build.gradle | 5 | ||||
| -rw-r--r-- | org.fox.epube/src/androidTest/java/org/fox/epube/ExampleInstrumentedTest.java | 27 | ||||
| -rw-r--r-- | org.fox.epube/src/main/AndroidManifest.xml | 5 | ||||
| -rw-r--r-- | org.fox.epube/src/main/java/org/fox/epube/LaunchActivity.java | 4 | ||||
| -rw-r--r-- | org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java (renamed from org.fox.epube/src/main/java/org/fox/epube/MainActivity.java) | 190 | ||||
| -rw-r--r-- | org.fox.epube/src/main/java/org/fox/epube/MasterModel.java | 42 | ||||
| -rw-r--r-- | org.fox.epube/src/main/res/menu/activity_main.xml | 20 | ||||
| -rw-r--r-- | org.fox.epube/src/main/res/values-night/themes.xml | 2 | ||||
| -rw-r--r-- | org.fox.epube/src/main/res/values/strings.xml | 9 | ||||
| -rw-r--r-- | org.fox.epube/src/main/res/values/themes.xml | 2 | ||||
| -rw-r--r-- | org.fox.epube/src/test/java/org/fox/epube/ExampleUnitTest.java | 17 |
13 files changed, 177 insertions, 168 deletions
diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..629d547 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,18 @@ +# indicate this is the root of the project +root = true + +[*.{java}] +charset = utf-8 +indent_style = tab +indent_size = 4 +trim_trailing_whitespace = true +insert_final_newline = true +end_of_line = lf + +[*.{gradle}] +charset = utf-8 +indent_style = space +indent_size = 4 +trim_trailing_whitespace = true +insert_final_newline = true +end_of_line = lf diff --git a/build.gradle b/build.gradle index 0fed969..6e69c6d 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,3 @@ allprojects { maven { url "https://clojars.org/repo" } } } - -task clean(type: Delete) { - delete rootProject.buildDir -} diff --git a/org.fox.epube/build.gradle b/org.fox.epube/build.gradle index d21761f..eb46824 100644 --- a/org.fox.epube/build.gradle +++ b/org.fox.epube/build.gradle @@ -32,6 +32,7 @@ android { abortOnError false checkReleaseBuilds false disable 'MissingTranslation' + enable 'SuspiciousIndentation' } buildTypes { @@ -47,7 +48,7 @@ android { proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' signingConfig signingConfigs.signed buildConfigField "String", "EPUBE_BASE_URL", "\"https://books.fakecake.org\"" - //matchingFallbacks = ['release'] + matchingFallbacks = ['release'] } } @@ -113,7 +114,7 @@ def getVersion() { dependencies { // https://issuetracker.google.com/issues/272973596 - implementation platform("org.jetbrains.kotlin:kotlin-bom:1.8.0") + implementation platform("org.jetbrains.kotlin:kotlin-bom:1.8.22") implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.appcompat:appcompat-resources:1.7.0' implementation 'com.google.android.material:material:1.12.0' diff --git a/org.fox.epube/src/androidTest/java/org/fox/epube/ExampleInstrumentedTest.java b/org.fox.epube/src/androidTest/java/org/fox/epube/ExampleInstrumentedTest.java deleted file mode 100644 index 170d665..0000000 --- a/org.fox.epube/src/androidTest/java/org/fox/epube/ExampleInstrumentedTest.java +++ /dev/null @@ -1,27 +0,0 @@ -package org.fox.epube; - -import android.content.Context; - -import androidx.test.platform.app.InstrumentationRegistry; -import androidx.test.ext.junit.runners.AndroidJUnit4; - -import org.junit.Test; -import org.junit.runner.RunWith; - -import static org.junit.Assert.*; - -/** - * Instrumented test, which will execute on an Android device. - * - * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> - */ -@RunWith(AndroidJUnit4.class) -public class ExampleInstrumentedTest { - @Test - public void useAppContext() { - // Context of the app under test. - Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext(); - - assertEquals("org.fox.epube", appContext.getPackageName()); - } -} diff --git a/org.fox.epube/src/main/AndroidManifest.xml b/org.fox.epube/src/main/AndroidManifest.xml index 15ff548..ffdb2b6 100644 --- a/org.fox.epube/src/main/AndroidManifest.xml +++ b/org.fox.epube/src/main/AndroidManifest.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - package="org.fox.epube"> + xmlns:tools="http://schemas.android.com/tools"> <uses-permission android:name="android.permission.INTERNET"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> @@ -28,7 +27,7 @@ </activity> <activity - android:name=".MainActivity" + android:name=".MasterActivity" android:theme="@style/AppTheme" android:windowSoftInputMode="adjustNothing" android:configChanges="orientation|screenSize"> diff --git a/org.fox.epube/src/main/java/org/fox/epube/LaunchActivity.java b/org.fox.epube/src/main/java/org/fox/epube/LaunchActivity.java index 220cd6a..c37b75e 100644 --- a/org.fox.epube/src/main/java/org/fox/epube/LaunchActivity.java +++ b/org.fox.epube/src/main/java/org/fox/epube/LaunchActivity.java @@ -1,9 +1,11 @@ package org.fox.epube; +import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; import android.os.Bundle; +@SuppressLint("CustomSplashScreen") public class LaunchActivity extends Activity { @Override @@ -16,7 +18,7 @@ public class LaunchActivity extends Activity { return; } - Intent main = new Intent(LaunchActivity.this, MainActivity.class); + Intent main = new Intent(LaunchActivity.this, MasterActivity.class); startActivity(main); finish(); diff --git a/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java index a8570c9..2875539 100644 --- a/org.fox.epube/src/main/java/org/fox/epube/MainActivity.java +++ b/org.fox.epube/src/main/java/org/fox/epube/MasterActivity.java @@ -5,6 +5,7 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.res.Configuration; +import android.graphics.Color; import android.net.ConnectivityManager; import android.net.NetworkInfo; import android.net.Uri; @@ -27,14 +28,15 @@ import android.widget.ProgressBar; import android.widget.Toast; import androidx.activity.EdgeToEdge; +import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import androidx.lifecycle.ViewModelProvider; import androidx.webkit.WebViewAssetLoader; -import com.google.android.material.appbar.AppBarLayout; - -public class MainActivity extends AppCompatActivity implements NetworkStateReceiver.NetworkStateReceiverListener { +public class MasterActivity extends AppCompatActivity implements NetworkStateReceiver.NetworkStateReceiverListener { private final String TAG = this.getClass().getSimpleName(); + private MasterModel m_model; public enum AppPage { PAGE_UNKNOWN, PAGE_LOGIN, PAGE_LIBRARY, PAGE_FAVORITES, PAGE_OFFLINE, PAGE_READER } @@ -44,8 +46,6 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei private NetworkStateReceiver m_networkStateReceiver; private String m_baseUrl; - protected boolean m_offlineMode; - protected AppPage m_currentPage = AppPage.PAGE_UNKNOWN; protected String m_lastVisitedURL; @SuppressLint("SetJavaScriptEnabled") @@ -56,13 +56,13 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei 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; + m_model = new ViewModelProvider(this).get(MasterModel.class); + startNetworkBroadcastReceiver(this); setContentView(R.layout.activity_main); @@ -113,9 +113,11 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei @Override public WebResourceResponse shouldInterceptRequest(WebView view, WebResourceRequest request) { - Log.d(TAG, "should intercept?=" + request.getUrl()); + WebResourceResponse resp = assetLoader.shouldInterceptRequest(request.getUrl()); + + Log.d(TAG, "should intercept: " + request.getUrl() + ", " + resp.getMimeType()); - return assetLoader.shouldInterceptRequest(request.getUrl()); + return resp; } @Override @@ -158,7 +160,7 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei //CookieManager.getInstance().setCookie(m_baseUrl, "is-epube-app=true"); - m_web.addJavascriptInterface(new WebAppInterface(this), "EpubeApp"); + m_web.addJavascriptInterface(new WebAppInterface(), "EpubeApp"); m_web.setScrollBarStyle(WebView.SCROLLBARS_OUTSIDE_OVERLAY); if (savedInstanceState == null || m_lastVisitedURL == null) { @@ -166,11 +168,23 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei } else { m_web.loadUrl(m_lastVisitedURL); } - } - private void onPageSwitched(MainActivity.AppPage page) { + m_model.getOffline().observe(this, (offline) -> { + Log.d(TAG, "observed offline mode change to: " + offline); + + AppPage currentPage = m_model.getCurrentPage().getValue(); - m_currentPage = page; + updateMenu(currentPage); + }); + + m_model.getCurrentPage().observe(this, (page) -> { + Log.d(TAG, "observed page change to: " + page); + + updateMenu(page); + }); + } + + private void updateMenu(AppPage page) { // not initialized yet if (m_menu == null) @@ -183,37 +197,46 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei m_menu.setGroupVisible(R.id.menu_group_offline, false); m_menu.setGroupVisible(R.id.menu_group_reader, false); - getSupportActionBar().setDisplayHomeAsUpEnabled(false); + boolean offline = Boolean.TRUE.equals(m_model.getOffline().getValue()); - Log.d(TAG, "switching to page: " + page); + Log.d(TAG, "switching to page: " + page + " offline:" + offline); if (page != AppPage.PAGE_READER && page != AppPage.PAGE_UNKNOWN && page != AppPage.PAGE_LOGIN) { - m_menu.setGroupVisible(R.id.menu_group_pages, !m_offlineMode); - m_menu.setGroupVisible(R.id.menu_group_pages_offline, m_offlineMode); + m_menu.setGroupVisible(R.id.menu_group_pages, !offline); + m_menu.setGroupVisible(R.id.menu_group_pages_offline, offline); } - if (page != AppPage.PAGE_READER) { - View abl = findViewById(R.id.appbarlayout); - - abl.setVisibility(View.VISIBLE); + if (page == AppPage.PAGE_READER) { + showActionBar(false); + getSupportActionBar().setDisplayHomeAsUpEnabled(true); + } else { + showActionBar(true); + getSupportActionBar().setDisplayHomeAsUpEnabled(false); } - if (page == AppPage.PAGE_FAVORITES) { - m_menu.setGroupVisible(R.id.menu_group_favorites, true); - getSupportActionBar().setTitle("Favorites"); - } else if (page == AppPage.PAGE_LIBRARY) { - m_menu.setGroupVisible(R.id.menu_group_library, true); - getSupportActionBar().setTitle("The Epube"); - } else if (page == AppPage.PAGE_OFFLINE) { - m_menu.setGroupVisible(R.id.menu_group_offline, true); - getSupportActionBar().setTitle("Downloaded"); - } else if (page == AppPage.PAGE_READER) { - m_menu.setGroupVisible(R.id.menu_group_reader, true); - - getSupportActionBar().setDisplayHomeAsUpEnabled(true); + switch (page) { + case PAGE_FAVORITES: + m_menu.setGroupVisible(R.id.menu_group_favorites, true); + getSupportActionBar().setTitle(R.string.page_favorites); + break; + case PAGE_LIBRARY: + m_menu.setGroupVisible(R.id.menu_group_library, true); + getSupportActionBar().setTitle(R.string.app_name); + break; + case PAGE_OFFLINE: + m_menu.setGroupVisible(R.id.menu_group_offline, true); + getSupportActionBar().setTitle(R.string.page_downloaded); + break; + case PAGE_READER: + m_menu.setGroupVisible(R.id.menu_group_reader, true); + break; } } + private void onPageSwitched(MasterActivity.AppPage page) { + m_model.setCurrentPage(page); + } + @Override protected void onPause() { unregisterNetworkBroadcastReceiver(this); @@ -230,7 +253,7 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei } public void toast(String msg) { - Toast toast = Toast.makeText(MainActivity.this, msg, Toast.LENGTH_SHORT); + Toast toast = Toast.makeText(MasterActivity.this, msg, Toast.LENGTH_SHORT); toast.show(); } @@ -272,11 +295,11 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei m_web.evaluateJavascript("App.Offline.removeAll();", null); return true; } else if (itemId == R.id.reader_search) { - getSupportActionBar().hide(); + showActionBar(false); m_web.evaluateJavascript("$(\"#search-modal\").modal()", null); return true; } else if (itemId == R.id.reader_settings) { - getSupportActionBar().hide(); + showActionBar(false); m_web.evaluateJavascript("$(\"#settings-modal\").modal()", null); return true; } else if (itemId == R.id.logout) { @@ -289,16 +312,7 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei private void onOfflineModeChanged(boolean offline) { Log.d(TAG, "offline mode changed: " + offline); - m_offlineMode = offline; - - onPageSwitched(m_currentPage); - - // this would probably be annoying if network access status changes a lot - // never reload if reading a book - /* if (m_web != null && m_currentPage != AppPage.PAGE_READER) - m_web.evaluateJavascript("window.location.reload();", null); */ - - // let's delegate this to webview + m_model.setOffline(offline); if (m_web != null) { m_web.evaluateJavascript("Reader.onOfflineModeChanged("+ offline +");", null); @@ -306,46 +320,27 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei } class WebAppInterface { - private Context m_context; - - WebAppInterface(Context context) { - m_context = context; - } - @JavascriptInterface public void setPage(String pageString) { final AppPage page = AppPage.valueOf(pageString); - runOnUiThread(new Runnable() { - @Override - public void run() { - onPageSwitched(page); - } - }); + runOnUiThread(() -> onPageSwitched(page)); } @JavascriptInterface public void setTitle(final String title) { - runOnUiThread(new Runnable() { - @Override - public void run() { - getSupportActionBar().setTitle(title); - } - }); + runOnUiThread(() -> getSupportActionBar().setTitle(title)); } @JavascriptInterface public void toggleActionBar() { - runOnUiThread(new Runnable() { - @Override - public void run() { - View abl = findViewById(R.id.appbarlayout); - - if (abl.getVisibility() == View.VISIBLE) - abl.setVisibility(View.GONE); - else - abl.setVisibility(View.VISIBLE); - } + runOnUiThread(() -> { + View abl = findViewById(R.id.appbarlayout); + + if (abl.getVisibility() == View.VISIBLE) + abl.setVisibility(View.GONE); + else + abl.setVisibility(View.VISIBLE); }); } @@ -361,13 +356,8 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei @JavascriptInterface public void showActionBar(final boolean show) { - runOnUiThread(new Runnable() { - @Override - public void run() { - View abl = findViewById(R.id.appbarlayout); - - abl.setVisibility(show ? View.VISIBLE : View.GONE); - } + runOnUiThread(() -> { + MasterActivity.this.showActionBar(show); }); } @@ -384,35 +374,33 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei @JavascriptInterface public boolean isNightMode() { - return MainActivity.this.isNightMode(); + return MasterActivity.this.isNightMode(); } @JavascriptInterface public void setStatusBarColor(final int r, final int g, final int b) { - // no-op for material3 - - /*Log.d(TAG, "setStatusBarColor:" + r + " " + g + " " + b); + runOnUiThread(() -> { + int argbColor = Color.argb(255, r, g, b); - runOnUiThread(new Runnable() { - @Override - public void run() { - int color = Color.argb(255, r, g, b); + float[] hsv = new float[3]; + Color.colorToHSV(argbColor, hsv); - float[] hsv = new float[3]; - Color.colorToHSV(color, hsv); + m_model.updateThemeColor(Color.HSVToColor(hsv)); - hsv[2] = 0.2f; - color = Color.HSVToColor(hsv); + // findViewById(R.id.appbarlayout).setBackgroundTintList(ColorStateList.valueOf(hsvColor)); + // getWindow().setStatusBarColor(hsvColor); - findViewById(R.id.toolbar).setBackground(new ColorDrawable(color)); - getWindow().setStatusBarColor(color); - getWindow().setNavigationBarColor(color); - } - });*/ + }); } } + /** actually shows or hides entire appbarlayout */ + private void showActionBar(boolean show) { + View abl = findViewById(R.id.appbarlayout); + abl.setVisibility(show ? View.VISIBLE : View.GONE); + } + private boolean isNightMode() { int nightModeFlags = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK; return nightModeFlags == Configuration.UI_MODE_NIGHT_YES; @@ -427,11 +415,9 @@ public class MainActivity extends AppCompatActivity implements NetworkStateRecei } @Override - public void onSaveInstanceState(Bundle out) { + public void onSaveInstanceState(@NonNull Bundle out) { super.onSaveInstanceState(out); - out.putBoolean("m_offlineMode", m_offlineMode); - out.putString("m_currentPage", m_currentPage.toString()); out.putString("m_lastVisitedURL", m_lastVisitedURL); } diff --git a/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java b/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java new file mode 100644 index 0000000..1a529a9 --- /dev/null +++ b/org.fox.epube/src/main/java/org/fox/epube/MasterModel.java @@ -0,0 +1,42 @@ +package org.fox.epube; + +import android.app.Application; + +import androidx.annotation.NonNull; +import androidx.lifecycle.AndroidViewModel; +import androidx.lifecycle.LiveData; +import androidx.lifecycle.MutableLiveData; + +public class MasterModel extends AndroidViewModel { + public MasterModel(@NonNull Application application) { + super(application); + } + + private final MutableLiveData<Integer> m_themeColorHSV = new MutableLiveData<>(-1); + private final MutableLiveData<MasterActivity.AppPage> m_currentPage = new MutableLiveData<>(MasterActivity.AppPage.PAGE_UNKNOWN); + private final MutableLiveData<Boolean> m_isOffline = new MutableLiveData<>(false); + + public LiveData<Integer> getThemeColor() { + return m_themeColorHSV; + } + + public void updateThemeColor(int hsvColor) { + m_themeColorHSV.postValue(hsvColor); + } + + public LiveData<MasterActivity.AppPage> getCurrentPage() { + return m_currentPage; + } + + public void setCurrentPage(MasterActivity.AppPage page) { + m_currentPage.postValue(page); + } + + public void setOffline(boolean offline) { + m_isOffline.postValue(offline); + } + + public LiveData<Boolean> getOffline() { + return m_isOffline; + } +} diff --git a/org.fox.epube/src/main/res/menu/activity_main.xml b/org.fox.epube/src/main/res/menu/activity_main.xml index 4408b4f..dbef461 100644 --- a/org.fox.epube/src/main/res/menu/activity_main.xml +++ b/org.fox.epube/src/main/res/menu/activity_main.xml @@ -7,21 +7,21 @@ android:icon="@drawable/baseline_book_24" app:showAsAction="ifRoom" app:iconTint="?attr/colorControlNormal" - android:title="All books"/> + android:title="@string/page_all_books"/> <item android:id="@+id/library_favorites" android:icon="@drawable/baseline_favorite_24" app:showAsAction="ifRoom" app:iconTint="?attr/colorControlNormal" - android:title="Favorites"/> + android:title="@string/page_favorites"/> <item android:id="@+id/library_local" android:icon="@drawable/baseline_download_for_offline_24" app:showAsAction="ifRoom" app:iconTint="?attr/colorControlNormal" - android:title="Downloaded"/> + android:title="@string/page_downloaded"/> </group> <group android:id="@+id/menu_group_pages_offline" > @@ -30,7 +30,7 @@ android:icon="@drawable/baseline_download_for_offline_24" app:showAsAction="ifRoom" app:iconTint="?attr/colorControlNormal" - android:title="Downloaded"/> + android:title="@string/page_downloaded"/> </group> <group android:id="@+id/menu_group_library" > @@ -38,11 +38,11 @@ android:id="@+id/refresh_script_cache" android:icon="@drawable/baseline_refresh_24" app:iconTint="?attr/colorControlNormal" - android:title="Refresh script cache"/> + android:title="@string/refresh_script_cache"/> <item android:id="@+id/logout" - android:title="Logout"/> + android:title="@string/logout"/> </group> <group android:id="@+id/menu_group_favorites" > @@ -50,7 +50,7 @@ android:id="@+id/favorites_download_all" android:icon="@drawable/baseline_download_for_offline_24" app:iconTint="?attr/colorControlNormal" - android:title="Download all"/> + android:title="@string/download_all"/> </group> @@ -59,7 +59,7 @@ android:id="@+id/offline_remove_all" android:icon="@drawable/baseline_remove_circle_24" app:iconTint="?attr/colorControlNormal" - android:title="Remove all downloads"/> + android:title="@string/remove_all_downloads"/> </group> <group android:id="@+id/menu_group_reader" > @@ -68,14 +68,14 @@ android:icon="@drawable/baseline_search_24" app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" - android:title="Search"/> + android:title="@string/search"/> <item android:id="@+id/reader_settings" android:icon="@drawable/baseline_settings_24" app:iconTint="?attr/colorControlNormal" app:showAsAction="ifRoom" - android:title="Settings"/> + android:title="@string/settings"/> </group> </menu> \ 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 f694812..82f9445 100644 --- a/org.fox.epube/src/main/res/values-night/themes.xml +++ b/org.fox.epube/src/main/res/values-night/themes.xml @@ -1,5 +1,5 @@ <resources> - <style name="AppTheme" parent="Theme.Material3.Dark.NoActionBar"> + <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar"> <item name="colorPrimary">@color/md_theme_primary</item> <item name="colorOnPrimary">@color/md_theme_onPrimary</item> <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item> diff --git a/org.fox.epube/src/main/res/values/strings.xml b/org.fox.epube/src/main/res/values/strings.xml index 622a909..95a4153 100644 --- a/org.fox.epube/src/main/res/values/strings.xml +++ b/org.fox.epube/src/main/res/values/strings.xml @@ -1,3 +1,12 @@ <resources> <string name="app_name">The Epube</string> + <string name="page_favorites">Favorites</string> + <string name="page_downloaded">Downloaded</string> + <string name="page_all_books">All books</string> + <string name="refresh_script_cache">Refresh script cache</string> + <string name="logout">Logout</string> + <string name="download_all">Download all</string> + <string name="remove_all_downloads">Remove all downloads</string> + <string name="search">Search</string> + <string name="settings">Settings</string> </resources> diff --git a/org.fox.epube/src/main/res/values/themes.xml b/org.fox.epube/src/main/res/values/themes.xml index 266cdd2..82f9445 100644 --- a/org.fox.epube/src/main/res/values/themes.xml +++ b/org.fox.epube/src/main/res/values/themes.xml @@ -1,5 +1,5 @@ <resources> - <style name="AppTheme" parent="Theme.Material3.Light.NoActionBar"> + <style name="AppTheme" parent="Theme.Material3.DayNight.NoActionBar"> <item name="colorPrimary">@color/md_theme_primary</item> <item name="colorOnPrimary">@color/md_theme_onPrimary</item> <item name="colorPrimaryContainer">@color/md_theme_primaryContainer</item> diff --git a/org.fox.epube/src/test/java/org/fox/epube/ExampleUnitTest.java b/org.fox.epube/src/test/java/org/fox/epube/ExampleUnitTest.java deleted file mode 100644 index afc44bd..0000000 --- a/org.fox.epube/src/test/java/org/fox/epube/ExampleUnitTest.java +++ /dev/null @@ -1,17 +0,0 @@ -package org.fox.epube; - -import org.junit.Test; - -import static org.junit.Assert.*; - -/** - * Example local unit test, which will execute on the development machine (host). - * - * @see <a href="http://d.android.com/tools/testing">Testing documentation</a> - */ -public class ExampleUnitTest { - @Test - public void addition_isCorrect() { - assertEquals(4, 2 + 2); - } -} \ No newline at end of file |
