E-MAIL
diff --git a/app/src/main/ic_dio-web.png b/app/src/main/ic_dis-web.png
similarity index 100%
rename from app/src/main/ic_dio-web.png
rename to app/src/main/ic_dis-web.png
diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
index 7355288..676bc91 100644
--- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
+++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java
@@ -45,6 +45,7 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
setupWebView(savedInstanceState, frameLayoutContainer, viewLoading);
// enables the activity icon as a 'home' button. required if "android:targetSdkVersion" > 14
//getActionBar().setHomeButtonEnabled(true);
+
}
@Override
@@ -155,10 +156,11 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL
webView.loadUrl(Constants.URL_DisApp_FORUM);
return true;
case R.id.action_chat:
- Intent xmpp = new Intent(Intent.ACTION_MAIN);
- PackageManager conversations = getPackageManager();
- xmpp = conversations.getLaunchIntentForPackage("eu.siacs.conversations");
- xmpp.addCategory(Intent.CATEGORY_LAUNCHER);
+ String Conversations = "eu.siacs.conversations";
+ Intent xmpp = getPackageManager().getLaunchIntentForPackage(Conversations);
+ if(xmpp == null) {
+ xmpp = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id="+Conversations));
+ }
startActivity(xmpp);
return true;
case R.id.action_pad:
diff --git a/app/src/main/java/org/disroot/disrootapp/webviews/DisWebViewClient.java b/app/src/main/java/org/disroot/disrootapp/webviews/DisWebViewClient.java
index 247401f..9765be9 100644
--- a/app/src/main/java/org/disroot/disrootapp/webviews/DisWebViewClient.java
+++ b/app/src/main/java/org/disroot/disrootapp/webviews/DisWebViewClient.java
@@ -1,11 +1,19 @@
package org.disroot.disrootapp.webviews;
+import android.content.Context;
+import android.content.Intent;
import android.graphics.Bitmap;
+import android.net.Uri;
import android.os.Bundle;
import android.view.View;
import android.view.ViewGroup;
import android.webkit.WebView;
import android.webkit.WebViewClient;
+import com.example.webview.R;
+
+import org.disroot.disrootapp.ui.MainActivity;
+
+import static android.support.v4.content.ContextCompat.startActivity;
/**
* Created by jackson on 02/11/15.
@@ -20,14 +28,22 @@ public class DisWebViewClient extends WebViewClient {
this.savedInstanceState = savedInstanceState;
this.viewLoading = viewLoading;
}
-
+Context context;
@Override
public boolean shouldOverrideUrlLoading(WebView view, String url) {
- if (savedInstanceState == null)
+ if(url.startsWith("https")&&url.contains("disroot")&&!url.contains("pod")) {
view.loadUrl(url);
- return super.shouldOverrideUrlLoading(view, url);
+ return super.shouldOverrideUrlLoading(view, url);
+ }
+ else {
+ Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
+ view.getContext().startActivity(intent);
+ return true;
+ }
}
+
+
@Override
public void onPageStarted(WebView view, String url, Bitmap favicon) {
super.onPageStarted(view, url, favicon);
diff --git a/app/src/main/res/drawable/ic_about.xml b/app/src/main/res/drawable/ic_about.xml
new file mode 100644
index 0000000..969da36
--- /dev/null
+++ b/app/src/main/res/drawable/ic_about.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_bin.xml b/app/src/main/res/drawable/ic_bin.xml
new file mode 100644
index 0000000..98baa56
--- /dev/null
+++ b/app/src/main/res/drawable/ic_bin.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_board.xml b/app/src/main/res/drawable/ic_board.xml
new file mode 100644
index 0000000..9344443
--- /dev/null
+++ b/app/src/main/res/drawable/ic_board.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_calc.xml b/app/src/main/res/drawable/ic_calc.xml
new file mode 100644
index 0000000..757ec1c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_calc.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_chat.xml b/app/src/main/res/drawable/ic_chat.xml
new file mode 100644
index 0000000..5641731
--- /dev/null
+++ b/app/src/main/res/drawable/ic_chat.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_cloud.xml b/app/src/main/res/drawable/ic_cloud.xml
new file mode 100644
index 0000000..0790f3f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cloud.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_diaspora.xml b/app/src/main/res/drawable/ic_diaspora.xml
new file mode 100644
index 0000000..680eb49
--- /dev/null
+++ b/app/src/main/res/drawable/ic_diaspora.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_forum.xml b/app/src/main/res/drawable/ic_forum.xml
new file mode 100644
index 0000000..7e9c2e7
--- /dev/null
+++ b/app/src/main/res/drawable/ic_forum.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml
index e274e20..c225228 100644
--- a/app/src/main/res/drawable/ic_home.xml
+++ b/app/src/main/res/drawable/ic_home.xml
@@ -8,7 +8,7 @@
android:strokeAlpha="1"
android:strokeLineJoin="miter"
android:strokeWidth="0.01416419"
- android:fillColor="#50162d"
+ android:fillColor="#ffffff"
android:strokeColor="#00000000"
android:fillAlpha="1"
android:strokeLineCap="butt"/>
diff --git a/app/src/main/res/drawable/ic_mail.xml b/app/src/main/res/drawable/ic_mail.xml
new file mode 100644
index 0000000..f30104d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_mail.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_pad.xml b/app/src/main/res/drawable/ic_pad.xml
new file mode 100644
index 0000000..4fc2d00
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pad.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_poll.xml b/app/src/main/res/drawable/ic_poll.xml
new file mode 100644
index 0000000..bc237b6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_poll.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_searx.xml b/app/src/main/res/drawable/ic_searx.xml
new file mode 100644
index 0000000..10dfe79
--- /dev/null
+++ b/app/src/main/res/drawable/ic_searx.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_upload.xml b/app/src/main/res/drawable/ic_upload.xml
new file mode 100644
index 0000000..9573e1c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_upload.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/drawable/ic_user.xml b/app/src/main/res/drawable/ic_user.xml
new file mode 100644
index 0000000..6c62818
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user.xml
@@ -0,0 +1,5 @@
+
+
+
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 6ed82b9..cc719ad 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -18,45 +18,59 @@
android:id="@+id/action_home"
android:title="@string/action_home"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index b6e2c6f..0d3f01c 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -12,7 +12,7 @@