yenru0/EhViewer
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use rikkax

Browse Source
This commit is contained in:
tehcneko committed 2021-03-17 11:06:07 +08:00
1 parent 7ed05caacb
commit e3b76a63e4
10 files changed
+116 -156
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/build.gradle
+9 -1
View File
@@ -25,7 +25,7 @@ android {
}
defaultConfig {
applicationId "io.github.nekoinverter.ehviewer"
minSdkVersion 21
minSdkVersion 23
targetSdkVersion 30
versionCode 143
versionName "1.7.22"
@@ -114,6 +114,7 @@ dependencies {
implementation 'androidx.biometric:biometric:1.1.0'
implementation "androidx.browser:browser:1.3.0"
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'androidx.core:core:1.5.0-beta03'
implementation 'androidx.dynamicanimation:dynamicanimation:1.1.0-alpha03'
implementation "androidx.fragment:fragment:1.3.1"
implementation "androidx.preference:preference:1.1.1"
@@ -145,6 +146,12 @@ dependencies {
implementation 'com.takisoft.preferencex:preferencex:1.1.0'
implementation 'com.github.NekoInverter:Image:8fd6c1e1df'
implementation 'com.gitlab.NekoInverter:yorozuya:723dc867a9'
implementation 'dev.rikka.rikkax.appcompat:appcompat:1.2.0-rc01'
implementation 'dev.rikka.rikkax.core:core:1.3.0'
implementation 'dev.rikka.rikkax.material:material:1.6.0'
implementation 'dev.rikka.rikkax.recyclerview:recyclerview-adapter:1.2.0'
implementation 'dev.rikka.rikkax.recyclerview:recyclerview-ktx:1.2.0'
implementation 'dev.rikka.rikkax.widget:borderview:1.0.1'
implementation 'dev.rikka.rikkax.preference:simplemenu-preference:1.0.2'
implementation 'org.ccil.cowan.tagsoup:tagsoup:1.2.1'
implementation 'org.greenrobot:greendao:3.3.0'
@@ -163,5 +170,6 @@ configurations.all {
exclude group: 'com.github.seven332', module: 'okhttp'
exclude group: 'com.github.seven332', module: 'image'
exclude group: 'com.github.seven332', module: 'yorozuya'
exclude group: 'androidx.appcompat', module: 'appcompat'
}
}
app/src/main/java/com/hippo/ehviewer/EhApplication.java
+5 -2
View File
@@ -31,7 +31,6 @@ import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.collection.LruCache;
import com.hippo.a7zip.A7Zip;
@@ -84,6 +83,8 @@ import okhttp3.Call;
import okhttp3.HttpUrl;
import okhttp3.OkHttpClient;
import okhttp3.Request;
import rikka.material.app.DayNightDelegate;
import rikka.material.app.LocaleDelegate;
public class EhApplication extends RecordingApplication {
@@ -336,7 +337,9 @@ public class EhApplication extends RecordingApplication {
Analytics.start(this);
AppCompatDelegate.setDefaultNightMode(Settings.getTheme());
LocaleDelegate.setDefaultLocale(Settings.getLocale());
DayNightDelegate.setApplicationContext(this);
DayNightDelegate.setDefaultNightMode(Settings.getTheme());
// Do io tasks in new thread
//noinspection deprecation
app/src/main/java/com/hippo/ehviewer/Settings.java
+10
View File
@@ -311,6 +311,16 @@ public class Settings {
//}
}
public static Locale getLocale() {
Locale locale = null;
String language = Settings.getAppLanguage();
if (language != null && !language.equals("system")) {
return Locale.forLanguageTag(language);
} else {
return Locale.getDefault();
}
}
private static EhConfig loadEhConfig() {
EhConfig ehConfig = new EhConfig();
ehConfig.imageSize = getImageResolution();
app/src/main/java/com/hippo/ehviewer/ui/EhActivity.java
+9 -67
View File
@@ -19,21 +19,20 @@ package com.hippo.ehviewer.ui;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.Resources;
import android.os.Build;
import android.os.Bundle;
import android.view.WindowManager;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.StyleRes;
import androidx.appcompat.app.AppCompatActivity;
import com.hippo.ehviewer.EhApplication;
import com.hippo.ehviewer.R;
import com.hippo.ehviewer.Settings;
import java.util.Locale;
import rikka.material.app.MaterialActivity;
public abstract class EhActivity extends AppCompatActivity {
public abstract class EhActivity extends MaterialActivity {
private static final String THEME_DEFAULT = "DEFAULT";
private static final String THEME_BLACK = "BLACK";
@@ -55,21 +54,13 @@ public abstract class EhActivity extends AppCompatActivity {
}
@Override
protected void onApplyThemeResource(Resources.Theme theme, int resid, boolean first) {
// apply real style and our custom style
if (getParent() == null) {
theme.applyStyle(resid, true);
} else {
try {
theme.setTo(getParent().getTheme());
} catch (Exception e) {
// Empty
}
theme.applyStyle(resid, false);
}
public void onApplyUserThemeResource(@NonNull Resources.Theme theme, boolean isDecorView) {
theme.applyStyle(getThemeStyleRes(this), true);
// only pass theme style to super, so styled theme will not be overwritten
super.onApplyThemeResource(theme, R.style.ThemeOverlay, first);
}
@Override
public String computeUserThemeKey() {
return getTheme(this);
}
@StyleRes
@@ -83,11 +74,6 @@ public abstract class EhActivity extends AppCompatActivity {
}
}
@Override
protected void onNightModeChanged(int mode) {
getTheme().applyStyle(getThemeStyleRes(this), true);
}
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -112,48 +98,4 @@ public abstract class EhActivity extends AppCompatActivity {
getWindow().clearFlags(WindowManager.LayoutParams.FLAG_SECURE);
}
}
@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(newBase);
applyOverrideConfiguration(new Configuration());
}
@Override
public void applyOverrideConfiguration(Configuration newConfig) {
super.applyOverrideConfiguration(updateConfigurationIfSupported(newConfig));
}
private Configuration updateConfigurationIfSupported(Configuration config) {
// Configuration.getLocales is added after 24 and Configuration.locale is deprecated in 24
if (Build.VERSION.SDK_INT >= 24) {
if (!config.getLocales().isEmpty()) {
return config;
}
} else {
if (config.locale != null) {
return config;
}
}
Locale locale = null;
String language = Settings.getAppLanguage();
if (language != null && !language.equals("system")) {
String[] split = language.split("-");
if (split.length == 1) {
locale = new Locale(split[0]);
} else if (split.length == 2) {
locale = new Locale(split[0], split[1]);
} else if (split.length == 3) {
locale = new Locale(split[0], split[1], split[2]);
}
} else {
Resources res = EhApplication.getInstance().getResources();
Configuration configuration = res.getConfiguration();
locale = Build.VERSION.SDK_INT >= Build.VERSION_CODES.N ? configuration.getLocales().get(0) : configuration.locale;
}
if (locale != null) {
config.setLocale(locale);
}
return config;
}
}
app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java
+20 -39
View File
@@ -54,7 +54,6 @@ import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AlertDialog;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.widget.SwitchCompat;
import androidx.core.content.ContextCompat;
import androidx.core.content.FileProvider;
@@ -99,6 +98,8 @@ import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import rikka.material.app.DayNightDelegate;
public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChangeListener,
GalleryView.Listener {
@@ -302,19 +303,30 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
}
@Override
@SuppressWarnings({"WrongConstant"})
protected void onCreate(@Nullable Bundle savedInstanceState) {
protected void attachBaseContext(@NonNull Context newBase) {
switch (Settings.getReadTheme()) {
case 0:
getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_UNSPECIFIED);
DayNightDelegate.setDefaultNightMode(Settings.getTheme());
break;
case 1:
getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
DayNightDelegate.setDefaultNightMode(DayNightDelegate.MODE_NIGHT_YES);
break;
case 2:
getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);
DayNightDelegate.setDefaultNightMode(DayNightDelegate.MODE_NIGHT_NO);
break;
}
super.attachBaseContext(newBase);
}
@Override
public void finish() {
DayNightDelegate.setDefaultNightMode(Settings.getTheme());
super.finish();
}
@Override
@SuppressWarnings({"WrongConstant"})
protected void onCreate(@Nullable Bundle savedInstanceState) {
if (Settings.getReadingFullscreen()) {
Window w = getWindow();
w.setFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_NAVIGATION,
@@ -1041,6 +1053,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
int screenLightness = mScreenLightness.getProgress();
boolean oldReadingFullscreen = Settings.getReadingFullscreen();
int oldReadTheme = Settings.getReadTheme();
Settings.putScreenRotation(screenRotation);
Settings.putReadingDirection(layoutMode);
@@ -1074,17 +1087,6 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
break;
}
setRequestedOrientation(orientation);
switch (Settings.getReadTheme()) {
case 0:
getDelegate().setLocalNightMode(AppCompatDelegate.getDefaultNightMode());
break;
case 1:
getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES);
break;
case 2:
getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_NO);
break;
}
mGalleryView.setLayoutMode(layoutMode);
mGalleryView.setScaleMode(scaleMode);
mGalleryView.setStartPosition(startPosition);
@@ -1110,7 +1112,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
mLayoutMode = layoutMode;
updateSlider();
if (oldReadingFullscreen != readingFullscreen) {
if (oldReadingFullscreen != readingFullscreen || oldReadTheme != readTheme) {
recreate();
}
}
@@ -1222,25 +1224,4 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan
}
}
}
@Override
public void applyOverrideConfiguration(Configuration newConfig) {
// **Magic**
super.applyOverrideConfiguration(updateConfigurationIfSupported(newConfig));
}
private Configuration updateConfigurationIfSupported(Configuration config) {
switch (Settings.getReadTheme()) {
case 0:
config.uiMode = Configuration.UI_MODE_NIGHT_UNDEFINED | Configuration.UI_MODE_NIGHT_MASK;
break;
case 1:
config.uiMode = Configuration.UI_MODE_NIGHT_YES | Configuration.UI_MODE_NIGHT_MASK;
break;
case 2:
config.uiMode = Configuration.UI_MODE_NIGHT_NO | Configuration.UI_MODE_NIGHT_MASK;
break;
}
return config;
}
}
app/src/main/java/com/hippo/ehviewer/ui/MainActivity.java
+4 -1
View File
@@ -92,6 +92,8 @@ import java.io.FileOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import rikka.material.app.DayNightDelegate;
public final class MainActivity extends StageActivity
implements NavigationView.OnNavigationItemSelectedListener {
@@ -317,7 +319,8 @@ public final class MainActivity extends StageActivity
mDisplayName = (TextView) ViewUtils.$$(headerLayout, R.id.display_name);
ViewUtils.$$(headerLayout, R.id.night_mode).setOnClickListener(v -> {
int theme = (getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) > 0 ? AppCompatDelegate.MODE_NIGHT_NO : AppCompatDelegate.MODE_NIGHT_YES;
AppCompatDelegate.setDefaultNightMode(theme);
DayNightDelegate.setDefaultNightMode(theme);
recreate();
if (Settings.getTheme() != AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) {
Settings.putTheme(theme);
}
app/src/main/java/com/hippo/ehviewer/ui/fragment/AdvancedFragment.java
+9 -1
View File
@@ -47,9 +47,12 @@ import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Locale;
import java.util.zip.ZipEntry;
import java.util.zip.ZipOutputStream;
import rikka.material.app.LocaleDelegate;
public class AdvancedFragment extends BasePreferenceFragment {
private static final String KEY_DUMP_LOGCAT = "dump_logcat";
@@ -271,7 +274,12 @@ public class AdvancedFragment extends BasePreferenceFragment {
public boolean onPreferenceChange(Preference preference, Object newValue) {
String key = preference.getKey();
if (KEY_APP_LANGUAGE.equals(key)) {
((EhApplication) getActivity().getApplication()).recreate();
if ("system".equals(newValue)) {
LocaleDelegate.setDefaultLocale(LocaleDelegate.getSystemLocale());
} else {
LocaleDelegate.setDefaultLocale(Locale.forLanguageTag((String) newValue));
}
requireActivity().recreate();
return true;
}
return false;
app/src/main/java/com/hippo/ehviewer/ui/fragment/EhFragment.java
+5 -4
View File
@@ -21,14 +21,14 @@ import android.content.res.Configuration;
import android.os.Bundle;
import androidx.annotation.Nullable;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.preference.Preference;
import com.hippo.ehviewer.EhApplication;
import com.hippo.ehviewer.R;
import com.hippo.ehviewer.Settings;
import com.hippo.ehviewer.client.EhTagDatabase;
import rikka.material.app.DayNightDelegate;
public class EhFragment extends BasePreferenceFragment {
@Override
@@ -62,7 +62,8 @@ public class EhFragment extends BasePreferenceFragment {
public boolean onPreferenceChange(Preference preference, Object newValue) {
String key = preference.getKey();
if (Settings.KEY_THEME.equals(key)) {
AppCompatDelegate.setDefaultNightMode(Integer.parseInt((String) newValue));
DayNightDelegate.setDefaultNightMode(Integer.parseInt((String) newValue));
requireActivity().recreate();
return true;
} else if (Settings.KEY_GALLERY_SITE.equals(key)) {
requireActivity().setResult(Activity.RESULT_OK);
@@ -80,7 +81,7 @@ public class EhFragment extends BasePreferenceFragment {
}
} else if (Settings.KEY_BLACK_DARK_THEME.equals(key)) {
if ((requireActivity().getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_YES) > 0) {
((EhApplication) requireActivity().getApplication()).recreate();
requireActivity().recreate();
}
return true;
}
app/src/main/res/values-night/themes.xml
+2 -39
View File
@@ -1,44 +1,7 @@
<resources>
<style name="BaseTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/grey_875</item>
<item name="colorAccent">@color/colorPrimary</item>
<item name="colorControlActivated">@color/colorPrimary</item>
<item name="actionBarStyle">@style/ActionBarStyle</item>
<item name="android:windowBackground">@color/grey_850</item>
<item name="android:colorBackground">@color/grey_850</item>
<item name="colorBackgroundFloating">@color/grey_850</item>
<item name="colorEdgeEffect">@color/grey_500</item>
<item name="dividerColor">@color/divider</item>
<item name="toolbarColor">?android:attr/colorBackground</item>
<item name="textColorThemePrimary">?android:attr/textColorSecondary</item>
<item name="textColorThemeAccent">?android:attr/textColorSecondary</item>
<item name="colorControlNormal">@color/primary_drawable</item>
<item name="drawableColorSecondary">@color/secondary_drawable</item>
<item name="drawableColorThemePrimary">@color/primary_drawable</item>
<item name="contentColorPrimary">@color/content</item>
<item name="contentColorThemePrimary">?attr/contentColorPrimary</item>
<item name="contentColorThemeAccent">?attr/contentColorPrimary</item>
<item name="contentColorReactive">@color/content_reactive</item>
<item name="widgetColorThemePrimary">@color/widget</item>
<item name="widgetColorThemeAccent">@color/widget</item>
<item name="progressColor">@color/progress</item>
<item name="guideBackgroundColor">#e5303030</item>
<item name="guideTitleColor">?android:attr/textColorPrimary</item>
<item name="guideTextColor">?android:attr/textColorSecondary</item>
<item name="tagGroupBackgroundColor">@color/tag_group_background</item>
<item name="tagBackgroundColor">@color/tag_background</item>
<item name="galleryDetailHeaderTitleColor">?android:attr/textColorPrimary</item>
<item name="galleryDetailHeaderBackgroundColor">?attr/contentColorThemePrimary</item>
<item name="galleryDetailButtonBackgroundColor">@color/gallery_detail_button_background
</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.MaterialComponents.Dark</item>
<item name="galleryDetailDivider">@drawable/divider_gallery_detail_dark</item>
<item name="android:navigationBarColor">@color/colorNavigationBar</item>
<style name="AppTheme" parent="BaseTheme">
<item name="android:colorEdgeEffect">?attr/colorEdgeEffect</item>
</style>
<style name="ToolbarPopupTheme" parent="ThemeOverlay.MaterialComponents.Dark" />
app/src/main/res/values/themes.xml
+43 -2
View File
@@ -19,7 +19,7 @@
<!-- ========== -->
<!-- Base Theme -->
<!-- ========== -->
<style name="BaseTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<style name="BaseTheme.Light" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
@@ -59,9 +59,50 @@
</item>
</style>
<style name="BaseTheme" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/grey_875</item>
<item name="colorAccent">@color/colorPrimary</item>
<item name="colorControlActivated">@color/colorPrimary</item>
<item name="actionBarStyle">@style/ActionBarStyle</item>
<item name="android:windowBackground">@color/grey_850</item>
<item name="android:colorBackground">@color/grey_850</item>
<item name="colorBackgroundFloating">@color/grey_850</item>
<item name="colorEdgeEffect">@color/grey_500</item>
<item name="dividerColor">@color/divider</item>
<item name="toolbarColor">?android:attr/colorBackground</item>
<item name="textColorThemePrimary">?android:attr/textColorSecondary</item>
<item name="textColorThemeAccent">?android:attr/textColorSecondary</item>
<item name="colorControlNormal">@color/primary_drawable</item>
<item name="drawableColorSecondary">@color/secondary_drawable</item>
<item name="drawableColorThemePrimary">@color/primary_drawable</item>
<item name="contentColorPrimary">@color/content</item>
<item name="contentColorThemePrimary">?attr/contentColorPrimary</item>
<item name="contentColorThemeAccent">?attr/contentColorPrimary</item>
<item name="contentColorReactive">@color/content_reactive</item>
<item name="widgetColorThemePrimary">@color/widget</item>
<item name="widgetColorThemeAccent">@color/widget</item>
<item name="progressColor">@color/progress</item>
<item name="guideBackgroundColor">#e5303030</item>
<item name="guideTitleColor">?android:attr/textColorPrimary</item>
<item name="guideTextColor">?android:attr/textColorSecondary</item>
<item name="tagGroupBackgroundColor">@color/tag_group_background</item>
<item name="tagBackgroundColor">@color/tag_background</item>
<item name="galleryDetailHeaderTitleColor">?android:attr/textColorPrimary</item>
<item name="galleryDetailHeaderBackgroundColor">?attr/contentColorThemePrimary</item>
<item name="galleryDetailButtonBackgroundColor">@color/gallery_detail_button_background
</item>
<item name="toolbarPopupTheme">@style/ThemeOverlay.MaterialComponents.Dark</item>
<item name="galleryDetailDivider">@drawable/divider_gallery_detail_dark</item>
<item name="android:navigationBarColor">@color/colorNavigationBar</item>
</style>
<style name="ToolbarPopupTheme" parent="ThemeOverlay.MaterialComponents.Light" />
<style name="AppTheme" parent="BaseTheme">
<style name="AppTheme" parent="BaseTheme.Light">
<item name="android:colorEdgeEffect">?attr/colorEdgeEffect</item>
</style>