Skip to content

Commit e807003

Browse files
author
Gregor Santner
committed
Release 0.2.0 (Updated translation files)
1 parent bc925e1 commit e807003

16 files changed

+102
-16
lines changed

‎app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ android {
3030
// Additional repositories
3131
repositories {
3232
maven {
33-
url "http://dl.bintray.com/dasar/maven" //Color picker
33+
url "https://jitpack.io"
3434
}
3535
}
3636

@@ -52,7 +52,7 @@ dependencies {
5252
compile 'com.jakewharton:butterknife:8.0.1'
5353
compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'
5454
compile 'info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1'
55-
compile(group: 'uz.shift', name: 'colorpicker', version: '0.5', ext: 'aar')
55+
compile 'com.github.DASAR:ShiftColorPicker:v0.5'
5656
apt 'com.jakewharton:butterknife-compiler:8.0.1'
5757
}
5858

‎app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="com.github.dfa.diaspora_android">
3+
xmlns:tools="http://schemas.android.com/tools"
4+
package="com.github.dfa.diaspora_android"
5+
tools:ignore="GoogleAppIndexingWarning">
46

57
<uses-permission android:name="android.permission.INTERNET" />
68
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -15,7 +17,8 @@
1517

1618
<provider
1719
android:name="com.github.dfa.diaspora_android.service.HashtagContentProvider"
18-
android:authorities="com.github.dfa.diaspora_android.mainactivity" />
20+
android:authorities="com.github.dfa.diaspora_android.mainactivity"
21+
android:exported="false"/>
1922

2023
<service
2124
android:name="com.github.dfa.diaspora_android.service.FetchPodsService"

‎app/src/main/java/com/github/dfa/diaspora_android/activity/SettingsActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.github.dfa.diaspora_android.activity;
22

3+
import android.annotation.SuppressLint;
34
import android.app.AlarmManager;
45
import android.app.AlertDialog;
56
import android.app.FragmentTransaction;
@@ -284,6 +285,7 @@ public String getFragmentTag() {
284285
*
285286
* @param type 1 -> Primary Color, 2 -> Accent Color
286287
*/
288+
@SuppressLint("InflateParams")
287289
public void showColorPickerDialog(final int type) {
288290
final AppSettings appSettings = ((App) getActivity().getApplication()).getSettings();
289291
final Context context = getActivity();

‎app/src/main/java/com/github/dfa/diaspora_android/ui/PodSelectionDialog.java

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.github.dfa.diaspora_android.ui;
22

33

4+
import android.annotation.SuppressLint;
45
import android.app.Dialog;
56
import android.os.Bundle;
67
import android.support.annotation.NonNull;
@@ -9,6 +10,7 @@
910
import android.view.LayoutInflater;
1011
import android.view.View;
1112
import android.widget.ArrayAdapter;
13+
import android.widget.Button;
1214
import android.widget.CheckBox;
1315
import android.widget.EditText;
1416
import android.widget.RadioGroup;
@@ -93,13 +95,20 @@ public static PodSelectionDialog newInstance(DiasporaPod pod, PodSelectionDialog
9395
@BindView(R.id.podselection__dialog__text_protocol)
9496
TextView textProtocol;
9597

98+
@BindView(R.id.podselection__dialog__btn_ok)
99+
Button btnOk;
100+
101+
@BindView(R.id.podselection__dialog__btn_cancel)
102+
Button btnCancel;
103+
96104
private PodSelectionDialogResultListener resultListener;
97105
private View root;
98106
private DiasporaPod pod = new DiasporaPod();
99107
private App app;
100108

101109
@NonNull
102110
@Override
111+
@SuppressLint("InflateParams")
103112
public Dialog onCreateDialog(Bundle savedInstanceState) {
104113
AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
105114
LayoutInflater inflater = getActivity().getLayoutInflater();
@@ -135,6 +144,8 @@ protected void applyColorsToViews() {
135144
textProfile.setTextColor(ThemeHelper.getAccentColor());
136145
textProtocol.setTextColor(ThemeHelper.getAccentColor());
137146
textTorPreset.setTextColor(ThemeHelper.getAccentColor());
147+
btnOk.setTextColor(ThemeHelper.getAccentColor());
148+
btnCancel.setTextColor(ThemeHelper.getAccentColor());
138149

139150
ThemeHelper.updateEditTextColor(editPodAddress);
140151
ThemeHelper.updateEditTextColor(editPodName);

‎app/src/main/res/layout/main__nav_header.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools"
34
android:id="@+id/nav_drawer"
45
android:layout_width="wrap_content"
56
android:layout_height="110dp"
6-
android:background="@color/colorPrimary"
77
android:gravity="bottom"
88
android:orientation="vertical"
99
android:theme="@style/ThemeOverlay.AppCompat.Dark">
@@ -36,7 +36,8 @@
3636
android:layout_marginEnd="@dimen/activity_horizontal_margin_half"
3737
android:layout_marginStart="@dimen/activity_horizontal_margin"
3838
android:scaleType="fitCenter"
39-
android:src="@drawable/ic_launcher" />
39+
android:src="@drawable/ic_launcher"
40+
tools:ignore="ContentDescription" />
4041

4142
<LinearLayout
4243
android:layout_width="wrap_content"

‎app/src/main/res/layout/podselection__dialog.xml

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<LinearLayout
1212
android:layout_width="match_parent"
1313
android:layout_height="wrap_content"
14+
style="?android:attr/buttonBarStyle"
1415
android:orientation="vertical">
1516

1617
<TextView
@@ -88,14 +89,14 @@
8889
android:layout_width="wrap_content"
8990
android:layout_height="wrap_content"
9091
android:layout_weight="1"
91-
android:text="http" />
92+
android:text="@string/http" />
9293

9394
<RadioButton
9495
android:id="@+id/podselection__dialog__radio_https"
9596
android:layout_width="wrap_content"
9697
android:layout_height="wrap_content"
9798
android:layout_weight="1"
98-
android:text="https" />
99+
android:text="@string/https" />
99100
</RadioGroup>
100101

101102
<TextView
@@ -127,13 +128,15 @@
127128
android:layout_width="match_parent"
128129
android:layout_height="wrap_content"
129130
android:layout_weight="1"
131+
style="?android:attr/buttonBarButtonStyle"
130132
android:text="@android:string/cancel" />
131133

132134
<Button
133135
android:id="@+id/podselection__dialog__btn_ok"
134136
android:layout_width="match_parent"
135137
android:layout_height="wrap_content"
136138
android:layout_weight="1"
139+
style="?android:attr/buttonBarButtonStyle"
137140
android:text="@android:string/ok" />
138141
</LinearLayout>
139142

‎app/src/main/res/menu/main__menu_bottom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<menu xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:app="http://schemas.android.com/apk/res-auto"
33
xmlns:tools="http://schemas.android.com/tools"
4-
tools:context=".activity.MainActivity">
4+
tools:context=".activity.MainActivity"
5+
tools:ignore="AlwaysShowAction">
56

67

78
<item

‎app/src/main/res/menu/main__menu_top.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<menu xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:app="http://schemas.android.com/apk/res-auto"
33
xmlns:tools="http://schemas.android.com/tools"
4-
tools:context=".activity.MainActivity">
4+
tools:context=".activity.MainActivity"
5+
tools:ignore="AlwaysShowAction">
56

67
<item
78
android:id="@+id/action_notifications"

‎app/src/main/res/menu/main__menu_top__notifications_dropdown.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
<menu xmlns:android="http://schemas.android.com/apk/res/android"
22
xmlns:app="http://schemas.android.com/apk/res-auto"
33
xmlns:tools="http://schemas.android.com/tools"
4-
tools:context=".activity.MainActivity">
4+
tools:context=".activity.MainActivity"
5+
tools:ignore="AlwaysShowAction">
56

67
<item
78
android:id="@+id/action_notifications"

‎app/src/main/res/menu/stream__menu_bottom.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
3-
xmlns:app="http://schemas.android.com/apk/res-auto">
3+
xmlns:app="http://schemas.android.com/apk/res-auto"
4+
xmlns:tools="http://schemas.android.com/tools"
5+
tools:ignore="AlwaysShowAction">
46

57
<item
68
android:icon="@drawable/ic_share_white_48px"

‎app/src/main/res/menu/stream__menu_top.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<menu xmlns:android="http://schemas.android.com/apk/res/android"
33
xmlns:app="http://schemas.android.com/apk/res-auto">
4-
54
<item
65
android:id="@+id/action_reload"
76
android:icon="@drawable/ic_refresh_white_48px"
87
android:orderInCategory="1000"
98
android:title="@string/reload"
109
app:showAsAction="always" />
11-
1210
</menu>

‎app/src/main/res/values-nl/strings-about.xml

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,25 @@
22
<!--Generated by crowdin.com-->
33
<resources>
44
<!-- License & help (large amount of text) -->
5+
<string name="about_activity__title_about_app">Info</string>
6+
<string name="about_activity__title_about_license">Licentie</string>
7+
<string name="about_activity__title_debug_info">Foutopsporing</string>
8+
<string name="fragment_debug__section_app">Applicatie</string>
9+
<string name="fragment_debug__section_device">Toestel</string>
10+
<string name="fragment_debug__section_pod">diaspora* Pod</string>
11+
<string name="fragment_debug__section_log">Debug Logboek</string>
12+
<string name="fragment_debug__section_log_spam">Debug Log (Verbose)</string>
13+
<string name="fragment_debug__app_version">Versie: %1$s</string>
14+
<string name="fragment_debug__package_name">Pakket-naam: %1$s</string>
15+
<string name="fragment_debug__android_version">Android-versie: %1$s</string>
16+
<string name="fragment_debug__device_name">Toestelnaam: %1$s</string>
17+
<string name="fragment_debug__app_codename">Versienaam: %1$s</string>
18+
<string name="fragment_debug__pod_profile_name">Pod Profielnaam: %1$s</string>
19+
<string name="fragment_debug__pod_profile_url">Pod-domein: %1$s</string>
20+
<string name="fragment_debug__toast_log_copied">Tekst naar klembord gekopieerd</string>
21+
<string name="fragment_license__3rd_party_libs_title">Gebruikte bibliotheken van derden</string>
522
<!-- About (large amount of text) -->
23+
<string name="fragment_about__about_content">
24+
DiasporaForAndroid is uw behulpzame app voor het bladeren door het sociale netwerk van Diaspora. Het voegt functies toe zoals nuttige werkbalken en ondersteuning voor proxyservers zoals het Tor Network aan uw sociale ervaring. &lt; Br &gt;&lt; br &gt; Diaspora maakt gebruik van Markdown voor het opmaken van berichten. U vindt meer informatie bij &lt; br &gt; https://diasporafoundation.org/formatting &lt; br &gt;&lt; br &gt; DiasporaForAndroid is vrije software als in het is in vrijheid ontwikkeld en volgt de ideeën van het Diaspora-project &lt; Br &gt; kunt u de broncode op Github: &lt; br &gt; https://github.com/Diaspora-for-Android/diaspora-android &lt; br &gt;&lt; br &gt; wanneer u tegen eventuele problemen aanloopt of als u suggesties hebt, u onze bug tracker op de bovenstaande link kunt. Als alternatief kunt u uw vraag met de hashtag #DFAQ op Diaspora plaatsen. &lt; Br &gt;&lt; br &gt; deze app niet beschikbaar in uw taal? Check ons project op Crowdin.com en help mee met vertalen! &lt; br &gt; https://crowdin.com/project/diaspora-for-android &lt; br &gt;&lt; br &gt; voel je ook vrij om je vrienden vertellen over #DiasporaForAndroid!</string>
625
<!-- Lorem ipsum -->
726
</resources>

‎app/src/main/res/values-nl/strings-preferences.xml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,20 +13,42 @@
1313
<!-- Visuals -->
1414
<!-- Navigiation Slider -->
1515
<string name="pref_title__sub_nav_slider">Navigatie Slider</string>
16+
<string name="pref_desc__sub_nav_slider">Bepalen zichtbaarheid van vermeldingen in de navigatie-lade</string>
1617
<string name="pref_cat__visibility_nav_items">Item Zichtbaarheid</string>
1718
<!-- Themes -->
19+
<string name="pref_title__themes">Thema en kleuren</string>
20+
<string name="pref_desc__themes">Bepalen welke kleuren worden gebruikt in de app</string>
21+
<string name="pref_title__primary_color">Primaire kleur</string>
22+
<string name="pref_desc__primary_color">Kleur van de werkbalken</string>
23+
<string name="pref_title__accent_color">Accentkleur</string>
24+
<string name="pref_desc__accent_color">Kleur van de voortgangsbalk</string>
1825
<!-- Notifications dropdown -->
26+
<string name="pref_title__extended_notifications">Uitgebreide meldingen</string>
27+
<string name="pref_desc__extended_notifications">Uitbreiden van de bel van de meldingen met een dropdown menu dat kennisgeving Categorieën toont</string>
1928
<!-- Font size -->
2029
<string name="pref_title__font_size">Lettergrootte</string>
2130
<!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
31+
<string name="font_size_normal">Normaal</string>
32+
<string name="font_size_large">Groot</string>
33+
<string name="font_size_huge">Grootst</string>
2234
<!-- Load images -->
2335
<string name="pref_title__load_images">Afbeeldingen laden</string>
2436
<string name="pref_desc__load_images">Afbeelding laden uitschakelen om mobiele data te besparen</string>
2537
<!-- Proxy -->
38+
<string name="pref_title__http_proxy_load_tor_preset">Tor Voorinstelling laden</string>
39+
<string name="pref_desc__http_proxy_load_tor_preset">Laden van de proxy-instellingen voor HTTP-Proxy Tor (Orbot)</string>
40+
<string name="pref_title__sub_proxy">Proxy</string>
2641
<string name="pref_title__proxy_enabled">Proxy inschakelen</string>
42+
<string name="pref_desc__http_proxy_enabled">Proxy Diaspora-verkeer om firewalls te omzeilen. \nVereist mogelijk app herstart. Dit kan op sommige telefoons niet werken.</string>
43+
<string name="pref_title__http_proxy_host">Host</string>
44+
<string name="pref_title__http_proxy_port">Poort</string>
45+
<string name="toast__proxy_disabled__restart_required">App moet opnieuw opstarten om het gebruik van de proxy uit te schakelen</string>
46+
<string name="toast__proxy_orbot_preset_loaded">Orbot proxy-voorinstelling geladen</string>
2747
<!-- Chrome custom tabs -->
48+
<string name="pref_desc__chrome_custom_tabs_enabled">Open externe links met Chrome aangepaste tabbladen. Chromium of Google Chrome moet worden geïnstalleerd voor deze functie. \nLET OP: Chrome aangepaste tabbladen maakt geen gebruik van geconfigureerde proxyservers!</string>
2849
<!-- Diaspora Settings -->
2950
<string name="pref_title__personal_settings">Persoonlijke instellingen</string>
51+
<string name="pref_desc__personal_settings">Open uw accountinstellingen van diaspora*</string>
3052
<string name="pref_desc__manage_contacts">Uw lijst met contactpersonen beheren</string>
3153
<string name="pref_title__manage_tags">Beheren van Hashtags</string>
3254
<string name="pref_desc__manage_tags">Toevoegen en verwijderen van de hashtags die u volgt</string>

‎app/src/main/res/values-nl/strings.xml

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<!-- App - AppName specific -->
55
<string name="shared_by_diaspora_android">*[gedeeld door #DiasporaForAndroid]*</string>
66
<!-- Application -->
7-
<string name="reload">Opnieuw Laden</string>
7+
<string name="reload">Opnieuw laden</string>
88
<string name="new_notifications">Ongelezen bericht. Wilt u het lezen?</string>
99
<!-- Common Words -->
1010
<string name="settings">Instellingen</string>
@@ -19,11 +19,20 @@
1919
<string name="mentions">Vermeldingen</string>
2020
<string name="public_">Openbaar</string>
2121
<string name="search">Zoeken</string>
22+
<string name="contacts">Contacten</string>
2223
<!-- Notifications dropdown menu -->
24+
<string name="notifications__all">Alle meldingen</string>
25+
<string name="notifications__also_commented">Heeft ook gereageerd</string>
26+
<string name="notifications__comment_on_post">Reactie op bericht</string>
27+
<string name="notifications__liked">Leuk gevonden</string>
28+
<string name="notifications__mentioned">Vermeldingen</string>
29+
<string name="notifications__reshared">Opnieuw gedeeld</string>
30+
<string name="notifications__started_sharing">Begonnen te delen</string>
2331
<!-- Pod Activity -->
2432
<string name="title_activity_pods">Selecteer Pod</string>
2533
<string name="filter_hint">Voer pod domein</string>
2634
<string name="confirm_url">Bevestigen pod url</string>
35+
<string name="search_for_pod">Zoek Pod&#8230;</string>
2736
<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>
2837
<string name="valid_pod">Voer een geldige domeinnaam in</string>
2938
<string name="podlist_error">Fout: Kan niet de podlijst ophalen!</string>
@@ -32,6 +41,8 @@
3241
<string name="confirm_pod">Wilt u echt \nhttps://%1$s\n als uw Diaspora pod gebruiken?</string>
3342
<string name="confirm_exit">Wilt u afsluiten?</string>
3443
<!-- Drawer, Menu, Toolbar, ContextMenu -->
44+
<string name="nav_menu_more">Meer</string>
45+
<string name="nav_help_license">Over | Help</string>
3546
<string name="nav_followed_tags">Gevolgde Tags</string>
3647
<string name="nav_public_activities">Publieke activiteiten</string>
3748
<string name="share__share_link_as_text">Link delen als tekst</string>
@@ -59,6 +70,13 @@
5970
<string name="unable_to_load_image">Niet in staat om afbeelding te laden</string>
6071
<string name="all_tags">Alle tags</string>
6172
<!-- Permissions -->
73+
<string name="permissions_screenshot">U moet machtegingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wil geven maar screenshot functie later wil gebruiken, kunt u de toestemming later geven. Open dan: systemsettings - apps - Diaspora. In de machtegings sectie kunt u machtegingen geven aan \"write storage permission\".</string>
74+
<string name="permissions_image">U moet machtigingen aan \"Access Storage Permission\" geven om screenshots op te slaan. Daarna moet u de app volledig afsluiten of de telefoon opnieuw opstarten. Als u geen toestemming aan opslag wilt geven maar screenshot functie later wilt gebruiken, kunt u de toestemming later geven. Open dan: system settings - apps - Diaspora. In de machtigingssectie kunt u machtigingen geven aan \"write storage permission\".</string>
6275
<string name="permission_denied">Toestemming geweigerd.</string>
6376
<string name="permission_granted_try_again">Toestemming verleend. Probeer het opnieuw.</string>
77+
<string name="podselection__custom_pod">Aangepaste Pod</string>
78+
<string name="pod_name">Naam van de Pod</string>
79+
<string name="http_protocol">Protocol</string>
80+
<string name="pod_address">Pod-adres</string>
81+
<string name="missing_value">Ontbrekende waarde</string>
6482
</resources>

‎app/src/main/res/values/color.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<resources>
2+
<resources xmlns:tools="http://schemas.android.com/tools"
3+
tools:ignore="UnusedResources">
4+
35
<color name="colorPrimary">@color/md_blue_650</color>
46
<color name="colorPrimaryDark">@color/md_blue_750</color>
57
<color name="colorAccent">@color/md_deep_orange_650</color>

‎app/src/main/res/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,8 @@
119119
<string name="podselection__custom_pod">Custom Pod</string>
120120
<string name="pod_name">Pod name</string>
121121
<string name="http_protocol">Protocol</string>
122+
<string name="http" translatable="false">http</string>
123+
<string name="https" translatable="false">https</string>
122124
<string name="pod_address">Pod address</string>
123125
<string name="missing_value">Missing value</string>
124126
</resources>

0 commit comments

Comments
 (0)