Fixed lint issues (suppressed, where they cant be fixed)

Release 0.2.0 (Updated translation files)

Announcing 0.2.0-next

Added wipe-settings option

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

Merge branch 'master' into wipe-settings

Added ThemedAlertDialogBuilder and a corresponding method in ThemeHelper

Merge branch 'master' into wipe-settings

Reworked dialog

CHANGELOG.md

@@ -1,3 +1,6 @@
+# v0.2.0-next
+
+
 # v0.2.0
 - Added: Customizable Theme Colors!
 - Improved account setup with easy tor hidden service configuration

app/build.gradle

@@ -30,7 +30,7 @@ android {
 // Additional repositories
 repositories {
     maven {
-        url "http://dl.bintray.com/dasar/maven"   //Color picker
+        url "https://jitpack.io"
     }
 }
 
@@ -52,7 +52,7 @@ dependencies {
     compile 'com.jakewharton:butterknife:8.0.1'
     compile 'info.guardianproject.netcipher:netcipher:2.0.0-alpha1'
     compile 'info.guardianproject.netcipher:netcipher-webkit:2.0.0-alpha1'
-    compile(group: 'uz.shift', name: 'colorpicker', version: '0.5', ext: 'aar')
+    compile 'com.github.DASAR:ShiftColorPicker:v0.5'
     apt 'com.jakewharton:butterknife-compiler:8.0.1'
 }
 

app/src/main/AndroidManifest.xml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.dfa.diaspora_android">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.github.dfa.diaspora_android"
+    tools:ignore="GoogleAppIndexingWarning">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -15,7 +17,8 @@
 
         <provider
             android:name="com.github.dfa.diaspora_android.service.HashtagContentProvider"
-            android:authorities="com.github.dfa.diaspora_android.mainactivity" />
+            android:authorities="com.github.dfa.diaspora_android.mainactivity"
+            android:exported="false"/>
 
         <service
             android:name="com.github.dfa.diaspora_android.service.FetchPodsService"

app/src/main/java/com/github/dfa/diaspora_android/activity/DiasporaStreamFragment.java

@@ -30,7 +30,6 @@ import android.os.Build;
 import android.os.Bundle;
 import android.provider.MediaStore;
 import android.support.design.widget.Snackbar;
-import android.support.v7.app.AlertDialog;
 import android.view.Menu;
 import android.view.MenuInflater;
 import android.view.MenuItem;
@@ -43,6 +42,7 @@ import android.webkit.WebView;
 import com.github.dfa.diaspora_android.App;
 import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.data.DiasporaUserProfile;
+import com.github.dfa.diaspora_android.ui.theme.ThemedAlertDialogBuilder;
 import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
 import com.github.dfa.diaspora_android.util.Helpers;
@@ -247,7 +247,7 @@ public class DiasporaStreamFragment extends BrowserFragment {
                 int hasWRITE_EXTERNAL_STORAGE = getActivity().checkSelfPermission(Manifest.permission.WRITE_EXTERNAL_STORAGE);
                 if (hasWRITE_EXTERNAL_STORAGE != PackageManager.PERMISSION_GRANTED) {
                     if (!shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
-                        new AlertDialog.Builder(getContext())
+                        new ThemedAlertDialogBuilder(getContext(), appSettings)
                                 .setMessage(R.string.permissions_image)
                                 .setNegativeButton(android.R.string.no, null)
                                 .setPositiveButton(android.R.string.yes, new DialogInterface.OnClickListener() {

app/src/main/java/com/github/dfa/diaspora_android/activity/MainActivity.java

@@ -39,6 +39,7 @@ import android.support.v4.content.LocalBroadcastManager;
 import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.ActionMenuView;
 import android.support.v7.widget.Toolbar;
 import android.view.KeyEvent;
@@ -69,6 +70,7 @@ import com.github.dfa.diaspora_android.ui.PodSelectionDialog;
 import com.github.dfa.diaspora_android.ui.theme.CustomFragment;
 import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
 import com.github.dfa.diaspora_android.ui.theme.ThemedActivity;
+import com.github.dfa.diaspora_android.ui.theme.ThemedAlertDialogBuilder;
 import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.AppSettings;
 import com.github.dfa.diaspora_android.util.DiasporaUrlHelper;
@@ -485,7 +487,7 @@ public class MainActivity extends ThemedActivity
             return;
         }
         //Catch split screen recreation
-        if (action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) {
+        if (action != null && action.equals(Intent.ACTION_MAIN) && getTopFragment() != null) {
             return;
         }
 
@@ -774,7 +776,7 @@ public class MainActivity extends ThemedActivity
                         }
                     };
 
-                    final android.support.v7.app.AlertDialog dialog = new android.support.v7.app.AlertDialog.Builder(this)
+                    final AlertDialog dialog = new ThemedAlertDialogBuilder(this, appSettings)
                             .setView(layout).setTitle(R.string.search_alert_title)
                             .setCancelable(true)
                             .setPositiveButton(R.string.search_alert_tag, clickListener)

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

@@ -1,7 +1,7 @@
 package com.github.dfa.diaspora_android.activity;
 
+import android.annotation.SuppressLint;
 import android.app.AlarmManager;
-import android.app.AlertDialog;
 import android.app.FragmentTransaction;
 import android.app.PendingIntent;
 import android.content.Context;
@@ -26,6 +26,7 @@ import com.github.dfa.diaspora_android.R;
 import com.github.dfa.diaspora_android.ui.theme.ColorPalette;
 import com.github.dfa.diaspora_android.ui.theme.ThemeHelper;
 import com.github.dfa.diaspora_android.ui.theme.ThemedActivity;
+import com.github.dfa.diaspora_android.ui.theme.ThemedAlertDialogBuilder;
 import com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceFragment;
 import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.AppSettings;
@@ -214,7 +215,7 @@ public class SettingsActivity extends ThemedActivity {
                     getActivity().finish();
                     return true;
                 } else if (settings.isKeyEqual(key, R.string.pref_key__change_account)) {
-                    new AlertDialog.Builder(getActivity())
+                    new ThemedAlertDialogBuilder(getActivity(), new AppSettings(getActivity().getApplication()))
                             .setTitle(getString(R.string.confirmation))
                             .setMessage(getString(R.string.pref_warning__change_account))
                             .setNegativeButton(android.R.string.no, null)
@@ -284,6 +285,7 @@ public class SettingsActivity extends ThemedActivity {
          *
          * @param type 1 -> Primary Color, 2 -> Accent Color
          */
+        @SuppressLint("InflateParams")
         public void showColorPickerDialog(final int type) {
             final AppSettings appSettings = ((App) getActivity().getApplication()).getSettings();
             final Context context = getActivity();
@@ -291,7 +293,7 @@ public class SettingsActivity extends ThemedActivity {
             //Inflate dialog layout
             LayoutInflater inflater = getActivity().getLayoutInflater();
             View dialogLayout = inflater.inflate(R.layout.ui__dialog__color_picker, null);
-            final android.support.v7.app.AlertDialog.Builder builder = new android.support.v7.app.AlertDialog.Builder(context);
+            final ThemedAlertDialogBuilder builder = new ThemedAlertDialogBuilder(context, appSettings);
             builder.setView(dialogLayout);
 
             final FrameLayout titleBackground = (FrameLayout) dialogLayout.findViewById(R.id.color_picker_dialog__title_background);
@@ -447,5 +449,39 @@ public class SettingsActivity extends ThemedActivity {
         public String getFragmentTag() {
             return TAG;
         }
+
+        @Override
+        public boolean onPreferenceTreeClick(PreferenceScreen screen, Preference preference) {
+            if (isAdded() && preference.hasKey()) {
+                AppSettings appSettings = ((App) getActivity().getApplication()).getSettings();
+                String key = preference.getKey();
+                if (appSettings.isKeyEqual(key, R.string.pref_key__wipe_settings)) {
+                    showWipeSettingsDialog();
+                    return true;
+                }
+            }
+            return super.onPreferenceTreeClick(screen, preference);
+        }
+
+        private void showWipeSettingsDialog() {
+            final AppSettings appSettings = new AppSettings(this.getActivity().getApplication());
+
+            ThemedAlertDialogBuilder builder = new ThemedAlertDialogBuilder(getActivity(), appSettings);
+            builder.setTitle(R.string.confirmation)
+                    .setMessage(R.string.dialog_content__wipe_settings)
+                    .setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
+                        @Override
+                        public void onClick(DialogInterface dialogInterface, int i) {
+                            appSettings.clearAppSettings();
+                            appSettings.clearPodSettings();
+                            Intent restartActivity = new Intent(getActivity(), MainActivity.class);
+                            PendingIntent pendingIntent = PendingIntent.getActivity(getActivity(), 12374, restartActivity, PendingIntent.FLAG_CANCEL_CURRENT);
+                            AlarmManager mgr = (AlarmManager) getActivity().getSystemService(Context.ALARM_SERVICE);
+                            mgr.set(AlarmManager.RTC, System.currentTimeMillis() + 100, pendingIntent);
+                            System.exit(0);
+                        }
+                    }).setNegativeButton(android.R.string.cancel, null)
+                    .create().show();
+        }
     }
 }

app/src/main/java/com/github/dfa/diaspora_android/ui/BadgeDrawable.java

@@ -88,7 +88,7 @@ public class BadgeDrawable extends Drawable {
             canvas.drawCircle(centerX, centerY, (int) (radius + 6.5), badgeBackground);
             //canvas.drawRoundRect(radius, radius, radius, radius, 10, 10, badgeBackground);
         }
-        // Draw badge count text inside the circle.
+        // Draw badge count message inside the circle.
         badgeText.getTextBounds(badgeValue, 0, badgeValue.length(), textRect);
         float textHeight = textRect.bottom - textRect.top;
         float textY = centerY + (textHeight / 2f);

app/src/main/java/com/github/dfa/diaspora_android/ui/HtmlTextView.java

@@ -62,7 +62,7 @@ public class HtmlTextView extends TextView {
     }
 
     /**
-     * Linkify, format markdown and escape the displayed text.
+     * Linkify, format markdown and escape the displayed message.
      */
     private void init() {
         formatHtmlAndCustomTags();

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

@@ -1,6 +1,7 @@
 package com.github.dfa.diaspora_android.ui;
 
 
+import android.annotation.SuppressLint;
 import android.app.Dialog;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -9,6 +10,7 @@ import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ArrayAdapter;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.RadioGroup;
@@ -93,6 +95,12 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
     @BindView(R.id.podselection__dialog__text_protocol)
     TextView textProtocol;
 
+    @BindView(R.id.podselection__dialog__btn_ok)
+    Button btnOk;
+
+    @BindView(R.id.podselection__dialog__btn_cancel)
+    Button btnCancel;
+
     private PodSelectionDialogResultListener resultListener;
     private View root;
     private DiasporaPod pod = new DiasporaPod();
@@ -100,6 +108,7 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
 
     @NonNull
     @Override
+    @SuppressLint("InflateParams")
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
         LayoutInflater inflater = getActivity().getLayoutInflater();
@@ -135,6 +144,8 @@ public class PodSelectionDialog extends ThemedAppCompatDialogFragment {
         textProfile.setTextColor(ThemeHelper.getAccentColor());
         textProtocol.setTextColor(ThemeHelper.getAccentColor());
         textTorPreset.setTextColor(ThemeHelper.getAccentColor());
+        btnOk.setTextColor(ThemeHelper.getAccentColor());
+        btnCancel.setTextColor(ThemeHelper.getAccentColor());
 
         ThemeHelper.updateEditTextColor(editPodAddress);
         ThemeHelper.updateEditTextColor(editPodName);

app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemeHelper.java

@@ -19,6 +19,7 @@
  */
 package com.github.dfa.diaspora_android.ui.theme;
 
+import android.content.DialogInterface;
 import android.content.res.ColorStateList;
 import android.graphics.Color;
 import android.graphics.PorterDuff;
@@ -26,9 +27,11 @@ import android.os.Build;
 import android.support.design.widget.TabLayout;
 import android.support.v4.content.ContextCompat;
 import android.support.v4.widget.CompoundButtonCompat;
+import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.ActionMenuView;
 import android.support.v7.widget.Toolbar;
 import android.view.View;
+import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.widget.ProgressBar;
@@ -37,6 +40,7 @@ import android.widget.RadioGroup;
 import android.widget.TextView;
 
 import com.github.dfa.diaspora_android.R;
+import com.github.dfa.diaspora_android.util.AppLog;
 import com.github.dfa.diaspora_android.util.AppSettings;
 
 /**
@@ -153,4 +157,18 @@ public class ThemeHelper {
     public static int getNeutralGreyColor() {
         return ContextCompat.getColor(getInstance().appSettings.getApplicationContext(), R.color.md_grey_800);
     }
+
+    public static void updateAlertDialogColor(AlertDialog alertDialog) {
+        if(alertDialog != null) {
+            for(int i : new int[]{
+                    DialogInterface.BUTTON_POSITIVE,
+                    DialogInterface.BUTTON_NEUTRAL,
+                    DialogInterface.BUTTON_NEGATIVE}) {
+                Button b = alertDialog.getButton(i);
+                if(b != null) {
+                    b.setTextColor(getAccentColor());
+                }
+            }
+        }
+    }
 }

app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedActivity.java

@@ -22,6 +22,7 @@ import android.annotation.TargetApi;
 import android.app.ActivityManager;
 import android.graphics.drawable.BitmapDrawable;
 import android.os.Build;
+import android.support.v4.app.FragmentManager;
 import android.support.v7.app.AppCompatActivity;
 
 import com.github.dfa.diaspora_android.App;

app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedAlertDialogBuilder.java

@@ -0,0 +1,45 @@
+package com.github.dfa.diaspora_android.ui.theme;
+
+import android.content.Context;
+import android.content.DialogInterface;
+import android.support.annotation.NonNull;
+import android.support.annotation.StyleRes;
+import android.support.v7.app.AlertDialog;
+
+import com.github.dfa.diaspora_android.util.AppSettings;
+
+/**
+ * AlertDialog Builder that colors its buttons
+ * Created by vanitas on 06.11.16.
+ */
+
+public class ThemedAlertDialogBuilder extends AlertDialog.Builder {
+    protected AppSettings appSettings;
+
+    public ThemedAlertDialogBuilder(@NonNull Context context, AppSettings appSettings) {
+        super(context);
+        this.appSettings = appSettings;
+    }
+
+    public ThemedAlertDialogBuilder(@NonNull Context context, @StyleRes int themeResId, AppSettings appSettings) {
+        super(context, themeResId);
+        this.appSettings = appSettings;
+    }
+
+    @Override
+    public AlertDialog create() {
+        final AlertDialog dialog = super.create();
+        dialog.setOnShowListener(new DialogInterface.OnShowListener() {
+            @Override
+            public void onShow(DialogInterface dialogInterface) {
+                applyColors(dialog);
+            }
+        });
+        return dialog;
+    }
+
+    private void applyColors(AlertDialog alertDialog) {
+        ThemeHelper.getInstance(appSettings);
+        ThemeHelper.updateAlertDialogColor(alertDialog);
+    }
+}

app/src/main/java/com/github/dfa/diaspora_android/ui/theme/ThemedAppCompatDialogFragment.java

@@ -2,6 +2,7 @@ package com.github.dfa.diaspora_android.ui.theme;
 
 import android.app.Dialog;
 import android.os.Bundle;
+import android.support.annotation.NonNull;
 import android.support.v7.app.AppCompatDialogFragment;
 
 import com.github.dfa.diaspora_android.util.AppSettings;
@@ -13,6 +14,7 @@ import com.github.dfa.diaspora_android.util.AppSettings;
 
 public abstract class ThemedAppCompatDialogFragment extends AppCompatDialogFragment {
 
+    @NonNull
     @Override
     public Dialog onCreateDialog(Bundle savedInstanceState) {
         Dialog dialog = super.onCreateDialog(savedInstanceState);

app/src/main/java/com/github/dfa/diaspora_android/util/AppSettings.java

@@ -50,15 +50,15 @@ public class AppSettings {
     }
 
     public void clearPodSettings() {
-        prefPod.edit().clear().apply();
+        prefPod.edit().clear().commit();
     }
 
     public void clearAppSettings() {
-        prefApp.edit().clear().apply();
+        prefApp.edit().clear().commit();
     }
 
-    public String getKey(int stringKeyRessourceId) {
+    public String getKey(int stringKeyResourceId) {
-        return context.getString(stringKeyRessourceId);
+        return context.getString(stringKeyResourceId);
     }
 
     public boolean isKeyEqual(String key, int stringKeyRessourceId) {

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

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/nav_drawer"
     android:layout_width="wrap_content"
     android:layout_height="110dp"
-    android:background="@color/colorPrimary"
     android:gravity="bottom"
     android:orientation="vertical"
     android:theme="@style/ThemeOverlay.AppCompat.Dark">
@@ -36,7 +36,8 @@
             android:layout_marginEnd="@dimen/activity_horizontal_margin_half"
             android:layout_marginStart="@dimen/activity_horizontal_margin"
             android:scaleType="fitCenter"
-            android:src="@drawable/ic_launcher" />
+            android:src="@drawable/ic_launcher"
+            tools:ignore="ContentDescription" />
 
         <LinearLayout
             android:layout_width="wrap_content"

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

@@ -11,6 +11,7 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        style="?android:attr/buttonBarStyle"
         android:orientation="vertical">
 
         <TextView
@@ -88,14 +89,14 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="http" />
+                android:text="@string/http" />
 
             <RadioButton
                 android:id="@+id/podselection__dialog__radio_https"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="https" />
+                android:text="@string/https" />
         </RadioGroup>
 
         <TextView
@@ -127,6 +128,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                style="?android:attr/buttonBarButtonStyle"
                 android:text="@android:string/cancel" />
 
             <Button
@@ -134,6 +136,7 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                style="?android:attr/buttonBarButtonStyle"
                 android:text="@android:string/ok" />
         </LinearLayout>
 

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

@@ -1,7 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.MainActivity">
+    tools:context=".activity.MainActivity"
+    tools:ignore="AlwaysShowAction">
 
 
     <item

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

@@ -1,7 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.MainActivity">
+    tools:context=".activity.MainActivity"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:id="@+id/action_notifications"

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

@@ -1,7 +1,8 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    tools:context=".activity.MainActivity">
+    tools:context=".activity.MainActivity"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:id="@+id/action_notifications"

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

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="AlwaysShowAction">
 
     <item
         android:icon="@drawable/ic_share_white_48px"

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

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto">
-
     <item
         android:id="@+id/action_reload"
         android:icon="@drawable/ic_refresh_white_48px"
         android:orderInCategory="1000"
         android:title="@string/reload"
         app:showAsAction="always" />
-
 </menu>

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

@@ -2,6 +2,25 @@
 <!--Generated by crowdin.com-->
 <resources>
   <!-- License & help (large amount of text) -->
+  <string name="about_activity__title_about_app">Info</string>
+  <string name="about_activity__title_about_license">Licentie</string>
+  <string name="about_activity__title_debug_info">Foutopsporing</string>
+  <string name="fragment_debug__section_app">Applicatie</string>
+  <string name="fragment_debug__section_device">Toestel</string>
+  <string name="fragment_debug__section_pod">diaspora* Pod</string>
+  <string name="fragment_debug__section_log">Debug Logboek</string>
+  <string name="fragment_debug__section_log_spam">Debug Log (Verbose)</string>
+  <string name="fragment_debug__app_version">Versie: %1$s</string>
+  <string name="fragment_debug__package_name">Pakket-naam: %1$s</string>
+  <string name="fragment_debug__android_version">Android-versie: %1$s</string>
+  <string name="fragment_debug__device_name">Toestelnaam: %1$s</string>
+  <string name="fragment_debug__app_codename">Versienaam: %1$s</string>
+  <string name="fragment_debug__pod_profile_name">Pod Profielnaam: %1$s</string>
+  <string name="fragment_debug__pod_profile_url">Pod-domein: %1$s</string>
+  <string name="fragment_debug__toast_log_copied">Tekst naar klembord gekopieerd</string>
+  <string name="fragment_license__3rd_party_libs_title">Gebruikte bibliotheken van derden</string>
   <!-- About (large amount of text) -->
+  <string name="fragment_about__about_content">
+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>
   <!-- Lorem ipsum -->
 </resources>

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

@@ -13,20 +13,42 @@
   <!-- Visuals -->
   <!-- Navigiation Slider -->
   <string name="pref_title__sub_nav_slider">Navigatie Slider</string>
+  <string name="pref_desc__sub_nav_slider">Bepalen zichtbaarheid van vermeldingen in de navigatie-lade</string>
   <string name="pref_cat__visibility_nav_items">Item Zichtbaarheid</string>
   <!-- Themes -->
+  <string name="pref_title__themes">Thema en kleuren</string>
+  <string name="pref_desc__themes">Bepalen welke kleuren worden gebruikt in de app</string>
+  <string name="pref_title__primary_color">Primaire kleur</string>
+  <string name="pref_desc__primary_color">Kleur van de werkbalken</string>
+  <string name="pref_title__accent_color">Accentkleur</string>
+  <string name="pref_desc__accent_color">Kleur van de voortgangsbalk</string>
   <!-- Notifications dropdown -->
+  <string name="pref_title__extended_notifications">Uitgebreide meldingen</string>
+  <string name="pref_desc__extended_notifications">Uitbreiden van de bel van de meldingen met een dropdown menu dat kennisgeving Categorieën toont</string>
   <!-- Font size -->
   <string name="pref_title__font_size">Lettergrootte</string>
   <!-- prefix 's' is needed to make this a string array. Otherwise ListPreference would crash -->
+  <string name="font_size_normal">Normaal</string>
+  <string name="font_size_large">Groot</string>
+  <string name="font_size_huge">Grootst</string>
   <!-- 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__http_proxy_load_tor_preset">Tor Voorinstelling laden</string>
+  <string name="pref_desc__http_proxy_load_tor_preset">Laden van de proxy-instellingen voor HTTP-Proxy Tor (Orbot)</string>
+  <string name="pref_title__sub_proxy">Proxy</string>
   <string name="pref_title__proxy_enabled">Proxy inschakelen</string>
+  <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>
+  <string name="pref_title__http_proxy_host">Host</string>
+  <string name="pref_title__http_proxy_port">Poort</string>
+  <string name="toast__proxy_disabled__restart_required">App moet opnieuw opstarten om het gebruik van de proxy uit te schakelen</string>
+  <string name="toast__proxy_orbot_preset_loaded">Orbot proxy-voorinstelling geladen</string>
   <!-- Chrome custom tabs -->
+  <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>
   <!-- Diaspora Settings -->
   <string name="pref_title__personal_settings">Persoonlijke instellingen</string>
+  <string name="pref_desc__personal_settings">Open uw accountinstellingen van diaspora*</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>

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

@@ -4,7 +4,7 @@
   <!-- App - AppName specific -->
   <string name="shared_by_diaspora_android">*[gedeeld door #DiasporaForAndroid]*</string>
   <!-- Application -->
-  <string name="reload">Opnieuw Laden</string>
+  <string name="reload">Opnieuw laden</string>
   <string name="new_notifications">Ongelezen bericht. Wilt u het lezen?</string>
   <!-- Common Words -->
   <string name="settings">Instellingen</string>
@@ -19,11 +19,20 @@
   <string name="mentions">Vermeldingen</string>
   <string name="public_">Openbaar</string>
   <string name="search">Zoeken</string>
+  <string name="contacts">Contacten</string>
   <!-- Notifications dropdown menu -->
+  <string name="notifications__all">Alle meldingen</string>
+  <string name="notifications__also_commented">Heeft ook gereageerd</string>
+  <string name="notifications__comment_on_post">Reactie op bericht</string>
+  <string name="notifications__liked">Leuk gevonden</string>
+  <string name="notifications__mentioned">Vermeldingen</string>
+  <string name="notifications__reshared">Opnieuw gedeeld</string>
+  <string name="notifications__started_sharing">Begonnen te delen</string>
   <!-- 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="search_for_pod">Zoek Pod&#8230;</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>
@@ -32,6 +41,8 @@
   <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_menu_more">Meer</string>
+  <string name="nav_help_license">Over | Help</string>
   <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>
@@ -59,6 +70,13 @@
   <string name="unable_to_load_image">Niet in staat om afbeelding te laden</string>
   <string name="all_tags">Alle tags</string>
   <!-- Permissions -->
+  <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>
+  <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>
   <string name="permission_denied">Toestemming geweigerd.</string>
   <string name="permission_granted_try_again">Toestemming verleend. Probeer het opnieuw.</string>
+  <string name="podselection__custom_pod">Aangepaste Pod</string>
+  <string name="pod_name">Naam van de Pod</string>
+  <string name="http_protocol">Protocol</string>
+  <string name="pod_address">Pod-adres</string>
+  <string name="missing_value">Ontbrekende waarde</string>
 </resources>

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools"
+    tools:ignore="UnusedResources">
+
     <color name="colorPrimary">@color/md_blue_650</color>
     <color name="colorPrimaryDark">@color/md_blue_750</color>
     <color name="colorAccent">@color/md_deep_orange_650</color>

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

@@ -61,6 +61,7 @@
     <string name="pref_catkey__category_more" translatable="false">pref_catkey__category_more</string>
     <string name="pref_key__logging_spam_enabled" translatable="false">pref_key__logging_spam_enabled</string>
     <string name="pref_key__logging_enabled" translatable="false">pref_key__logging_enabled</string>
+    <string name="pref_key__wipe_settings" translatable="false">pref_key__wipe_settings</string>
 
     <!-- Category Titles -->
     <string name="pref_cat__visuals">Appearance</string>
@@ -153,10 +154,15 @@
     <!-- More -->
     <string name="pref_title__sub_logging" translatable="false">@string/about_activity__title_debug_info</string>
     <string name="pref_desc__sub_logging" translatable="false">@string/fragment_debug__section_log</string>
+    <string name="pref_title__sub_miscelaneous">Miscellaneous</string>
 
     <string name="pref_title__logging_enabled" translatable="false">@string/fragment_debug__section_log</string>
     <string name="pref_title__logging_spam_enabled" translatable="false">@string/fragment_debug__section_log_spam</string>
 
+    <string name="pref_title__wipe_settings">Full Reset</string>
+    <string name="pref_desc__wipe_settings">Locally wipe all settings related to the app and log out from all accounts</string>
+
+    <string name="dialog_content__wipe_settings">This will reset all changed settings of the app to their default values and log you out from all pods. Your downloaded images will stay untouched. Are you sure you want to proceed?</string>
 
     <!-- Recently added - Please move to right section-->
     <!-- Sorry -->

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

@@ -119,6 +119,8 @@
     <string name="podselection__custom_pod">Custom Pod</string>
     <string name="pod_name">Pod name</string>
     <string name="http_protocol">Protocol</string>
+    <string name="http" translatable="false">http</string>
+    <string name="https" translatable="false">https</string>
     <string name="pod_address">Pod address</string>
     <string name="missing_value">Missing value</string>
 </resources>

app/src/main/res/xml/preferences__sub_debugging.xml

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Logging -->
     <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
         android:key="@string/pref_key__title__debugging"
         android:title="@string/pref_title__sub_logging">
@@ -14,4 +16,16 @@
             android:title="@string/pref_title__logging_spam_enabled"
             android:dependency="@string/pref_key__logging_enabled"/>
     </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
+
+
+    <!-- Miscellaneous -->
+    <com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory
+        android:title="@string/pref_title__sub_miscelaneous">
+
+        <Preference
+            android:key="@string/pref_key__wipe_settings"
+            android:title="@string/pref_title__wipe_settings"
+            android:summary="@string/pref_desc__wipe_settings" />
+
+    </com.github.dfa.diaspora_android.ui.theme.ThemedPreferenceCategory>
 </PreferenceScreen>