1
0
Fork 0
mirror of https://github.com/gsantner/dandelion synced 2025-12-09 13:51:18 +01:00

BIG REFACTORING - 0.1.6-next edition

This commit is contained in:
Gregor Santner 2016-10-26 16:23:14 +02:00
parent e239f519e4
commit b7ca97208a
103 changed files with 555 additions and 1015 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.2 KiB

After

Width:  |  Height:  |  Size: 929 B

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 2 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Before After
Before After

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 4.4 KiB

Before After
Before After

View file

@ -3,7 +3,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<com.github.dfa.diaspora_android.ui.ContextMenuWebView
<com.github.dfa.diaspora_android.web.ContextMenuWebView
android:id="@+id/webView"
android:layout_width="match_parent"
android:layout_height="match_parent" />

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/recycler_view__list_item__root"
android:layout_width="match_parent"
android:layout_height="wrap_content"

View file

@ -7,32 +7,31 @@
<item
android:id="@+id/action_search"
android:icon="@drawable/ic_search_white_48px"
app:showAsAction="always"
android:orderInCategory="100"
android:title="@string/action_search_by_tags_or_persons" />
android:title="@string/action_search_by_tags_or_persons"
app:showAsAction="always" />
<item
android:id="@+id/action_compose"
android:icon="@drawable/ic_mode_edit_white_48px"
app:showAsAction="always"
android:orderInCategory="200"
android:title="@string/action_compose_new_post" />
android:title="@string/action_compose_new_post"
app:showAsAction="always" />
<!-- Keep right most -->
<item
android:id="@+id/action_go_to_top"
android:icon="@drawable/ic_arrow_upward_white_48px"
app:showAsAction="always"
android:orderInCategory="400"
android:title="@string/action_go_to_top" />
android:title="@string/action_go_to_top"
app:showAsAction="always" />
<!-- overflow menu -->
<item
android:id="@+id/action_exit"
app:showAsAction="never"
android:orderInCategory="600"
android:title="@string/action_exit_app"
/>
app:showAsAction="never" />
</menu>

View file

@ -8,7 +8,7 @@
android:icon="@drawable/ic_notifications_white_48px__layer"
android:orderInCategory="100"
android:title="@string/notifications"
app:showAsAction="always"/>
app:showAsAction="always" />
<item
android:id="@+id/action_conversations"
android:icon="@drawable/ic_mail_white_48px__layer"

View file

@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:checkableBehavior="none" android:id="@+id/nav_group__pod">
<group
android:id="@+id/nav_group__pod"
android:checkableBehavior="none">
<item
android:id="@+id/nav_stream"
android:icon="@drawable/ic_stream"
@ -55,7 +57,7 @@
android:id="@+id/nav_exit"
android:icon="@drawable/ic_cancel_black_48px"
android:title="@string/action_exit_app"
android:visible="false"/>
android:visible="false" />
</group>
<item android:title="@string/nav_menu_more">

View file

@ -4,13 +4,19 @@
<item
android:icon="@drawable/ic_share_white_48px"
app:showAsAction="always"
android:orderInCategory="300"
android:title="@string/action_share_dotdotdot">
android:title="@string/action_share_dotdotdot"
app:showAsAction="always">
<menu>
<item android:id="@+id/action_share_screenshot" android:title="@string/share__share_screenshot"/>
<item android:id="@+id/action_take_screenshot" android:title="@string/share__take_screenshot"/>
<item android:id="@+id/action_share_link" android:title="@string/share__share_link_as_text"/>
<item
android:id="@+id/action_share_screenshot"
android:title="@string/share__share_screenshot" />
<item
android:id="@+id/action_take_screenshot"
android:title="@string/share__take_screenshot" />
<item
android:id="@+id/action_share_link"
android:title="@string/share__share_link_as_text" />
</menu>
</item>

View file

@ -5,8 +5,8 @@
<item
android:id="@+id/action_reload"
android:icon="@drawable/ic_refresh_white_48px"
app:showAsAction="always"
android:orderInCategory="1000"
android:title="@string/reload"/>
android:title="@string/reload"
app:showAsAction="always" />
</menu>

View file

