From b34ea0a7455e6b65bae50a93d778482156f435ff Mon Sep 17 00:00:00 2001
From: NudeDude <extremeoverclocking>
Date: Sun, 6 Jan 2019 17:59:15 +0100
Subject: [PATCH] layout fix added more error notification

---
 .../twidda/backend/MessageUpload.java         |   9 ++
 .../twidda/backend/ProfileLoader.java         |  10 +-
 .../twidda/backend/StatusLoader.java          |   7 +-
 app/src/main/res/layout/popup_dm.xml          | 102 +++++++-------
 app/src/main/res/layout/popup_tweet.xml       | 130 +++++++++---------
 app/src/main/res/values-de-rDE/strings.xml    |   1 +
 app/src/main/res/values/strings.xml           |   1 +
 app/src/main/res/values/styles.xml            |   4 +
 8 files changed, 150 insertions(+), 114 deletions(-)

diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/MessageUpload.java b/app/src/main/java/org/nuclearfog/twidda/backend/MessageUpload.java
index 144d1a27..f9f40c50 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/MessageUpload.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/MessageUpload.java
@@ -99,6 +99,15 @@ public class MessageUpload extends AsyncTask<String, Void, Void> {
                 case 420:
                     Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_SHORT).show();
                     break;
+
+                case 150:
+                    Toast.makeText(ui.get(), R.string.cant_send_dm, Toast.LENGTH_SHORT).show();
+                    break;
+
+                case 50:
+                    Toast.makeText(ui.get(), R.string.user_not_found, Toast.LENGTH_SHORT).show();
+                    break;
+
                 default:
                     Toast.makeText(ui.get(), errorMsg, Toast.LENGTH_LONG).show();
             }
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java
index f1073481..ea9f19ad 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/ProfileLoader.java
@@ -304,13 +304,15 @@ public class ProfileLoader extends AsyncTask<Long, Long, Long> {
         } else if (MODE == FAILURE) {
 
             switch (returnCode) {
-                case 420:
+
+                case 420:   //
+                case 429:   // Rate limit exceeded!
                     Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_SHORT).show();
                     break;
 
-                case 50:
-                case 63:
-                case 136:
+                case 50:    // USER not found
+                case 63:    // USER suspended
+                case 136:   // Blocked!
                     Toast.makeText(ui.get(), R.string.user_not_found, Toast.LENGTH_SHORT).show();
                     ui.get().finish();
                     break;
diff --git a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
index 9fc3be96..2c61fb26 100644
--- a/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
+++ b/app/src/main/java/org/nuclearfog/twidda/backend/StatusLoader.java
@@ -120,7 +120,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
 
         } catch (TwitterException err) {
             returnCode = err.getErrorCode();
-            if (returnCode == 144 || returnCode == 34)
+            if (returnCode == 144 || returnCode == 34 || returnCode == 63)
                 database.removeStatus(TWEETID);
             else
                 errMsg += err.getMessage();
@@ -236,6 +236,7 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
             switch (returnCode) {
 
                 case 420:
+                case 429:
                     Toast.makeText(ui.get(), R.string.rate_limit_exceeded, Toast.LENGTH_SHORT).show();
                     break;
 
@@ -253,6 +254,10 @@ public class StatusLoader extends AsyncTask<Long, Void, Long> {
                     ui.get().finish();
                     break;
 
+                case -1:
+                    Toast.makeText(ui.get(), R.string.error_not_specified, Toast.LENGTH_SHORT).show();
+                    break;
+
                 default:
                     Toast.makeText(ui.get(), errMsg, Toast.LENGTH_LONG).show();
             }
diff --git a/app/src/main/res/layout/popup_dm.xml b/app/src/main/res/layout/popup_dm.xml
index 2b8a0a9c..ba51b284 100644
--- a/app/src/main/res/layout/popup_dm.xml
+++ b/app/src/main/res/layout/popup_dm.xml
@@ -1,62 +1,70 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView
+    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"
-    android:id="@+id/dm_popup"
+    style="@style/PopupCardView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:orientation="vertical"
-    android:padding="@dimen/layout_margin">
+    android:layout_gravity="center">
 
     <LinearLayout
+        android:id="@+id/dm_popup"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/layout_margin"
-        android:gravity="end|center_vertical"
-        android:orientation="horizontal">
+        android:layout_height="match_parent"
+        android:background="@color/tweetwindow"
+        android:orientation="vertical"
+        android:padding="@dimen/layout_margin">
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginBottom="@dimen/layout_margin"
+            android:gravity="end|center_vertical"
+            android:orientation="horizontal">
+
+            <EditText
+                android:id="@+id/dm_receiver"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/dm_button_size"
+                android:layout_weight="1"
+                android:background="@android:color/transparent"
+                android:hint="@string/username"
+                android:importantForAutofill="no"
+                android:inputType="text"
+                android:singleLine="true"
+                tools:targetApi="o" />
+
+            <ImageView
+                android:id="@+id/dm_media"
+                android:layout_width="@dimen/dm_button_size"
+                android:layout_height="@dimen/dm_button_size"
+                android:layout_marginStart="@dimen/dm_icon_margin"
+                android:layout_marginLeft="@dimen/dm_icon_margin"
+                android:contentDescription="@string/add_image"
+                app:srcCompat="@drawable/image" />
+
+            <ImageView
+                android:id="@+id/dm_send"
+                android:layout_width="@dimen/dm_button_size"
+                android:layout_height="@dimen/dm_button_size"
+                android:layout_marginStart="@dimen/button_margin"
+                android:layout_marginLeft="@dimen/button_margin"
+                android:contentDescription="@string/close_dm"
+                app:srcCompat="@drawable/right" />
+
+        </LinearLayout>
 
         <EditText
-            android:id="@+id/dm_receiver"
-            android:layout_width="0dp"
-            android:layout_height="@dimen/dm_button_size"
-            android:layout_weight="1"
+            android:id="@+id/dm_text"
+            android:layout_width="@dimen/text_input_width"
+            android:layout_height="@dimen/text_input_height"
             android:background="@android:color/transparent"
-            android:hint="@string/username"
-            android:inputType="text"
+            android:gravity="start"
+            android:hint="@string/dmessage"
             android:importantForAutofill="no"
-            android:singleLine="true"
+            android:inputType="textMultiLine"
             tools:targetApi="o" />
-
-        <ImageView
-            android:id="@+id/dm_media"
-            android:layout_width="@dimen/dm_button_size"
-            android:layout_height="@dimen/dm_button_size"
-            android:layout_marginStart="@dimen/dm_icon_margin"
-            android:layout_marginLeft="@dimen/dm_icon_margin"
-            android:contentDescription="@string/add_image"
-            app:srcCompat="@drawable/image" />
-
-        <ImageView
-            android:id="@+id/dm_send"
-            android:layout_width="@dimen/dm_button_size"
-            android:layout_height="@dimen/dm_button_size"
-            android:layout_marginStart="@dimen/button_margin"
-            android:layout_marginLeft="@dimen/button_margin"
-            android:contentDescription="@string/close_dm"
-            app:srcCompat="@drawable/right" />
-
     </LinearLayout>
 
-    <EditText
-        android:id="@+id/dm_text"
-        android:layout_width="@dimen/text_input_width"
-        android:layout_height="@dimen/text_input_height"
-        android:background="@android:color/transparent"
-        android:gravity="start"
-        android:hint="@string/dmessage"
-        android:importantForAutofill="no"
-        android:inputType="textMultiLine"
-        tools:targetApi="o" />
-
-</LinearLayout>
\ No newline at end of file
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/popup_tweet.xml b/app/src/main/res/layout/popup_tweet.xml
index 953164b8..1219bda5 100644
--- a/app/src/main/res/layout/popup_tweet.xml
+++ b/app/src/main/res/layout/popup_tweet.xml
@@ -1,79 +1,85 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.v7.widget.CardView
+    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"
-    android:id="@+id/tweet_popup"
+    style="@style/PopupCardView"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:background="@color/tweetwindow"
-    android:orientation="vertical">
-
-    <EditText
-        android:id="@+id/tweet_input"
-        android:layout_width="@dimen/text_input_width"
-        android:layout_height="@dimen/text_input_height"
-        android:layout_marginLeft="@dimen/layout_margin"
-        android:layout_marginTop="@dimen/layout_margin"
-        android:layout_marginRight="@dimen/layout_margin"
-        android:background="@android:color/transparent"
-        android:gravity="top"
-        android:hint="@string/tweet"
-        android:importantForAutofill="no"
-        android:inputType="textMultiLine"
-        tools:targetApi="o" />
+    android:layout_gravity="center">
 
     <LinearLayout
+        android:id="@+id/tweet_popup"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_margin="@dimen/layout_margin"
-        android:gravity="end|center_vertical"
-        android:orientation="horizontal">
+        android:background="@color/tweetwindow"
+        android:orientation="vertical"
+        android:padding="@dimen/layout_margin">
 
-        <TextView
-            android:id="@+id/imgcount"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textColor="@android:color/holo_red_dark"
-            android:textSize="18sp" />
+        <EditText
+            android:id="@+id/tweet_input"
+            android:layout_width="@dimen/text_input_width"
+            android:layout_height="@dimen/text_input_height"
+            android:background="@android:color/transparent"
+            android:gravity="top"
+            android:hint="@string/tweet"
+            android:importantForAutofill="no"
+            android:inputType="textMultiLine"
+            tools:targetApi="o" />
 
-        <ImageView
-            android:id="@+id/img_preview"
-            android:layout_width="@dimen/tweet_button_size"
-            android:layout_height="@dimen/tweet_button_size"
-            android:layout_marginStart="@dimen/tweet_icon_margin"
-            android:layout_marginLeft="@dimen/tweet_icon_margin"
-            android:contentDescription="@string/image_preview"
-            android:visibility="invisible"
-            app:srcCompat="@drawable/preview" />
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_margin="@dimen/layout_margin"
+            android:gravity="end|center_vertical"
+            android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="@dimen/tweet_button_size"
-            android:layout_height="@dimen/tweet_button_size"
-            android:layout_marginStart="@dimen/tweet_icon_margin"
-            android:layout_marginLeft="@dimen/tweet_icon_margin"
-            android:contentDescription="@string/add_image"
-            app:srcCompat="@drawable/image" />
+            <TextView
+                android:id="@+id/imgcount"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:textColor="@android:color/holo_red_dark"
+                android:textSize="18sp" />
 
-        <ImageView
-            android:id="@+id/sendTweet"
-            android:layout_width="@dimen/tweet_button_size"
-            android:layout_height="@dimen/tweet_button_size"
-            android:layout_marginStart="@dimen/tweet_icon_margin"
-            android:layout_marginLeft="@dimen/tweet_icon_margin"
-            android:contentDescription="@string/send_tweet"
-            app:srcCompat="@drawable/tweet" />
+            <ImageView
+                android:id="@+id/img_preview"
+                android:layout_width="@dimen/tweet_button_size"
+                android:layout_height="@dimen/tweet_button_size"
+                android:layout_marginStart="@dimen/tweet_icon_margin"
+                android:layout_marginLeft="@dimen/tweet_icon_margin"
+                android:contentDescription="@string/image_preview"
+                android:visibility="invisible"
+                app:srcCompat="@drawable/preview" />
 
-        <ImageView
-            android:id="@+id/close"
-            android:layout_width="@dimen/tweet_button_size"
-            android:layout_height="@dimen/tweet_button_size"
-            android:layout_marginStart="@dimen/tweet_icon_margin"
-            android:layout_marginLeft="@dimen/tweet_icon_margin"
-            android:contentDescription="@string/tweet_close"
-            app:srcCompat="@drawable/cross" />
+            <ImageView
+                android:id="@+id/image"
+                android:layout_width="@dimen/tweet_button_size"
+                android:layout_height="@dimen/tweet_button_size"
+                android:layout_marginStart="@dimen/tweet_icon_margin"
+                android:layout_marginLeft="@dimen/tweet_icon_margin"
+                android:contentDescription="@string/add_image"
+                app:srcCompat="@drawable/image" />
+
+            <ImageView
+                android:id="@+id/sendTweet"
+                android:layout_width="@dimen/tweet_button_size"
+                android:layout_height="@dimen/tweet_button_size"
+                android:layout_marginStart="@dimen/tweet_icon_margin"
+                android:layout_marginLeft="@dimen/tweet_icon_margin"
+                android:contentDescription="@string/send_tweet"
+                app:srcCompat="@drawable/tweet" />
+
+            <ImageView
+                android:id="@+id/close"
+                android:layout_width="@dimen/tweet_button_size"
+                android:layout_height="@dimen/tweet_button_size"
+                android:layout_marginStart="@dimen/tweet_icon_margin"
+                android:layout_marginLeft="@dimen/tweet_icon_margin"
+                android:contentDescription="@string/tweet_close"
+                app:srcCompat="@drawable/cross" />
+
+        </LinearLayout>
 
     </LinearLayout>
 
-</LinearLayout>
\ No newline at end of file
+</android.support.v7.widget.CardView>
\ No newline at end of file
diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml
index d95acf32..4da1e357 100644
--- a/app/src/main/res/values-de-rDE/strings.xml
+++ b/app/src/main/res/values-de-rDE/strings.xml
@@ -95,4 +95,5 @@
     <string name="close_dm">Direktnachricht schließen</string>
     <string name="user_not_found">Nutzer nicht gefunden!</string>
     <string name="profile_tweets">Profile tweets</string>
+    <string name="cant_send_dm">Nachricht kann nicht an den User gesendet werden!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 163f0a22..87e87c75 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -103,4 +103,5 @@
     <string name="close_dm">close direct message</string>
     <string name="user_not_found">user not found!</string>
     <string name="profile_tweets">Profile tweets</string>
+    <string name="cant_send_dm">cannot send dm to user!</string>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 295119c1..04fa1d6a 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -39,6 +39,10 @@
         <item name="cardCornerRadius">5dp</item>
     </style>
 
+    <style name="PopupCardView" parent="CardView">
+        <item name="cardCornerRadius">10dp</item>
+    </style>
+
     <style name="CustomButton" parent="Widget.AppCompat.Button">
         <item name="android:textAllCaps">false</item>
         <item name="android:fontFamily">RobotoTextView</item>