vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-18 02:01:10 +01:00
Code Issues Releases Wiki Activity

Download podlist at build time

Browse source 
Download podlist at build time

Added drawable ic_media_video_poster.xml in order to prevent upstream nullpointer exception in the webview

Merge branch 'master' of github.com:Diaspora-for-Android/diaspora-android

Added navslider entry for reports

Release v0.2.0

start of 0.2.0-next

Merge master
This commit is contained in:
vanitasvitae 2016-11-04 22:39:44 +01:00
parent 95dbb2cd34
commit eeecd98208
22 changed files with 230 additions and 1410 deletions
Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/res/drawable/ic_report_black_48px.xml Normal file
View file

@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#000000"
android:pathData="M15.73 3H8.27L3 8.27v7.46L8.27 21h7.46L21 15.73V8.27L15.73 3zM12 17.3c-.72
0-1.3-.58-1.3-1.3 0-.72 .58 -1.3 1.3-1.3 .72 0 1.3 .58 1.3 1.3 0 .72-.58 1.3-1.3
1.3zm1-4.3h-2V7h2v6z" />
<path
android:pathData="M0 0h24v24H0z" />
</vector>

5
app/src/main/res/menu/main__navdrawer.xml
View file

@ -53,6 +53,11 @@
android:icon="@drawable/ic_public_black_48px"
android:title="@string/nav_public_activities" />
<item
android:id="@+id/nav_reports"
android:icon="@drawable/ic_report_black_48px"
android:title="@string/nav_reports" />
<item
android:id="@+id/nav_exit"
android:icon="@drawable/ic_cancel_black_48px"

1286
app/src/main/res/raw/podlist.json
View file

File diff suppressed because it is too large Load diff

34
app/src/main/res/values-es/strings-about.xml
View file

@ -2,6 +2,40 @@
<!--Generated by crowdin.com-->
<resources>
<!-- License & help (large amount of text) -->
<string name="about_activity__title_about_app">Acerca de</string>
<string name="about_activity__title_about_license">Licencia</string>
<string name="about_activity__title_debug_info">Depurando</string>
<string name="fragment_debug__section_app">Aplicación</string>
<string name="fragment_debug__section_device">Dispositivo</string>
<string name="fragment_debug__section_pod">Pod de Diaspora</string>
<string name="fragment_debug__section_log">Depurar registro</string>
<string name="fragment_debug__section_log_spam">Depurar registro (Detallado)</string>
<string name="fragment_debug__app_version">Versión aplicación:%1$s</string>
<string name="fragment_debug__package_name">Nombre del paquete: %1$s</string>
<string name="fragment_debug__android_version">Versión de Android: %1$s</string>
<string name="fragment_debug__device_name">Nombre del dispositivo: %1$s</string>
<string name="fragment_debug__app_codename">Nombre clave: %1$s</string>
<string name="fragment_debug__pod_profile_name">Nombre de perfil del pod: %1$s</string>
<string name="fragment_debug__pod_profile_url">Dominio del pod:%1$s</string>
<string name="fragment_debug__toast_log_copied">Registro de depuración copiado al portapapeles</string>
<string name="fragment_license__3rd_party_libs_title">Usadas bibliotecas de terceros</string>
<!-- About (large amount of text) -->
<string name="fragment_about__about_content">
DiasporaForAndroid es su aplicación complementaria para explorar la red social Diaspora. Añade características como útiles barras de herramientas y soporte para servidores proxy como la red Tor a su experiencia social. &lt;br&gt;&lt;br&gt;
Diaspora utiliza Markdown para dar formato a las publicaciones. Puede encontrar más informaciónat&lt;br&gt;
El desarrollo de DiasporaForAndroid es libre en sentido de libertad y sigue las ideas del proyecto Diaspora.&lt;br&gt;
Puede encontrar el código fuente en Github: &lt;br&gt;
https://github.com/Diaspora-for-Android/diaspora-android &lt;br&gt; &lt;br&gt;
Si encuentra algún problema o tiene alguna sugerencia, puede utilizar nuestro gestor de errores en el enlace de arriba.
También puede publicar su pregunta utilizando la etiqueta #DFAQ en Diaspora. &lt;br&gt; &lt;br&gt;
¿Esta aplicación no está disponible en su idioma? Compruebe nuestro proyecto en Crowdin.com y ¡ayúdenos a traducirlo!&lt;br&gt;
https://crowdin.com/project/diaspora-for-android &lt;br&gt; &lt;br&gt;
¡No dude en hablarle a sus amigos de #DiasporaforAndroid!</string>
<!-- Lorem ipsum -->
</resources>

3
app/src/main/res/values-it/strings-about.xml
View file

@ -14,6 +14,9 @@
<string name="fragment_debug__package_name">Nome pacchetto: %1$s</string>
<string name="fragment_debug__android_version">Versione Android: %1$s</string>
<string name="fragment_debug__device_name">Nome dispositivo: %1$s</string>
<string name="fragment_debug__app_codename">Codename: %1$s</string>
<string name="fragment_debug__pod_profile_name">Pod alias: %1$s</string>
<string name="fragment_debug__pod_profile_url">Dominio pod: %1$s</string>
<string name="fragment_debug__toast_log_copied">Log di debug copiato negli appunti</string>
<string name="fragment_license__3rd_party_libs_title">Librerie di terze parti usate</string>
<!-- About (large amount of text) -->

5
app/src/main/res/values-it/strings-preferences.xml
View file