@ -1,7 +1,7 @@
{
"pods": [
{
"active6": 12442,
"active6": 12476,
"score": 20,
"podUrls": [
{"host": "joindiaspora.com"},
@ -16,7 +16,7 @@
"id": 38077
},
{
"active6": 7170,
"active6": 7155,
"score": 20,
"podUrls": [{"host": "pod.geraspora.de"}],
"name": "Geraspora",
@ -24,7 +24,7 @@
"id": 24783
},
{
"active6": 3726,
"active6": 3723,
"score": 20,
"podUrls": [{"host": "diasp.org"}],
"name": "diasporg*",
@ -32,7 +32,7 @@
"id": 12688
},
{
"active6": 10298,
"active6": 10321,
"score": 20,
"podUrls": [{"host": "framasphere.org"}],
"name": "Framasphere",
@ -48,7 +48,7 @@
"id": 17343
},
{
"active6": 853,
"active6": 854,
"score": 20,
"podUrls": [{"host": "despora.de"}],
"name": "Despora*",
@ -95,7 +95,7 @@
"id": 38327
},
{
"active6": 47,
"active6": 48,
"score": 20,
"podUrls": [{"host": "canfly.org"}],
"name": "canfly.org",
@ -119,7 +119,7 @@
"id": 46568
},
{
"active6": 72,
"active6": 73,
"score": 20,
"podUrls": [{"host": "d.consumium.org"}],
"name": "d.consumium.org",
@ -199,7 +199,7 @@
"id": 4343
},
{
"active6": 196,
"active6": 179,
"score": 20,
"podUrls": [{"host": "diasp.nl"}],
"name": "diasp.nl",
@ -207,7 +207,7 @@
"id": 33262
},
{
"active6": 185,
"active6": 177,
"score": 20,
"podUrls": [{"host": "diaspod.de"}],
"name": "diaspod.de",
@ -375,7 +375,7 @@
"id": 9863
},
{
"active6": 257,
"active6": 256,
"score": 20,
"podUrls": [{"host": "diaspora.permutationsofchaos.com"}],
"name": "permutationsofchaos.com",
@ -479,7 +479,7 @@
"id": 39183
},
{
"active6": 36,
"active6": 37,
"score": 20,
"podUrls": [{"host": "diaspora.subsignal.org"}],
"name": "subsignal.org",
@ -495,7 +495,7 @@
"id": 46672
},
{
"active6": 35,
"active6": 37,
"score": 20,
"podUrls": [{"host": "diaspora.u4u.org"}],
"name": "u4u.org",
@ -535,7 +535,7 @@
"id": 27412
},
{
"active6": 1169,
"active6": 1168,
"score": 20,
"podUrls": [{"host": "diasporabr.com.br"}],
"name": "diasporabr.com.br",
@ -543,7 +543,7 @@
"id": 18248
},
{
"active6": 365,
"active6": 364,
"score": 20,
"podUrls": [{"host": "diasporabrazil.org"}],
"name": "diasporabrazil.org",
@ -559,8 +559,8 @@
"id": 27962
},
{
"active6": 0,
"score": 0,
"active6": 7,
"score": 20,
"podUrls": [{"host": "diasporapr.tk"}],
"name": "diasporapr.tk",
"mainLangs": [],
@ -575,7 +575,7 @@
"id": 46740
},
{
"active6": 29,
"active6": 30,
"score": 20,
"podUrls": [{"host": "diasporing.ch"}],
"name": "Diasporing.ch",
@ -639,7 +639,7 @@
"id": 41690
},
{
"active6": 168,
"active6": 169,
"score": 20,
"podUrls": [{"host": "flokk.no"}],
"name": "flokk.no",
@ -671,7 +671,7 @@
"id": 13758
},
{
"active6": 73,
"active6": 72,
"score": 20,
"podUrls": [{"host": "idoru.pl"}],
"name": "idoru.pl",
@ -727,7 +727,7 @@
"id": 32393
},
{
"active6": 140,
"active6": 139,
"score": 20,
"podUrls": [{"host": "liberdade.digital"}],
"name": "liberdade.digital",
@ -775,7 +775,7 @@
"id": 16366
},
{
"active6": 616,
"active6": 614,
"score": 20,
"podUrls": [{"host": "mondiaspora.net"}],
"name": "mondiaspora.net",
@ -959,7 +959,7 @@
"id": 36615
},
{
"active6": 57,
"active6": 56,
"score": 20,
"podUrls": [{"host": "pod.hashtagueule.fr"}],
"name": "hashtagueule.fr",
@ -1031,7 +1031,7 @@
"id": 9248
},
{
"active6": 98,
"active6": 99,
"score": 20,
"podUrls": [{"host": "pod.nomorestars.com"}],
"name": "nomorestars.com",
@ -1039,7 +1039,7 @@
"id": 31958
},
{
"active6": 404,
"active6": 405,
"score": 20,
"podUrls": [{"host": "pod.orkz.net"}],
"name": "orkz.net",
@ -1048,7 +1048,7 @@
},
{
"active6": 37,
"score": 20,
"score": -1,
"podUrls": [{"host": "pod.ponk.pink"}],
"name": "ponk.pink",
"mainLangs": [],
@ -1063,8 +1063,8 @@
"id": 21338
},
{
"active6": 86,
"score": 20,
"active6": 85,
"score": 11,
"podUrls": [{"host": "pod.psynet.su"}],
"name": "psynet.su",
"mainLangs": [],
@ -1135,7 +1135,7 @@
"id": 33181
},
{
"active6": 73,
"active6": 74,
"score": 20,
"podUrls": [{"host": "pod.tchncs.de"}],
"name": "tchncs.de",
@ -1175,7 +1175,7 @@
"id": 16270
},
{
"active6": 386,
"active6": 392,
"score": 20,
"podUrls": [{"host": "poddery.com"}],
"name": "poddery.com",
@ -1215,7 +1215,7 @@
"id": 41788
},
{
"active6": 100,
"active6": 101,
"score": 20,
"podUrls": [{"host": "ruhrspora.de"}],
"name": "ruhrspora.de",
@ -1263,7 +1263,7 @@
"id": 37517
},
{
"active6": 84,
"active6": 85,
"score": 20,
"podUrls": [{"host": "social.elaon.de"}],
"name": "elaon.de",
@ -1319,7 +1319,7 @@
"id": 29359
},
{
"active6": 39,
"active6": 37,
"score": 20,
"podUrls": [{"host": "sysad.org"}],
"name": "sysad.org",
@ -1335,7 +1335,7 @@
"id": 5276
},
{
"active6": 3982,
"active6": 3964,
"score": 20,
"podUrls": [{"host": "therealtalk.org"}],
"name": "therealtalk.org",
@ -1439,7 +1439,7 @@
"id": 33317
},
{
"active6": 11,
"active6": 14,
"score": 20,
"podUrls": [{"host": "diaspora.zone"}],
"name": "zone",
@ -1447,7 +1447,7 @@
"id": 41976
},
{
"active6": 1,
"active6": 2,
"score": 20,
"podUrls": [{"host": "pod.userzap.de"}],
"name": "userzap.de",
@ -1455,5 +1455,5 @@
"id": 12816
}
],
"timestamp": 1477430185319
"timestamp": 1477491769316
}

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- License & help (large amount of text) -->
<!-- About (large amount of text) -->
<!-- Lorem ipsum -->
</resources>

View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- Key Names (Untranslatable) -->
<!-- Themes -->
<!-- Navigiation Slider -->
<!-- PodProfile -->
<!-- More -->
<!-- Category Titles -->
<!-- Visuals -->
<!-- Navigiation Slider -->
<!-- Themes -->
<!-- Notifications dropdown -->
<!-- Font size -->
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<!-- Load images -->
<!-- Proxy -->
<!-- Chrome custom tabs -->
<!-- Diaspora Settings -->
<!-- More -->
<!-- Recently added - Please move to right section-->
<!-- Sorry -->
</resources>

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- App - AppName specific -->
<!-- Application -->
<!-- Common Words -->
<!-- Notifications dropdown menu -->
<!-- Pod Activity -->
<!-- Drawer, Menu, Toolbar, ContextMenu -->
<!-- More from MainActivity -->
<!-- Permissions -->
</resources>

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- License & help (large amount of text) -->
<!-- About (large amount of text) -->
<!-- Lorem ipsum -->
</resources>

View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- Key Names (Untranslatable) -->
<!-- Themes -->
<!-- Navigiation Slider -->
<!-- PodProfile -->
<!-- More -->
<!-- Category Titles -->
<!-- Visuals -->
<!-- Navigiation Slider -->
<!-- Themes -->
<!-- Notifications dropdown -->
<!-- Font size -->
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<!-- Load images -->
<!-- Proxy -->
<!-- Chrome custom tabs -->
<!-- Diaspora Settings -->
<!-- More -->
<!-- Recently added - Please move to right section-->
<!-- Sorry -->
</resources>

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- App - AppName specific -->
<!-- Application -->
<!-- Common Words -->
<!-- Notifications dropdown menu -->
<!-- Pod Activity -->
<!-- Drawer, Menu, Toolbar, ContextMenu -->
<!-- More from MainActivity -->
<!-- Permissions -->
</resources>

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- License & help (large amount of text) -->
<!-- About (large amount of text) -->
<!-- Lorem ipsum -->
</resources>

View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- Key Names (Untranslatable) -->
<!-- Themes -->
<!-- Navigiation Slider -->
<!-- PodProfile -->
<!-- More -->
<!-- Category Titles -->
<!-- Visuals -->
<!-- Navigiation Slider -->
<!-- Themes -->
<!-- Notifications dropdown -->
<!-- Font size -->
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<!-- Load images -->
<!-- Proxy -->
<!-- Chrome custom tabs -->
<!-- Diaspora Settings -->
<!-- More -->
<!-- Recently added - Please move to right section-->
<!-- Sorry -->
</resources>

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- App - AppName specific -->
<!-- Application -->
<!-- Common Words -->
<!-- Notifications dropdown menu -->
<!-- Pod Activity -->
<!-- Drawer, Menu, Toolbar, ContextMenu -->
<!-- More from MainActivity -->
<!-- Permissions -->
</resources>

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- License & help (large amount of text) -->
<!-- About (large amount of text) -->
<!-- Lorem ipsum -->
</resources>

View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- Key Names (Untranslatable) -->
<!-- Themes -->
<!-- Navigiation Slider -->
<!-- PodProfile -->
<!-- More -->
<!-- Category Titles -->
<!-- Visuals -->
<!-- Navigiation Slider -->
<!-- Themes -->
<!-- Notifications dropdown -->
<!-- Font size -->
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<!-- Load images -->
<!-- Proxy -->
<!-- Chrome custom tabs -->
<!-- Diaspora Settings -->
<!-- More -->
<!-- Recently added - Please move to right section-->
<!-- Sorry -->
</resources>

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- App - AppName specific -->
<!-- Application -->
<!-- Common Words -->
<!-- Notifications dropdown menu -->
<!-- Pod Activity -->
<!-- Drawer, Menu, Toolbar, ContextMenu -->
<!-- More from MainActivity -->
<!-- Permissions -->
</resources>

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- License & help (large amount of text) -->
<!-- About (large amount of text) -->
<!-- Lorem ipsum -->
</resources>

View file

@ -1,45 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- Key Names (Untranslatable) -->
<!-- Themes -->
<!-- Navigiation Slider -->
<!-- PodProfile -->
<!-- More -->
<!-- Category Titles -->
<string name="pref_cat__visuals">Vormgeving</string>
<string name="pref_cat__network">Netwerk</string>
<string name="pref_cat__pod_settings">Pod-instellingen</string>
<!-- Visuals -->
<!-- Navigiation Slider -->
<string name="pref_title__sub_nav_slider">Navigatie Slider</string>
<string name="pref_cat__visibility_nav_items">Item Zichtbaarheid</string>
<!-- Themes -->
<!-- Notifications dropdown -->
<!-- Font size -->
<string name="pref_title__font_size">Lettergrootte</string>
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<!-- Load images -->
<string name="pref_title__load_images">Afbeeldingen laden</string>
<string name="pref_desc__load_images">Afbeelding laden uitschakelen om mobiele data te besparen</string>
<!-- Proxy -->
<string name="pref_title__proxy_enabled">Proxy inschakelen</string>
<!-- Chrome custom tabs -->
<!-- Diaspora Settings -->
<string name="pref_title__personal_settings">Persoonlijke instellingen</string>
<string name="pref_desc__manage_contacts">Uw lijst met contactpersonen beheren</string>
<string name="pref_title__manage_tags">Beheren van Hashtags</string>
<string name="pref_desc__manage_tags">Toevoegen en verwijderen van de hashtags die u volgt</string>
<string name="pref_title__change_account">Account wijzigen</string>
<string name="pref_desc__change_account">Lokale sessiegegevens wissen en schakel over naar een andere Diaspora pod/account</string>
<string name="pref_warning__change_account">Dit zal alle cookies en sessiegegevens wissen. Wilt u echt uw account wijzigen?</string>
<string name="pref_title__clear_cache">Cache wissen</string>
<string name="pref_desc__clear_cache">WebView-cache leegmaken</string>
<string name="pref_desc__intellihide_toolbars">Boven- en onderkant werkbalken automatisch verbergen tijdens het scrollen</string>
<string name="pref_title__intellihide_toolbars">Werkbalken slim wegwerken</string>
<string name="pref_title__append_shared_via_app">Gedeeld-via-aankondiging toevoegen</string>
<string name="pref_desc__append_shared_via_app">Een verwijzing naar dit app (\"gedeeld door&#8230;\") toevoegen aan gedeelde teksten</string>
<!-- More -->
<!-- Recently added - Please move to right section-->
<!-- Sorry -->
</resources>

View file

@ -1,64 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- App - AppName specific -->
<string name="shared_by_diaspora_android">*[gedeeld door #DiasporaForAndroid]*</string>
<!-- Application -->
<string name="reload">Opnieuw Laden</string>
<string name="new_notifications">Ongelezen bericht. Wilt u het lezen?</string>
<!-- Common Words -->
<string name="settings">Instellingen</string>
<string name="notifications">Meldingen</string>
<string name="conversations">Gesprekken</string>
<string name="stream">Stream</string>
<string name="profile">Profiel</string>
<string name="aspects">Aspecten</string>
<string name="activities">Activiteiten</string>
<string name="liked">Leuk gevonden</string>
<string name="commented">Gereageerd</string>
<string name="mentions">Vermeldingen</string>
<string name="public_">Openbaar</string>
<string name="search">Zoeken</string>
<!-- Notifications dropdown menu -->
<!-- Pod Activity -->
<string name="title_activity_pods">Selecteer Pod</string>
<string name="filter_hint">Voer pod domein</string>
<string name="confirm_url">Bevestigen pod url</string>
<string name="podlist_source_note">Opmerking: De podlijst is gevuld met beveiligde pods vermeld op https://podupti.me. U kunt in het bewerk veld elke pod invullen die niet in de lijst staat.</string>
<string name="valid_pod">Voer een geldige domeinnaam in</string>
<string name="podlist_error">Fout: Kan niet de podlijst ophalen!</string>
<string name="no_internet">Sorry, u moet verbinding met internet hebben om verder te gaan</string>
<string name="confirmation">Bevestiging</string>
<string name="confirm_pod">Wilt u echt \nhttps://%1$s\n als uw Diaspora pod gebruiken?</string>
<string name="confirm_exit">Wilt u afsluiten?</string>
<!-- Drawer, Menu, Toolbar, ContextMenu -->
<string name="nav_followed_tags">Gevolgde Tags</string>
<string name="nav_public_activities">Publieke activiteiten</string>
<string name="share__share_link_as_text">Link delen als tekst</string>
<string name="share__share_screenshot">Screenshot van de webpagina delen</string>
<string name="share__take_screenshot">Neem screenshot van de webpagina</string>
<string name="share__toast_saved_image_to_location">Afbeelding opslaan</string>
<string name="share__toast_screenshot">Screenshot oplaan als:</string>
<string name="share__toast_link_address_copied">Link adres gekopieerd&#8230;</string>
<string name="new_post">Nieuw Bericht</string>
<string name="action_go_to_top">Terug naar boven</string>
<string name="action_search_by_tags_or_persons">Zoeken op tags of personen</string>
<string name="action_exit_app">App afsluiten</string>
<string name="action_toggle_desktop_page">Desktop weergave in-/uitschakelen</string>
<string name="action_share_dotdotdot">Delen&#8230;</string>
<string name="search_alert_tag">viaTags</string>
<string name="search_alert_people">via mensen</string>
<string name="search_alert_bypeople_validate_needsomedata">Voeg een naam toe</string>
<string name="context_menu_share_link">Deel adreslink</string>
<string name="context_menu_save_image">Afbeelding opslaan</string>
<string name="context_menu_share_image">Deel afbeelding</string>
<string name="context_menu_open_external_browser">Geopend in externe browser&#8230;</string>
<string name="context_menu_copy_link">Link-adres kopiëren naar Klembord</string>
<!-- More from MainActivity -->
<string name="toast_set_proxy_failed">Waarschuwing: Kan niet netwerk proxy instellen&#8230;</string>
<string name="unable_to_load_image">Niet in staat om afbeelding te laden</string>
<string name="all_tags">Alle tags</string>
<!-- Permissions -->
<string name="permission_denied">Toestemming geweigerd.</string>
<string name="permission_granted_try_again">Toestemming verleend. Probeer het opnieuw.</string>
</resources>

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- License & help (large amount of text) -->
<!-- About (large amount of text) -->
<!-- Lorem ipsum -->
</resources>

View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- Key Names (Untranslatable) -->
<!-- Themes -->
<!-- Navigiation Slider -->
<!-- PodProfile -->
<!-- More -->
<!-- Category Titles -->
<!-- Visuals -->
<!-- Navigiation Slider -->
<!-- Themes -->
<!-- Notifications dropdown -->
<!-- Font size -->
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<!-- Load images -->
<!-- Proxy -->
<!-- Chrome custom tabs -->
<!-- Diaspora Settings -->
<!-- More -->
<!-- Recently added - Please move to right section-->
<!-- Sorry -->
</resources>

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- App - AppName specific -->
<!-- Application -->
<!-- Common Words -->
<!-- Notifications dropdown menu -->
<!-- Pod Activity -->
<!-- Drawer, Menu, Toolbar, ContextMenu -->
<!-- More from MainActivity -->
<!-- Permissions -->
</resources>

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- License & help (large amount of text) -->
<!-- About (large amount of text) -->
<!-- Lorem ipsum -->
</resources>

View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- Key Names (Untranslatable) -->
<!-- Themes -->
<!-- Navigiation Slider -->
<!-- PodProfile -->
<!-- More -->
<!-- Category Titles -->
<!-- Visuals -->
<!-- Navigiation Slider -->
<!-- Themes -->
<!-- Notifications dropdown -->
<!-- Font size -->
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<!-- Load images -->
<!-- Proxy -->
<!-- Chrome custom tabs -->
<!-- Diaspora Settings -->
<!-- More -->
<!-- Recently added - Please move to right section-->
<!-- Sorry -->
</resources>

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- App - AppName specific -->
<!-- Application -->
<!-- Common Words -->
<!-- Notifications dropdown menu -->
<!-- Pod Activity -->
<!-- Drawer, Menu, Toolbar, ContextMenu -->
<!-- More from MainActivity -->
<!-- Permissions -->
</resources>

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- License & help (large amount of text) -->
<!-- About (large amount of text) -->
<!-- Lorem ipsum -->
</resources>

View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- Key Names (Untranslatable) -->
<!-- Themes -->
<!-- Navigiation Slider -->
<!-- PodProfile -->
<!-- More -->
<!-- Category Titles -->
<!-- Visuals -->
<!-- Navigiation Slider -->
<!-- Themes -->
<!-- Notifications dropdown -->
<!-- Font size -->
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<!-- Load images -->
<!-- Proxy -->
<!-- Chrome custom tabs -->
<!-- Diaspora Settings -->
<!-- More -->
<!-- Recently added - Please move to right section-->
<!-- Sorry -->
</resources>

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- App - AppName specific -->
<!-- Application -->
<!-- Common Words -->
<!-- Notifications dropdown menu -->
<!-- Pod Activity -->
<!-- Drawer, Menu, Toolbar, ContextMenu -->
<!-- More from MainActivity -->
<!-- Permissions -->
</resources>

View file

@ -1,7 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- License & help (large amount of text) -->
<!-- About (large amount of text) -->
<!-- Lorem ipsum -->
</resources>

View file

@ -1,23 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- Key Names (Untranslatable) -->
<!-- Themes -->
<!-- Navigiation Slider -->
<!-- PodProfile -->
<!-- More -->
<!-- Category Titles -->
<!-- Visuals -->
<!-- Navigiation Slider -->
<!-- Themes -->
<!-- Notifications dropdown -->
<!-- Font size -->
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
<!-- Load images -->
<!-- Proxy -->
<!-- Chrome custom tabs -->
<!-- Diaspora Settings -->
<!-- More -->
<!-- Recently added - Please move to right section-->
<!-- Sorry -->
</resources>

View file

@ -1,12 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--Generated by crowdin.com-->
<resources>
<!-- App - AppName specific -->
<!-- Application -->
<!-- Common Words -->
<!-- Notifications dropdown menu -->
<!-- Pod Activity -->
<!-- Drawer, Menu, Toolbar, ContextMenu -->
<!-- More from MainActivity -->
<!-- Permissions -->
</resources>

View file

@ -17,9 +17,12 @@
<color name="white">#ffffff</color>
<color name="black">#000000</color>
<color name="actvitiy_white">#eeeeee</color>
<color name="transparent_black">#c4000000</color>
<color name="alternate_row_color">@color/md_grey_200</color>
<!-- Taken from org.horaapps.leafpic -->
<!--Accent Color Collection-->
<!-- Accent Color Collection
Taken from org.horaapps.leafpic -->
<color name="accent_red">#f44336</color>
<color name="accent_pink">#e91e63</color>
<color name="accent_purple">#9c27b0</color>
@ -37,7 +40,14 @@
<color name="accent_grey">#9e9e9e</color>
<color name="accent_black">#000000</color>
<!--MATERIAL COLORS-->
<!--
███╗ ███╗ █████╗ ████████╗███████╗██████╗ ██╗ █████╗ ██╗
████╗ ████║██╔══██╗╚══██╔══╝██╔════╝██╔══██╗██║██╔══██╗██║
██╔████╔██║███████║ ██║ █████╗ ██████╔╝██║███████║██║
██║╚██╔╝██║██╔══██║ ██║ ██╔══╝ ██╔══██╗██║██╔══██║██║
██║ ╚═╝ ██║██║ ██║ ██║ ███████╗██║ ██║██║██║ ██║███████╗
╚═╝ ╚═╝╚═╝ ╚═╝ ╚═╝ ╚══════╝╚═╝ ╚═╝╚═╝╚═╝ ╚═╝╚══════╝
-->
<color name="md_black_1000">#000000</color>
<color name="md_light_primary_icon">#8A000000</color>
@ -133,7 +143,6 @@
<color name="md_cyan_A700">#00B8D4</color>
<color name="md_deep_orange_100">#FFCCBC</color>
<color name="md_deep_orange_200">#FFAB91</color>
<color name="md_deep_orange_300">#FF8A65</color>
@ -342,6 +351,4 @@
<color name="md_yellow_A200">#FFFF00</color>
<color name="md_yellow_A400">#FFEA00</color>
<color name="md_yellow_A700">#FFD600</color>
<color name="transparent_black">#c4000000</color>
</resources>

View file

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Appearance -->
<com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__appearance"
android:title="@string/pref_cat__visuals">
@ -23,34 +23,34 @@
android:summary="%s"
android:title="@string/pref_title__font_size"/>
<com.github.dfa.diaspora_android.ui.ThemedCheckBoxPreference
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="true"
android:key="@string/pref_key__intellihide_toolbars"
android:summary="@string/pref_desc__intellihide_toolbars"
android:title="@string/pref_title__intellihide_toolbars"/>
<com.github.dfa.diaspora_android.ui.ThemedCheckBoxPreference
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="false"
android:key="@string/pref_key__extended_notifications"
android:summary="@string/pref_desc__extended_notifications"
android:title="@string/pref_title__extended_notifications"/>
<com.github.dfa.diaspora_android.ui.ThemedCheckBoxPreference
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="true"
android:key="@string/pref_key__append_shared_via_app"
android:summary="@string/pref_desc__append_shared_via_app"
android:title="@string/pref_title__append_shared_via_app"/>
<com.github.dfa.diaspora_android.ui.ThemedCheckBoxPreference
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="true"
android:key="@string/pref_key__chrome_custom_tabs_enabled"
android:summary="@string/pref_desc__chrome_custom_tabs_enabled"
android:title="@string/pref_title__chrome_custom_tabs_enabled"/>
</com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
<!-- Diaspora Pod Settings -->
<com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__pod_settings"
android:title="@string/pref_cat__pod_settings">
<Preference
@ -72,13 +72,13 @@
android:key="@string/pref_key__change_account"
android:summary="@string/pref_desc__change_account"
android:title="@string/pref_title__change_account"/>
</com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
<!-- Networking -->
<com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__network"
android:title="@string/pref_cat__network">
<com.github.dfa.diaspora_android.ui.ThemedCheckBoxPreference
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="true"
android:key="@string/pref_key__load_images"
android:summary="@string/pref_desc__load_images"
@ -94,10 +94,10 @@
android:summary="@string/pref_desc__sub_proxy"
android:title="@string/pref_title__sub_proxy" />
</com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
<!-- More -->
<com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__more"
android:title="@string/pref_cat__more">
@ -106,5 +106,5 @@
android:summary="@string/pref_desc__sub_logging"
android:title="@string/pref_title__sub_logging" />
</com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
</PreferenceScreen>

View file

@ -1,16 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__debugging"
android:title="@string/pref_title__sub_logging">
<com.github.dfa.diaspora_android.ui.ThemedCheckBoxPreference
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="true"
android:key="@string/pref_key__logging_enabled"
android:title="@string/pref_title__logging_enabled"/>
<com.github.dfa.diaspora_android.ui.ThemedCheckBoxPreference
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="false"
android:key="@string/pref_key__logging_spam_enabled"
android:title="@string/pref_title__logging_spam_enabled"/>
</com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
</PreferenceScreen>

View file

@ -1,54 +1,54 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory
<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.ThemedVisibilityPreference
<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.ThemedVisibilityPreference
<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.ThemedVisibilityPreference
<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.ThemedVisibilityPreference
<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.ThemedVisibilityPreference
<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.ThemedVisibilityPreference
<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.ThemedVisibilityPreference
<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.ThemedVisibilityPreference
<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.ThemedVisibilityPreference
<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.ThemedVisibilityPreference
<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.ThemedVisibilityPreference
<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.ThemedPreferenceCategory>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
</PreferenceScreen>

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__proxy"
android:title="@string/HTTP">
<com.github.dfa.diaspora_android.ui.ThemedCheckBoxPreference
<com.github.dfa.diaspora_android.ui.theme.ThemedCheckBoxPreference
android:defaultValue="false"
android:key="@string/pref_key__http_proxy_enabled"
android:summary="@string/pref_desc__http_proxy_enabled"
@ -27,5 +27,5 @@
android:summary="@string/pref_desc__http_proxy_load_tor_preset"
android:title="@string/pref_title__http_proxy_load_tor_preset"/>
</com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
</PreferenceScreen>

View file

@ -1,18 +1,18 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory
<com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
android:key="@string/pref_key__title__themes"
android:title="@string/pref_title__themes">
<com.github.dfa.diaspora_android.ui.ThemedColorPickerPreference
<com.github.dfa.diaspora_android.ui.theme.ThemedColorPickerPreference
android:key="@string/pref_key__primary_color__preference_click"
android:summary="@string/pref_desc__primary_color"
android:title="@string/pref_title__primary_color"
android:icon="@drawable/circle" />
<com.github.dfa.diaspora_android.ui.ThemedColorPickerPreference
<com.github.dfa.diaspora_android.ui.theme.ThemedColorPickerPreference
android:key="@string/pref_key__accent_color__preference_click"
android:summary="@string/pref_desc__accent_color"
android:title="@string/pref_title__accent_color"
android:icon="@drawable/circle" />
</com.github.dfa.diaspora_android.ui.ThemedPreferenceCategory>
</com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
</PreferenceScreen>