From 4ff6a977a50a88c90e9b27dfaf282770e90d631b Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Fri, 13 Oct 2017 07:30:23 +0200
Subject: [PATCH 01/16] Changes button color

---
 app/src/main/res/layout-sw600dp/activity_toot.xml | 2 ++
 app/src/main/res/layout/activity_toot.xml         | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index fa21bb090..1476e4984 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -85,6 +85,7 @@
                     android:id="@+id/toot_picture"
                     android:layout_width="50dp"
                     android:layout_height="50dp"
+                    android:background="@color/mastodonC4"
                     android:src="@drawable/ic_insert_photo"
                     tools:ignore="ContentDescription" />
                 <ImageButton
@@ -93,6 +94,7 @@
                     android:id="@+id/toot_visibility"
                     android:layout_width="50dp"
                     android:layout_height="50dp"
+                    android:background="@color/mastodonC4"
                     android:src="@drawable/ic_action_globe"
                     tools:ignore="ContentDescription" />
                 <Button
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index 4a0fed02d..035b28176 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -85,6 +85,7 @@
                     android:id="@+id/toot_picture"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
+                    android:background="@color/mastodonC4"
                     android:src="@drawable/ic_insert_photo"
                     tools:ignore="ContentDescription" />
                 <ImageButton
@@ -93,6 +94,7 @@
                     android:id="@+id/toot_visibility"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
+                    android:background="@color/mastodonC4"
                     android:src="@drawable/ic_action_globe"
                     tools:ignore="ContentDescription" />
                 <Button

From ba9563eeb040f9174a59a64e14555d9ef72ab00c Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Fri, 13 Oct 2017 19:06:39 +0200
Subject: [PATCH 02/16] Changes the way to manage scroll

---
 .../activities/ShowAccountActivity.java       |  10 +-
 .../main/res/layout/activity_show_account.xml |   4 +-
 app/src/main/res/values-pt/strings.xml        | 437 ++++++++++++++++++
 app/src/main/res/values-sw360dp/dimens.xml    |   2 +-
 app/src/main/res/values-sw600dp/dimens.xml    |   2 +-
 app/src/main/res/values/dimens.xml            |   2 +-
 6 files changed, 448 insertions(+), 9 deletions(-)
 create mode 100644 app/src/main/res/values-pt/strings.xml

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
index 32883d469..e8957b59b 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
@@ -49,6 +49,7 @@ import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
+import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -138,6 +139,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
 
     private action doAction;
 
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -492,16 +494,16 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
 
                 }});
             if( Build.VERSION.SDK_INT >= 21) {
+
                 AppBarLayout appBar = (AppBarLayout) findViewById(R.id.appBar);
                 appBar.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
                     @Override
                     public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                        if (verticalOffset > 10 ) {
-                            pp_actionBar.setVisibility(View.GONE);
-                        } else {
+                        if (Math.abs(verticalOffset)-appBarLayout.getTotalScrollRange() == 0) {
                             pp_actionBar.setVisibility(View.VISIBLE);
+                        } else {
+                            pp_actionBar.setVisibility(View.GONE);
                         }
-
                     }
                 });
             }
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 387e84534..cce5b09a2 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -31,9 +31,9 @@
         android:theme="@style/AppTheme.AppBarOverlay">
         <android.support.design.widget.CollapsingToolbarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/layout_height_header"
             android:fitsSystemWindows="true"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed">
+            app:layout_scrollFlags="scroll|enterAlwaysCollapsed|snap">
         <LinearLayout
             android:id="@+id/main_header_container"
             android:background="@color/mastodonC1"
diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
new file mode 100644
index 000000000..05f7cfc6b
--- /dev/null
+++ b/app/src/main/res/values-pt/strings.xml
@@ -0,0 +1,437 @@
+<resources>
+    <string name="app_name" translatable="false">Mastalab</string>
+    <string name="navigation_drawer_open">Abrir menu</string>
+    <string name="navigation_drawer_close">Fechar menu</string>
+
+    <string name="action_about">Sobre</string>
+    <string name="action_about_instance">Sobre a instância</string>
+    <string name="action_privacy">Privacidade</string>
+    <string name="action_cache">Cache</string>
+    <string name="action_logout">Sair</string>
+    <string name="login">Entrar</string>
+
+    <!-- common -->
+    <string name="close">Fechar</string>
+    <string name="yes">Sim</string>
+    <string name="no">Não</string>
+    <string name="cancel">Cancelar</string>
+    <string name="download">Baixar</string>
+    <string name="download_file">Baixar %1$s</string>
+    <string name="download_over">Download completo</string>
+    <string name="save_file">Salvar %1$s</string>
+    <string name="save_over">Mídia salva</string>
+    <string name="download_from">Arquivo: %1$s</string>
+    <string name="password">Senha</string>
+    <string name="email">E-mail</string>
+    <string name="accounts">Contas</string>
+    <string name="toots">Toots</string>
+    <string name="tags">Tags</string>
+    <string name="token">Token</string>
+    <string name="save">Salvar</string>
+    <string name="restore">Restaurar</string>
+    <string name="two_factor_authentification">Autenticação em dois passos?</string>
+    <string name="other_instance">Outra instância que não mastodon.etalab.gouv.fr?</string>
+    <string name="no_result">Sem resultados!</string>
+    <string name="instance">Instância</string>
+    <string name="instance_example">Instância: mastodon.social</string>
+    <string name="toast_account_changed">Agora funcionando com a conta %1$s</string>
+    <string name="add_account">Adicionar conta</string>
+    <string name="clipboard">O conteúdo do toot foi copiado para a área de transferência</string>
+    <string name="change">Mudar</string>
+    <string name="choose_picture">Selecione uma imagem…</string>
+    <string name="clear">Limpar</string>
+    <string name="microphone">Microfone</string>
+    <string name="speech_prompt">Por favor, diga algo</string>
+    <string name="speech_not_supported">Desculpe! Seu aparelho não suporta entrada por voz!</string>
+    <string name="delete_all">Excluir tudo</string>
+    <string name="translate_toot">Traduzir este toot.</string>
+    <string name="schedule">Agendar</string>
+    <string name="text_size">Tamanhos de ícones e texto</string>
+    <string name="text_size_change">Mudar o tamanho de texto atual:</string>
+    <string name="icon_size_change">Mudar o tamanho de ícones atual:</string>
+    <string name="next">Próximo</string>
+    <string name="previous">Anterior</string>
+    <string name="open_with">Abrir com</string>
+    <string name="validate">Validar</string>
+    <string name="media">Mídia</string>
+    <string name="share_with">Compartilhar com</string>
+    <string name="shared_via">Compartilhado via Mastalab</string>
+    <string name="replies">Respostas</string>
+    <string name="username">Nome de usuário</string>
+    <string name="drafts">Rascunhos</string>
+    <string name="new_data">Novos dados disponíveis! Deseja exibi-los?</string>
+    <string name="favourite">Favoritos</string>
+    <string name="follow">Novos seguidores</string>
+    <string name="mention">Menções</string>
+    <string name="reblog">Compartilhamentos</string>
+
+    <!--- Menu -->
+    <string name="home_menu">Página inicial</string>
+    <string name="local_menu">Timeline local</string>
+    <string name="global_menu">Timeline federada</string>
+    <string name="neutral_menu_title">Opções</string>
+    <string name="favorites_menu">Favoritos</string>
+    <string name="communication_menu_title">Comunicação</string>
+    <string name="muted_menu">Usuários silenciados</string>
+    <string name="blocked_menu">Usuários bloqueados</string>
+    <string name="remote_follow_menu">Seguir remotamente</string>
+    <string name="notifications">Notificações</string>
+    <string name="follow_request">Solicitações de seguidor</string>
+    <string name="optimization">Otimização</string>
+    <string name="settings">Configurações</string>
+    <string name="profile">Perfil</string>
+    <string name="make_a_choice">O que você quer fazer?</string>
+    <string name="delete_account_title">Excluir conta</string>
+    <string name="delete_account_message">Excluir a conta %1$s do aplicativo?</string>
+    <string name="send_email">Mandar um e-mail</string>
+    <string name="choose_file">Por favor, selecione um arquivo</string>
+    <string name="choose_file_error">Nenhum gerenciador de arquivo encontrado!</string>
+    <string name="click_to_change">Clique no caminho para mudá-lo</string>
+    <string name="failed">Falhou!</string>
+    <string name="scheduled_toots">Toots agendados</string>
+    <!-- Status -->
+    <string name="no_status">Sem toots para exibir</string>
+    <string name="fav_added">Toot adicionado aos favoritos</string>
+    <string name="fav_removed">Toot removido dos favoritos!</string>
+    <string name="reblog_added">Toot compartilhado!</string>
+    <string name="reblog_removed">Toot não mais compartilhado!</string>
+    <string name="reblog_by">Compartilhado por %1$s</string>
+
+
+    <string name="favourite_add">Adicionar este toot aos favoritos?</string>
+    <string name="favourite_remove">Remover este toot dos favoritos?</string>
+    <string name="reblog_add">Compartilhar este toot?</string>
+    <string name="reblog_remove">Desfazer compartilhamento?</string>
+    <string name="pin_add">Fixar este toot?</string>
+    <string name="pin_remove">Desafixar este toot?</string>
+
+
+
+    <string name="more_action_1">Silenciar</string>
+    <string name="more_action_2">Bloquear</string>
+    <string name="more_action_3">Denunciar</string>
+    <string name="more_action_4">Deletar</string>
+    <string name="more_action_5">Copiar</string>
+    <string name="more_action_6">Compartilhar</string>
+    <string name="more_action_7">Mencionar</string>
+    <string-array name="more_action_confirm">
+        <item>Silenciar esta conta?</item>
+        <item>Bloquear esta conta?</item>
+        <item>Denunciar este toot?</item>
+    </string-array>
+
+    <string-array name="more_action_owner_confirm">
+        <item>Excluir este toot?</item>
+    </string-array>
+
+    <plurals name="preview_replies">
+        <item quantity="one">%d resposta</item>
+        <item quantity="other">%d respostas</item>
+    </plurals>
+    <!-- Date -->
+    <plurals name="date_seconds">
+        <item quantity="one">Há %d segundo</item>
+        <item quantity="other">Há %d segundos</item>
+    </plurals>
+    <plurals name="date_minutes">
+        <item quantity="one">Há %d minuto</item>
+        <item quantity="other">Há %d minutos</item>
+    </plurals>
+    <plurals name="date_hours">
+        <item quantity="one">Há %d hora</item>
+        <item quantity="other">Há %d horas</item>
+    </plurals>
+    <string name="date_yesterday">Ontem</string>
+    <string name="date_day_before_yesterday">Anteontem</string>
+    <string name="date_day">Há %d dias</string>
+    <plurals name="date_month">
+        <item quantity="one">Há %d mês</item>
+        <item quantity="other">Há %d mês</item>
+    </plurals>
+    <plurals name="date_year">
+        <item quantity="one">Há %d ano</item>
+        <item quantity="other">Há %d anos</item>
+    </plurals>
+
+    <!-- TOOT -->
+    <string name="toot_cw_placeholder">Alerta de conteúdo</string>
+    <string name="toot_placeholder">No que você está pensando?</string>
+    <string name="toot_it">TOOT!</string>
+    <string name="cw">cw</string>
+    <string name="toot_title">Escrever um toot</string>
+    <string name="toot_title_reply">Responder a um toot</string>
+    <string name="toot_no_space">Você já gastou os 500 caracteres permitidos!</string>
+    <string name="toot_select_image">Selecionar mídia</string>
+    <string name="toot_select_image_error">Ocorreu um erro enquanto se selecionava a mídia!</string>
+    <string name="toot_delete_media">Excluir mídia?</string>
+    <string name="toot_error_no_content">Toot vazio!</string>
+    <string name="toot_visibility_tilte">Visibilidade do toot</string>
+    <string name="toots_visibility_tilte">Visibilidade padrão dos toots: </string>
+    <string name="toot_sent">Toot enviado!</string>
+    <string name="toot_reply_content_title">Você está respondendo a este toot:</string>
+    <string name="toot_sensitive">Conteúdo sensível?</string>
+    <string-array name="toot_visibility">
+        <item>Postar em timelines públicas</item>
+        <item>Não postar em timelines públicas</item>
+        <item>Postar apenas para seguidores</item>
+        <item>Postar apenas para usuários mencionados</item>
+    </string-array>
+
+    <string name="no_draft">Sem rascunhos!</string>
+    <string name="choose_toot">Escolha um toot</string>
+    <string name="choose_accounts">Escolha uma conta</string>
+    <string name="remove_draft">Excluir rascunho?</string>
+    <string name="show_reply">Clique no botão para exibir toot original</string>
+    <!-- Instance -->
+    <string name="instance_no_description">Sem descrição!</string>
+
+    <!-- About -->
+    <string name="about_vesrion">Versão %1$s</string>
+    <string name="about_developer">Desenvolvedor:</string>
+    <string name="about_developer_action">\@tschneider</string>
+    <string name="about_license">Licença: </string>
+    <string name="about_license_action">GNU GPL V3</string>
+    <string name="about_code">Código-fonte: </string>
+    <string name="about_code_action">Bitbucket</string>
+    <string name="about_yandex">Tradução dos toots:</string>
+    <string name="about_yandex_action" translatable="false">Powered by Yandex.Translate</string>
+    <string name="about_thekinrar">Busca de instâncias:</string>
+    <string name="about_thekinrar_action">instances.social</string>
+    <string name="thanks_text_logo">Designer do ícone:</string>
+    <!-- Conversation -->
+    <string name="conversation">Conversa</string>
+
+    <!-- Accounts -->
+    <string name="no_accounts">Sem contas para exibir</string>
+    <string name="no_follow_request">Sem solicitações de seguidor</string>
+    <string name="status_cnt">Toots \n %d</string>
+    <string name="following_cnt">Seguindo \n %d</string>
+    <string name="followers_cnt">Seguidores \n %d</string>
+    <string name="pins_cnt">Fixado \n %d</string>
+    <string name="authorize">Autorizar</string>
+    <string name="reject">Rejeitar</string>
+
+
+    <!-- Scheduled toots -->
+    <string name="no_scheduled_toots">Nenhum toot agendado para exibir!</string>
+    <string name="no_scheduled_toots_indications">Escreva um toot e então clique em <b>Agendar</b> no topo do menu.</string>
+    <string name="remove_scheduled">Excluir toot agendado?</string>
+    <string name="media_count">Mídia: %d</string>
+    <string name="toot_scheduled">Toot agendado!</string>
+    <string name="toot_scheduled_date">A data de agendamento deve ser após o momento atual!</string>
+    <string name="warning_battery">Economia de bateria ativada! Pode não funcionar como esperado.</string>
+    <!-- Notifications -->
+    <string name="no_notifications">Sem notificações para exibir</string>
+    <string name="notif_mention">mencionou você</string>
+    <string name="notif_reblog">compartilhou sua postagem</string>
+    <string name="notif_favourite">favoritou sua postagem</string>
+    <string name="notif_follow">seguiu você</string>
+    <string name="notif_pouet">Novo toot de %1$s</string>
+    <plurals name="other_notifications">
+        <item quantity="one">e outra %d notificação</item>
+        <item quantity="other">e outras %d notificações</item>
+    </plurals>
+    <plurals name="other_notif_hometimeline">
+        <item quantity="one">e outro % toot para descobrir</item>
+        <item quantity="other">e outros %d toots para descobrir</item>
+    </plurals>
+    <string name="delete_notification_ask">Excluir notificação?</string>
+    <string name="delete_notification_ask_all">Excluir todas as notificações?</string>
+    <string name="delete_notification">Notificação excluída!</string>
+    <string name="delete_notification_all">Todas as notificações foram excluídas!</string>
+    <!-- HEADER -->
+    <string name="following">Seguindo</string>
+    <string name="followers">Seguidores</string>
+    <string name="pinned_toots">Fixados</string>
+    <!-- TOAST -->
+    <string name="client_error">Não foi possível detectar id do cliente!</string>
+    <string name="no_internet">Sem conexão!</string>
+    <string name="toast_block">Conta bloqueada!</string>
+    <string name="toast_unblock">Conta desbloqueada!</string>
+    <string name="toast_mute">Silêncio ativado!</string>
+    <string name="toast_unmute">Silêncio desativado!</string>
+    <string name="toast_follow">Você seguiu a conta!</string>
+    <string name="toast_unfollow">Você deixou de seguir a conta!</string>
+    <string name="toast_reblog">Toot compartilhado!</string>
+    <string name="toast_unreblog">Toot descompartilhado!</string>
+    <string name="toast_favourite">Toot adicionado aos favoritos!</string>
+    <string name="toast_unfavourite">Toot retirado dos favoritos!</string>
+    <string name="toast_report">Toot denunciado!</string>
+    <string name="toast_unstatus">Toot excluído!</string>
+    <string name="toast_pin">Toot fixado!</string>
+    <string name="toast_unpin">Toot desafixado!</string>
+    <string name="toast_error">Oops! Ocorreu um erro!</string>
+    <string name="toast_code_error">Ocorreu um erro! A instância não retornou um código de autorização!</string>
+    <string name="toast_error_instance">O domínio da instância parece não ser válido!</string>
+    <string name="toast_error_loading_account">Ocorreu um erro na transição entre contas!</string>
+    <string name="toast_error_search">Ocorreu um erro na busca!</string>
+    <string name="toast_error_login">Não é possível entrar!</string>
+    <string name="toast_update_credential_ok">Dados de perfil salvos!</string>
+    <string name="nothing_to_do">Nenhuma ação pode ser feita</string>
+    <string name="toast_saved">Mídia salva!</string>
+    <string name="toast_error_translate">Ocorreu um erro na tradução!</string>
+    <string name="toast_toot_saved">Rascunho salvo!</string>
+    <string name="toast_error_char_limit">Você tem certeza que sua instância permite esse número de caracteres? Geralmente, são 500 caracteres.</string>
+    <string name="toast_visibility_changed">Visibilidade dos toots foi mudada para a conta %1$s</string>
+    <string name="toast_empty_search">Nome da instância e nome de exibição não podem ser vazios!</string>
+    <!-- Settings -->
+    <string name="settings_title_optimisation">Otimização do carregamento</string>
+    <string name="set_toots_page">Número de toots por atualização</string>
+    <string name="set_accounts_page">Número de contas por atualização</string>
+    <string name="set_notifications_page">Número de notificações por atualização</string>
+    <string name="set_attachment_always">Sempre</string>
+    <string name="set_attachment_wifi">Wi-Fi</string>
+    <string name="set_attachment_ask">Pedir</string>
+    <string name="set_attachment_action">Carregar mídia</string>
+    <string name="load_attachment">Carregar imagens</string>
+    <string name="load_attachment_spoiler">Mostrar mais…</string>
+    <string name="load_sensitive_attachment">Conteúdo sensível</string>
+    <string name="set_display_reply">Exibir mensagem anterior nas respostas</string>
+    <string name="set_display_local">Exibir timeline local</string>
+    <string name="set_display_global">Exibir timeline federada</string>
+    <string name="set_folder_title">Caminho: </string>
+    <string name="set_auto_store_toot">Salvar rascunhos automaticamente</string>
+    <string name="set_bubble_counter">Exibir contadores</string>
+    <string name="set_auto_add_media_url">Adicionar URL da mídia nos toots</string>
+    <string name="settings_title_notifications">Administrar notificações</string>
+    <string name="set_notif_follow">Notificar quando alguém te seguir</string>
+    <string name="set_notif_follow_ask">Notificar quando alguém requisitar ser seu seguidor</string>
+    <string name="set_notif_follow_share">Notificar quando alguém compartilhar suas postagens</string>
+    <string name="set_notif_follow_add">Notificar quando alguém favoritar suas postagens</string>
+    <string name="set_notif_follow_mention">Notificar quando alguém te mencionar</string>
+    <string name="set_share_validation">Mostrar diálogo antes de compartilhar</string>
+    <string name="set_share_validation_fav">Mostrar diálogo antes de adicionar aos favoritos</string>
+    <string name="settings_title_more_options">Configurações avançadas</string>
+    <string name="set_wifi_only">Notificar somente em Wi-Fi</string>
+    <string name="set_notify">Notificar?</string>
+    <string name="set_notif_silent">Notificações silenciosas</string>
+    <string name="set_night_mode">Modo noturno</string>
+    <string name="set_nsfw_timeout">Tempo até visualização de NSFW expirar (segundos, 0 significa desligado)</string>
+    <string name="settings_title_profile">Editar perfil</string>
+    <string name="set_profile_description">Bio…</string>
+    <string name="set_save_changes">Salvar mudanças</string>
+    <string name="set_header_picture_overlay">Escolher cabeçalho</string>
+    <string name="set_preview_reply">Exibir número de respostas na página inicial</string>
+    <string name="set_preview_reply_pp">Exibir imagens de perfil?</string>
+    <string name="set_multiaccount_actions">Permitir interações entre contas?</string>
+    <string name="note_no_space">Você já usou os 160 caracteres permitidos!</string>
+    <string name="username_no_space">Você já usou os 30 caracteres permitidos!</string>
+
+    <string name="settings_title_hour">Horário das notificações:</string>
+    <string name="settings_time_from">Entre</string>
+    <string name="settings_time_to">e</string>
+    <string name="settings_time_greater">O tempo deve ser maior que %1$s</string>
+    <string name="settings_time_lower">O tempo deve ser menor que %1$s</string>
+    <string name="settings_hour_init">Horário de início</string>
+    <string name="settings_hour_end">Horário de fim</string>
+    <string name="embedded_browser">Usar navegador interno</string>
+    <string name="use_javascript">Habilitar Javascript</string>
+    <string name="use_cookies">Habilitar cookies de terceiros</string>
+    <string name="settings_ui_layout">Modelo das timelines: </string>
+    <string-array name="settings_menu_tabs">
+        <item>Abas</item>
+        <item>Menu</item>
+        <item>Abas e menu</item>
+    </string-array>
+
+    <string-array name="settings_translation">
+        <item>Yandex</item>
+        <item>Google</item>
+        <item>Não</item>
+    </string-array>
+
+    <string name="set_led_colour">Configurar cor do LED:</string>
+
+    <string-array name="led_colours">
+        <item>Azul</item>
+        <item>Cyano</item>
+        <item>Magenta</item>
+        <item>Verde</item>
+        <item>Vermelho</item>
+        <item>Amarelo</item>
+        <item>Branco</item>
+    </string-array>
+
+    <string name="set_title_news">Novidades</string>
+    <string name="set_notification_news">Notificar sobre novos toots na página inicial</string>
+    <string name="set_show_error_messages">Exibir mensagens de erro?</string>
+    <string name="action_follow">Seguir</string>
+    <string name="action_unfollow">Deixar de seguir</string>
+    <string name="action_block">Bloquear</string>
+    <string name="action_unblock">Desbloquear</string>
+    <string name="action_mute">Silenciar</string>
+    <string name="action_no_action">Sem ação</string>
+    <string name="action_unmute">Retirar silêncio</string>
+    <string name="request_sent">Solicitação enviada</string>
+    <string name="followed_by">Segue você</string>
+
+    <string name="action_search">Busca</string>
+
+    <!-- Quick settings for notifications -->
+    <string name="settings_popup_title">Notificações</string>
+    <string name="settings_popup_message">
+        Por favor, confirme que notificações você quer receber.
+        Você pode habilitar ou desabilitar essas notificações mais tarde em configurações (na aba Notificações).
+    </string>
+    <string name="settings_popup_timeline">Para toots não lidos na página inicial?</string>
+    <string name="settings_popup_notification">Para notificações não lidas?</string>
+    <!-- CACHE -->
+    <string name="cache_title">Limpar cache</string>
+    <string name="cache_message">Há %1$s em dados em cache.\n\nGostaria de exclui-los?</string>
+    <string name="cache_units">Mb</string>
+    <string name="toast_cache_clear">Cache limpo! %1$s foram liberados</string>
+
+    <!-- PRIVACY -->
+    <string name="privacy_data_title">Dados salvos</string>
+    <string name="privacy_data">
+        Apenas informação básica das contas é armazenada no aparelho.
+        Estes dados são estritamente confidenciais e só podem ser usados pelo aplicativo.
+        Desinstalar o aplicativo imediatamente remove esses dados.\n
+        &#9888; Credenciais nunca são armazenadas. Elas só são usadas durante a autenticação segura (SSL) com uma instância.
+    </string>
+
+    <string name="privacy_authorizations_title">Permissões:</string>
+    <string name="privacy_authorizations">
+        - <b>ACCESS_NETWORK_STATE</b>: Usada para detectar se o aparelho está conectado a uma rede Wi-Fi.\n
+        - <b>INTERNET</b>: Usado para consultas em instâncias.\n
+        - <b>WRITE_EXTERNAL_STORAGE</b>: Usada para armazenar mídia ou mover o aplicativo para o cartão SD.\n
+        - <b>READ_EXTERNAL_STORAGE</b>: Usada para adicionar mídia a toots.\n
+        - <b>BOOT_COMPLETED</b>: Usada para iniciar o serviço de notificação.\n
+        - <b>WAKE_LOCK</b>: Usada durante o serviço de notificação.
+    </string>
+
+    <string name="privacy_API_authorizations_title">Permissões da API:</string>
+    <string name="privacy_API_authorizations">
+        - <b>Leitura</b>: Ler dados.\n
+        - <b>Escrita</b>: Fazer postagens e enviar mídia em postagens.\n
+        - <b>Seguir</b>: Seguir, deixar de seguir, bloquear, desbloquear.\n\n
+        <b>&#9888; Essas ações são realizadas apenas quando o usuário requisitá-las.</b>
+    </string>
+    <string name="privacy_API_title">Rastreamento e bibliotecas</string>
+    <string name="privacy_API">
+        O aplicativo <b>não usa ferramentas de rastreamento</b> (medição de audiência, relatório de erros, etc.) e não contém propagandas.\n\n
+        O uso de bibliotecas é mínimo: \n
+        - <b>Android Asynchronous Http Client</b>: Para administrar consultas\n
+        - <b>Universal Image Loader</b>: Para administrar mídia\n
+        - <b>Android-Job</b>: Para administrar serviços\n
+        - <b>PhotoView</b>: Para administrar imagens\n
+        - <b>Gson</b> : Para administrar rascunhos
+    </string>
+
+    <string name="yandex" translatable="false">&lt;a hreh="http://translate.yandex.com/">Powered by Yandex.Translate&lt;/a></string>
+
+    <string name="privacy_API_yandex_title">Tradução de toots</string>
+    <string name="privacy_API_yandex_authorizations">
+        O aplicativo oferece a habilidade de traduzir toots usando o idioma do aparelho a API do Yandex.\n
+        Yandex tem a sua própria política de privacidade, que pode ser lida aqui: https://yandex.ru/legal/confidential/?lang=en
+    </string>
+
+
+    <string name="thanks_text">
+        Agradecimentos a Stéphane pelo logo.
+    </string>
+
+    <string name="thanks_text_dev">
+        Agradecimentos a:
+    </string>
+</resources>
diff --git a/app/src/main/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml
index 1a4bcd8cd..9a6c86a85 100644
--- a/app/src/main/res/values-sw360dp/dimens.xml
+++ b/app/src/main/res/values-sw360dp/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="layout_height_header">180dp</dimen>
+    <dimen name="layout_height_header">250dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 6c1ad0603..741a71fa2 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -6,5 +6,5 @@
     <dimen name="activity_vertical_margin">30dp</dimen>
     <dimen name="activity_padding_top_header">16dp</dimen>
     <bool name="isTablet">true</bool>
