vanitasvitae/dandelion
1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2024-11-25 13:52:08 +01:00
Code Issues Releases Wiki Activity

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

Browse source
This commit is contained in:
vanitasvitae 2016-08-07 01:09:26 +02:00
commit 6534a89721
7 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -33,7 +33,7 @@ Why a WebApp is better than using the mobile site on a browser?
Basically it provides better integration with the system (events coming into and going out of the app), notifications, customized interface and functions and a nice little icon that takes you directly to your favorite social network :) Basically it provides better integration with the system (events coming into and going out of the app), notifications, customized interface and functions and a nice little icon that takes you directly to your favorite social network :)
### Device Requirements ### Device Requirements
The minimum version supported is Ice Cream Sandwich, Android v4.0.3 / API 15 The minimum version supported is Jelly Bean, Android v4.2.0 / API 17
### App Permissions ### App Permissions
It requires access to the Internet and to external storage to be able to upload photos when creating a new post and for taking screenshots. It requires access to the Internet and to external storage to be able to upload photos when creating a new post and for taking screenshots.

7
app/src/main/AndroidManifest.xml
View file

@ -105,6 +105,7 @@
<data android:host="diaspora.mazi.tk" android:scheme="https" /> <data android:host="diaspora.mazi.tk" android:scheme="https" />
<data android:host="diaspora.moosje.nl" android:scheme="https" /> <data android:host="diaspora.moosje.nl" android:scheme="https" />
<data android:host="diaspora.net.gr" android:scheme="https" /> <data android:host="diaspora.net.gr" android:scheme="https" />
<data android:host="diasporanet.tk" android:scheme="https" />
<data android:host="diaspora.permutationsofchaos.com" android:scheme="https" /> <data android:host="diaspora.permutationsofchaos.com" android:scheme="https" />
<data android:host="diaspora.pimpmypony.eu" android:scheme="https" /> <data android:host="diaspora.pimpmypony.eu" android:scheme="https" />
<data android:host="diaspora.pingupod.de" android:scheme="https" /> <data android:host="diaspora.pingupod.de" android:scheme="https" />
@ -125,11 +126,14 @@
<data android:host="diaspora.unixcorn.org" android:scheme="https" /> <data android:host="diaspora.unixcorn.org" android:scheme="https" />
<data android:host="diasporausa.com" android:scheme="https" /> <data android:host="diasporausa.com" android:scheme="https" />
<data android:host="diasp.org" android:scheme="https" /> <data android:host="diasp.org" android:scheme="https" />
<data android:host="distributed.chat" android:scheme="https" />
<data android:host="espora.com.es" android:scheme="https" />
<data android:host="espora.social" android:scheme="https" /> <data android:host="espora.social" android:scheme="https" />
<data android:host="failure.net" android:scheme="https" /> <data android:host="failure.net" android:scheme="https" />
<data android:host="flokk.no" android:scheme="https" /> <data android:host="flokk.no" android:scheme="https" />
<data android:host="framasphere.org" android:scheme="https" /> <data android:host="framasphere.org" android:scheme="https" />
<data android:host="freehuman.fr" android:scheme="https" /> <data android:host="freehuman.fr" android:scheme="https" />
<data android:host="friendica.tk" android:scheme="https" />
<data android:host="home.enslaver.net" android:scheme="https" /> <data android:host="home.enslaver.net" android:scheme="https" />
<data android:host="idoru.pl" android:scheme="https" /> <data android:host="idoru.pl" android:scheme="https" />
<data android:host="iliketoast.net" android:scheme="https" /> <data android:host="iliketoast.net" android:scheme="https" />
@ -145,6 +149,7 @@
<data android:host="LibertyPod.org" android:scheme="https" /> <data android:host="LibertyPod.org" android:scheme="https" />
<data android:host="librenet.co.za" android:scheme="https" /> <data android:host="librenet.co.za" android:scheme="https" />
<data android:host="librenet.gr" android:scheme="https" /> <data android:host="librenet.gr" android:scheme="https" />
<data android:host="londor.be" android:scheme="https" />
<data android:host="misamigos.online" android:scheme="https" /> <data android:host="misamigos.online" android:scheme="https" />
<data android:host="mondiaspora.net" android:scheme="https" /> <data android:host="mondiaspora.net" android:scheme="https" />
<data android:host="nerdpol.ch" android:scheme="https" /> <data android:host="nerdpol.ch" android:scheme="https" />
@ -190,6 +195,7 @@
<data android:host="pod.undreaming.org" android:scheme="https" /> <data android:host="pod.undreaming.org" android:scheme="https" />
<data android:host="pubpod.alqualonde.org" android:scheme="https" /> <data android:host="pubpod.alqualonde.org" android:scheme="https" />
<data android:host="realms.the-wizard.co.za" android:scheme="https" /> <data android:host="realms.the-wizard.co.za" android:scheme="https" />
<data android:host="revreso.de" android:scheme="https" />
<data android:host="ruhrspora.de" android:scheme="https" /> <data android:host="ruhrspora.de" android:scheme="https" />
<data android:host="russiandiaspora.org" android:scheme="https" /> <data android:host="russiandiaspora.org" android:scheme="https" />
<data android:host="sechat.org" android:scheme="https" /> <data android:host="sechat.org" android:scheme="https" />
@ -200,6 +206,7 @@
<data android:host="social.elaon.de" android:scheme="https" /> <data android:host="social.elaon.de" android:scheme="https" />
<data android:host="socializer.cc" android:scheme="https" /> <data android:host="socializer.cc" android:scheme="https" />
<data android:host="social.mbuto.me" android:scheme="https" /> <data android:host="social.mbuto.me" android:scheme="https" />
<data android:host="social.sum7.de" android:scheme="https" />
<data android:host="spora.zone" android:scheme="https" /> <data android:host="spora.zone" android:scheme="https" />
<data android:host="subvillage.de" android:scheme="https" /> <data android:host="subvillage.de" android:scheme="https" />
<data android:host="sysad.org" android:scheme="https" /> <data android:host="sysad.org" android:scheme="https" />

