minor intro improvements, shorten some texts

12 files changed, 28 insertions, 4 deletions

diff --git a/src/main/java/de/pixart/messenger/ui/IntroActivity.java b/src/main/java/de/pixart/messenger/ui/IntroActivity.java
index 802072efe..6164b2df3 100644
--- a/src/main/java/de/pixart/messenger/ui/IntroActivity.java
+++ b/src/main/java/de/pixart/messenger/ui/IntroActivity.java
@@ -57,6 +57,13 @@ public class IntroActivity extends AppIntro {
                 welcome.setBgColor(backgroundColor);
                 addSlide(AppIntroFragment.newInstance(welcome));
 
+                SliderPage xmpp = new SliderPage();
+                xmpp.setTitle(getString(R.string.intro_whats_xmpp));
+                xmpp.setDescription(getString(R.string.intro_desc_whats_xmpp));
+                xmpp.setImageDrawable(R.drawable.intro_xmpp_icon);
+                xmpp.setBgColor(backgroundColor);
+                addSlide(AppIntroFragment.newInstance(xmpp));
+
                 SliderPage permissions = new SliderPage();
                 permissions.setTitle(getString(R.string.intro_permissions));
                 permissions.setDescription(getString(R.string.intro_desc_permissions));
@@ -64,6 +71,13 @@ public class IntroActivity extends AppIntro {
                 permissions.setBgColor(backgroundColor);
                 addSlide(AppIntroFragment.newInstance(permissions));
 
+                SliderPage permissions2 = new SliderPage();
+                permissions2.setTitle(getString(R.string.intro_permissions));
+                permissions2.setDescription(getString(R.string.intro_desc_contacts_permissions));
+                permissions2.setImageDrawable(R.drawable.intro_contacts_icon);
+                permissions2.setBgColor(backgroundColor);
+                addSlide(AppIntroFragment.newInstance(permissions2));
+
                 SliderPage account = new SliderPage();
                 account.setTitle(getString(R.string.intro_account));
                 account.setDescription(getString(R.string.intro_desc_account));
@@ -71,6 +85,13 @@ public class IntroActivity extends AppIntro {
                 account.setBgColor(backgroundColor);
                 addSlide(AppIntroFragment.newInstance(account));
 
+                SliderPage account2 = new SliderPage();
+                account2.setTitle(getString(R.string.intro_account));
+                account2.setDescription(getString(R.string.intro_desc_account2));
+                account2.setImageDrawable(R.drawable.intro_account_icon);
+                account2.setBgColor(backgroundColor);
+                addSlide(AppIntroFragment.newInstance(account2));
+
                 SliderPage startChatting = new SliderPage();
                 startChatting.setTitle(getString(R.string.intro_start_chatting));
                 startChatting.setDescription(getString(R.string.intro_desc_start_chatting));
@@ -129,6 +150,5 @@ public class IntroActivity extends AppIntro {
     @Override
     public void onSlideChanged(@Nullable Fragment oldFragment, @Nullable Fragment newFragment) {
         super.onSlideChanged(oldFragment, newFragment);
-        // Do something when the slide changes.
     }
 }
diff --git a/src/main/res/drawable-hdpi/intro_contacts_icon.png b/src/main/res/drawable-hdpi/intro_contacts_icon.png
new file mode 100644
index 000000000..cc5c07ea2
--- /dev/null
+++ b/src/main/res/drawable-hdpi/intro_contacts_icon.png
diff --git a/src/main/res/drawable-hdpi/intro_xmpp_icon.png b/src/main/res/drawable-hdpi/intro_xmpp_icon.png
new file mode 100644
index 000000000..c12730cdf
--- /dev/null
+++ b/src/main/res/drawable-hdpi/intro_xmpp_icon.png
diff --git a/src/main/res/drawable-mdpi/intro_contacts_icon.png b/src/main/res/drawable-mdpi/intro_contacts_icon.png
new file mode 100644
index 000000000..493ffa0fe
--- /dev/null
+++ b/src/main/res/drawable-mdpi/intro_contacts_icon.png
diff --git a/src/main/res/drawable-mdpi/intro_xmpp_icon.png b/src/main/res/drawable-mdpi/intro_xmpp_icon.png
new file mode 100644
index 000000000..635cf1963
--- /dev/null
+++ b/src/main/res/drawable-mdpi/intro_xmpp_icon.png
diff --git a/src/main/res/drawable-xhdpi/intro_contacts_icon.png b/src/main/res/drawable-xhdpi/intro_contacts_icon.png
new file mode 100644
index 000000000..02a4252ad
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/intro_contacts_icon.png
diff --git a/src/main/res/drawable-xhdpi/intro_xmpp_icon.png b/src/main/res/drawable-xhdpi/intro_xmpp_icon.png
new file mode 100644
index 000000000..364f0a469
--- /dev/null
+++ b/src/main/res/drawable-xhdpi/intro_xmpp_icon.png
diff --git a/src/main/res/drawable-xxhdpi/intro_contacts_icon.png b/src/main/res/drawable-xxhdpi/intro_contacts_icon.png
new file mode 100644
index 000000000..fe4cf7964
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/intro_contacts_icon.png
diff --git a/src/main/res/drawable-xxhdpi/intro_xmpp_icon.png b/src/main/res/drawable-xxhdpi/intro_xmpp_icon.png
new file mode 100644
index 000000000..9a6ff9eb7
--- /dev/null
+++ b/src/main/res/drawable-xxhdpi/intro_xmpp_icon.png
diff --git a/src/main/res/drawable-xxxhdpi/intro_contacts_icon.png b/src/main/res/drawable-xxxhdpi/intro_contacts_icon.png
new file mode 100644
index 000000000..2f1204ffc
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/intro_contacts_icon.png
diff --git a/src/main/res/drawable-xxxhdpi/intro_xmpp_icon.png b/src/main/res/drawable-xxxhdpi/intro_xmpp_icon.png
new file mode 100644
index 000000000..fbb1cf1aa
--- /dev/null
+++ b/src/main/res/drawable-xxxhdpi/intro_xmpp_icon.png
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index c7c819540..805be357f 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -944,11 +944,11 @@
     <string name="intro_desc_main">Learn how to use Pix-Art Messenger.</string>
     <string name="welcome_header">Welcome to Pix-Art Messenger</string>
     <string name="intro_permissions">Permissions</string>
-    <string name="intro_desc_permissions">Pix-Art Messenger will ask you for granting a few permissions. We need to have at least access to your external storage. Any other permissions are requested as required. Note: We will ask you for contacts permissions to read Jabber-IDs from your addressbook. We will not share, upload or copy any of your contacts.</string>
+    <string name="intro_desc_permissions">Pix-Art Messenger will ask you for granting a few permissions. We need to have at least access to your external storage. Any other permissions are requested as required and are not mandatory. </string>
     <string name="intro_account">Your account</string>
-    <string name="intro_desc_account">To start over, you will need an own account. This works like e-mail works. If you have an own account, just login with your Jabber-ID and password. If you would like to create a new account, you have the choice between choosing a suggested server from the drop-down menu or use a custom one. You have also the possibility to import an existing account into the app.</string>
+    <string name="intro_desc_account">To start over, you will need an own account. If you have an own account, just login with your Jabber-ID and password.</string>
     <string name="intro_start_chatting">Start chatting</string>
-    <string name="intro_desc_start_chatting">Congratulations! But how about chatting? Just add Jabber-IDs of your contacts, or if you have given contacts permissions and Jabber-IDs in your addressbook they will be shown up. You can also add or join group chats or join public channels.</string>
+    <string name="intro_desc_start_chatting">Congratulations! But how about chatting? Just add Jabber-IDs of your contacts, or if you have given contacts permissions and Jabber-IDs in your address book they will be shown up. You can also add or create group chats or join public channels.</string>
     <string name="intro_desc_open_chat">Now you can start chatting, share locations, files, videos and images or send voice messages.</string>
     <string name="intro_chat_details">Chat details</string>
     <string name="intro_desc_chat_details">You want to open the chat details? Just tip on the chat name in the menu bar on the top.</string>
@@ -959,4 +959,8 @@
     <string name="pref_show_intro">Show intro again</string>
     <string name="show_intro_again">Intro screens will be shown again</string>
     <string name="show_intro_again_failed">Resetting intro screens failed. Try again…</string>
+    <string name="intro_desc_whats_xmpp">XMPP, also called jabber, is a decentralized communication network and it works like e-mail works. You need an address, which is called Jabber-ID and a password.</string>
+    <string name="intro_whats_xmpp">What is XMPP / Jabber?</string>
+    <string name="intro_desc_contacts_permissions">We will also ask you for granting permissions to read your address book, to read out Jabber-IDs from your contacts. We will never share, upload or copy any of your contacts.</string>
+    <string name="intro_desc_account2">If you would like to create a new account, you have the choice between choosing a suggested server from the drop-down menu or use a custom one.</string>
 </resources>