UI elements for sending typcing indicators

markwinter · Apr 20, 2014 · ebe7d38 · ebe7d38
1 parent 3a3902d
commit ebe7d38
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 9 deletions.
diff --git a/app/src/main/java/im/tox/antox/activities/SettingsActivity.java b/app/src/main/java/im/tox/antox/activities/SettingsActivity.java
@@ -64,7 +64,10 @@ public class SettingsActivity extends ActionBarActivity
      */
     private Spinner themeSpinner;
 
-
+    /**
+     * Checkbox for sending typing indicators
+     */
+    private CheckBox indicatorBox;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -165,6 +168,13 @@ protected void onCreate(Bundle savedInstanceState) {
             default:
                 break;
         }
+
+        indicatorBox = (CheckBox) findViewById(R.id.settings_typing_indicators_box);
+        String indicators = pref.getString("indicators", "");
+        if(indicators.equals("0"))
+            indicatorBox.setChecked(false);
+        else
+            indicatorBox.setChecked(true);
     }
 
     /**
@@ -261,6 +271,12 @@ public void updateSettings(View view) {
             setResult(RESULT_OK - 1);
         }
 
+        // Update typing indicators
+        boolean indicators = indicatorBox.isChecked();
+        if(indicators)
+            editor.putString("indicators", "1");
+        else
+            editor.putString("indicators", "0");
 
         editor.commit();
 

diff --git a/app/src/main/java/im/tox/antox/fragments/ChatFragment.java b/app/src/main/java/im/tox/antox/fragments/ChatFragment.java
@@ -64,13 +64,6 @@ public void sendMessage() {
         db.close();
     }
 
-
-    public void setContact(int position, String contact) {
-        if (contact != null) {
-
-        }
-    }
-
     public void updateChat(ArrayList<Message> messages) {
         AntoxDB db = new AntoxDB(getActivity().getApplicationContext());
         if(!db.isFriendBlocked(toxSingleton.activeFriendKey)) {
@@ -86,7 +79,6 @@ public void updateChat(ArrayList<Message> messages) {
         }
     }
 
-
     @SuppressWarnings("deprecation")
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,

diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
@@ -62,6 +62,13 @@
             android:checked="false"
             android:onClick="onDhtBoxClicked"/>
 
+        <CheckBox
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/settings_send_typing_indicators"
+            android:checked="true"
+            android:layout_gravity="center_horizontal|left"
+            android:id="@+id/settings_typing_indicators_box"/>
 
         <Button
             android:id="@+id/updateSettings"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -73,6 +73,7 @@
     <string name="settings_username_title">Username</string>
     <string name="settings_empty_strings">You must fill out all fields</string>
     <string name="settings_invalid_key">Invalid key entered</string>
+    <string name="settings_send_typing_indicators">Send Typing Indicators</string>
     <string name="developer_string">Made with love by the Tox Development Team</string>
     <string name="welcome_must_select_username">You must set a name</string>