diff options
| author | tom79 <tschneider.ac@gmail.com> | 2019-04-28 18:51:16 +0200 |
|---|---|---|
| committer | tom79 <tschneider.ac@gmail.com> | 2019-04-28 18:51:16 +0200 |
| commit | 4d665a0d9eea481ba6bbb075b72c7cc0cc9825c1 (patch) | |
| tree | 668be3baaf1dd48b3b92e3c420985968dc5aecb6 | |
| parent | bdb6ac94be0e2d49e5a039982071a0fdde645b2b (diff) | |
| parent | a925b454891f0e4b64080fbe68b1a11b308d34f8 (diff) | |
Merge branch 'develop'
# Conflicts:
# fastlane/metadata/android/en-US/full_description.txt
# fastlane/metadata/android/en-US/short_description.txt
123 files changed, 4270 insertions, 1866 deletions
diff --git a/app/build.gradle b/app/build.gradle index 883c79e7d..2f3e86741 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 16 targetSdkVersion 28 - versionCode 253 - versionName "1.79.0" + versionCode 257 + versionName "1.80.0" multiDexEnabled true } dexOptions { @@ -82,7 +82,7 @@ dependencies { implementation 'com.github.stom79:mytransl:1.5' implementation 'com.github.stom79:SparkButton:1.0.12' implementation "com.koushikdutta.async:androidasync:2.+" - implementation 'com.vanniktech:emoji-one:0.6.0-SNAPSHOT' + implementation 'com.vanniktech:emoji-one:0.6.0' implementation 'com.oguzdev:CircularFloatingActionMenu:1.0.2' implementation 'com.github.franmontiel:LocaleChanger:0.9.2' implementation 'com.github.GrenderG:Toasty:1.3.1' diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0719ab804..8c3461d73 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -208,6 +208,11 @@ android:configChanges="orientation|screenSize" android:label="@string/app_name" /> + <activity android:name=".activities.ReorderTimelinesActivity" + android:windowSoftInputMode="stateAlwaysHidden" + android:configChanges="orientation|screenSize" + android:label="@string/app_name" + /> <activity android:name=".activities.OpencollectiveActivity" android:windowSoftInputMode="stateAlwaysHidden" android:configChanges="orientation|screenSize" diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java index 08eb50674..2a23aed5f 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/BaseMainActivity.java @@ -23,9 +23,7 @@ import android.content.DialogInterface; import a |