-    <dimen name="layout_height_header">220dp</dimen>
+    <dimen name="layout_height_header">300dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 756bd56f1..577e79f49 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,5 +9,5 @@
     <dimen name="drawer_padding">2dp</dimen>
     <dimen name="toot_padding">20dp</dimen>
     <bool name="isTablet">false</bool>
-    <dimen name="layout_height_header">180dp</dimen>
+    <dimen name="layout_height_header">250dp</dimen>
 </resources>

From cafe4ae2a6f9515e83028952ee39b45b543d271f Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Fri, 13 Oct 2017 19:25:05 +0200
Subject: [PATCH 03/16] Changes for tablets

---
 app/src/main/res/layout-sw600dp/activity_show_account.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index 2d2fa41f6..8e59e5257 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -31,9 +31,9 @@
         android:theme="@style/AppTheme.AppBarOverlay">
         <android.support.design.widget.CollapsingToolbarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/layout_height_header"
             android:fitsSystemWindows="true"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed">
+            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
             <LinearLayout
                 android:id="@+id/main_header_container"
                 android:background="@color/mastodonC1"

From 77e7d39223561444e4983f442ab992f6f705a620 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Fri, 13 Oct 2017 19:29:19 +0200
Subject: [PATCH 04/16] Fixes header issue

---
 app/src/main/res/layout-sw600dp/activity_show_account.xml | 2 +-
 app/src/main/res/layout/activity_show_account.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index 8e59e5257..e2fe2979e 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -31,7 +31,7 @@
         android:theme="@style/AppTheme.AppBarOverlay">
         <android.support.design.widget.CollapsingToolbarLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/layout_height_header"
+            android:layout_height="wrap_content"
             android:fitsSystemWindows="true"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index cce5b09a2..430a19f4b 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -31,7 +31,7 @@
         android:theme="@style/AppTheme.AppBarOverlay">
         <android.support.design.widget.CollapsingToolbarLayout
             android:layout_width="match_parent"
-            android:layout_height="@dimen/layout_height_header"
+            android:layout_height="wrap_content"
             android:fitsSystemWindows="true"
             app:layout_scrollFlags="scroll|enterAlwaysCollapsed|snap">
         <LinearLayout

From 880aa074a1b9697f004f986e9cc1bb23d13f60c0 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Fri, 13 Oct 2017 19:38:36 +0200
Subject: [PATCH 05/16] Fixes header issue api < 21

---
 .../etalab/mastodon/activities/ShowAccountActivity.java     | 6 ++++--
 app/src/main/res/layout-sw600dp/activity_show_account.xml   | 2 +-
 app/src/main/res/layout/activity_show_account.xml           | 3 ++-
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
index e8957b59b..369faefa2 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
@@ -36,6 +36,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.AppBarLayout;
+import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
@@ -276,6 +277,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
         });
         
         if( Build.VERSION.SDK_INT < 21) {
+            final CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) findViewById(R.id.collapsingToolbarLayout);
             //Register LocalBroadcast to receive selected accounts after search
             hide_header = new BroadcastReceiver() {
                 @Override
@@ -285,14 +287,14 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
                         ImageView account_pp = (ImageView) findViewById(R.id.account_pp);
                         boolean hide = intent.getBooleanExtra("hide", false);
                         if (hide) {
-                            main_header_container.setVisibility(View.GONE);
+                            collapsingToolbarLayout.setVisibility(View.GONE);
                             if (pp_actionBar != null)
                                 pp_actionBar.setVisibility(View.VISIBLE);
                             tabLayout.setVisibility(View.GONE);
                         } else {
                             manageButtonVisibility();
                             tabLayout.setVisibility(View.VISIBLE);
-                            main_header_container.setVisibility(View.VISIBLE);
+                            collapsingToolbarLayout.setVisibility(View.VISIBLE);
                             if (pp_actionBar != null)
                                 pp_actionBar.setVisibility(View.GONE);
                         }
diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index e2fe2979e..8e59e5257 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -31,7 +31,7 @@
         android:theme="@style/AppTheme.AppBarOverlay">
         <android.support.design.widget.CollapsingToolbarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/layout_height_header"
             android:fitsSystemWindows="true"
             app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
             <LinearLayout
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 430a19f4b..5cc80cafa 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -31,7 +31,8 @@
         android:theme="@style/AppTheme.AppBarOverlay">
         <android.support.design.widget.CollapsingToolbarLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:id="@+id/collapsingToolbarLayout"
+            android:layout_height="@dimen/layout_height_header"
             android:fitsSystemWindows="true"
             app:layout_scrollFlags="scroll|enterAlwaysCollapsed|snap">
         <LinearLayout

From d062b4492cd1ae8633d33eb1e6f42b9a7fa24b76 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Fri, 13 Oct 2017 20:23:39 +0200
Subject: [PATCH 06/16] Adds filter for boosts/replies on Fdroid version

---
 .../activities/MainActivity.java              | 66 ++++++++++++++++++-
 1 file changed, 65 insertions(+), 1 deletion(-)

diff --git a/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
index 7ed93c5b5..58a6aa124 100644
--- a/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
+++ b/app/src/fdroid/java/fr.gouv.etalab.mastodon/activities/MainActivity.java
@@ -140,7 +140,7 @@ public class MainActivity extends AppCompatActivity
     private String userIdService;
     private Intent streamingIntent;
     public static String lastHomeId = null, lastNotificationId = null;
-    boolean notif_follow, notif_add, notif_mention, notif_share;
+    boolean notif_follow, notif_add, notif_mention, notif_share, show_boosts, show_replies;
 
     public MainActivity() {
     }
@@ -310,6 +310,70 @@ public class MainActivity extends AppCompatActivity
             }
         });
 
+
+        tabStrip.getChildAt(0).setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                //Only shown if the tab has focus
+                if( homeFragment != null && homeFragment.getUserVisibleHint()){
+                    PopupMenu popup = new PopupMenu(MainActivity.this, tabStrip.getChildAt(0));
+                    popup.getMenuInflater()
+                            .inflate(R.menu.option_filter_toots, popup.getMenu());
+                    Menu menu = popup.getMenu();
+                    final MenuItem itemShowBoosts = menu.findItem(R.id.action_show_boosts);
+                    final MenuItem itemShowReplies = menu.findItem(R.id.action_show_replies);
+
+                    show_boosts = sharedpreferences.getBoolean(Helper.SET_SHOW_BOOSTS, true);
+                    show_replies = sharedpreferences.getBoolean(Helper.SET_SHOW_REPLIES, true);
+                    itemShowBoosts.setChecked(show_boosts);
+                    itemShowReplies.setChecked(show_replies);
+                    popup.setOnDismissListener(new PopupMenu.OnDismissListener() {
+                        @Override
+                        public void onDismiss(PopupMenu menu) {
+                            if( homeFragment != null)
+                                homeFragment.refreshFilter();
+                        }
+                    });
+                    popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+                        public boolean onMenuItemClick(MenuItem item) {
+                            item.setShowAsAction(MenuItem.SHOW_AS_ACTION_COLLAPSE_ACTION_VIEW);
+                            item.setActionView(new View(getApplicationContext()));
+                            item.setOnActionExpandListener(new MenuItem.OnActionExpandListener() {
+                                @Override
+                                public boolean onMenuItemActionExpand(MenuItem item) {
+                                    return false;
+                                }
+
+                                @Override
+                                public boolean onMenuItemActionCollapse(MenuItem item) {
+                                    return false;
+                                }
+                            });
+                            switch (item.getItemId()) {
+                                case R.id.action_show_boosts:
+                                    SharedPreferences.Editor editor = sharedpreferences.edit();
+                                    show_boosts = !show_boosts;
+                                    editor.putBoolean(Helper.SET_SHOW_BOOSTS, show_boosts);
+                                    itemShowBoosts.setChecked(show_boosts);
+                                    editor.apply();
+                                    break;
+                                case R.id.action_show_replies:
+                                    editor = sharedpreferences.edit();
+                                    show_replies = !show_replies;
+                                    editor.putBoolean(Helper.SET_SHOW_REPLIES, show_replies);
+                                    itemShowReplies.setChecked(show_replies);
+                                    editor.apply();
+                                    break;
+                            }
+                            return false;
+                        }
+                    });
+                    popup.show();
+                }
+                return true;
+            }
+        });
+
         viewPager = (ViewPager) findViewById(R.id.viewpager);
         int countPage = 2;
         if( sharedpreferences.getBoolean(Helper.SET_DISPLAY_LOCAL, true))

From 6a5fe95956dbbf36ee60171643978b0f55276e0d Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 14 Oct 2017 09:19:20 +0200
Subject: [PATCH 07/16] changes behavior

---
 app/src/main/res/layout-sw600dp/activity_show_account.xml | 2 +-
 app/src/main/res/layout/activity_show_account.xml         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index 8e59e5257..48e4e4ee0 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -33,7 +33,7 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/layout_height_header"
             android:fitsSystemWindows="true"
-            app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
+            app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
             <LinearLayout
                 android:id="@+id/main_header_container"
                 android:background="@color/mastodonC1"
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 5cc80cafa..e2ebd5cdd 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -34,7 +34,7 @@
             android:id="@+id/collapsingToolbarLayout"
             android:layout_height="@dimen/layout_height_header"
             android:fitsSystemWindows="true"
-            app:layout_scrollFlags="scroll|enterAlwaysCollapsed|snap">
+            app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
         <LinearLayout
             android:id="@+id/main_header_container"
             android:background="@color/mastodonC1"

From 513513046dbbdb37b2e9cd2d1813cc63841364f0 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 14 Oct 2017 10:14:55 +0200
Subject: [PATCH 08/16] Changes layout for accounts

---
 app/build.gradle                              |   1 +
 .../activities/ShowAccountActivity.java       |  49 ++++---
 .../layout-sw600dp/activity_show_account.xml  |   9 +-
 .../main/res/layout/activity_show_account.xml | 122 +++++++++++++-----
 app/src/main/res/values-sw360dp/dimens.xml    |   2 +-
 app/src/main/res/values-sw600dp/dimens.xml    |   2 +-
 app/src/main/res/values/dimens.xml            |   2 +-
 7 files changed, 132 insertions(+), 55 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dbc3aad98..692663481 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,6 +41,7 @@ dependencies {
     compile 'com.github.chrisbanes:PhotoView:2.0.0'
     compile 'com.google.code.gson:gson:2.8.0'
     compile 'org.jsoup:jsoup:1.10.3'
+    compile 'de.hdodenhof:circleimageview:2.2.0'
     safetynetCompile 'com.google.android.gms:play-services-safetynet:11.0.4'
     safetynetCompile 'io.github.kobakei:ratethisapp:1.2.0'
 }
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
index 369faefa2..b85151c79 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
@@ -48,6 +48,7 @@ import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
 import android.util.Log;
@@ -74,6 +75,7 @@ import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 
+import de.hdodenhof.circleimageview.CircleImageView;
 import fr.gouv.etalab.mastodon.asynctasks.PostActionAsyncTask;
 import fr.gouv.etalab.mastodon.asynctasks.RetrieveAccountAsyncTask;
 import fr.gouv.etalab.mastodon.asynctasks.RetrieveAccountsAsyncTask;
@@ -131,6 +133,8 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
     private ImageView header_edit_profile;
     private List<Status> pins;
     private String accountUrl;
+    private int maxScrollSize;
+    private boolean avatarShown = true;
     public enum action{
         FOLLOW,
         UNFOLLOW,
@@ -147,9 +151,9 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
         SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE);
         int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK);
         if( theme == Helper.THEME_LIGHT){
-            setTheme(R.style.AppTheme);
+            setTheme(R.style.AppTheme_NoActionBar);
         }else {
-            setTheme(R.style.AppThemeDark);
+            setTheme(R.style.AppThemeDark_NoActionBar);
         }
         setContentView(R.layout.activity_show_account);
         setTitle("");
@@ -189,13 +193,10 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
         int positionSpinnerTrans = sharedpreferences.getInt(Helper.SET_TRANSLATOR, Helper.TRANS_YANDEX);
 
         statusListAdapter = new StatusListAdapter(getApplicationContext(), RetrieveFeedsAsyncTask.Type.USER, accountId, isOnWifi, behaviorWithAttachments, positionSpinnerTrans, this.statuses);