@ -28,6 +28,9 @@
<!-- Font size -->
<string name="pref_title__font_size">Dimensione font</string>
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<string name="font_size_normal">Normale</string>
<string name="font_size_large">Grosso</string>
<string name="font_size_huge">Immenso</string>
<!-- Load images -->
<string name="pref_title__load_images">Carica immagini</string>
<string name="pref_desc__load_images">Disabilita il caricamento delle immagini per risparmiare la rete dati</string>
@ -39,6 +42,8 @@
<string name="pref_desc__http_proxy_enabled">Usa il proxy con i dati di Diaspora per eludere i firewall.\nPotrebbe essere necessario il riavvio</string>
<string name="pref_title__http_proxy_host">Host</string>
<string name="pref_title__http_proxy_port">Porta</string>
<string name="toast__proxy_disabled__restart_required">App è necessario riavviare per disattivare l\'utilizzo del proxy</string>
<string name="toast__proxy_orbot_preset_loaded">Orbot proxy preset caricato</string>
<!-- Chrome custom tabs -->
<string name="pref_desc__chrome_custom_tabs_enabled">Apri collegamenti esterni con le schede personalizzate di Chrome. Chromium o Google Chrome devono essere installati per questa funzione. \nNOTA IMPORTANTE: le schede personalizzate di Chrome non usano i server proxy configurabili!</string>
<!-- Diaspora Settings -->

2
app/src/main/res/values-pl/strings-about.xml
View file

@ -15,7 +15,7 @@
<string name="fragment_debug__android_version">Wersja systemu Android: %1$s</string>
<string name="fragment_debug__device_name">Nazwa urządzenia: %1$s</string>
<string name="fragment_debug__app_codename">Nazwa kodowa: %1$s</string>
<string name="fragment_debug__pod_profile_name">Nazwa profilu na Podzie: %1$s</string>
<string name="fragment_debug__pod_profile_name">Alias Poda: %1$s</string>
<string name="fragment_debug__pod_profile_url">Domena Poda: %1$s</string>
<string name="fragment_debug__toast_log_copied">Log debugowania został skopiowany do schowka</string>
<string name="fragment_license__3rd_party_libs_title">Lista bibliotek zewnętrznych</string>

3
app/src/main/res/values/strings-preferences.xml
View file

@ -34,6 +34,7 @@
<!-- Navigiation Slider -->
<string name="pref_catkey__visibility_nav" translatable="false">pref_catkey__visibility_navslider</string>
<string name="pref_cat__visibility_nav_items__general">General</string>
<string name="pref_key__visibility_nav__exit" translatable="false">pref_key__visibility_navslider__exit</string>
<string name="pref_key__visibility_nav__help_license" translatable="false">pref_key__visibility_nav__help_license</string>
<string name="pref_key__visibility_nav__public_activities" translatable="false">pref_key__visibility_nav__public_activities</string>
@ -45,6 +46,8 @@
<string name="pref_key__visibility_nav__followed_tags" translatable="false">pref_key__visibility_nav__followed_tags</string>
<string name="pref_key__visibility_nav__profile" translatable="false">pref_key__visibility_nav__profile</string>
<string name="pref_key__visibility_nav__contacts" translatable="false">pref_key__visibility_nav__contacts</string>
<string name="pref_cat__visibility_nav_items__admin">Admin</string>
<string name="pref_key__visibility_nav__reports" translatable="false">pref_key__visibility_nav__report</string>
<!-- PodProfile -->
<string name="pref_key__podprofile_avatar_url" translatable="false">podUserProfile_avatar</string>

1
app/src/main/res/values/strings.xml
View file

@ -70,6 +70,7 @@
<string name="nav_followed_tags">Followed Tags</string>
<string name="nav_public_activities">Public activities</string>
<string name="nav_contacts" translatable="false">@string/contacts</string>
<string name="nav_reports">Report</string>
<string name="share__share_link_as_text">Share link as text</string>
<string name="share__share_screenshot">Share screenshot of webpage</string>

2
app/src/main/res/xml/preferences__sub_debugging.xml
View file

@ -5,7 +5,7 @@
android:title="@string/pref_title__sub_logging">
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="true"
android:defaultValue="false"
android:key="@string/pref_key__logging_enabled"
android:title="@string/pref_title__logging_enabled"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference

106
app/src/main/res/xml/preferences__sub_navslider_vis.xml
View file

@ -1,54 +1,64 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__visibility_nav"
android:title="@string/pref_cat__visibility_nav_items">
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__visibility_nav"
android:title="@string/pref_cat__visibility_nav_items__general">
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__profile"
android:title="@string/nav_profile"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__followed_tags"
android:title="@string/nav_followed_tags"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__aspects"
android:title="@string/nav_aspects"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__contacts"
android:title="@string/nav_contacts" />
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__activities"
android:title="@string/nav_activities"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__liked"
android:title="@string/nav_liked"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__commented"
android:title="@string/nav_commented"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__mentions"
android:title="@string/nav_mentions"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__public_activities"
android:title="@string/nav_public_activities"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__exit"
android:title="@string/action_exit_app"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__help_license"
android:title="@string/nav_help_license"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__profile"
android:title="@string/nav_profile"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__followed_tags"
android:title="@string/nav_followed_tags"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__aspects"
android:title="@string/nav_aspects"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__contacts"
android:title="@string/nav_contacts" />
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__activities"
android:title="@string/nav_activities"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__liked"
android:title="@string/nav_liked"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__commented"
android:title="@string/nav_commented"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__mentions"
android:title="@string/nav_mentions"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__public_activities"
android:title="@string/nav_public_activities"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__exit"
android:title="@string/action_exit_app"/>
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="true"
android:key="@string/pref_key__visibility_nav__help_license"
android:title="@string/nav_help_license"/>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:title="@string/pref_cat__visibility_nav_items__admin">
<com.github.dfa.diaspora_android.ui.theme.ThemedVisibilityPreference
android:defaultValue="false"
android:key="@string/pref_key__visibility_nav__reports"
android:title="@string/nav_reports" />
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
</PreferenceScreen>