diff --git a/app/build.gradle b/app/build.gradle index 4a3c25f1b..a63a7b6c6 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -7,8 +7,8 @@ android { applicationId "fr.gouv.etalab.mastodon" minSdkVersion 15 targetSdkVersion 27 - versionCode 90 - versionName "1.6.7-rc-1" + versionCode 91 + versionName "1.6.7" } flavorDimensions "default" diff --git a/app/fdroid/release/app-fdroid-release-1.4.9-beta-4.apk b/app/fdroid/release/app-fdroid-release-1.4.9-beta-4.apk deleted file mode 100644 index 7882416a3..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.4.9-beta-4.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.4.9-beta-6.apk b/app/fdroid/release/app-fdroid-release-1.4.9-beta-6.apk deleted file mode 100644 index 246002bfc..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.4.9-beta-6.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.4.9-beta-7.apk b/app/fdroid/release/app-fdroid-release-1.4.9-beta-7.apk deleted file mode 100644 index 0d584b2ec..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.4.9-beta-7.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.4.9-rc-1.apk b/app/fdroid/release/app-fdroid-release-1.4.9-rc-1.apk deleted file mode 100644 index b9e273c6f..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.4.9-rc-1.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.5.0.apk b/app/fdroid/release/app-fdroid-release-1.5.0.apk deleted file mode 100644 index 97c9bf61e..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.5.0.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.5.8-BT27.apk b/app/fdroid/release/app-fdroid-release-1.5.8-BT27.apk deleted file mode 100644 index 0486b7b40..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.5.8-BT27.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.5.8-new.apk b/app/fdroid/release/app-fdroid-release-1.5.8-new.apk deleted file mode 100644 index 006035373..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.5.8-new.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.5.8.apk b/app/fdroid/release/app-fdroid-release-1.5.8.apk deleted file mode 100644 index 006035373..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.5.8.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.6.0-beta-1.apk b/app/fdroid/release/app-fdroid-release-1.6.0-beta-1.apk deleted file mode 100644 index 1f813ef66..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.6.0-beta-1.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.6.0-rc-1-fix.apk b/app/fdroid/release/app-fdroid-release-1.6.0-rc-1-fix.apk deleted file mode 100644 index 41e24a4b2..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.6.0-rc-1-fix.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.6.0-rc-1-fix2.apk b/app/fdroid/release/app-fdroid-release-1.6.0-rc-1-fix2.apk deleted file mode 100644 index c7b7a5112..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.6.0-rc-1-fix2.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.6.0-rc-1-fix3.apk b/app/fdroid/release/app-fdroid-release-1.6.0-rc-1-fix3.apk deleted file mode 100644 index 64144b1a5..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.6.0-rc-1-fix3.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.6.0-rc-1.apk b/app/fdroid/release/app-fdroid-release-1.6.0-rc-1.apk deleted file mode 100644 index 97392123f..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.6.0-rc-1.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.6.3-test-1.apk b/app/fdroid/release/app-fdroid-release-1.6.3-test-1.apk deleted file mode 100644 index 73fbd0f80..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.6.3-test-1.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-1.6.4.1-fix.apk b/app/fdroid/release/app-fdroid-release-1.6.4.1-fix.apk deleted file mode 100644 index 2bc80d38d..000000000 Binary files a/app/fdroid/release/app-fdroid-release-1.6.4.1-fix.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-bookmark-2.apk b/app/fdroid/release/app-fdroid-release-bookmark-2.apk deleted file mode 100644 index 218ae407e..000000000 Binary files a/app/fdroid/release/app-fdroid-release-bookmark-2.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-bookmark-3.apk b/app/fdroid/release/app-fdroid-release-bookmark-3.apk deleted file mode 100644 index 0d716588a..000000000 Binary files a/app/fdroid/release/app-fdroid-release-bookmark-3.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-bookmark-4.apk b/app/fdroid/release/app-fdroid-release-bookmark-4.apk deleted file mode 100644 index 32cc7b395..000000000 Binary files a/app/fdroid/release/app-fdroid-release-bookmark-4.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-bookmark-5.apk b/app/fdroid/release/app-fdroid-release-bookmark-5.apk deleted file mode 100644 index 4dc988b3f..000000000 Binary files a/app/fdroid/release/app-fdroid-release-bookmark-5.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-bookmark.apk b/app/fdroid/release/app-fdroid-release-bookmark.apk deleted file mode 100644 index 72f687ec5..000000000 Binary files a/app/fdroid/release/app-fdroid-release-bookmark.apk and /dev/null differ diff --git a/app/fdroid/release/app-fdroid-release-federatedtm-stream.apk b/app/fdroid/release/app-fdroid-release-federatedtm-stream.apk deleted file mode 100644 index 03fc59def..000000000 Binary files a/app/fdroid/release/app-fdroid-release-federatedtm-stream.apk and /dev/null differ diff --git a/app/playstore/release/app-playstore-release-1.6.7-beta-1.apk b/app/playstore/release/app-playstore-release-1.6.7-beta-1.apk deleted file mode 100644 index e7d31946e..000000000 Binary files a/app/playstore/release/app-playstore-release-1.6.7-beta-1.apk and /dev/null differ diff --git a/app/playstore/release/app-playstore-release-1.6.7-beta-2.apk b/app/playstore/release/app-playstore-release-1.6.7-beta-2.apk deleted file mode 100644 index 0da455d03..000000000 Binary files a/app/playstore/release/app-playstore-release-1.6.7-beta-2.apk and /dev/null differ diff --git a/app/playstore/release/app-playstore-release-1.6.7-beta-3.apk b/app/playstore/release/app-playstore-release-1.6.7-beta-3.apk deleted file mode 100644 index f416ca520..000000000 Binary files a/app/playstore/release/app-playstore-release-1.6.7-beta-3.apk and /dev/null differ diff --git a/app/playstore/release/app-playstore-release-1.6.7-rc-1.apk b/app/playstore/release/app-playstore-release-1.6.7-rc-1.apk deleted file mode 100644 index 3d1c66998..000000000 Binary files a/app/playstore/release/app-playstore-release-1.6.7-rc-1.apk and /dev/null differ diff --git a/app/safetynet/release/app-safetynet-release-for-tests.apk b/app/safetynet/release/app-safetynet-release-for-tests.apk deleted file mode 100644 index cedbd01cd..000000000 Binary files a/app/safetynet/release/app-safetynet-release-for-tests.apk and /dev/null differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index be64508a7..bcf372e63 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -179,6 +179,7 @@ android:theme="@style/Base.V7.Theme.AppCompat.Dialog" android:excludeFromRecents="true"/> diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java index ec7938b7f..eab8eab3e 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ListAdapter.java @@ -107,8 +107,8 @@ public class ListAdapter extends BaseAdapter implements OnListActionInterface { Drawable next = ContextCompat.getDrawable(context, R.drawable.ic_keyboard_arrow_right); holder.search_title.setText(list.getTitle()); assert next != null; - next.setBounds(0,0,100,100); - assert next != null; + final float scale = context.getResources().getDisplayMetrics().density; + next.setBounds(0,0,(int) (30 * scale + 0.5f),(int) (30 * scale + 0.5f)); holder.search_title.setCompoundDrawables(null, null, next, null); holder.search_container.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java index c5ac0d468..56f2def44 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/SearchTootsListAdapter.java @@ -103,8 +103,9 @@ public class SearchTootsListAdapter extends BaseAdapter { } Drawable next = ContextCompat.getDrawable(context, R.drawable.ic_keyboard_arrow_right); holder.search_title.setText(search); + final float scale = context.getResources().getDisplayMetrics().density; assert next != null; - next.setBounds(0,0,100,100); + next.setBounds(0,0,(int) (30 * scale + 0.5f),(int) (30 * scale + 0.5f)); holder.search_title.setCompoundDrawables(null, null, next, null); holder.search_container.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/res/layout/activity_manage_accounts_list.xml b/app/src/main/res/layout/activity_manage_accounts_list.xml index 48c5b4745..01cdb556c 100644 --- a/app/src/main/res/layout/activity_manage_accounts_list.xml +++ b/app/src/main/res/layout/activity_manage_accounts_list.xml @@ -55,7 +55,7 @@ android:visibility="gone" android:id="@+id/lv_accounts_search" android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="300dp" android:scrollbars="none" android:divider="@null" />