-        options = new DisplayImageOptions.Builder().displayer(new RoundedBitmapDisplayer(80)).cacheInMemory(false)
+        options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false)
                 .cacheOnDisk(true).resetViewBeforeLoading(true).build();
 
 
-        if( getSupportActionBar() != null)
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-
 
         tabLayout = (TabLayout) findViewById(R.id.account_tabLayout);
         tabLayout.addTab(tabLayout.newTab().setText(getString(R.string.toots)));
@@ -411,7 +412,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
         }
 
         accountUrl = account.getUrl();
-        ImageView account_pp = (ImageView) findViewById(R.id.account_pp);
+        final CircleImageView account_pp = (CircleImageView) findViewById(R.id.account_pp);
         TextView account_dn = (TextView) findViewById(R.id.account_dn);
         TextView account_un = (TextView) findViewById(R.id.account_un);
         final SharedPreferences sharedpreferences = getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE);
@@ -435,17 +436,16 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
                     @Override
                     public void onLoadingComplete(String imageUri, View view, Bitmap loadedImage) {
                         super.onLoadingComplete(imageUri, view, loadedImage);
-                        LinearLayout main_header_container = (LinearLayout) findViewById(R.id.main_header_container);
+                        ImageView banner_pp = (ImageView) findViewById(R.id.banner_pp);
                         Bitmap workingBitmap = Bitmap.createBitmap(loadedImage);
                         Bitmap mutableBitmap = workingBitmap.copy(Bitmap.Config.ARGB_8888, true);
                         Canvas canvas = new Canvas(mutableBitmap);
                         Paint p = new Paint(Color.BLACK);
                         ColorFilter filter = new LightingColorFilter(0xFF7F7F7F, 0x00000000);
-
                         p.setColorFilter(filter);
                         canvas.drawBitmap(mutableBitmap, new Matrix(), p);
                         BitmapDrawable background = new BitmapDrawable(getResources(), mutableBitmap);
-                        main_header_container.setBackground(background);
+                        banner_pp.setImageDrawable(background);
                     }
 
                     @Override
@@ -466,16 +466,14 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
             account_dn.setCompoundDrawables( null, null, null, null);
         }
 
-        final ActionBar actionBar = getSupportActionBar();
+        Toolbar actionBar = (Toolbar) findViewById(R.id.toolbar);
         LayoutInflater mInflater = LayoutInflater.from(ShowAccountActivity.this);
         if( actionBar != null && account != null){
             @SuppressLint("InflateParams") View show_account_actionbar = mInflater.inflate(R.layout.showaccount_actionbar, null);
             TextView actionbar_title = (TextView) show_account_actionbar.findViewById(R.id.show_account_title);
             if( account.getAcct() != null)
                 actionbar_title.setText(account.getAcct());
-            actionBar.setCustomView(show_account_actionbar);
-            actionBar.setDisplayShowCustomEnabled(true);
-            pp_actionBar = (ImageView) actionBar.getCustomView().findViewById(R.id.pp_actionBar);
+            pp_actionBar = (ImageView) actionBar.findViewById(R.id.pp_actionBar);
             String url = account.getAvatar();
             if( url.startsWith("/") ){
                 url = "https://" + Helper.getLiveInstance(getApplicationContext()) + account.getAvatar();
@@ -498,13 +496,28 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
             if( Build.VERSION.SDK_INT >= 21) {
 
                 AppBarLayout appBar = (AppBarLayout) findViewById(R.id.appBar);
+                maxScrollSize = appBar.getTotalScrollRange();
                 appBar.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
                     @Override
                     public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                        if (Math.abs(verticalOffset)-appBarLayout.getTotalScrollRange() == 0) {
-                            pp_actionBar.setVisibility(View.VISIBLE);
-                        } else {
-                            pp_actionBar.setVisibility(View.GONE);
+                        if (maxScrollSize == 0)
+                            maxScrollSize = appBarLayout.getTotalScrollRange();
+
+                        int percentage = (Math.abs(verticalOffset)) * 100 / maxScrollSize;
+
+                        if (percentage >= 20 && avatarShown) {
+                            avatarShown = false;
+
+                            account_pp.animate()
+                                    .scaleY(0).scaleX(0)
+                                    .setDuration(200)
+                                    .start();
+                        }
+                        if (percentage <= 20 && !avatarShown) {
+                            avatarShown = true;
+                            account_pp.animate()
+                                    .scaleY(1).scaleX(1)
+                                    .start();
                         }
                     }
                 });
diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index 48e4e4ee0..b533f0657 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -148,7 +148,14 @@
                     android:layout_height="wrap_content" />
             </LinearLayout>
         </android.support.design.widget.CollapsingToolbarLayout>
-
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/materialup.toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            app:theme="@style/ThemeOverlay.AppCompat.Light"
+            app:layout_scrollFlags="scroll|enterAlways|snap"
+            />
         <android.support.design.widget.TabLayout
             android:id="@+id/account_tabLayout"
             android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index e2ebd5cdd..6c160621e 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -17,10 +17,10 @@
 -->
 <android.support.design.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:fitsSystemWindows="true"
     tools:context="fr.gouv.etalab.mastodon.activities.ShowAccountActivity">
     <android.support.design.widget.AppBarLayout
@@ -34,13 +34,72 @@
             android:id="@+id/collapsingToolbarLayout"
             android:layout_height="@dimen/layout_height_header"
             android:fitsSystemWindows="true"
-            app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
+            app:expandedTitleMarginStart="48dp"
+            app:expandedTitleMarginEnd="64dp"
+            app:layout_scrollFlags="scroll|snap">
+            <ImageView
+                android:id="@+id/banner_pp"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                app:layout_collapseMode="parallax"
+                />
+            <android.support.design.widget.FloatingActionButton
+                android:layout_gravity="end|bottom"
+                android:visibility="gone"
+                app:fabSize="mini"
+                android:id="@+id/account_follow"
+                android:textAllCaps="false"
+                android:gravity="end|bottom"
+                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                />
+        </android.support.design.widget.CollapsingToolbarLayout>
+        <android.support.v7.widget.Toolbar
+            android:id="@+id/toolbar"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:minHeight="?attr/actionBarSize"
+            app:theme="@style/ThemeOverlay.AppCompat.Light"
+            app:layout_scrollFlags="scroll|enterAlways|snap"
+            >
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal"
+                tools:ignore="UseCompoundDrawables">
+                <ImageView
+                    android:visibility="gone"
+                    android:id="@+id/pp_actionBar"
+                    android:layout_width="30dp"
+                    android:layout_height="30dp"
+                    android:layout_gravity="center_vertical"
+                    android:gravity="center_vertical"
+                    android:layout_marginEnd="10dp"
+                    android:layout_marginRight="10dp"
+                    tools:ignore="ContentDescription" />
+                <TextView
+                    android:layout_marginLeft="5dp"
+                    android:layout_marginStart="5dp"
+                    android:layout_gravity="center_vertical"
+                    android:id="@+id/show_account_title"
+                    android:maxLines="1"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:textSize="14sp"
+                    android:textColor="?attr/actionBarTextColor"
+                    />
+            </LinearLayout>
+            </android.support.v7.widget.Toolbar>
         <LinearLayout
             android:id="@+id/main_header_container"
-            android:background="@color/mastodonC1"
-            android:gravity="center_horizontal"
             android:layout_width="match_parent"
-            android:layout_height="@dimen/layout_height_header"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            android:gravity="center"
+            app:layout_scrollFlags="scroll|enterAlways|snap"
             android:orientation="vertical">
             <LinearLayout
                 android:id="@+id/header_container"
@@ -50,16 +109,12 @@
                 android:orientation="horizontal"
                 android:layout_height="wrap_content"
                 >
-                <ImageView
-                    android:padding="10dp"
-                    android:id="@+id/account_pp"
-                    android:layout_width="80dp"
-                    android:layout_height="80dp"
-                    tools:ignore="ContentDescription" />
                 <LinearLayout
                     android:layout_width="0dp"
                     android:layout_weight="1"
                     android:orientation="vertical"
+                    android:layout_gravity="center_horizontal"
+                    android:gravity="center_horizontal"
                     android:layout_height="wrap_content">
                     <TextView
                         android:id="@+id/account_dn"
@@ -126,22 +181,12 @@
                             />
                     </LinearLayout>
                 </LinearLayout>
-                <android.support.design.widget.FloatingActionButton
-                    android:layout_gravity="center"
-                    android:visibility="gone"
-                    app:fabSize="mini"
-                    android:id="@+id/account_follow"
-                    android:textAllCaps="false"
-                    android:gravity="center"
-                    android:layout_marginRight="10dp"
-                    android:layout_marginEnd="10dp"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    />
+
             </LinearLayout>
             <TextView
                 android:id="@+id/account_note"
                 android:padding="10dp"
+                android:layout_marginTop="5dp"
                 android:gravity="center"
                 android:textColor="?attr/color_in_account_header"
                 android:layout_width="match_parent"
@@ -149,16 +194,14 @@
                 android:autoLink="web"
                 android:layout_height="wrap_content" />
         </LinearLayout>
-    </android.support.design.widget.CollapsingToolbarLayout>
-
-    <android.support.design.widget.TabLayout
-        android:id="@+id/account_tabLayout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
-        app:tabMode="fixed"
-        app:tabGravity="fill"
-        />
+        <android.support.design.widget.TabLayout
+            android:id="@+id/account_tabLayout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:tabTextAppearance="@android:style/TextAppearance.Widget.TabWidget"
+            app:tabMode="fixed"
+            app:tabGravity="fill"
+            />
     </android.support.design.widget.AppBarLayout>
     <android.support.v4.view.ViewPager
         android:id="@+id/account_viewpager"
@@ -167,4 +210,17 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         />
 
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:padding="10dp"
+        android:id="@+id/account_pp"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_gravity="center_horizontal"
+        app:layout_anchor="@id/main_header_container"
+        android:elevation="8dp"
+        app:civ_border_width="2dp"
+        app:civ_border_color="#FFF"
+        app:layout_scrollFlags="scroll"
+        app:layout_anchorGravity="top|center_horizontal"
+         />
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw360dp/dimens.xml b/app/src/main/res/values-sw360dp/dimens.xml
index 9a6c86a85..0361dec29 100644
--- a/app/src/main/res/values-sw360dp/dimens.xml
+++ b/app/src/main/res/values-sw360dp/dimens.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="layout_height_header">250dp</dimen>
+    <dimen name="layout_height_header">200dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values-sw600dp/dimens.xml b/app/src/main/res/values-sw600dp/dimens.xml
index 741a71fa2..5f66420e5 100644
--- a/app/src/main/res/values-sw600dp/dimens.xml
+++ b/app/src/main/res/values-sw600dp/dimens.xml
@@ -6,5 +6,5 @@
     <dimen name="activity_vertical_margin">30dp</dimen>
     <dimen name="activity_padding_top_header">16dp</dimen>
     <bool name="isTablet">true</bool>
-    <dimen name="layout_height_header">300dp</dimen>
+    <dimen name="layout_height_header">250dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 577e79f49..022544fc1 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -9,5 +9,5 @@
     <dimen name="drawer_padding">2dp</dimen>
     <dimen name="toot_padding">20dp</dimen>
     <bool name="isTablet">false</bool>
-    <dimen name="layout_height_header">250dp</dimen>
+    <dimen name="layout_height_header">200dp</dimen>
 </resources>

From 67bd790a9e2f1bb803db82b9d90d85850b9af1de Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 14 Oct 2017 11:09:12 +0200
Subject: [PATCH 09/16] For tablets

---
 .../activities/ShowAccountActivity.java       | 130 +++-----
 .../layout-sw600dp/activity_show_account.xml  | 287 +++++++++++-------
 .../main/res/layout/activity_show_account.xml |  60 ++--
 3 files changed, 241 insertions(+), 236 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
index b85151c79..56f55fba8 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java
@@ -14,11 +14,8 @@
  * see <http://www.gnu.org/licenses>. */
 package fr.gouv.etalab.mastodon.activities;
 
-import android.annotation.SuppressLint;
-import android.content.BroadcastReceiver;
 import android.content.Context;
 import android.content.Intent;
-import android.content.IntentFilter;
 import android.content.SharedPreferences;
 import android.graphics.Bitmap;
 import android.graphics.Canvas;
@@ -29,30 +26,22 @@ import android.graphics.Matrix;
 import android.graphics.Paint;
 import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
-import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Bundle;
-import android.os.Handler;
 import android.support.annotation.RequiresApi;
 import android.support.design.widget.AppBarLayout;
-import android.support.design.widget.CollapsingToolbarLayout;
 import android.support.design.widget.FloatingActionButton;
 import android.support.design.widget.TabLayout;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentStatePagerAdapter;
 import android.support.v4.content.ContextCompat;
-import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
-import android.support.v7.app.ActionBar;
 import android.support.v7.app.AppCompatActivity;
-import android.support.v7.widget.Toolbar;
 import android.text.SpannableString;
 import android.text.method.LinkMovementMethod;
-import android.util.Log;
-import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -66,7 +55,6 @@ import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 import com.nostra13.universalimageloader.core.assist.FailReason;
-import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
 import com.nostra13.universalimageloader.core.display.SimpleBitmapDisplayer;
 import com.nostra13.universalimageloader.core.listener.SimpleImageLoadingListener;
 
@@ -98,8 +86,6 @@ import fr.gouv.etalab.mastodon.interfaces.OnRetrieveFeedsInterface;
 import fr.gouv.etalab.mastodon.interfaces.OnRetrieveRelationshipInterface;
 import mastodon.etalab.gouv.fr.mastodon.R;
 import fr.gouv.etalab.mastodon.client.Entities.Relationship;
-
-import static fr.gouv.etalab.mastodon.helper.Helper.canPin;
 import static fr.gouv.etalab.mastodon.helper.Helper.changeDrawableColor;
 
 
@@ -127,9 +113,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
     private Relationship relationship;
     private boolean showMediaOnly, showPinned;
     private ImageView pp_actionBar;
-    private BroadcastReceiver hide_header;
-    private boolean isHiddingShowing = false;
-    private LinearLayout main_header_container;
+    private LinearLayout small_info;
     private ImageView header_edit_profile;
     private List<Status> pins;
     private String accountUrl;
@@ -162,7 +146,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
         Bundle b = getIntent().getExtras();
         account_follow = (FloatingActionButton) findViewById(R.id.account_follow);
         account_follow_request = (TextView) findViewById(R.id.account_follow_request);
-        main_header_container = (LinearLayout) findViewById(R.id.main_header_container);
+        small_info = (LinearLayout) findViewById(R.id.small_info);
         header_edit_profile = (ImageView) findViewById(R.id.header_edit_profile);
         account_follow.setEnabled(false);
         if(b != null){
@@ -276,44 +260,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
                 }
             }
         });
