Fix landscape even more, make blur disabled by default (new strings)
Fox2Code
2 years ago
parent
6f7c40393e
commit
cd5f6b6e6a
@ -0,0 +1,144 @@
|
||||
package com.fox2code.mmm.compat;
|
||||
|
||||
import android.app.Application;
|
||||
import android.content.res.Configuration;
|
||||
import android.content.res.Resources;
|
||||
import android.os.Build;
|
||||
import android.util.Log;
|
||||
import android.util.TypedValue;
|
||||
|
||||
import androidx.annotation.AttrRes;
|
||||
import androidx.annotation.CallSuper;
|
||||
import androidx.annotation.ColorInt;
|
||||
import androidx.annotation.ColorRes;
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.core.content.ContextCompat;
|
||||
import androidx.core.graphics.ColorUtils;
|
||||
|
||||
import com.fox2code.mmm.R;
|
||||
|
||||
import java.lang.ref.WeakReference;
|
||||
|
||||
/**
|
||||
* I will probably outsource this to a separate library later
|
||||
*/
|
||||
public class CompatApplication extends Application implements CompatActivity.ApplicationCallbacks {
|
||||
private static final String TAG = "CompatApplication";
|
||||
private final CompatConfigHelper compatConfigHelper = new CompatConfigHelper(this);
|
||||
private WeakReference<CompatActivity> lastCompatActivity;
|
||||
// CompatConfigHelper
|
||||
private boolean forceEnglish;
|
||||
private Boolean nightModeOverride;
|
||||
private boolean propagateOverrides;
|
||||
|
||||
public CompatApplication() {}
|
||||
|
||||
@Override
|
||||
public void onConfigurationChanged(@NonNull Configuration newConfig) {
|
||||
this.compatConfigHelper.checkResourcesOverrides(newConfig,
|
||||
this.forceEnglish, this.nightModeOverride);
|
||||
super.onConfigurationChanged(newConfig);
|
||||
}
|
||||
|
||||
public void setForceEnglish(boolean forceEnglish) {
|
||||
if (this.forceEnglish != forceEnglish) {
|
||||
this.forceEnglish = forceEnglish;
|
||||
this.checkResourcesOverrides(forceEnglish, this.nightModeOverride);
|
||||
}
|
||||
// Propagate even if local value didn't changed
|
||||
if (this.propagateOverrides && this.lastCompatActivity != null) {
|
||||
CompatActivity compatActivity = this.lastCompatActivity.get();
|
||||
if (compatActivity != null)
|
||||
compatActivity.setForceEnglish(forceEnglish);
|
||||
}
|
||||
}
|
||||
|
||||
public void setNightModeOverride(Boolean nightModeOverride) {
|
||||
if (this.nightModeOverride != nightModeOverride) {
|
||||
this.nightModeOverride = nightModeOverride;
|
||||
this.checkResourcesOverrides(this.forceEnglish, nightModeOverride);
|
||||
}
|
||||
// Propagate even if local value didn't changed
|
||||
if (this.propagateOverrides && this.lastCompatActivity != null) {
|
||||
CompatActivity compatActivity = this.lastCompatActivity.get();
|
||||
if (compatActivity != null)
|
||||
compatActivity.setNightModeOverride(nightModeOverride);
|
||||
}
|
||||
}
|
||||
|
||||
public boolean isPropagateOverrides() {
|
||||
return propagateOverrides;
|
||||
}
|
||||
|
||||
public void setPropagateOverrides(boolean propagateOverrides) {
|
||||
this.propagateOverrides = propagateOverrides;
|
||||
WeakReference<CompatActivity> lastCompatActivity = this.lastCompatActivity;
|
||||
if (lastCompatActivity != null) {
|
||||
Log.d(TAG, "setPropagateOverrides(" + // This should be avoided
|
||||
propagateOverrides + ") called after first activity created!");
|
||||
CompatActivity compatActivity = lastCompatActivity.get();
|
||||
if (compatActivity != null && propagateOverrides) {
|
||||
this.propagateOverrides(compatActivity);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void checkResourcesOverrides(boolean forceEnglish, Boolean nightModeOverride) {
|
||||
this.compatConfigHelper.checkResourcesOverrides(forceEnglish, nightModeOverride);
|
||||
}
|
||||
|
||||
public boolean isLightTheme() {
|
||||
Resources.Theme theme = this.getTheme();
|
||||
TypedValue typedValue = new TypedValue();
|
||||
theme.resolveAttribute(R.attr.isLightTheme, typedValue, true);
|
||||
if (typedValue.type == TypedValue.TYPE_INT_BOOLEAN) {
|
||||
return typedValue.data == 1;
|
||||
}
|
||||
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q) {
|
||||
theme.resolveAttribute(android.R.attr.isLightTheme, typedValue, true);
|
||||
if (typedValue.type == TypedValue.TYPE_INT_BOOLEAN) {
|
||||
return typedValue.data == 1;
|
||||
}
|
||||
}
|
||||
theme.resolveAttribute(android.R.attr.background, typedValue, true);
|
||||
if (typedValue.type >= TypedValue.TYPE_FIRST_COLOR_INT &&
|
||||
typedValue.type <= TypedValue.TYPE_LAST_COLOR_INT) {
|
||||
return ColorUtils.calculateLuminance(typedValue.data) > 0.7D;
|
||||
}
|
||||
throw new IllegalStateException("Theme is not a valid theme!");
|
||||
}
|
||||
|
||||
@ColorInt
|
||||
public final int getColorCompat(@ColorRes @AttrRes int color) {
|
||||
TypedValue typedValue = new TypedValue();
|
||||
this.getTheme().resolveAttribute(color, typedValue, true);
|
||||
if (typedValue.type >= TypedValue.TYPE_FIRST_COLOR_INT &&
|
||||
typedValue.type <= TypedValue.TYPE_LAST_COLOR_INT) {
|
||||
return typedValue.data;
|
||||
}
|
||||
return ContextCompat.getColor(this, color);
|
||||
}
|
||||
|
||||
@Override
|
||||
@CallSuper
|
||||
public void onCreateCompatActivity(CompatActivity compatActivity) {
|
||||
this.lastCompatActivity = compatActivity.selfReference;
|
||||
if (this.propagateOverrides) {
|
||||
this.propagateOverrides(compatActivity);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@CallSuper
|
||||
public void onRefreshUI(CompatActivity compatActivity) {
|
||||
this.lastCompatActivity = compatActivity.selfReference;
|
||||
if (this.propagateOverrides) {
|
||||
this.propagateOverrides(compatActivity);
|
||||
}
|
||||
}
|
||||
|
||||
private void propagateOverrides(CompatActivity compatActivity) {
|
||||
compatActivity.propagateResourcesOverride(
|
||||
this.forceEnglish, this.nightModeOverride);
|
||||
}
|
||||
}
|
||||
@ -0,0 +1,8 @@
|
||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="24"
|
||||
android:viewportHeight="24"
|
||||
android:tint="?attr/colorControlNormal">
|
||||
<path android:fillColor="@android:color/white" android:pathData="M6,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM6,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM3,9.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM6,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,10.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM14,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM14,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM3,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,3.5c0.28,0 0.5,-0.22 0.5,-0.5s-0.22,-0.5 -0.5,-0.5 -0.5,0.22 -0.5,0.5 0.22,0.5 0.5,0.5zM10,7c0.55,0 1,-0.45 1,-1s-0.45,-1 -1,-1 -1,0.45 -1,1 0.45,1 1,1zM10,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM18,13c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,9c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM18,5c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM21,13.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM14,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,20.5c-0.28,0 -0.5,0.22 -0.5,0.5s0.22,0.5 0.5,0.5 0.5,-0.22 0.5,-0.5 -0.22,-0.5 -0.5,-0.5zM10,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM10,17c-0.55,0 -1,0.45 -1,1s0.45,1 1,1 1,-0.45 1,-1 -0.45,-1 -1,-1zM14,12.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM14,8.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5z"/>
|
||||
</vector>
|
||||
@ -1,10 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent">
|
||||
<TextView
|
||||
android:id="@+id/markdownView"
|
||||
android:text="@string/loading"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content" />
|
||||
</ScrollView>
|
||||
Loading…
Reference in New Issue