some changes (8ffd5b3a) · Commits · Android-smartphones / Fedilab

app/build.gradle

+6 −5

Original line number	Diff line number	Diff line
		@@ -96,12 +96,11 @@ allprojects {
		}
		}
		dependencies {
		implementation project(':autoimageslider')

		implementation 'androidx.appcompat:appcompat:1.6.1'

		implementation 'com.google.android.material:material:1.8.0'

		implementation 'com.jaredrummler:colorpicker:1.1.0'

		implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
		implementation "com.google.code.gson:gson:2.9.1"
		@@ -121,15 +120,18 @@ dependencies {
		}

		implementation "org.jsoup:jsoup:1.15.1"

		implementation 'com.github.mergehez:ArgPlayer:v3.1'

		implementation project(':autoimageslider')
		implementation project(path: ':mytransl')
		implementation project(path: ':ratethisapp')
		implementation project(path: ':sparkbutton')
		implementation project(path: ':colorPicker')
		implementation project(path: ':mathjaxandroid')


		implementation 'com.burhanrashid52:photoeditor:1.5.1'
		implementation("com.vanniktech:android-image-cropper:4.3.3")
		implementation project(path: ':mathjaxandroid')
		annotationProcessor "com.github.bumptech.glide:compiler:4.12.0"
		implementation 'jp.wasabeef:glide-transformations:4.3.0'
		implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.23.0'
		@@ -165,7 +167,6 @@ dependencies {
		implementation 'com.r0adkll:slidableactivity:2.1.0'
		coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'


		implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
		implementation "androidx.fragment:fragment:1.5.5"
		implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'

app/src/main/java/app/fedilab/android/BaseMainActivity.java

+10 −0

Original line number	Diff line number	Diff line
		@@ -1067,6 +1067,16 @@ public abstract class BaseMainActivity extends BaseActivity implements NetworkSt
		} catch (DBException e) {
		e.printStackTrace();
		}
		if (currentAccount != null && currentInstance == null) {
		currentInstance = currentAccount.instance;
		currentUserID = currentAccount.user_id;
		Handler mainHandler = new Handler(Looper.getMainLooper());
		Runnable myRunnable = () -> {
		recreate();
		};
		mainHandler.post(myRunnable);
		}

		if (currentAccount != null && currentAccount.peertube_account != null) {
		//It is a peertube user
		Intent intent = getIntent();

app/src/main/java/app/fedilab/android/mastodon/activities/BaseActivity.java

+4 −7

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import androidx.appcompat.app.AppCompatActivity;
		import androidx.appcompat.app.AppCompatDelegate;
		import androidx.preference.PreferenceManager;

		import com.google.android.material.color.DynamicColors;
		import com.vanniktech.emoji.EmojiManager;
		import com.vanniktech.emoji.one.EmojiOneProvider;

		@@ -52,6 +51,7 @@ public class BaseActivity extends AppCompatActivity {
		EmojiManager.install(new EmojiOneProvider());
		}

		@SuppressLint("RestrictedApi")
		@Override
		protected void onCreate(@Nullable Bundle savedInstanceState) {

		@@ -70,9 +70,8 @@ public class BaseActivity extends AppCompatActivity {

		String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
		//Default automatic switch
		if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {

		int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
		if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
		switch (currentNightMode) {
		case Configuration.UI_MODE_NIGHT_NO:
		String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
		@@ -144,10 +143,8 @@ public class BaseActivity extends AppCompatActivity {
		}
		}
		super.onCreate(savedInstanceState);
		boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);
		if (dynamicColor) {
		DynamicColors.applyToActivityIfAvailable(this);
		}
		ThemeHelper.applyThemeColor(this);

		if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.N) {
		ThemeHelper.adjustFontScale(this, getResources().getConfiguration());
		}

app/src/main/java/app/fedilab/android/mastodon/activities/BaseBarActivity.java

+3 −7

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import androidx.appcompat.app.AppCompatActivity;
		import androidx.appcompat.app.AppCompatDelegate;
		import androidx.preference.PreferenceManager;

		import com.google.android.material.color.DynamicColors;
		import com.vanniktech.emoji.EmojiManager;
		import com.vanniktech.emoji.one.EmojiOneProvider;

		@@ -66,9 +65,8 @@ public class BaseBarActivity extends AppCompatActivity {
		}
		String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
		//Default automatic switch
		if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {

		int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
		if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {
		switch (currentNightMode) {
		case Configuration.UI_MODE_NIGHT_NO:
		String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
		@@ -129,10 +127,8 @@ public class BaseBarActivity extends AppCompatActivity {
		}
		}
		super.onCreate(savedInstanceState);
		boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);
		if (dynamicColor) {
		DynamicColors.applyToActivityIfAvailable(this);
		}
		ThemeHelper.applyThemeColor(this);

		if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
		Window window = getWindow();
		window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

app/src/main/java/app/fedilab/android/mastodon/activities/BaseTransparentActivity.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@ import androidx.appcompat.app.AppCompatActivity;
		import androidx.appcompat.app.AppCompatDelegate;
		import androidx.preference.PreferenceManager;

		import com.google.android.material.color.DynamicColors;
		import com.vanniktech.emoji.EmojiManager;
		import com.vanniktech.emoji.one.EmojiOneProvider;

		@@ -66,9 +65,9 @@ public class BaseTransparentActivity extends AppCompatActivity {
		}
		String currentTheme = sharedpreferences.getString(getString(R.string.SET_THEME_BASE), getString(R.string.SET_DEFAULT_THEME));
		//Default automatic switch
		int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
		if (currentTheme.equals(getString(R.string.SET_DEFAULT_THEME))) {

		int currentNightMode = getResources().getConfiguration().uiMode & Configuration.UI_MODE_NIGHT_MASK;
		switch (currentNightMode) {
		case Configuration.UI_MODE_NIGHT_NO:
		String defaultLight = sharedpreferences.getString(getString(R.string.SET_THEME_DEFAULT_LIGHT), "LIGHT");
		@@ -129,10 +128,7 @@ public class BaseTransparentActivity extends AppCompatActivity {
		}
		}
		super.onCreate(savedInstanceState);
		boolean dynamicColor = sharedpreferences.getBoolean(getString(R.string.SET_DYNAMICCOLOR), false);
		if (dynamicColor) {
		DynamicColors.applyToActivityIfAvailable(this);
		}
		ThemeHelper.applyThemeColor(this);
		if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.M) {
		Window window = getWindow();
		window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);