-        
-        if( Build.VERSION.SDK_INT < 21) {
-            final CollapsingToolbarLayout collapsingToolbarLayout = (CollapsingToolbarLayout) findViewById(R.id.collapsingToolbarLayout);
-            //Register LocalBroadcast to receive selected accounts after search
-            hide_header = new BroadcastReceiver() {
-                @Override
-                public void onReceive(Context context, Intent intent) {
-                    if (!isHiddingShowing) {
-                        isHiddingShowing = true;
-                        ImageView account_pp = (ImageView) findViewById(R.id.account_pp);
-                        boolean hide = intent.getBooleanExtra("hide", false);
-                        if (hide) {
-                            collapsingToolbarLayout.setVisibility(View.GONE);
-                            if (pp_actionBar != null)
-                                pp_actionBar.setVisibility(View.VISIBLE);
-                            tabLayout.setVisibility(View.GONE);
-                        } else {
-                            manageButtonVisibility();
-                            tabLayout.setVisibility(View.VISIBLE);
-                            collapsingToolbarLayout.setVisibility(View.VISIBLE);
-                            if (pp_actionBar != null)
-                                pp_actionBar.setVisibility(View.GONE);
-                        }
-                        account_pp.requestLayout();
-                        Handler handler = new Handler();
-                        handler.postDelayed(new Runnable() {
-                            @Override
-                            public void run() {
-                                isHiddingShowing = false;
-                            }
-                        }, 700);
-                    }
-
-                }
-            };
-
-            LocalBroadcastManager.getInstance(this).registerReceiver(hide_header, new IntentFilter(Helper.HEADER_ACCOUNT + String.valueOf(instanceValue)));
-        }
 
         header_edit_profile.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -398,7 +344,6 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
     @Override
     public void onDestroy(){
         super.onDestroy();
-        LocalBroadcastManager.getInstance(this).unregisterReceiver(hide_header);
     }
 
     @Override
@@ -450,8 +395,7 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
 
                     @Override
                     public void onLoadingFailed(java.lang.String imageUri, android.view.View view, FailReason failReason) {
-                        LinearLayout main_header_container = (LinearLayout) findViewById(R.id.main_header_container);
-                        main_header_container.setBackgroundResource(R.drawable.side_nav_bar);
+
                     }
                 });
             }
@@ -466,14 +410,12 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
             account_dn.setCompoundDrawables( null, null, null, null);
         }
 
