Commit 8e3b146a authored by Thomas's avatar Thomas
Browse files

Merge branch 'develop'

parents 376daf7c a63f1a93

app/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -13,8 +13,8 @@ android { 
    defaultConfig {

        minSdk 21

        targetSdk 32

        versionCode 449

        versionName "3.11.3"

        versionCode 450

        versionName "3.12.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"

app/src/main/assets/release_notes/notes.json

+5 −0
Original line number Diff line number Diff line 
[

  {

    "version": "3.12.0",

    "code": "450",

    "note": "Added:\n- Full data import/export feature\n- Android 13 themed icon support\n\nFixed:\n- Fix a regression with filters\n- Fix dark solarized theme\n- Fix hide link previews for CW\n- Fix status bar color for all themes\n- Fix language in compose \"...\"\n- Fix add all home muted accounts from lists\n- Fix top notification badges"

  },

  {

    "version": "3.11.3",

    "code": "449",

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

+0 −9
Original line number Diff line number Diff line
@@ -19,11 +19,8 @@ import android.annotation.SuppressLint; 
import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.graphics.Color;

import android.os.Build;

import android.os.Bundle;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.Nullable;

import androidx.appcompat.app.AppCompatActivity;
@@ -84,9 +81,6 @@ public class BaseActivity extends AppCompatActivity { 
                            break;

                        case "BLACK":

                            setTheme(R.style.BlackAppTheme);

                            Window window = getWindow();

                            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

                            window.setStatusBarColor(Color.BLACK);

                            currentThemeId = R.style.BlackAppTheme;

                            break;

                        case "DRACULA":
@@ -121,9 +115,6 @@ public class BaseActivity extends AppCompatActivity { 
                case "BLACK":

                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    setTheme(R.style.BlackAppTheme);

                    Window window = getWindow();

                    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

                    window.setStatusBarColor(Color.BLACK);

                    currentThemeId = R.style.BlackAppTheme;

                    break;

                case "DRACULA":

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

+0 −9
Original line number Diff line number Diff line
@@ -19,11 +19,8 @@ import android.annotation.SuppressLint; 
import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.graphics.Color;

import android.os.Build;

import android.os.Bundle;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.Nullable;

import androidx.appcompat.app.AppCompatActivity;
@@ -76,9 +73,6 @@ public class BaseBarActivity extends AppCompatActivity { 
                            setTheme(R.style.SolarizedAppThemeBar);

                            break;

                        case "BLACK":

                            Window window = getWindow();

                            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

                            window.setStatusBarColor(Color.BLACK);

                            setTheme(R.style.BlackAppThemeBar);

                            break;

                        case "DRACULA":
@@ -108,9 +102,6 @@ public class BaseBarActivity extends AppCompatActivity { 
                    break;

                case "BLACK":

                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    Window window = getWindow();

                    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

                    window.setStatusBarColor(Color.BLACK);

                    setTheme(R.style.BlackAppThemeBar);

                    break;

                case "DRACULA":

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

+0 −9
Original line number Diff line number Diff line
@@ -19,11 +19,8 @@ import android.annotation.SuppressLint; 
import android.content.Context;

import android.content.SharedPreferences;

import android.content.res.Configuration;

import android.graphics.Color;

import android.os.Build;

import android.os.Bundle;

import android.view.Window;

import android.view.WindowManager;



import androidx.annotation.Nullable;

import androidx.appcompat.app.AppCompatActivity;
@@ -76,9 +73,6 @@ public class BaseTransparentActivity extends AppCompatActivity { 
                            setTheme(R.style.TransparentSolarized);

                            break;

                        case "BLACK":

                            Window window = getWindow();

                            window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

                            window.setStatusBarColor(Color.BLACK);

                            setTheme(R.style.TransparentBlack);

                            break;

                        case "DRACULA":
@@ -108,9 +102,6 @@ public class BaseTransparentActivity extends AppCompatActivity { 
                    break;

                case "BLACK":

                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    Window window = getWindow();

                    window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);

                    window.setStatusBarColor(Color.BLACK);

                    setTheme(R.style.TransparentBlack);

                    break;

                case "DRACULA":