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

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>