-        Toolbar actionBar = (Toolbar) findViewById(R.id.toolbar);
-        LayoutInflater mInflater = LayoutInflater.from(ShowAccountActivity.this);
-        if( actionBar != null && account != null){
-            @SuppressLint("InflateParams") View show_account_actionbar = mInflater.inflate(R.layout.showaccount_actionbar, null);
-            TextView actionbar_title = (TextView) show_account_actionbar.findViewById(R.id.show_account_title);
+
+        if( account != null){
+            TextView actionbar_title = (TextView) findViewById(R.id.show_account_title);
             if( account.getAcct() != null)
                 actionbar_title.setText(account.getAcct());
-            pp_actionBar = (ImageView) actionBar.findViewById(R.id.pp_actionBar);
+            pp_actionBar = (ImageView) findViewById(R.id.pp_actionBar);
             String url = account.getAvatar();
             if( url.startsWith("/") ){
                 url = "https://" + Helper.getLiveInstance(getApplicationContext()) + account.getAvatar();
@@ -493,35 +435,41 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi
                 public void onLoadingFailed(java.lang.String imageUri, android.view.View view, FailReason failReason){
 
                 }});
-            if( Build.VERSION.SDK_INT >= 21) {
+            final AppBarLayout appBar = (AppBarLayout) findViewById(R.id.appBar);
+            maxScrollSize = appBar.getTotalScrollRange();
 
-                AppBarLayout appBar = (AppBarLayout) findViewById(R.id.appBar);
-                maxScrollSize = appBar.getTotalScrollRange();
-                appBar.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
-                    @Override
-                    public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
-                        if (maxScrollSize == 0)
-                            maxScrollSize = appBarLayout.getTotalScrollRange();
 
-                        int percentage = (Math.abs(verticalOffset)) * 100 / maxScrollSize;
-
-                        if (percentage >= 20 && avatarShown) {
-                            avatarShown = false;
-
-                            account_pp.animate()
-                                    .scaleY(0).scaleX(0)
-                                    .setDuration(200)
-                                    .start();
-                        }
-                        if (percentage <= 20 && !avatarShown) {
-                            avatarShown = true;
-                            account_pp.animate()
-                                    .scaleY(1).scaleX(1)
-                                    .start();
-                        }
+            appBar.addOnOffsetChangedListener(new AppBarLayout.OnOffsetChangedListener() {
+                @Override
+                public void onOffsetChanged(AppBarLayout appBarLayout, int verticalOffset) {
+                    if (Math.abs(verticalOffset)-appBar.getTotalScrollRange() == 0) {
+                        if( small_info.getVisibility() == View.GONE)
+                            small_info.setVisibility(View.VISIBLE);
+                    }else {
+                        if( small_info.getVisibility() == View.VISIBLE)
+                            small_info.setVisibility(View.GONE);
                     }
-                });
-            }
+                    if (maxScrollSize == 0)
+                        maxScrollSize = appBarLayout.getTotalScrollRange();
+
+                    int percentage = (Math.abs(verticalOffset)) * 100 / maxScrollSize;
+
+                    if (percentage >= 20 && avatarShown) {
+                        avatarShown = false;
+
+                        account_pp.animate()
+                                .scaleY(0).scaleX(0)
+                                .setDuration(200)
+                                .start();
+                    }
+                    if (percentage <= 20 && !avatarShown) {
+                        avatarShown = true;
+                        account_pp.animate()
+                                .scaleY(1).scaleX(1)
+                                .start();
+                    }
+                }
+            });
         }else {
             if(  account != null && account.getAcct() != null)
                 setTitle(account.getAcct());
diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml
index b533f0657..baa568bc7 100644
--- a/app/src/main/res/layout-sw600dp/activity_show_account.xml
+++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml
@@ -17,10 +17,10 @@
 -->
 <android.support.design.widget.CoordinatorLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:fitsSystemWindows="true"
     tools:context="fr.gouv.etalab.mastodon.activities.ShowAccountActivity">
     <android.support.design.widget.AppBarLayout
@@ -30,132 +30,173 @@
         android:fitsSystemWindows="true"
         android:theme="@style/AppTheme.AppBarOverlay">
         <android.support.design.widget.CollapsingToolbarLayout
-            android:layout_width="match_parent"
+            android:layout_width="500dp"
+            android:layout_gravity="center_horizontal"
+            android:id="@+id/collapsingToolbarLayout"
             android:layout_height="@dimen/layout_height_header"
             android:fitsSystemWindows="true"
-            app:layout_scrollFlags="scroll|enterAlwaysCollapsed">
-            <LinearLayout
-                android:id="@+id/main_header_container"
-                android:background="@color/mastodonC1"
+            app:expandedTitleMarginStart="48dp"
+            app:expandedTitleMarginEnd="64dp"
+            app:layout_scrollFlags="scroll|snap">
+            <ImageView
+                android:id="@+id/banner_pp"
                 android:layout_width="match_parent"
-                android:gravity="center_horizontal"
-                android:layout_height="@dimen/layout_height_header"
-                android:orientation="vertical">
-                <LinearLayout
-                    android:id="@+id/header_container"
-                    android:layout_marginTop="5dp"
-                    android:layout_width="500dp"
-                    android:gravity="center"
-                    android:orientation="horizontal"
-                    android:layout_height="wrap_content"
-                    >
-                    <ImageView
-                        android:padding="10dp"
-                        android:id="@+id/account_pp"
-                        android:layout_width="80dp"
-                        android:layout_height="80dp"
-                        tools:ignore="ContentDescription" />
-                    <LinearLayout
-                        android:layout_width="0dp"
-                        android:layout_weight="1"
-                        android:orientation="vertical"
-                        android:layout_height="wrap_content">
-                        <TextView
-                            android:id="@+id/account_dn"
-                            android:textColor="@color/mastodonC4"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:maxLines="1"
-                            android:textSize="16sp"
-                            android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
-                        <LinearLayout
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-                            <TextView
-                                android:layout_marginLeft="10dp"
-                                android:layout_marginStart="10dp"
-                                android:textColor="?attr/color_in_account_header"
-                                android:id="@+id/account_un"
-                                android:maxLines="1"
-                                android:layout_width="wrap_content"
-                                android:textSize="14sp"
-                                android:layout_height="wrap_content"
-                                />
-                            <ImageView
-                                android:visibility="gone"
-                                android:layout_marginLeft="10dp"
-                                android:layout_marginStart="10dp"
-                                android:gravity="center_horizontal|bottom"
-                                android:src="@drawable/ic_edit"
-                                android:id="@+id/header_edit_profile"
-                                android:layout_width="20dp"
-                                android:layout_height="20dp"
-                                tools:ignore="ContentDescription" />
-                        </LinearLayout>
-
-                        <LinearLayout
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:orientation="horizontal">
-                            <TextView
-                                android:layout_marginStart="10dp"
-                                android:layout_marginLeft="10dp"
-                                android:visibility="gone"
-                                android:id="@+id/account_followed_by"
-                                android:layout_gravity="center_vertical"
-                                android:gravity="center_vertical"
-                                android:textColor="?attr/colorAccent"
-                                android:text="@string/followed_by"
-                                android:maxLines="1"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content" />
-                            <TextView
-                                android:id="@+id/account_follow_request"
-                                android:layout_marginStart="10dp"
-                                android:layout_marginLeft="10dp"
-                                android:visibility="gone"
-                                android:layout_gravity="center_vertical"
-                                android:gravity="center_vertical"
-                                android:textColor="?attr/colorAccent"
-                                android:text="@string/request_sent"
-                                android:maxLines="1"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                />
-                        </LinearLayout>
-                    </LinearLayout>
-                    <android.support.design.widget.FloatingActionButton
-                        android:layout_gravity="center"
-                        android:visibility="gone"
-                        app:fabSize="mini"
-                        android:id="@+id/account_follow"
-                        android:textAllCaps="false"
-                        android:gravity="center"
-                        android:layout_marginRight="10dp"
-                        android:layout_marginEnd="10dp"
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        />
-                </LinearLayout>
-                <TextView
-                    android:id="@+id/account_note"
-                    android:padding="10dp"
-                    android:gravity="center"
-                    android:textColor="?attr/color_in_account_header"
-                    android:layout_width="500dp"
-                    android:autoLink="web"
-                    android:layout_height="wrap_content" />
-            </LinearLayout>
+                android:layout_height="match_parent"
+                android:scaleType="centerCrop"
+                app:layout_collapseMode="parallax"
+                />
+            <android.support.design.widget.FloatingActionButton
+                android:layout_gravity="end|bottom"
+                android:visibility="gone"
+                app:fabSize="mini"
+                android:id="@+id/account_follow"
+                android:textAllCaps="false"
+                android:gravity="end|bottom"
+                android:layout_marginRight="10dp"
+                android:layout_marginEnd="10dp"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                />
         </android.support.design.widget.CollapsingToolbarLayout>
         <android.support.v7.widget.Toolbar
-            android:id="@+id/materialup.toolbar"
+            android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:minHeight="?attr/actionBarSize"
             app:theme="@style/ThemeOverlay.AppCompat.Light"
             app:layout_scrollFlags="scroll|enterAlways|snap"
             />
+        <LinearLayout
+            android:id="@+id/main_header_container"
+            android:layout_width="500dp"
+            android:layout_height="wrap_content"
+            android:paddingTop="8dp"
+            android:gravity="center"
+            android:layout_gravity="center_horizontal"
+            app:layout_scrollFlags="scroll|enterAlways|snap"
+            android:orientation="vertical">
+            <LinearLayout
+                android:id="@+id/header_container"
+                android:layout_marginTop="5dp"
+                android:layout_width="match_parent"
+                android:gravity="center"
+                android:orientation="horizontal"
+                android:layout_height="wrap_content"
+                >
+                <LinearLayout
+                    android:layout_width="0dp"
+                    android:layout_weight="1"
+                    android:orientation="vertical"
+                    android:layout_gravity="center_horizontal"
+                    android:gravity="center_horizontal"
+                    android:layout_height="wrap_content">
+                    <TextView
+                        android:id="@+id/account_dn"
+                        android:textColor="@color/mastodonC4"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:maxLines="1"
+                        android:textSize="16sp"
+                        android:textAppearance="@style/TextAppearance.AppCompat.Body1" />
+                    <LinearLayout
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <TextView
+                            android:layout_marginLeft="10dp"
+                            android:layout_marginStart="10dp"
+                            android:textColor="?attr/color_in_account_header"
+                            android:id="@+id/account_un"
+                            android:maxLines="1"
+                            android:layout_width="wrap_content"
+                            android:textSize="14sp"
+                            android:layout_height="wrap_content"
+                            />
+                        <ImageView
+                            android:visibility="gone"
+                            android:layout_marginLeft="20dp"
+                            android:layout_marginStart="20dp"
+                            android:gravity="center_horizontal|bottom"
+                            android:src="@drawable/ic_edit"
+                            android:id="@+id/header_edit_profile"
+                            android:layout_width="20dp"
+                            android:layout_height="20dp"
+                            tools:ignore="ContentDescription" />
+                    </LinearLayout>
+
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:orientation="horizontal">
+                        <TextView
+                            android:layout_marginStart="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:visibility="gone"
+                            android:id="@+id/account_followed_by"
+                            android:layout_gravity="center_vertical"
+                            android:gravity="center_vertical"
+                            android:textColor="?attr/colorAccent"
+                            android:text="@string/followed_by"
+                            android:maxLines="1"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content" />
+                        <TextView
+                            android:id="@+id/account_follow_request"
+                            android:layout_marginStart="10dp"
+                            android:layout_marginLeft="10dp"
+                            android:visibility="gone"
+                            android:layout_gravity="center_vertical"
+                            android:gravity="center_vertical"
+                            android:textColor="?attr/colorAccent"
+                            android:text="@string/request_sent"
+                            android:maxLines="1"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            />
+                    </LinearLayout>
+                </LinearLayout>
+
+            </LinearLayout>
+            <TextView
+                android:id="@+id/account_note"
+                android:padding="10dp"
+                android:layout_marginTop="5dp"
+                android:gravity="center"
+                android:textColor="?attr/color_in_account_header"
+                android:layout_width="match_parent"
+                android:maxLines="4"
+                android:autoLink="web"
+                android:layout_height="wrap_content" />
+        </LinearLayout>
+        <LinearLayout
+            android:id="@+id/small_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            android:padding="5dp"
+            tools:ignore="UseCompoundDrawables">
+            <ImageView
+                android:id="@+id/pp_actionBar"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:layout_marginEnd="10dp"
+                android:layout_marginRight="10dp"
+                tools:ignore="ContentDescription" />
+            <TextView
+                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_gravity="center_vertical"
+                android:id="@+id/show_account_title"
+                android:maxLines="1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:textColor="?attr/actionBarTextColor"
+                />
+        </LinearLayout>
         <android.support.design.widget.TabLayout
             android:id="@+id/account_tabLayout"
             android:layout_width="match_parent"
@@ -165,6 +206,7 @@
             app:tabGravity="fill"
             />
     </android.support.design.widget.AppBarLayout>
+
     <android.support.v4.view.ViewPager
         android:id="@+id/account_viewpager"
         android:layout_width="match_parent"
@@ -172,4 +214,17 @@
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         />
 
+    <de.hdodenhof.circleimageview.CircleImageView
+        android:padding="10dp"
+        android:id="@+id/account_pp"
+        android:layout_width="150dp"
+        android:layout_height="150dp"
+        android:layout_gravity="center_horizontal"
+        app:layout_anchor="@id/main_header_container"
+        android:elevation="8dp"
+        app:civ_border_width="2dp"
+        app:civ_border_color="#FFF"
+        app:layout_scrollFlags="scroll"
+        app:layout_anchorGravity="top|center_horizontal"
+         />
 </android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_show_account.xml b/app/src/main/res/layout/activity_show_account.xml
index 6c160621e..38b8ad494 100644
--- a/app/src/main/res/layout/activity_show_account.xml
+++ b/app/src/main/res/layout/activity_show_account.xml
@@ -64,35 +64,7 @@
             android:minHeight="?attr/actionBarSize"
             app:theme="@style/ThemeOverlay.AppCompat.Light"
             app:layout_scrollFlags="scroll|enterAlways|snap"
-            >
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:orientation="horizontal"
-                tools:ignore="UseCompoundDrawables">
-                <ImageView
-                    android:visibility="gone"
-                    android:id="@+id/pp_actionBar"
-                    android:layout_width="30dp"
-                    android:layout_height="30dp"
-                    android:layout_gravity="center_vertical"
-                    android:gravity="center_vertical"
-                    android:layout_marginEnd="10dp"
-                    android:layout_marginRight="10dp"
-                    tools:ignore="ContentDescription" />
-                <TextView
-                    android:layout_marginLeft="5dp"
-                    android:layout_marginStart="5dp"
-                    android:layout_gravity="center_vertical"
-                    android:id="@+id/show_account_title"
-                    android:maxLines="1"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textSize="14sp"
-                    android:textColor="?attr/actionBarTextColor"
-                    />
-            </LinearLayout>
-            </android.support.v7.widget.Toolbar>
+            />
         <LinearLayout
             android:id="@+id/main_header_container"
             android:layout_width="match_parent"
@@ -194,6 +166,35 @@
                 android:autoLink="web"
                 android:layout_height="wrap_content" />
         </LinearLayout>
+        <LinearLayout
+            android:id="@+id/small_info"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="horizontal"
+            android:visibility="gone"
+            android:padding="5dp"
+            tools:ignore="UseCompoundDrawables">
+            <ImageView
+                android:id="@+id/pp_actionBar"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center_vertical"
+                android:gravity="center_vertical"
+                android:layout_marginEnd="10dp"
+                android:layout_marginRight="10dp"
+                tools:ignore="ContentDescription" />
+            <TextView
+                android:layout_marginLeft="5dp"
+                android:layout_marginStart="5dp"
+                android:layout_gravity="center_vertical"
+                android:id="@+id/show_account_title"
+                android:maxLines="1"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="14sp"
+                android:textColor="?attr/actionBarTextColor"
+                />
+        </LinearLayout>
         <android.support.design.widget.TabLayout
             android:id="@+id/account_tabLayout"
             android:layout_width="match_parent"
@@ -203,6 +204,7 @@
             app:tabGravity="fill"
             />
     </android.support.design.widget.AppBarLayout>
+
     <android.support.v4.view.ViewPager
         android:id="@+id/account_viewpager"
         android:layout_width="match_parent"

From e8a15898037b3dbc10bd795c71b2285825cd85e4 Mon Sep 17 00:00:00 2001
From: PhotonQyv <shenstone.porter@gmail.com>
Date: Sat, 14 Oct 2017 14:39:32 +0100
Subject: [PATCH 10/16] Corrected issues with Portuguese translation by
 removing strings marked as untranslatable, added English text where strings
 were missing.

---
 app/src/main/res/values-pt/strings.xml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/app/src/main/res/values-pt/strings.xml b/app/src/main/res/values-pt/strings.xml
index 05f7cfc6b..f825f0a68 100644
--- a/app/src/main/res/values-pt/strings.xml
+++ b/app/src/main/res/values-pt/strings.xml
@@ -1,5 +1,4 @@
 <resources>
-    <string name="app_name" translatable="false">Mastalab</string>
     <string name="navigation_drawer_open">Abrir menu</string>
     <string name="navigation_drawer_close">Fechar menu</string>
 
@@ -64,6 +63,8 @@
     <string name="follow">Novos seguidores</string>
     <string name="mention">Menções</string>
     <string name="reblog">Compartilhamentos</string>
+    <string name="show_boosts">Show boosts</string>
+    <string name="show_replies">Show replies</string>
 
     <!--- Menu -->
     <string name="home_menu">Página inicial</string>
@@ -194,7 +195,6 @@
     <string name="about_code">Código-fonte: </string>
     <string name="about_code_action">Bitbucket</string>
     <string name="about_yandex">Tradução dos toots:</string>
-    <string name="about_yandex_action" translatable="false">Powered by Yandex.Translate</string>
     <string name="about_thekinrar">Busca de instâncias:</string>
     <string name="about_thekinrar_action">instances.social</string>
     <string name="thanks_text_logo">Designer do ícone:</string>
@@ -418,8 +418,6 @@
         - <b>Gson</b> : Para administrar rascunhos
     </string>
 
-    <string name="yandex" translatable="false">&lt;a hreh="http://translate.yandex.com/">Powered by Yandex.Translate&lt;/a></string>
-
     <string name="privacy_API_yandex_title">Tradução de toots</string>
     <string name="privacy_API_yandex_authorizations">
         O aplicativo oferece a habilidade de traduzir toots usando o idioma do aparelho a API do Yandex.\n

From 35e3ffa5414ec214f5e3aa7e2ba600ce5879c624 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 14 Oct 2017 16:43:18 +0200
Subject: [PATCH 11/16] Improves pictures

---
 .../etalab/mastodon/drawers/StatusListAdapter.java     | 10 ++++++----
 .../java/fr/gouv/etalab/mastodon/helper/Helper.java    |  1 -
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index 8777c2206..fe333450d 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -58,6 +58,7 @@ import com.nostra13.universalimageloader.cache.disc.impl.UnlimitedDiskCache;
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
+import com.nostra13.universalimageloader.core.display.RoundedBitmapDisplayer;
 import com.nostra13.universalimageloader.core.display.SimpleBitmapDisplayer;
 
 import org.json.JSONArray;
@@ -111,7 +112,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
     private List<Status> statuses;
     private LayoutInflater layoutInflater;
     private ImageLoader imageLoader;
-    private DisplayImageOptions options;
+    private DisplayImageOptions options, optionsAttachment;
     private ViewHolder holder;
     private boolean isOnWifi;
     private int translator;
@@ -194,9 +195,10 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
                     .build();
             if( !imageLoader.isInited())
                 imageLoader.init(configImg);
-            options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false)
+            options = new DisplayImageOptions.Builder().displayer(new RoundedBitmapDisplayer(10)).cacheInMemory(false)
+                    .cacheOnDisk(true).resetViewBeforeLoading(true).build();
+            optionsAttachment = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false)
                     .cacheOnDisk(true).resetViewBeforeLoading(true).build();
