Commit 002bc488 authored by Thomas's avatar Thomas
Browse files

Merge branch 'develop'

parents 52901731 6710ef2e

app/build.gradle

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

        minSdk 21

        targetSdk 32

        versionCode 439

        versionName "3.9.4"

        versionCode 443

        versionName "3.10.0"

        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

    }

    flavorDimensions "default"
@@ -79,7 +79,11 @@ allprojects { 
dependencies {

    implementation project(':autoimageslider')

    implementation 'androidx.appcompat:appcompat:1.5.1'



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



    implementation 'com.jaredrummler:colorpicker:1.1.0'



    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'

    implementation "com.google.code.gson:gson:2.9.1"

    implementation 'com.squareup.retrofit2:retrofit:2.9.0'

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

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

  {

    "version": "3.10.0",

    "code": "443",

    "note": "Added:\n- Dracula theme\n- Customize message colors\n- Enable/Disable Card presentation\n\nChanged:\n- Colors for some themes\n- Space between buttons\n\nFixed:\n- Animated profile pictures not displayed\n- Mentions broken in profile bio and fields\n- Jumps with fit preview images when scrolling up\n- Fetch more button broken with cache\n- Tag patterns in URL break the link\n- Typo in followed tags"

  },

  {

    "version": "3.9.7",

    "code": "442",

    "note": "Added:\n- Dracula theme\n\nChanged:\n- Colors for Light/Dark/Black themes\n\nFixed:\n- Animated profile pictures not displayed\n- Mentions broken in profile bio and fields\n- Tag patterns in URL break the link\n- Typo in followed tags"

  },

  {

    "version": "3.9.6",

    "code": "441",

    "note": "Fixed:\n- Jumps with fit preview images when scrolling up\n- Fetch more button broken with cache"

  },

  {

    "version": "3.9.5",

    "code": "440",

    "note": "Fixed:\n- Custom emoji are not always displayed\n- Jumps in timeline when using \"fit preview images\"\n- Dark theme: timeline buttons without toggle"

  },

  {

    "version": "3.9.4",

    "code": "439",

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

+9 −0
Original line number Diff line number Diff line
@@ -83,6 +83,10 @@ public class BaseActivity extends AppCompatActivity { 
                            setTheme(R.style.BlackAppTheme);

                            currentThemeId = R.style.BlackAppTheme;

                            break;

                        case "DRACULA":

                            setTheme(R.style.DraculaAppTheme);

                            currentThemeId = R.style.DraculaAppTheme;

                            break;

                    }

                    break;

            }
@@ -113,6 +117,11 @@ public class BaseActivity extends AppCompatActivity { 
                    setTheme(R.style.BlackAppTheme);

                    currentThemeId = R.style.BlackAppTheme;

                    break;

                case "DRACULA":

                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    setTheme(R.style.DraculaAppTheme);

                    currentThemeId = R.style.DraculaAppTheme;

                    break;

            }

        }

        super.onCreate(savedInstanceState);

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

+7 −0
Original line number Diff line number Diff line
@@ -76,6 +76,9 @@ public class BaseAlertDialogActivity extends AppCompatActivity { 
                        case "BLACK":

                            setTheme(R.style.BlackAlertDialog);

                            break;

                        case "DRACULA":

                            setTheme(R.style.DraculaAlertDialog);

                            break;

                    }

                    break;

            }
@@ -101,6 +104,10 @@ public class BaseAlertDialogActivity extends AppCompatActivity { 
                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    setTheme(R.style.BlackAlertDialog);

                    break;

                case "DRACULA":

                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    setTheme(R.style.DraculaAlertDialog);

                    break;

            }

        }

        super.onCreate(savedInstanceState);

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

+7 −0
Original line number Diff line number Diff line
@@ -75,6 +75,9 @@ public class BaseBarActivity extends AppCompatActivity { 
                        case "BLACK":

                            setTheme(R.style.BlackAppThemeBar);

                            break;

                        case "DRACULA":

                            setTheme(R.style.DraculaAppThemeBar);

                            break;

                    }

                    break;

            }
@@ -101,6 +104,10 @@ public class BaseBarActivity extends AppCompatActivity { 
                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    setTheme(R.style.BlackAppThemeBar);

                    break;

                case "DRACULA":

                    AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);

                    setTheme(R.style.DraculaAppThemeBar);

                    break;

            }

        }

        super.onCreate(savedInstanceState);