2
app/src/main/res/menu/main__menu_bottom.xml
View file

@ -15,7 +15,7 @@
android:id="@+id/action_compose" android:id="@+id/action_compose"
android:icon="@drawable/fab_compose" android:icon="@drawable/fab_compose"
app:showAsAction="always" app:showAsAction="always"
android:title="@string/action_compose" /> android:title="@string/action_compose_new_post" />
<item <item
android:icon="@drawable/ic_share_white_24dp" android:icon="@drawable/ic_share_white_24dp"

2
app/src/main/res/menu/main__menu_top.xml
View file

@ -12,7 +12,7 @@
<item <item
android:id="@+id/action_conversations" android:id="@+id/action_conversations"
android:icon="@drawable/ic_message_text_outline_white_24dp" android:icon="@drawable/ic_message_text_outline_white_24dp"
android:title="@string/messages" android:title="@string/conversations"
app:showAsAction="always" /> app:showAsAction="always" />
</menu> </menu>

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

@ -40,12 +40,11 @@
<string name="share__toast_link_address_copied">Linkadresse kopiert &#8230;</string> <string name="share__toast_link_address_copied">Linkadresse kopiert &#8230;</string>
<string name="action_go_to_top">Nach oben scrollen</string> <string name="action_go_to_top">Nach oben scrollen</string>
<string name="action_search_by_tags_or_persons">Suche nach Tags oder Personen …</string> <string name="action_search_by_tags_or_persons">Suche nach Tags oder Personen …</string>
<string name="action_compose">Neuer Beitrag</string> <string name="action_compose_new_post">Neuer Beitrag</string>
<string name="action_exit_app">App beenden</string> <string name="action_exit_app">App beenden</string>
<string name="action_toggle_desktop_page">Mobil-/Desktopansicht umschalten</string> <string name="action_toggle_desktop_page">Mobil-/Desktopansicht umschalten</string>
<string name="action_share_dotdotdot">Teilen&#8230;</string> <string name="action_share_dotdotdot">Teilen&#8230;</string>
<string name="new_post">Neuer Beitrag</string> <string name="new_post">Neuer Beitrag</string>
<string name="messages">Unterhaltungen</string>
<string name="search_alert_tag">nach Tags</string> <string name="search_alert_tag">nach Tags</string>
<string name="search_alert_people">nach Personen</string> <string name="search_alert_people">nach Personen</string>
<string name="search_alert_bypeople_validate_needsomedata">Füge einen Namen ein.</string> <string name="search_alert_bypeople_validate_needsomedata">Füge einen Namen ein.</string>

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

@ -36,11 +36,10 @@
<string name="share__toast_link_address_copied">Lien copié&#8230;</string> <string name="share__toast_link_address_copied">Lien copié&#8230;</string>
<string name="action_go_to_top">Retour en haut</string> <string name="action_go_to_top">Retour en haut</string>
<string name="action_search_by_tags_or_persons">Recherche par tags ou par personnes</string> <string name="action_search_by_tags_or_persons">Recherche par tags ou par personnes</string>
<string name="action_compose">Nouveau message</string> <string name="action_compose_new_post">Nouveau message</string>
<string name="action_exit_app">Quitter l\'application</string> <string name="action_exit_app">Quitter l\'application</string>
<string name="action_share_dotdotdot">Partager&#8230;</string> <string name="action_share_dotdotdot">Partager&#8230;</string>
<string name="new_post">Nouveau message</string> <string name="new_post">Nouveau message</string>
<string name="messages">Discussions</string>
<string name="search_alert_tag">par tags</string> <string name="search_alert_tag">par tags</string>
<string name="search_alert_people">par personne</string> <string name="search_alert_people">par personne</string>
<string name="search_alert_bypeople_validate_needsomedata">Veuillez ajouter un nom</string> <string name="search_alert_bypeople_validate_needsomedata">Veuillez ajouter un nom</string>

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

@ -65,14 +65,13 @@
<string name="share__toast_link_address_copied">Link address copied …</string> <string name="share__toast_link_address_copied">Link address copied …</string>
<string name="new_post">New post</string>
<string name="action_go_to_top">Go to top</string> <string name="action_go_to_top">Go to top</string>
<string name="action_search_by_tags_or_persons">Search by tags or persons</string> <string name="action_search_by_tags_or_persons">Search by tags or persons</string>
<string name="action_compose">New message</string> <string name="action_compose_new_post" translatable="false">@string/new_post</string>
<string name="action_exit_app">Exit app</string> <string name="action_exit_app">Exit app</string>
<string name="action_toggle_desktop_page">Toggle mobile/desktop view</string> <string name="action_toggle_desktop_page">Toggle mobile/desktop view</string>
<string name="action_share_dotdotdot">Share…</string> <string name="action_share_dotdotdot">Share…</string>
<string name="new_post">New message</string>
<string name="messages">Conversations</string>
<string name="search_alert_title" translatable="false">@string/search</string> <string name="search_alert_title" translatable="false">@string/search</string>