-
             if (convertView == null) {
                 convertView = layoutInflater.inflate(R.layout.drawer_status, parent, false);
                 holder = new ViewHolder();
@@ -1154,7 +1156,7 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
                 if( url == null || url.trim().equals(""))
                     url = attachment.getUrl();
                 if( !url.trim().contains("missing.png"))
-                    imageLoader.displayImage(url, imageView, options);
+                    imageLoader.displayImage(url, imageView, optionsAttachment);
                 final int finalPosition = position;
                 imageView.setOnClickListener(new View.OnClickListener() {
                     @Override
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
index 6431b3b9d..888fd6856 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/helper/Helper.java
@@ -828,7 +828,6 @@ public class Helper {
                     if( currentSubmenu  == null)
                         continue;
                     final MenuItem item = currentSubmenu.add("@" + account.getAcct());
-                    //final MenuItem item = mainMenu.addSubMenu("@" + account.getAcct()).add("@" + account.getAcct());
                     ImageLoader imageLoader;
                     DisplayImageOptions options = new DisplayImageOptions.Builder().displayer(new SimpleBitmapDisplayer()).cacheInMemory(false)
                             .cacheOnDisk(true).resetViewBeforeLoading(true).build();

From 423ebfe00864ca57bc89eba25dbf9dc570c7788c Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 14 Oct 2017 16:45:18 +0200
Subject: [PATCH 12/16] Fixes an issue when removing picture

---
 .../java/fr/gouv/etalab/mastodon/activities/TootActivity.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
index 70c97820d..531f1de92 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java
@@ -1063,7 +1063,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc
                             toot_content.setText(toot_content.getText().toString().replace(attachment.getText_url(), ""));
                             toot_space_left.setText(String.valueOf(toot_content.length()));
                             //Moves the cursor
-                            if (selectionBefore >= 0)
+                            if (selectionBefore >= 0 && selectionBefore < toot_content.length())
                                 toot_content.setSelection(selectionBefore);
                         }
                         ((ViewGroup) namebar.getParent()).removeView(namebar);

From 13bfb8626699c292cfd2a056c721d2a680a57d73 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 14 Oct 2017 17:17:29 +0200
Subject: [PATCH 13/16] Improves button sizes

---
 app/src/main/res/layout-sw600dp/activity_toot.xml |  8 ++++----
 app/src/main/res/layout/activity_toot.xml         | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/app/src/main/res/layout-sw600dp/activity_toot.xml b/app/src/main/res/layout-sw600dp/activity_toot.xml
index 1476e4984..442241a44 100644
--- a/app/src/main/res/layout-sw600dp/activity_toot.xml
+++ b/app/src/main/res/layout-sw600dp/activity_toot.xml
@@ -84,8 +84,8 @@
                 <ImageButton
                     android:id="@+id/toot_picture"
                     android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:background="@color/mastodonC4"
+                    android:layout_height="wrap_content"
+                    style="@style/Base.Widget.AppCompat.Button.Colored"
                     android:src="@drawable/ic_insert_photo"
                     tools:ignore="ContentDescription" />
                 <ImageButton
@@ -93,8 +93,8 @@
                     android:layout_marginStart="5dp"
                     android:id="@+id/toot_visibility"
                     android:layout_width="50dp"
-                    android:layout_height="50dp"
-                    android:background="@color/mastodonC4"
+                    android:layout_height="wrap_content"
+                    style="@style/Base.Widget.AppCompat.Button.Colored"
                     android:src="@drawable/ic_action_globe"
                     tools:ignore="ContentDescription" />
                 <Button
diff --git a/app/src/main/res/layout/activity_toot.xml b/app/src/main/res/layout/activity_toot.xml
index 035b28176..f677c55da 100644
--- a/app/src/main/res/layout/activity_toot.xml
+++ b/app/src/main/res/layout/activity_toot.xml
@@ -83,18 +83,18 @@
                 android:layout_height="wrap_content">
                 <ImageButton
                     android:id="@+id/toot_picture"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:background="@color/mastodonC4"
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    style="@style/Base.Widget.AppCompat.Button.Colored"
                     android:src="@drawable/ic_insert_photo"
                     tools:ignore="ContentDescription" />
                 <ImageButton
                     android:layout_marginLeft="5dp"
                     android:layout_marginStart="5dp"
                     android:id="@+id/toot_visibility"
-                    android:layout_width="40dp"
-                    android:layout_height="40dp"
-                    android:background="@color/mastodonC4"
+                    android:layout_width="50dp"
+                    android:layout_height="wrap_content"
+                    style="@style/Base.Widget.AppCompat.Button.Colored"
                     android:src="@drawable/ic_action_globe"
                     tools:ignore="ContentDescription" />
                 <Button

From 516ebe9ddc594faf47529dffee4a670217510bcd Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 14 Oct 2017 17:48:28 +0200
Subject: [PATCH 14/16] Improves some colors

---
 .../activities/ShowConversationActivity.java  | 15 +++--------
 .../mastodon/drawers/StatusListAdapter.java   |  4 +--
 app/src/main/res/values/colors.xml            | 26 +++++++++----------
 app/src/main/res/values/styles.xml            |  2 ++
 4 files changed, 20 insertions(+), 27 deletions(-)

diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
index 60439e2a6..6314b1b11 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowConversationActivity.java
@@ -79,7 +79,6 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet
     private SwipeRefreshLayout swipeRefreshLayout;
     private ListView lv_status;
     private boolean isRefreshed;
-    private TextView title;
     private ImageView pp_actionBar;
 
     @Override
@@ -101,7 +100,7 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet
             View view = inflater.inflate(R.layout.conversation_action_bar, null);
             actionBar.setCustomView(view, new ActionBar.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.MATCH_PARENT));
             actionBar.setDisplayOptions(ActionBar.DISPLAY_SHOW_CUSTOM);
-            title = (TextView) actionBar.getCustomView().findViewById(R.id.toolbar_title);
+            TextView title = (TextView) actionBar.getCustomView().findViewById(R.id.toolbar_title);
             pp_actionBar = (ImageView) actionBar.getCustomView().findViewById(R.id.pp_actionBar);
             title.setText(R.string.conversation);
             ImageView close_conversation = (ImageView) actionBar.getCustomView().findViewById(R.id.close_conversation);
@@ -163,15 +162,9 @@ public class ShowConversationActivity extends AppCompatActivity implements OnRet
         swipeRefreshLayout = (SwipeRefreshLayout) findViewById(R.id.swipeContainer);
         new RetrieveFeedsAsyncTask(getApplicationContext(), RetrieveFeedsAsyncTask.Type.ONESTATUS, statusId,null, false,false, ShowConversationActivity.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR);
 
-        if( theme == Helper.THEME_LIGHT) {
-            swipeRefreshLayout.setColorSchemeResources(R.color.colorAccent,
-                    R.color.colorPrimary,
-                    R.color.colorPrimaryDark);
-        }else {
-            swipeRefreshLayout.setColorSchemeResources(R.color.colorAccentD,
-                    R.color.colorPrimaryD,
-                    R.color.colorPrimaryDarkD);
-        }
+        swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4,
+                R.color.mastodonC2,
+                R.color.mastodonC3);
         swipeRefreshLayout.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
             @Override
             public void onRefresh() {
diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
index fe333450d..9ceb7274c 100644
--- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
+++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java
@@ -709,9 +709,9 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf
                     }
                 }else {
                     if( position == ShowConversationActivity.position){
-                        holder.main_container.setBackgroundResource(R.color.mastodonC1_);
+                        holder.main_container.setBackgroundResource(R.color.mastodonC1___);
                     }else {
-                        holder.main_container.setBackgroundResource(R.color.mastodonC1);
+                        holder.main_container.setBackgroundResource(R.color.mastodonC1_);
                     }
                 }
             }
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index f8f3940b7..eb81bf4bf 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -40,6 +40,7 @@
 
     <!-- Mastodon color scheme -->
     <color name="mastodonC1__">#585c67</color>
+    <color name="mastodonC1___">#454b5b</color>
     <color name="mastodonC1">#282c37</color>
     <color name="mastodonC1_">#313543</color>
     <color name="mastodonC2">#9baec8</color>
@@ -51,6 +52,17 @@
     <color name="mastodonC4_">#1b80c9</color>
 
 
+    <!-- Primary & accent colors -->
+    <color name="notif_dark_1">#313543</color>
+    <color name="notif_dark_2">#353947</color>
+    <color name="notif_dark_3">#393f4f</color>
+    <color name="notif_dark_4">#494f5f</color>
+
+    <color name="notif_light_1">#efefef</color>
+    <color name="notif_light_2">#ebf3fa</color>
+    <color name="notif_light_3">#d9e1e8</color>
+    <color name="notif_light_4">#c9d1d8</color>
+
     <color name="foreground_material_dark" >@color/mastodonC3__</color>
     <color name="foreground_material_light">@color/mastodonC1</color>
 
@@ -65,18 +77,4 @@
     <color name="primary_dark_material_light">@color/mastodonC3__</color>
 
 
-    <!-- Primary & accent colors -->
-    <color name="notif_dark_1">#313543</color>
-    <color name="notif_dark_2">#353947</color>
-    <color name="notif_dark_3">#393f4f</color>
-    <color name="notif_dark_4">#494f5f</color>
-
-    <color name="notif_light_1">#efefef</color>
-    <color name="notif_light_2">#ebf3fa</color>
-    <color name="notif_light_3">#d9e1e8</color>
-    <color name="notif_light_4">#c9d1d8</color>
-
-    <eat-comment />
-
-
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 89ce8277f..e92a2ebc7 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -13,6 +13,7 @@
     <!-- Light theme -->
     <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- Customize your theme here. -->
+        <item name="android:textColor">@color/black</item>
         <item name="colorPrimary">@color/mastodonC1</item>
         <item name="colorPrimaryDark">@color/mastodonC2</item>
         <item name="colorAccent">@color/mastodonC4</item>
@@ -35,6 +36,7 @@
     </style>
 
     <style name="AppTheme_NoActionBar" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:textColor">@color/black</item>
         <item name="colorPrimary">@color/mastodonC1</item>
         <item name="colorPrimaryDark">@color/mastodonC2</item>
         <item name="colorAccent">@color/mastodonC4</item>

From dce8f447bd468c1472ad52f6c90b353247d93458 Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 14 Oct 2017 18:34:42 +0200
Subject: [PATCH 15/16] Changes icons

---
 .../res/drawable-hdpi/ic_action_users_tl.png    | Bin 428 -> 292 bytes
 .../res/drawable-ldpi/ic_action_users_tl.png    | Bin 279 -> 285 bytes
 .../res/drawable-mdpi/ic_action_users_tl.png    | Bin 292 -> 181 bytes
 .../res/drawable-xhdpi/ic_action_users_tl.png   | Bin 562 -> 299 bytes
 .../res/drawable-xxhdpi/ic_action_users_tl.png  | Bin 801 -> 404 bytes
 .../res/drawable-xxxhdpi/ic_action_users_tl.png | Bin 720 -> 498 bytes
 6 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/app/src/main/res/drawable-hdpi/ic_action_users_tl.png b/app/src/main/res/drawable-hdpi/ic_action_users_tl.png
