AboutViewer: dark theme, new layout, links to twitter, github,...

AboutViewer: dark theme, new layout, links to twitter, github, redsolution.com, etc. New icons and pictures for these links.
ActivityManager: app theme is NOT applied to every managed activity. Theme set in manifest.

app/src/main/AndroidManifest.xml

@@ -73,9 +73,10 @@
             android:name="com.xabber.android.ui.LoadActivity"
             />
         <activity
-            android:name="com.xabber.android.ui.preferences.AboutViewer"
+            android:name=".ui.AboutViewer"
             android:label="@string/about_viewer"
             android:parentActivityName="com.xabber.android.ui.preferences.PreferenceEditor"
+            android:theme="@style/ThemeDark"
             >
 
             <!-- Parent activity meta-data to support 4.0 and lower -->

app/src/main/java/com/xabber/android/data/ActivityManager.java

@@ -132,7 +132,6 @@ public class ActivityManager implements OnUnloadListener {
     public void onCreate(Activity activity) {
         if (LOG)
             LogManager.i(activity, "onCreate: " + activity.getIntent());
-        applyTheme(activity);
         if (application.isClosing() && !(activity instanceof LoadActivity)) {
             activity.startActivity(LoadActivity.createIntent(activity));
             activity.finish();

app/src/main/java/com/xabber/android/ui/preferences/AboutViewer.java → app/src/main/java/com/xabber/android/ui/AboutViewer.java

 /**
  * Copyright (c) 2013, Redsolution LTD. All rights reserved.
- *
+ * <p/>
  * This file is part of Xabber project; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License, Version 3.
- *
+ * <p/>
  * Xabber is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
  * See the GNU General Public License for more details.
- *
+ * <p/>
  * You should have received a copy of the GNU General Public License,
  * along with this program. If not, see http://www.gnu.org/licenses/.
  */
-package com.xabber.android.ui.preferences;
+package com.xabber.android.ui;
 
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.app.NavUtils;
 import android.support.v7.widget.Toolbar;
-import android.text.method.LinkMovementMethod;
-import android.view.MenuItem;
-import android.widget.TextView;
+import android.view.View;
 
 import com.xabber.android.R;
-import com.xabber.android.ui.helper.BarPainter;
 import com.xabber.android.ui.helper.ManagedActivity;
 
-public class AboutViewer extends ManagedActivity {
+public class AboutViewer extends ManagedActivity implements View.OnClickListener {
 
     public static Intent createIntent(Context context) {
         return new Intent(context, AboutViewer.class);
@@ -40,17 +38,20 @@ public class AboutViewer extends ManagedActivity {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.about_viewer);
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar_default);
-        setSupportActionBar(toolbar);
+        toolbar.setNavigationIcon(R.drawable.ic_arrow_left_white_24dp);
+        toolbar.setNavigationOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                NavUtils.navigateUpFromSameTask(AboutViewer.this);
+            }
+        });
 
-        BarPainter barPainter = new BarPainter(this, toolbar);
-        barPainter.setDefaultColor();
+        findViewById(R.id.about_github).setOnClickListener(this);
+        findViewById(R.id.about_twitter).setOnClickListener(this);
+        findViewById(R.id.about_redsolution).setOnClickListener(this);
 
-        ((TextView) findViewById(R.id.about_version))
-                .setText(getString(R.string.about_version, getVersionName()));
-        ((TextView) findViewById(R.id.about_license))
-                .setMovementMethod(LinkMovementMethod.getInstance());
-
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
+//        ((TextView) findViewById(R.id.about_version))
+//                .setText(getString(R.string.about_version, getVersionName()));
     }
 
     private String getVersionName() {
@@ -64,14 +65,27 @@ public class AboutViewer extends ManagedActivity {
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            // Respond to the action bar's Up/Home button
-            case android.R.id.home:
-                NavUtils.navigateUpFromSameTask(this);
-                return true;
+    public void onClick(View v) {
+
+        switch (v.getId()) {
+            case R.id.about_redsolution:
+                sendUrlViewIntent(getString(R.string.about_redsolution_url));
+                break;
+
+            case R.id.about_github:
+                sendUrlViewIntent(getString(R.string.about_xabber_github_url));
+                break;
+
+
+            case R.id.about_twitter:
+                sendUrlViewIntent(getString(R.string.about_xabber_twitter_url));
+                break;
         }
-        return super.onOptionsItemSelected(item);
     }
 
+    private void sendUrlViewIntent(String url) {
+        Intent i = new Intent(Intent.ACTION_VIEW);
+        i.setData(Uri.parse(url));
+        startActivity(i);
+    }
 }

app/src/main/java/com/xabber/android/ui/ContactList.java

@@ -64,7 +64,6 @@ import com.xabber.android.ui.dialog.ContactIntegrationDialogFragment;
 import com.xabber.android.ui.dialog.StartAtBootDialogFragment;
 import com.xabber.android.ui.helper.BarPainter;
 import com.xabber.android.ui.helper.ManagedActivity;
-import com.xabber.android.ui.preferences.AboutViewer;
 import com.xabber.android.ui.preferences.AccountEditor;
 import com.xabber.android.ui.preferences.AccountList;
 import com.xabber.android.ui.preferences.PreferenceEditor;

app/src/main/res/values-ru/about_viewer.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
-    <string name="about_copyright">© Redsolution LTD, 2010–2015</string>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
-    <string name="about_feedback">mailto:info@xabber.com</string>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
-    <string name="about_site">http://www.xabber.com</string>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
     <string name="about_version">Версия: %s</string>
-    <string name="about_license">Лицензия: GNU GPLv3\n<a href="https://github.com/redsolution/xabber-android">Программное обеспечение с открытым исходным кодом</a></string>
-
     <string name="about_open_source_xmpp_client">open source XMPP client</string>
+
+    <string name="about_about">О программе</string>
+    <string name="about_developers">Разработчики</string>
+    <string name="about_redsolution_url">http://www.redsolution.com/</string>
+    <string name="about_xabber_url">http://www.xabber.com</string>
+    <string name="about_xabber_email">info@xabber.com</string>
+    <string name="about_follow_us">Подпишитесь</string>
+    <string name="about_xabber_twitter_url">https://twitter.com/xabber_xmpp</string>
+    <string name="about_xabber_github_url">https://github.com/redsolution/xabber-android</string>
+
+    <string name="about_copyright">© Redsolution LTD, 2010–2015</string>
+    <string name="about_license">Лицензия: GNU GPLv3</string>
+    <string name="about_open_source_software">Программное обеспечение с открытым исходным кодом</string>
 </resources>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
-    <string name="about_copyright">© Redsolution LTD, 2010–2015</string>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
-    <string name="about_feedback">mailto:info@xabber.com</string>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
-    <string name="about_site">http://www.xabber.com</string>
-    <!-- http://dl.dropbox.com/u/1029995/com.xabber.android/about_viewer.png -->
     <string name="about_version">Version: %s</string>
-    <string name="about_license">License: GNU GPLv3\n<a href="https://github.com/redsolution/xabber-android">Open source software</a></string>
-
     <string name="about_open_source_xmpp_client">open source XMPP client</string>
+
+    <string name="about_about">About</string>
+    <string name="about_developers">Developers</string>
+    <string name="about_redsolution_url">http://www.redsolution.com/</string>
+    <string name="about_xabber_url">http://www.xabber.com</string>
+    <string name="about_xabber_email">info@xabber.com</string>
+    <string name="about_follow_us">Follow us</string>
+    <string name="about_xabber_twitter_url">https://twitter.com/xabber_xmpp</string>
+    <string name="about_xabber_github_url">https://github.com/redsolution/xabber-android</string>
+
+    <string name="about_copyright">© Redsolution LTD, 2010–2015</string>
+    <string name="about_license">License: GNU GPLv3</string>
+    <string name="about_open_source_software">Open source software</string>
 </resources>
\ No newline at end of file

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

@@ -13,10 +13,13 @@
      along with this program. If not, see http://www.gnu.org/licenses/.
 -->
 <resources>
-    <style name="Theme" parent="Theme.AppCompat.Light.DarkActionBar">
-        <item name="windowActionBar">false</item>
-        <item name="windowNoTitle">true</item>
 
+    <style name="Theme" parent="Theme.AppCompat.Light.NoActionBar">
+        <!--for text selection toolbar to be above usual toolbar -->
+        <item name="windowActionModeOverlay">true</item>
+    </style>
+
+    <style name="ThemeDark" parent="Theme.AppCompat.NoActionBar">
         <!--for text selection toolbar to be above usual toolbar -->
         <item name="windowActionModeOverlay">true</item>
     </style>