From 1fcafa088fad565b21e11239e2f09823d46d06e3 Mon Sep 17 00:00:00 2001
From: scoute-dich <baumann.juergen@posteo.de>
Date: Wed, 23 Mar 2016 21:07:53 +0100
Subject: [PATCH] removed swipeviewfunction from share activities, removed
 snackbar on menu - exit

---
 app/src/main/AndroidManifest.xml              |  3 +--
 .../de/baumann/diaspora/MainActivity.java     | 10 +-------
 .../de/baumann/diaspora/ShareActivity.java    | 25 +++----------------
 .../de/baumann/diaspora/ShareActivity2.java   | 25 +++----------------
 app/src/main/res/menu/menu_compose.xml        |  7 +++---
 app/src/main/res/values-de/strings.xml        |  2 +-
 app/src/main/res/values/strings.xml           |  2 +-
 7 files changed, 13 insertions(+), 61 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 583b8cfe..8ae6534b 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,8 +10,7 @@
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme"
-        android:windowSoftInputMode="adjustResize" >
+        android:theme="@style/AppTheme" >
         <activity
             android:name=".SplashActivity"
             android:launchMode="singleInstance"
diff --git a/app/src/main/java/de/baumann/diaspora/MainActivity.java b/app/src/main/java/de/baumann/diaspora/MainActivity.java
index e259bbc0..6ee2e8da 100644
--- a/app/src/main/java/de/baumann/diaspora/MainActivity.java
+++ b/app/src/main/java/de/baumann/diaspora/MainActivity.java
@@ -496,15 +496,7 @@ public class MainActivity extends AppCompatActivity
             }
 
             case R.id.action_exit: {
-                Snackbar snackbar = Snackbar
-                        .make(swipeView, R.string.confirm_exit, Snackbar.LENGTH_LONG)
-                        .setAction(R.string.yes, new View.OnClickListener() {
-                            @Override
-                            public void onClick(View view) {
-                                moveTaskToBack(true);
-                            }
-                        });
-                snackbar.show();
+                moveTaskToBack(true);
             }
             break;
 
diff --git a/app/src/main/java/de/baumann/diaspora/ShareActivity.java b/app/src/main/java/de/baumann/diaspora/ShareActivity.java
index d854d11f..d13f3a75 100644
--- a/app/src/main/java/de/baumann/diaspora/ShareActivity.java
+++ b/app/src/main/java/de/baumann/diaspora/ShareActivity.java
@@ -74,8 +74,7 @@ public class ShareActivity extends MainActivity {
         progressBar = (ProgressBar)findViewById(R.id.progressBar);
 
         swipeView = (SwipeRefreshLayout) findViewById(R.id.swipe);
-        swipeView.setColorSchemeResources(R.color.colorPrimary,
-                R.color.fab_big);
+        swipeView.setEnabled(false);
 
         toolbar.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -137,18 +136,6 @@ public class ShareActivity extends MainActivity {
             }
         });
 
-        swipeView.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                if (Helpers.isOnline(ShareActivity.this)) {
-                    webView.reload();
-                } else {
-                    Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
-                    swipeView.setRefreshing(false);
-                }
-            }
-        });
-
 
         /*
          * WebChromeClient
@@ -332,14 +319,8 @@ public class ShareActivity extends MainActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        if (id == R.id.action_reload) {
-            if (Helpers.isOnline(ShareActivity.this)) {
-                webView.reload();
-                return true;
-            } else {
-                Snackbar.make(getWindow().findViewById(R.id.drawer_layout), R.string.no_internet, Snackbar.LENGTH_LONG).show();
-                return false;
-            }
+        if (id == R.id.action_exit) {
+            moveTaskToBack(true);
         }
 
         return super.onOptionsItemSelected(item);
diff --git a/app/src/main/java/de/baumann/diaspora/ShareActivity2.java b/app/src/main/java/de/baumann/diaspora/ShareActivity2.java
index a7aeddbd..28aef6ae 100644
--- a/app/src/main/java/de/baumann/diaspora/ShareActivity2.java
+++ b/app/src/main/java/de/baumann/diaspora/ShareActivity2.java
@@ -74,8 +74,7 @@ public class ShareActivity2 extends MainActivity {
         progressBar = (ProgressBar)findViewById(R.id.progressBar);
 
         swipeView = (SwipeRefreshLayout) findViewById(R.id.swipe);
-        swipeView.setColorSchemeResources(R.color.colorPrimary,
-                R.color.fab_big);
+        swipeView.setEnabled(false);
 
         toolbar.setOnClickListener(new View.OnClickListener() {
             @Override
@@ -137,18 +136,6 @@ public class ShareActivity2 extends MainActivity {
             }
         });
 
-        swipeView.setOnRefreshListener(new SwipeRefreshLayout.OnRefreshListener() {
-            @Override
-            public void onRefresh() {
-                if (Helpers.isOnline(ShareActivity2.this)) {
-                    webView.reload();
-                } else {
-                    Snackbar.make(swipeView, R.string.no_internet, Snackbar.LENGTH_LONG).show();
-                    swipeView.setRefreshing(false);
-                }
-            }
-        });
-
 
         /*
          * WebChromeClient
@@ -333,14 +320,8 @@ public class ShareActivity2 extends MainActivity {
     public boolean onOptionsItemSelected(MenuItem item) {
         int id = item.getItemId();
 
-        if (id == R.id.action_reload) {
-            if (Helpers.isOnline(ShareActivity2.this)) {
-                webView.reload();
-                return true;
-            } else {
-                Snackbar.make(getWindow().findViewById(R.id.drawer_layout), R.string.no_internet, Snackbar.LENGTH_SHORT).show();
-                return false;
-            }
+        if (id == R.id.action_exit) {
+            moveTaskToBack(true);
         }
 
         return super.onOptionsItemSelected(item);
diff --git a/app/src/main/res/menu/menu_compose.xml b/app/src/main/res/menu/menu_compose.xml
index 9b4f21de..fa69292e 100644
--- a/app/src/main/res/menu/menu_compose.xml
+++ b/app/src/main/res/menu/menu_compose.xml
@@ -3,11 +3,10 @@
     xmlns:tools="http://schemas.android.com/tools" tools:context=".MainActivity">
 
     <item
-        android:id="@+id/action_reload"
+        android:id="@+id/action_exit"
         android:icon="@drawable/ic_sync_white_24dp"
-        android:title="@string/reload"
-        android:orderInCategory="109"
-        app:showAsAction="ifRoom" />
+        android:title="@string/exit_app"
+        app:showAsAction="never" />
 
     <!--<item-->
         <!--android:id="@+id/exit_app"-->
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 04bffee9..6b0e0069 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -58,7 +58,7 @@
 
     //Dialog
     <string name="messages">Unterhaltungen</string>
-    <string name="new_post">Neuer Beitrag</string>
+    <string name="new_post">D* Neuer Beitrag</string>
     <string name="notifications">Benachrichtigungen</string>
     <string name="settings_font">Schriftgröße ändern</string>
     <string name="settings_image">Bilder laden umschalten</string>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a0918c7b..f75a338a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -31,7 +31,7 @@
     <string name="yes">YES</string>
     <string name="no">NO</string>
     <string name="change_pod_warning">This will erase all cookies and session data. Do you really want to change pods?</string>
-    <string name="new_post">New message</string>
+    <string name="new_post">D* New message</string>
     <string name="new_post1">D* Text only</string>
     <string name="new_post2">D* Title and text</string>
     <string name="notifications">Notifications</string>