index ddb72f0dd7d845e1a35f284d7acc7ab10cd15707..2eef401fdb91d7f245626717dd8049a5fba727f3 100644
GIT binary patch
delta 266
zcmV+l0rmc@1Ed0wBYyzvNkl<Zc-muN7zG4?07D={00TdoNHCDZ1Kb%tF#HF?_Y5v*
zA|DvsaN7h?0)p=tcriryuxks1D*-_t3=u!<+5%7%d1Hv+(8dq+6HLilup===umV@8
zvbPLQXd>_6frP`x00w^)&x1q)QKE!eK#akWArc53fh+_FVt<GRI$9i?21SMrhFd7%
zb`vO~0G2an_yQKW&Ctc5jL^aiRPYBy3k?2dXlGyos>p?l{9)(@st1DxtXg2O4yb~g
z;TMufD@5BhyxOjU)jUEHxdqYo0I#+O7-}9+q%DLY0S^qpP!lp*EMWlv6$#4dwBA{+
Q00000NkvXXt^-0~g5RuWM*si-

delta 403
zcmV;E0c`%H0;~g&BYy#NNkl<Zc-rlhy)Oh&6vcnLSPcyc9R*RWg2cxrLi_;|EQ74?
zKLEAQL_#69P!lwgO?3PLLTE*VEyQ=Xtw^>)#@U&N&CaYu@7&^^ckVs&?!0*!_{Xm(
zpo19AIcf{TbgGsIbzEaRaYBXBDmgV;Qgt5`bH^KT2HA0pE`KtnO)Tl}+^fff0W~Zd
zzAN73jF&OFSP~!b+U6v;8a^Z*Q;sQHMr##c@Y+TtPZ_=;-lp8H95>pG_?XvLN{Teo
zL|E2)ToRNP<Vt)=JI$z;QjZTJD!8Y1LyggDxiwl!^*ktHgjxCsWoaS$nb&xw`Amg0
z5LH7j_0EVmV}FL}VO-WmioBLC4m7>}9WNwwND1X1EzKd_1ima~97+7pr(MxrQ6^dE
z+_YY>#)S4CW0f=YWG+IvYunRei>jRc!+N$YQ#PvEmbULM9&{J|5a5+#kDBDsCC@x*
x48KULDOY<^zp>eW3S+Z$2!9Fd|HtHmPdj{`L95>_y$k>V002ovPDHLkV1nAix@-Ud

diff --git a/app/src/main/res/drawable-ldpi/ic_action_users_tl.png b/app/src/main/res/drawable-ldpi/ic_action_users_tl.png
index 10ef041264f170f1e29a1df8ae6b2a2e33c76991..a673f0f2987681970d06fd8e0f4378eb9f1aec13 100644
GIT binary patch
delta 257
zcmV+c0sj7%0-XYoB!A>dL_t(|+O5*PY63wNhT&b^1&btL5zs;jc3TIMLIS~`!q!S}
zKy1a!FpXi;2LhsHDmx2rL#^D-LQwFh^BwqvMMki2;9>U6oO5Pi)^YAI67b+Eb`>YC
z75E5HL>@`aMXmd`6U@d05kllNM_LaqPxRE$By2Ij8-|J_?RtChB3D-lmDoTUO^ooP
zeK%f|!XsYri3}d_gm)D5or)K=@QpwG;}>7}kRJMIp9@UqId(YUh&?tKqlT&C1xlu<
zgC*7$Gt^bQQeM~5{mZCYn6A%wMMZhp_`_av{wsXj1K&JO^9d}dlO~r`00000NkvXX
Hu0mjfo=|si

delta 251
zcmV<X00jS?0+#}iB!AvXL_t(|+O5&QYQj(y$MHmQ5dVx)CpQJHqgjMXRn%4V1)_Zb
zZ54H~6tWaLxrjc16{qaJLZS4H{6>CCDp?c{e7HI1o|7AH4C4+F7E`(Ds|7{^C0Ix!
zq}5VAaXAo02Ya{}<3X#ddRKktNMVjD%6QcY1Le<nSKq%+vvlzV2Sa2u<fz_5(mxbK
z7AvgL)LR?MJvqevLlb=91%1r0&}ysh?N3hwbu7`wBl2irgHIGu(Ed`V8*li<4&Q3t
z;txN1-e}+J8yUJ<@75|lPpAddtNM4xh+N^eH~_29CCv2o@Kyi-002ovPDHLkV1n1S
BbZh_s

diff --git a/app/src/main/res/drawable-mdpi/ic_action_users_tl.png b/app/src/main/res/drawable-mdpi/ic_action_users_tl.png
index b5440511fe558d022f19250b19873d8b92398850..f96ff97c4981b910b0a100ee1a4118c04c638f75 100644
GIT binary patch
delta 153
zcmV;K0A~NB0<{5<B!7HKL_t(|+SQIb4uVh+MUP8>eaR;##Ddze3>&usYauM;{W@6y
z4x^Z79+j2e+nmgtWCngYH4aOud?MhfQpvGMjdD<SsbnL`E8A2mMKBy+yq+$;csi$J
zV3hV;$Yjz+tT{954_ogv9GKp$`Ba`OxJ4{kb_&;s|1}SA9ui1%>1F`&00000NkvXX
Hu0mjf)H6Xh

delta 265
zcmV+k0rvj20i*(uB!BBkL_t(|+QpKwP69y~gui$VQ410+yhh54G{j2qBKk6R7FNWB
zf{LerhJ?^aX^!|9=3c;~IxrV4Ow5ui7&aG<wV>4blf8fDW@rCR7XArGT;p$<Pss6a
zOGw57!-Hjy>QX78Yl`VutKm#3hAXirsSZ|L*zb~-tf}qmGJiXG<ym5v4-Pd;rj$BU
zBG=?IQ`#HNV!~J{k&brY5zyw6ie(iV+(<bn4K;>*@xxrJ;YDTCB~m^aaK5peYL2nS
z_3Va#zJA^p=^+zc<pgfE$Hj==4ol?Vj+}R=zI9m1ayh7K*<aN^ejsaDp+=^0?8smM
P0000<MNUMnLIPldR=a+9

diff --git a/app/src/main/res/drawable-xhdpi/ic_action_users_tl.png b/app/src/main/res/drawable-xhdpi/ic_action_users_tl.png
index 55c3a3d20e8ac90e14a1c18b6a1156bac2379355..3c31252a05dc16413e5b20de11bf59ecfb5e0a61 100644
GIT binary patch
delta 273
zcmV+s0q*{?1gip&BYyz$Nkl<Zc-rlgPY%IA9EBg^2#!z$3s%^13`@?!9VB*a+YEXJ
zv0~vMt^Qj!Oq*uRv>h!W5$X4mrv2vEm$aP%1qI)s0Ro$b&@-Mkba-&FM>AiIiCYvC
zb>>^Jn7`(!B5XW}#=I{0ZFZ3@++Z>93Ep|X$bGd)6K+tM-+u|7WEUwg*tkKjvOdDo
zDwRHxMUP5iTR1c%U(K&kK@T%5u%ww|iZ06B>OkUSjIrTf=;MX2F^VQiSfzT74vvWm
zJ_q`z1ypfK^%29^c1w$cemFak_>gmEO^{PKTa)+@KUa|-P0M`Bk}R_6&leRG{2O=i
X^dS`!2;~C+015yANkvXXu0mjfDx7)m

delta 538
zcmV+#0_FXy0<r{<BYy$;Nkl<Zc-rk%ze`(T6g_cj#Z+n}tFEO84u#N8Zn2=rRMG^R
z(m@LK2LUM>f0X<I8APN`;#!0hr5OuV2jir%ty}O{XEmjw@`%RsZeCvAi}_v#-J0_)
z=iYO_`|kbjB>@^}z=kdiVG<#<+)~{1P9cWw`bj+ahN5v!5Pz|0Z*XdAX|y|~d5CQZ
z+ruU<ghecAbo(3|$O+3bT8VK6Xm~B$i&a|3MuTpt<~u9a5oS~oado0!l#{0A#U<@m
z!b4Jx$JCOvch!mXi@g?mllFwLDY6ZV;+NW$$WxA5?0wq9!eV4OixQQ#l~|^{V?JV3
z9<@t&xA3r`G=JkKt&}>E4+Tl}7B4X)e8tq#(oB*~MI}uE&zu(EJ+91MDPjw4rqa%V
zSCj$<>aC;?U%84Jeq#&|s<tf7NojnWlyf!rie|jPJAU~S=M+SzP3u4aBUIvyc+N-#
zS~197)-3O!pFfyqvp#&rQI(?M2R`7DJxLQj;;#{Kjei4Vu+GW+tGZgGCyO<zhm0zD
z@)+f911>Cy^9&2<vwXvarwl94Y7tN9snp+3&zUG+%Fdvevv{m%+AkZvRYPgRoZJnR
z%xTh$;|ToHa&2U&O_ykbbk#9Yk9@Z_^dFl<B~hLZ^(nnmZ7pw4bhncz7oND|>1q69
c{^z&>=o7FSb^}5n1ONa407*qoM6N<$f+xBGuK)l5

diff --git a/app/src/main/res/drawable-xxhdpi/ic_action_users_tl.png b/app/src/main/res/drawable-xxhdpi/ic_action_users_tl.png
index 5ed578fca92036a80038a9076059d85ac06b5438..178fb0f9ff34f53c10c8f7725a754c61b7d4f78d 100644
GIT binary patch
delta 378
zcmV-=0fqjd29yJkBYy!~Nkl<Zc-rliy-EW?6on6piDIinShW#*eSy4%=mSK%kf1h3
z3lR(7K}chzZ{Q=u{9qJgp;p?6m?kD{7iZ({GP^U$+*w1a`(0R;<=b-@c7_EQhG7^x
zQplr%4qVi+k6EoVheI@kG0Gv};2wQx9<ic0t7sV=(yF3We}7Tw*s5AaheTe9@unDY
z4hRm3iZ-YkaT)}NL`NIci#RU9A>mH4tfmdRvvx=nwLt}IheR3=N=#E62wR7IsGG4E
zCy_&5T|sQ*o|vk*OC@%g$+3(qcCd?_xMqibdI#IsGdLsIL<zTOE8Ds)o*rQ%X3yZt
z=xABQ30}2FRdb#f9AiOxYYI0;NBQTTqiZY*<_Blee|a8nMn_^D&*Y+Dp0F0azeR9-
zmhfR+<;^=Xe!?_9jgC(_QI$8BVa7GV8StIB>?_Q;AUFg1|CoSNg2QFwD`OajVVE)V
Y3*+R9U@8)mF#rGn07*qoM6N<$f{L7`umAu6

delta 779
zcmV+m1N8iq1EB_xBYy(uNkl<Zc-rk&O>0v@6g@RH;zxC%3pbkBKcFIl7PWPy1~(Nq
zf>J@zfJ#ODK(XLPQ3Q<v@hi2Z#j4n<G0=*wP<5fug{g{K8l^7%Y73@~hVtU|cAUO9
z?<JWCr4-+p)totZ&di%TcOKxvg$oyx9<#6o*U*YKgb~1$tbaNWjfP3pjyhCP)IVS+
zz93_2@36*ESAq8yT|a__T3xhEFxp0F-72;dYgb-Hk-pVo8P<#2XpwsyQFd1$tv-{g
z2|Y6In6A|Vq&Q#@n*`&<aTv_KHJzPDd_aSy_6n{N1I+z`U(f8Mn4;Xm)`&H4kW9dF
z7v*AEXY|ZovVS<HuwHy+J|vm2_<&wT`GEPjp4lLa_uKe;%(u#Z8~0mmx@zW!^~};N
z-eu!&G5<*R+qvIl(*>DN>zREN>8m2ad_?xIbHB%?i!h(iGpl29lCsi_%_1GPN~TIM
zl@^^3L&~CZqD)NEZL(V{PVyUOn#$RC<_1i8>%%J%y?;XYrri_)Nve%OI`EiC=L~jO
zbh`y>PzF|$G9q@BL8E>JDM6P*5z63_O?kyp*Hu_KF2N0Df}c3zpew>r8nG%HDY{^+
zL@hp03J=i*J&lD~bv_!6)4fVl2G;7I)&GEbSdT-vj3^$X1I<(s_h1#K+jKLqnno^=
zqJxxCihnqWb(pJbvm9sf#xckKl%S{d*7;cHr-XSXN}JjYyr!zZESHUkYC?Aw8|zdL
zsTmr|IJP<eyDYUC_2W6!^ae`h7=@*>PMM<780i{t7ca!)X*OJ}T5U8<HjF#;Z&9i!
zifK6q@WisCI5A7;i&#-g(aki=*n9!&@ZU1ihkw18o%2lnbQ(Wo^(@Y+n}dD$B+K5S
zv4Qh~JY{=zoiU%DP^XHoVj5ldQQbKx&*1$6uEtdHlTeda8C9NKbTUz2&`s>)m=k$*
z^{nfhP_qOL=(nWE$9%ekv)OpIi82dOXM9`8ecN2Pa50JS8z-N7a07lZ_y7O^07*qo
JL<FuvV1hkberf;!

diff --git a/app/src/main/res/drawable-xxxhdpi/ic_action_users_tl.png b/app/src/main/res/drawable-xxxhdpi/ic_action_users_tl.png
index d559a5a378d44c5d3e20a7ecd65ba72f3c624da3..911c4b5266d2d89c1b55d076f2b8d34b4aaeb1f8 100644
GIT binary patch
delta 473
zcmV;~0Ve*?1@Z%sBYy$8Nkl<Zc-rll!Ab&A6o&scwQ5z1f@l*F5wxpak(6aVLl01I
z;8R3UtK3xj2DJ#<M2dy$!bPc1kf}v9CfT`*VrF#aa^_ye#rgiF-~8t=D04?Z5ClOG
z1Ysx{K@wS1(1L?9GDukVnJl4*jxYCEu;w$_#79@XN)zi=e1G=c>0PhVz`U`~{_Ye5
z>s9UyeKyI^dX<=w&nBxKkT&w!RI~%0jC?jN?SO`n&&FX6aQeMaSv%m-$Y+z$4mdUP
z*(9_BHjMlTJcQQY8vAS(@g7)T$DFYrfmpzZ2G*?jk?vBVt3DU<pyc|I*ugno@I`sX
z8RFJ`K@f(9Nq_7jg$v|SrT2z5rAf!I9Q~+M^vOiXm3w4%7`}!vy8Hws?ZdK!V|t{H
z2As%0S$-g^bn>lhSMffj(pc%y6c0E<2KhZJ3anM!$<s@sp97}vVHQ`Bm-)*jW_+#J
zOy6~HYR2oRykg7uF8jms|Id0YE9<B@*!FbaFnwYgZ&KFQQK@0d)xOX4i6g7)s2sZ5
zmzh3MwZ2f<)jrPjiMI8HzCHhm@O+}vhj9C4Az4Tk8t6iTAP9mW2m|65$mpiORdDq9
P00000NkvXXu0mjfQy}v4

delta 697
zcmV;q0!IDv1JDJKBYy&yNkl<Zc-rlk-%Aux6vw|MWDoXG)IVUm^(Y!q{s$3+qF_;f
zL1d5BLj;=`6`@bk64*=iZY3l^)J7DnZDLz5sjp>95Nc|<x^)(2@7|fcGjnG4u4SCh
zWnS*NpR;FX?vGhO5ClOG1mPd#5C)OM0ygN%VE}D)v_d(Er+@fe)y9ylgT<g5KMaXW
zZ3&&0Emk=jK8Z_h-6wfGi}kYf`}~A7`skW+-EYE@#iB9`zM@0x@4~!_Jh5c4)<`As
zeori+C2zH0u^3cxhjE^iqqi(rEOKfVn3;Cs;}$Fy3yzxhiQjSJ-z``y%1gJ;C*H4?
zaqZUDd_v{fFn?u?Zo`Zd&swlp45$^+Wr+5u=uHb2i#8?CSM96^@J&TqELcp&wB+5|
zWAD)tk6N-=B<a+toIukwA^Yi?(fStAY{_EMNy{_n+&*E^Vwbe!lXx*8aXgDjg3jjZ
z#G@gPJ)Xs;l@7yk+RWDJ%F>c;siP(QZzOSs-u`3cF@J}jG%eR?yUXJd^_>p*OVf-~
zxPcK&lJyHkGUxE#v0{Et@1m3sFdML+l-exr<0P7t)kOR8J$w$azId!q+DTXrNvgLM
zD!m;?$y$kEEz|fToMK)^NLqW#1QoTDKC6lbX$>FnkYd+ym98|+g^wtN{#3~t!EIba
zD$puoh<|?Bz#hEy3@zX}F47$|8b&wLE4qXihEuD6XSjgF*b%|XVz+l_1KzlX<k5@0
zjQO??=jqOM^EKs)ZoTqay;^Vr$0DxD<Fvpl{<&DzS$A+kz0u3q9%Gwmz!f$BCSzIe
z+@V#cd$@*8^sbskajaE$clp7kYA7hBvRJUBATn-285$6`WwhIhV;Kwjn@tMZ+64)M
fAP9mWY!ZI}bA)Jtj>0_U00000NkvXXu0mjf{YhIN


From e10d4fc7887f34758aa875eb00eca085eebe85dc Mon Sep 17 00:00:00 2001
From: tom79 <tschneider.ac@gmail.com>
Date: Sat, 14 Oct 2017 18:35:40 +0200
Subject: [PATCH 16/16] Prepares release 1.5.1

---
 app/build.gradle | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 692663481..60ca554de 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -7,8 +7,8 @@ android {
         applicationId "fr.gouv.etalab.mastodon"
         minSdkVersion 15
         targetSdkVersion 26
-        versionCode 60
-        versionName "1.5.0"
+        versionCode 61
+        versionName "1.5.1"
     }
     buildTypes {
         release {