From 52f7808a70f98396d4527e5f04b2455c0777df54 Mon Sep 17 00:00:00 2001
From: Aran Zaiger <aranzaiger@gmail.com>
Date: Sun, 3 Jul 2016 14:32:08 +0300
Subject: [PATCH 1/4] added limitation in adding note

---
 .idea/gradle.xml                              |   2 +-
 .../sagi/thesocialnotework/ListAdapter.java   |  12 +-
 .../ara/sagi/thesocialnotework/Note.java      |  30 ++++-
 .../PersonalSpaceActivity.java                | 127 +++++++++++++-----
 app/src/main/res/layout/note_view_mini.xml    |  74 +++++++---
 5 files changed, 184 insertions(+), 61 deletions(-)

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 58992cc..ee6ddd0 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="$APPLICATION_HOME_DIR$/gradle/gradle-2.10" />
+        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.10" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/ListAdapter.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/ListAdapter.java
index 9070d6a..a58dbde 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/ListAdapter.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/ListAdapter.java
@@ -59,12 +59,18 @@ public class ListAdapter extends BaseAdapter {
         TextView title = (TextView) v.findViewById(R.id.nvm_title_textview);
         TextView datetime = (TextView) v.findViewById(R.id.nvm_time_textview);
         TextView location = (TextView) v.findViewById(R.id.nvm_location_textview);
+        TextView likes = (TextView) v.findViewById(R.id.nvm_likes_textview);
+        TextView permission = (TextView) v.findViewById(R.id.nvm_permission_textview);
 //        NetworkImageView thumbNail = (NetworkImageView) v.findViewById(R.id.infoImageImageView);
 //        String url = mVideos.get(position).getImgURL();
 //        thumbNail.setImageUrl(url, VolleyUtilSingleTone.getInstance(mContext).getImageLoader());
-        title.setText(mNotes.get(position).getTitle());
-        datetime.setText(Html.fromHtml(mNotes.get(position).getTimestamp()));
-        location.setText(mNotes.get(position).getAddress());
+        Note curNote = mNotes.get(position);
+        title.setText(curNote.getTitle());
+        datetime.setText(Html.fromHtml(curNote.getTimestamp()));
+        location.setText(curNote.getAddress());
+        likes.setText(""+curNote.getLikes());
+        permission.setText(curNote.isPublic() ? "Public":"Private");
+
 //        Animation animation = AnimationUtils.loadAnimation(mContext, (position > lastPosition) ? R.anim.up_from_bottom : R.anim.down_from_top);
 //        v.startAnimation(animation);
         lastPosition = position;
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Note.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Note.java
index 4311fb2..4d8bfeb 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Note.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/Note.java
@@ -1,25 +1,32 @@
 package com.android_app.matan.ara.sagi.thesocialnotework;
 
+import java.util.ArrayList;
+
 /**
  * Created by JERLocal on 7/1/2016.
  */
 public class Note {
 
-//    protected int id;
+    protected int likes;
+    protected ArrayList<String> tags;
     protected float lat, lon;
-    protected String id, address, title, body;
-    protected String  timestamp;
+    protected String id, address, title, body, timestamp;
     protected boolean isPublic;
 
-    public Note(String id, float lat, float lon, String address, String title, String body, String timestamp, boolean isPublic) {
+
+
+    public Note(String id, float lat, float lon, String address, String title, String body, String timestamp, boolean isPublic, int likes, ArrayList<String> tags) {
         this.id = id;
         this.lat = lat;
         this.lon = lon;
         this.address = address;
+
         this.title = title;
         this.body = body;
         this.timestamp = timestamp;
         this.isPublic = isPublic;
+        this.likes = likes;
+        this.tags =  tags;
     }
 
     @Override
@@ -103,6 +110,21 @@ public class Note {
     public String getLocationAndTime() {
         return getTimestamp()+" at "+ getAddress();
     }
+    public int getLikes() {
+        return likes;
+    }
+
+    public void setLikes(int likes) {
+        this.likes = likes;
+    }
+
+    public ArrayList<String> getTags() {
+        return tags;
+    }
+
+    public void setTags(ArrayList<String> tags) {
+        this.tags = tags;
+    }
 
 //    public void save(SQLiteOpenHelper dbHelper, Context context){
 //        SQLiteDatabase db = dbHelper.getWritableDatabase();
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalSpaceActivity.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalSpaceActivity.java
index f76baa5..426bf28 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalSpaceActivity.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/PersonalSpaceActivity.java
@@ -15,6 +15,7 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.ListView;
 import android.widget.Switch;
+import android.widget.Toast;
 
 import com.android.volley.Request;
 import com.android.volley.Response;
@@ -29,6 +30,7 @@ import org.json.JSONObject;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -72,8 +74,8 @@ public class PersonalSpaceActivity extends AppCompatActivity {
 
 
         listOfNotes = new ArrayList<>();
-        //add demo notes to view
-        addDemoNotes(listOfNotes);
+        //TODO - remove -add demo notes to view
+//        addDemoNotes(listOfNotes);
         noteListAdapter = new ListAdapter(this, listOfNotes);
 
         noteList.setAdapter(noteListAdapter);
@@ -123,6 +125,22 @@ public class PersonalSpaceActivity extends AppCompatActivity {
 
             saveBtn.setOnClickListener(new View.OnClickListener() {
                 public void onClick(View v) {
+
+                    //title too short
+                    if (newTitle.getText().length() == 0)
+                    {
+                        Toast toast = Toast.makeText(PersonalSpaceActivity.this, "Title too short.", Toast.LENGTH_LONG);
+                        toast.show();
+                        return;
+                    }
+
+                    //title too long
+                    if (newTitle.getText().length() > 20)
+                    {
+                        Toast toast = Toast.makeText(PersonalSpaceActivity.this, "Title too long.\n Use up to 20 notes.", Toast.LENGTH_LONG);
+                        toast.show();
+                        return;
+                    }
                     //volley post
                     final JSONObject noteJson = new JSONObject();
                     try {
@@ -165,17 +183,17 @@ public class PersonalSpaceActivity extends AppCompatActivity {
 
 
 
-    //TODO remove
-    public void addDemoNotes(List<Note> listOfNotes) {
-        Note n1 = new Note("1", 100, 100, "location1", "My 1st Title", "ohh i'm so sexy1", ""+System.currentTimeMillis() / 1000, true);
-        Note n2 = new Note("2", 200, 200, "location2", "My 2st Title", "ohh i'm so sexy2", ""+System.currentTimeMillis() / 1000, true);
-        Note n3 = new Note("3", 300, 300, "hell", "My 3st Title", "ohh i'm so sexy3", ""+System.currentTimeMillis() / 1000, true);
-//        Note n4 = new Note("4", 400, 400, "hell2", "My 4st Title", "ohh i'm so sexy4", ""+System.currentTimeMillis() / 1000, true);
-        listOfNotes.add(n1);
-        listOfNotes.add(n2);
-        listOfNotes.add(n3);
-//        listOfNotes.add(n4);
-    }
+//    //TODO remove
+//    public void addDemoNotes(List<Note> listOfNotes) {
+//        Note n1 = new Note("1", 100, 100, "location1", "My 1st Title", "ohh i'm so sexy1", ""+System.currentTimeMillis() / 1000, true);
+//        Note n2 = new Note("2", 200, 200, "location2", "My 2st Title", "ohh i'm so sexy2", ""+System.currentTimeMillis() / 1000, true);
+//        Note n3 = new Note("3", 300, 300, "hell", "My 3st Title", "ohh i'm so sexy3", ""+System.currentTimeMillis() / 1000, true);
+////        Note n4 = new Note("4", 400, 400, "hell2", "My 4st Title", "ohh i'm so sexy4", ""+System.currentTimeMillis() / 1000, true);
+//        listOfNotes.add(n1);
+//        listOfNotes.add(n2);
+//        listOfNotes.add(n3);
+////        listOfNotes.add(n4);
+//    }
 
 
     public void setLocationPermission(boolean locationPermission) {
@@ -192,19 +210,22 @@ public class PersonalSpaceActivity extends AppCompatActivity {
                 Date time = new Date();
                 JSONObject noteObject = response.getJSONObject("note");
                 time.setTime(noteObject.getLong("created_at"));
+                addNoteFromJsonObj(noteObject, time);
 
-                Note addNote = new Note(
-                        noteObject.getString("id"),
-                        Float.parseFloat(noteObject.getJSONObject("location").getString("lat")),
-                        Float.parseFloat(noteObject.getJSONObject("location").getString("lng")),
-                        noteObject.getJSONObject("location").getString("address"),
-                        noteObject.getString("title"),
-                        noteObject.getString("body"),
-                        time.toString(),
-                        noteObject.getBoolean("is_public")
-                );
-
-                listOfNotes.add(addNote);
+//                Note addNote = new Note(
+//                        noteObject.getString("id"),
+//                        Float.parseFloat(noteObject.getJSONObject("location").getString("lat")),
+//                        Float.parseFloat(noteObject.getJSONObject("location").getString("lng")),
+//                        noteObject.getJSONObject("location").getString("address"),
+//                        noteObject.getString("title"),
+//                        noteObject.getString("body"),
+//                        time.toString(),
+//                        noteObject.getBoolean("is_public"),
+//                        noteObject.getInt("likes"),
+//                        jsonArrayToStringArray(noteObject.getJSONArray("tags"))
+//                );
+//
+//                listOfNotes.add(addNote);
                 noteList.setAdapter(noteListAdapter);
             } catch (Exception e) {
                 Log.e(TAG, "newNoteSuccess:" + e.getMessage());
@@ -236,17 +257,20 @@ public class PersonalSpaceActivity extends AppCompatActivity {
                     JSONObject noteObject = noteObjectsArray.getJSONObject(i);
                     time.setTime(noteObject.getLong("created_at"));
 
-                    Note addNote = new Note(
-                            noteObject.getString("id"),
-                            Float.parseFloat(noteObject.getJSONObject("location").getString("lat")),
-                            Float.parseFloat(noteObject.getJSONObject("location").getString("lng")),
-                            noteObject.getJSONObject("location").getString("address"),
-                            noteObject.getString("title"),
-                            noteObject.getString("body"),
-                            time.toString(),
-                            noteObject.getBoolean("is_public")
-                    );
-                    listOfNotes.add(addNote);
+                    addNoteFromJsonObj(noteObject, time);
+//                    Note addNote = new Note(
+//                            noteObject.getString("id"),
+//                            Float.parseFloat(noteObject.getJSONObject("location").getString("lat")),
+//                            Float.parseFloat(noteObject.getJSONObject("location").getString("lng")),
+//                            noteObject.getJSONObject("location").getString("address"),
+//                            noteObject.getString("title"),
+//                            noteObject.getString("body"),
+//                            time.toString(),
+//                            noteObject.getBoolean("is_public"),
+//                            noteObject.getInt("likes"),
+//                            jsonArrayToStringArray(noteObject.getJSONArray("tags"))
+//                    );
+//                    listOfNotes.add(addNote);
                 }
                 noteList.setAdapter(noteListAdapter);
             } catch (Exception e) {
@@ -326,4 +350,35 @@ public class PersonalSpaceActivity extends AppCompatActivity {
 
 
 
+    private ArrayList<String> jsonArrayToStringArray(JSONArray jArray){
+        ArrayList<String> stringArray = new ArrayList<String>();
+        for(int i = 0, count = jArray.length(); i< count; i++)
+        {
+            try {
+                JSONObject jsonObject = jArray.getJSONObject(i);
+                stringArray.add(jsonObject.toString());
+            }
+            catch (JSONException e) {
+                e.printStackTrace();
+            }
+        }
+        return stringArray;
+    }
+
+    private void addNoteFromJsonObj(JSONObject noteObject, Date time) throws JSONException {
+        Note addNote = new Note(
+                noteObject.getString("id"),
+                Float.parseFloat(noteObject.getJSONObject("location").getString("lat")),
+                Float.parseFloat(noteObject.getJSONObject("location").getString("lng")),
+                noteObject.getJSONObject("location").getString("address"),
+                noteObject.getString("title"),
+                noteObject.getString("body"),
+                time.toString(),
+                noteObject.getBoolean("is_public"),
+                noteObject.getInt("likes"),
+                jsonArrayToStringArray(noteObject.getJSONArray("tags"))
+        );
+        listOfNotes.add(addNote);
+
+    }
 }
diff --git a/app/src/main/res/layout/note_view_mini.xml b/app/src/main/res/layout/note_view_mini.xml
index 9259bb3..295c71a 100644
--- a/app/src/main/res/layout/note_view_mini.xml
+++ b/app/src/main/res/layout/note_view_mini.xml
@@ -1,27 +1,67 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical" android:layout_width="match_parent"
+    android:orientation="horizontal" android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:text="Note Title"
-        android:id="@+id/nvm_title_textview" />
+        android:layout_width="0dp"
+        android:layout_height="70dp"
+        android:id="@+id/nvm_permission_textview"
+        android:background="@android:drawable/ic_lock_lock"
+        android:layout_weight="0.2"
+        />
 
-    <TextView
-        android:layout_width="fill_parent"
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="Date and time"
-        android:id="@+id/nvm_time_textview" />
+        android:layout_weight="0.6">
 
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:text="location"
-        android:id="@+id/nvm_location_textview" />
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceMedium"
+            android:text="Note Title"
+            android:id="@+id/nvm_title_textview" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="Date and time"
+            android:id="@+id/nvm_time_textview" />
+
+        <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="location"
+            android:id="@+id/nvm_location_textview" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:orientation="vertical"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="0.2">
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Tags #1"
+            android:id="@+id/nvm_tags1_textview" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Tags #2"
+            android:id="@+id/nvm_tags2_textview" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Likes"
+            android:id="@+id/nvm_likes_textview" />
+    </LinearLayout>
 
 </LinearLayout>
\ No newline at end of file

From 77970845cbb9cd4457201b3af6d28ef609d90fe0 Mon Sep 17 00:00:00 2001
From: Sagi Dayan <sagidayan@gmail.com>
Date: Sun, 3 Jul 2016 15:17:11 +0300
Subject: [PATCH 2/4] New Login Look

---
 .../animated_vector_drawable_23_3_0.xml       |   2 -
 .idea/libraries/appcompat_v7_23_3_0.xml       |   2 -
 .idea/libraries/design_23_3_0.xml             |   2 -
 .idea/libraries/recyclerview_v7_23_3_0.xml    |   4 +-
 .../libraries/support_annotations_23_3_0.xml  |   4 +-
 .idea/libraries/support_v4_23_3_0.xml         |   4 +-
 .../support_vector_drawable_23_3_0.xml        |   2 -
 .idea/libraries/volley_1_0_0.xml              |   2 +-
 .idea/misc.xml                                |   2 +-
 .../sagi/thesocialnotework/LoginActivity.java |  64 ++-------
 app/src/main/res/drawable/logo.png            | Bin 0 -> 17361 bytes
 app/src/main/res/layout/activity_login.xml    | 128 +++++++++---------
 app/src/main/res/values/strings.xml           |   2 +-
 13 files changed, 82 insertions(+), 136 deletions(-)
 create mode 100644 app/src/main/res/drawable/logo.png

diff --git a/.idea/libraries/animated_vector_drawable_23_3_0.xml b/.idea/libraries/animated_vector_drawable_23_3_0.xml
index 4ba521e..d5460f1 100644
--- a/.idea/libraries/animated_vector_drawable_23_3_0.xml
+++ b/.idea/libraries/animated_vector_drawable_23_3_0.xml
@@ -6,8 +6,6 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/23.3.0/animated-vector-drawable-23.3.0-sources.jar!/" />
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/23.3.0/animated-vector-drawable-23.3.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/animated-vector-drawable/23.3.0/animated-vector-drawable-23.3.0-sources.jar!/" />
     </SOURCES>
   </library>
diff --git a/.idea/libraries/appcompat_v7_23_3_0.xml b/.idea/libraries/appcompat_v7_23_3_0.xml
index de5aaeb..0dbe7ef 100644
--- a/.idea/libraries/appcompat_v7_23_3_0.xml
+++ b/.idea/libraries/appcompat_v7_23_3_0.xml
@@ -9,8 +9,6 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.3.0/appcompat-v7-23.3.0-sources.jar!/" />
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.3.0/appcompat-v7-23.3.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/appcompat-v7/23.3.0/appcompat-v7-23.3.0-sources.jar!/" />
     </SOURCES>
   </library>
diff --git a/.idea/libraries/design_23_3_0.xml b/.idea/libraries/design_23_3_0.xml
index 1120123..441bb88 100644
--- a/.idea/libraries/design_23_3_0.xml
+++ b/.idea/libraries/design_23_3_0.xml
@@ -9,8 +9,6 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/design/23.3.0/design-23.3.0-sources.jar!/" />
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/design/23.3.0/design-23.3.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/design/23.3.0/design-23.3.0-sources.jar!/" />
     </SOURCES>
   </library>
diff --git a/.idea/libraries/recyclerview_v7_23_3_0.xml b/.idea/libraries/recyclerview_v7_23_3_0.xml
index 36865de..c4ab7de 100644
--- a/.idea/libraries/recyclerview_v7_23_3_0.xml
+++ b/.idea/libraries/recyclerview_v7_23_3_0.xml
@@ -4,13 +4,11 @@
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.3.0/annotations.zip!/" />
     </ANNOTATIONS>
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.3.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.3.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.3.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/recyclerview-v7/23.3.0/recyclerview-v7-23.3.0-sources.jar!/" />
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/recyclerview-v7/23.3.0/recyclerview-v7-23.3.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/recyclerview-v7/23.3.0/recyclerview-v7-23.3.0-sources.jar!/" />
     </SOURCES>
   </library>
diff --git a/.idea/libraries/support_annotations_23_3_0.xml b/.idea/libraries/support_annotations_23_3_0.xml
index 118a0e7..e592bd6 100644
--- a/.idea/libraries/support_annotations_23_3_0.xml
+++ b/.idea/libraries/support_annotations_23_3_0.xml
@@ -1,12 +1,10 @@
 <component name="libraryTable">
   <library name="support-annotations-23.3.0">
     <CLASSES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.3.0/support-annotations-23.3.0.jar!/" />
+      <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-annotations/23.3.0/support-annotations-23.3.0.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.3.0/support-annotations-23.3.0-sources.jar!/" />
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-annotations/23.3.0/support-annotations-23.3.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-annotations/23.3.0/support-annotations-23.3.0-sources.jar!/" />
     </SOURCES>
   </library>
diff --git a/.idea/libraries/support_v4_23_3_0.xml b/.idea/libraries/support_v4_23_3_0.xml
index 62a2f14..a2479db 100644
--- a/.idea/libraries/support_v4_23_3_0.xml
+++ b/.idea/libraries/support_v4_23_3_0.xml
@@ -5,13 +5,11 @@
     </ANNOTATIONS>
     <CLASSES>
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.3.0/res" />
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.3.0/jars/classes.jar!/" />
       <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.3.0/jars/libs/internal_impl-23.3.0.jar!/" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.support/support-v4/23.3.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.3.0/support-v4-23.3.0-sources.jar!/" />
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-v4/23.3.0/support-v4-23.3.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-v4/23.3.0/support-v4-23.3.0-sources.jar!/" />
     </SOURCES>
   </library>
diff --git a/.idea/libraries/support_vector_drawable_23_3_0.xml b/.idea/libraries/support_vector_drawable_23_3_0.xml
index b4ad228..7f87d23 100644
--- a/.idea/libraries/support_vector_drawable_23_3_0.xml
+++ b/.idea/libraries/support_vector_drawable_23_3_0.xml
@@ -6,8 +6,6 @@
     </CLASSES>
     <JAVADOC />
     <SOURCES>
-      <root url="jar://$USER_HOME$/AppData/Local/Android/sdk/extras/android/m2repository/com/android/support/support-vector-drawable/23.3.0/support-vector-drawable-23.3.0-sources.jar!/" />
-      <root url="jar://$USER_HOME$/Library/Android/sdk/extras/android/m2repository/com/android/support/support-vector-drawable/23.3.0/support-vector-drawable-23.3.0-sources.jar!/" />
       <root url="jar:///opt/android-sdk/extras/android/m2repository/com/android/support/support-vector-drawable/23.3.0/support-vector-drawable-23.3.0-sources.jar!/" />
     </SOURCES>
   </library>
diff --git a/.idea/libraries/volley_1_0_0.xml b/.idea/libraries/volley_1_0_0.xml
index 81a83dd..8e317b7 100644
--- a/.idea/libraries/volley_1_0_0.xml
+++ b/.idea/libraries/volley_1_0_0.xml
@@ -1,8 +1,8 @@
 <component name="libraryTable">
   <library name="volley-1.0.0">
     <CLASSES>
-      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.volley/volley/1.0.0/jars/classes.jar!/" />
       <root url="file://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.volley/volley/1.0.0/res" />
+      <root url="jar://$PROJECT_DIR$/app/build/intermediates/exploded-aar/com.android.volley/volley/1.0.0/jars/classes.jar!/" />
     </CLASSES>
     <JAVADOC />
     <SOURCES>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5d19981..1a3eaff 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
index caad4ec..91f0196 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
@@ -30,6 +30,7 @@ import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.android.volley.Response;
 import com.android.volley.VolleyError;
@@ -75,19 +76,14 @@ public class LoginActivity extends AppCompatActivity{ // implements LoaderCallba
 
     private final String BASE_URL = "http://thesocialnotework-api.appspot.com/api";
     private final String LOGIN_PATH = "/login";
-    private final String REG_PATH = "/register";
 
+    private LoginActivity self;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_login);
-
-        // Set up the login form.
-//        mEmailView = (AutoCompleteTextView) findViewById(R.id.email);
-//        populateAutoComplete();
-//        mUsernameView = (AutoCompleteTextView) findViewById(R.id.username);
-//        populateAutoComplete();
+        this.self = this;
 
         mUsernameView = (EditText) findViewById(R.id.al_username);
         mPasswordView = (EditText) findViewById(R.id.al_password);
@@ -101,14 +97,14 @@ public class LoginActivity extends AppCompatActivity{ // implements LoaderCallba
                 return false;
             }
         });
-        Button mRegisterButton = (Button) findViewById(R.id.al_register_button);
-        mRegisterButton.setOnClickListener(new OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                Log.d(TAG, "Register....... this section under construction");
-                //attemptRegister(); // TODO : implement
-            }
-        });
+//        Button mRegisterButton = (Button) findViewById(R.id.al_register_button);
+//        mRegisterButton.setOnClickListener(new OnClickListener() {
+//            @Override
+//            public void onClick(View view) {
+//                Log.d(TAG, "Register....... this section under construction");
+//                //attemptRegister(); // TODO : implement
+//            }
+//        });
 
         Button mEmailSignInButton = (Button) findViewById(R.id.al_login_button);
         mEmailSignInButton.setOnClickListener(new OnClickListener() {
@@ -188,25 +184,14 @@ public class LoginActivity extends AppCompatActivity{ // implements LoaderCallba
             return;
         }
         showProgress(true);
-
-        // Reset errors.
-//        mEmailView.setError(null);
-//        mUsernameView.setError(null);
         mPasswordView.setError(null);
 
-        // Store values at the time of the login attempt.
-
-//        String email = mEmailView.getText().toString();
 
         if (isParamsValid(mUsernameView.getText().toString(), mPasswordView.getText().toString())) {
 
             String username = mUsernameView.getText().toString();
             String password = mPasswordView.getText().toString();
 
-            boolean cancel = false;
-            View focusView = null;
-//            mAuthTask = new UserLoginTask(username, password); // TODO: RETRIEVE ?
-//            mAuthTask.execute((Void) null); // TODO: RETRIEVE ?
 
             // http request register
             JSONObject tempJson = new JSONObject();
@@ -218,37 +203,11 @@ public class LoginActivity extends AppCompatActivity{ // implements LoaderCallba
             }
 
             VolleyUtilSingleton.getInstance(LoginActivity.this).post(BASE_URL + LOGIN_PATH, tempJson, onLoginSuccess, onLoginError);
-
-            // Check for a valid password, if the user entered one.
-//            if (!TextUtils.isEmpty(password) && !isPasswordValid(password)) {
-//                mPasswordView.setError(getString(R.string.error_invalid_password));
-//                focusView = mPasswordView;
-//                cancel = true;
-//            }
-//            if (cancel) {
-//                // There was an error; don't attempt login and focus the first
-//                // form field with an error.
-//                focusView.requestFocus();
-//            } else {
-//                // Show a progress spinner, and kick off a background task to
-//                // perform the user login attempt.
-//
-//            }
         } else {
             showProgress(false);
             Log.d(TAG, "Invalid params - make sure username exist & password is 4 characters or more");
         }
 
-        // Check for a valid username
-//        if (TextUtils.isEmpty(username)) {
-//            mUsernameView.setError(getString(R.string.error_field_required));
-//            focusView = mUsernameView;
-//            cancel = true;
-//        } else if (!isEmailValid(username)) {
-//            mUsernameView.setError(getString(R.string.error_invalid_email));
-//            focusView = mUsernameView;
-//            cancel = true;
-//        }
     }
 
     Response.Listener<JSONObject> onLoginSuccess = new Response.Listener<JSONObject>() {
@@ -277,6 +236,7 @@ public class LoginActivity extends AppCompatActivity{ // implements LoaderCallba
         @Override
         public void onErrorResponse(VolleyError error) {
             showProgress(false);
+            Toast.makeText(self , "Username Or Password Incorrect", Toast.LENGTH_LONG).show();
             Log.d(TAG, "onLoginError: msg: " + error.getMessage());
         }
     };
diff --git a/app/src/main/res/drawable/logo.png b/app/src/main/res/drawable/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d5a01b8cfedb8bd4c33b93181e79b42ab397d11f
GIT binary patch
literal 17361
zcmbTebyOSO8#P*rySqzqhoS+ByAz~1L5jOup}4zCad&qsQna`eAZT%Sxb*$q`}bYn
zw=&60X017M<~)1vN6tyYRg|Prk%*8!eE5JWD<h%y;R96M`|$_@-23McZp-%j4$eeg
zTH?dozt_*MlEn8jhz>G3&L2J?WB+?YeaOfncs~j6BC99~zX=bG%ugZS{$2UQ2Z|4}
z5~3O&E63TMS^ARcJ-IED{O(6xiApoFbjHYnFj7gFs;YgkYZ&1)HW8Ht2YfLxTz_MK
zatR1<3FPzDkJQpwqI|4w{f-bp5s2176BO5kUGGw|xO$i4{P*R>(caz89lVjCBopd&
zua~g4%j~*QZa@E|*#(OhI<V!yNAiETOQNbqAgNK(Q2E1|{PV4=|7|Wgd0-3X*9Bwa
zSw*#4-d2D@d&o*Vq4VF~+*88Y0|s@C(gsz%>E-qSzHz8cSlRNwne5$*EONTcHu%=O
zk`in!wg!tSwifWZ%7<-_R@3<ld?ZR=NMc?B8dBNrHWK*j1V(Lh6OU{JQI6}%IoaYz
z$ID7{Hx6LK<&p}+U?Lugh7I-?ZhonDQ&9K?mWM2d?GFY@loL_yY_o&s*B>v7ee9<M
zFnyuM)qj__<N7&`wu5g0D~`i~uystnq1YIqpoBV~2Pb>=UB?^X?`sY`A=ypW<(L!c
zJptX4ybP&d%9;!DW$6)Ngy*`%(n;7DkO%1Q601W?uvB#gss^=0{qOQemczdcQ;5%q
zJ6n@_w}(U3bYJoLI2`$)9Qkf-tDk;D2xn$vkfL%TGSo5n;fy1q`+s)WCQ7u~^o>MI
zoB2|UmYa-l3^7uCFt+E_ugX->{R1zOUYuX88ciN#)dbvR2!a=@xN`-bkC!NCB)Tg9
zejo9zrBIK(kd{S}>1%uYaoE`@jQAGHnIJ0)s{HbuhHRIXE)**$1hr(1xv5?P`xcmA
zD`}?-6G2`2gDarY(o7{P{ot^l<q<Mr^`dom5r3yv4OZ?$l?|QLD!i@G=qS*JnMQ_=
zh)OgyXqB1@r}R?2R&^IGHdMiQB*rF*r*AP|<&~fCoYqfXXmiT4rRwwHFqc`NRDthj
zu8)_*44(lys^Z1wL?+{#XJ4Bft?k{PUW9CQ&rV10*4%H*&er#G@&^#Z2I}yqbxX8d
zJj!@~xK~GXLKl&7%z%iNvV4Sy)l2^1kto^BNEpXdpRg?DQxJ%Vn!PAIOVl6N4O3Hm
zP!*QeI{FDwP7f!i8ADP^8naS<N@-?KeJN^cpS#Z_e;$X$cj+kk>+o^g;aGO76{!L8
zv+Zh-3!lmfkBTceK-EF=fMa$k3lNW5)>6w4ma*`benX&CRTY;!X{7AC(#ORB%HPGX
z?7&Ak5XorHrI2owGPdQQ)t~6HINFb0TqX*}&KQDcYQ5$YojxxJnf-^R{6UES{zCK9
zC1unD`v@Y{cI^F2eq7~Zfi^DLuqGN!%G`H?!Cwd?e+cBM^d%+NqbThvU!9lIHg2oN
z4<GpHM)Xy`3Xp3x@ml8ldcFiUyWKUC{v!lpzN_pkM~<vsHDly=BEsq$w$)y7x*MB6
z1v*FB5?VLmn_4JOzSh)UD+Xi~6zT1U1YDg4gQ__>w=7HaFufj7=_{5VekR(U)*~<J
zppMs20e$q+h+61I{^p0X`P`N*%e%S%ZnSRnu<UW>^R{+J|C)?skB4cWD$V{SRmto}
z`V`R<ugw;P36@!Ej5P^rB~FgW;|2WNkOzCz<a}NHV!B{@kuqATLpc#LfL;Rpx*NOj
z>e5HrdPDsmqCA$pAW7vE`o4Kox!fjb>7@|HKV|CL_Oa&CWK(!(w6sgs#ku)E7SqU`
z(*RNN#$sevS`3d>?5mFQ1B0uA*`N8czVnfQOs`O9i%YnG<XY2Xs_C3$sq<;U62VG;
zwQGj!hsd;W5`K|&v5Ak=T{7)u8e+-t^*5DK+2HSbFXv32jklVPjZHHCCo!tux{4fQ
zF4S{BI@g71oE~14A?eT6Es%{l_dOlPd*$n~30_el`Eh<OF2@XQdj%eT7(!<^Pys~j
z_8y2TZHAf_f}$3S^^NQsRnK^j*wz{+bwd9^nghl5UBp!YZ&$sZRJ3ipQ`xB~v2)MF
zy3Yj%E6t8yFuI)nR$~4*7~IRT(IW05U3~(}YAz&H=R{C&?~p;#s*g$|wPMvbZP2vy
z9k1<O@hiQ5>x6?0hgzu|I@PGrFP^86onANaVqbF-Im{MA!w7ywJ&U3EQGGW0Ye%vt
zN(pLVXY=N5g5bn%w<QK<vE{ryEa(#L^U43GNOA|Au8)m@s}WZivI;}q7?=Q&>9hKe
zwW?&qp>rWjX;{KtM*~k{=~))fb0s`rcH8y_f`7>V(Qm_aWLC}m3vl~70up12z2Nv{
zEm9dhU7PuM&j0abSuuc9mL0!@3zr=HZf8ad{&%CtXnh__g}@&EMF#F%c44xEkq6=e
z_?tB@oODZ(-$o^DH0i058J#@is=HNEA^gZr@0!_Z<!QlpClu&|mCR7H<4TVqOC(>r
zI(+%O^PNvl;0`N!t35n3JD*cBPT4KQ84O__`R9Pj3;*#W!vB*A+A{VLVCcsuBgIGk
z#wYl*Qv|3f<?9+fd}dU)PYfq%wbr<pqT`ei{$@uB#h|QD{O_nT(BH1>tRCVDAH&@M
z7?V2B>wD?oE|e%4yFU8<Qj@XGFB&F(K2tR?0YvQ=l;39*i5iI2n)P&K78LV((>i({
zUA7ZhsQ&lBuwJ-Qm!FZp;GHVjRrKZ8U3Fb_HN#3@nLH}go6BwS4QjnP!oPSo;#0kF
z)iEwhkrGGdo&fe`7DZy>!{F;x-mkr8)UyA_#hQ<9B;4-ZVQn(WE9<y1eSyX&_rD6p
z#y5kn(;FW{Q@Ho=1dW2!JnR7lL=gDWuf???QO&6QXPZYPKFT0Acq_?qNkOy>L9k8=
z$gtO4a&rk(5c@8-jl|Bzjv}%85#C8i@ZVYPQ)}Cub7r+ywp2JP6?!tGUyo|1Cl%Tk
zhL-sH@fwaIF2eE=Ktmg?Oo2;)n@ZXR1YJ&O`NGz3sz_Z;GbR`eYhdlj;@W*dx-bjY
zIo*<)BxD0OL1KaTalKVWTKzMsQ(z1C8SkPN$tqd9Zzb^i5|-Aqj5f;AEM477mV)r2
z;5mt-Le?22nzOGx#+{pSSDp7NH<Ij-Zdqf+Z&^zzHwJ{T@0jdV9#R~|=Xd%zn1=BU
z0-bX;0p3~3{06dmtjxnXn6dBP%F66fH!KU9(@yKq=pwAj1cb~Z@u;uxi8T*1COH+U
znO5oNaHi%hz_=M(S0UnClr(!kTF8JNv*?*u#x>i0&?kH3JR&icV_Yncz%$&}YZL-%
zg5|d8k)^3Jy!q84rl;S3$9Qa=7xo;eF^2tus}!;rM+Duq0FCryM8Pl_!;7`xPu#bs
z$~lksyeJ*|i6to7#rUUUJ)`t$QbQ)eIU^ux;h$Q*35b-q2#Da#g0N+NEJEp?sSjt3
z$>Hh&tJzKb1`K)_>l|Cht$Aez=aU+xtMj01_@BUOKH6ITkEl=H#}Hq_<8!v@fSUMj
z!G4a>>_uJ`++P|`p7m{Ela)nuH9J)Drjd8NGJL}t!YXtg7N_qmZRljZD--CA(6{h8
z5$JhT4KoR^G!5J)h?;<4Qzp)BF@Bs!lwS#Iy!+*1#?s~aDJp4c<}8L7%ps}aS)uqq
zCm8Ac&dg){gUjN^u&kI7yPK%w?xoPdrLgc3mK(W98QNMG3sAe4JPgeOrM2Xc;~y_f
ze*IM5qU_y&^r96yY1{lp?UWIATyJaX$lp5OO(+*JvXgU0`BB#Jx3rvlO%bm~e=A>w
zg1aJ_<S&Bw*%jx$>B-A~LY?Sy9T4ikC^KtE9w}zin{VXOLr=~j_brkmP9@xA@aqZw
zxc-<Ml_Ek(yG>V&)<<6CF%Dy!zkovF>;&~*xDG*sB|-`K8`1P<Dii7v$q0L-f><$(
z?AK@A4mES6fUvBYWqyd%Qs=x*-oHUoyIdrEa~kiQEE--|YQo;OSA%6TI>J?4l{FML
zX4*0Nab0E2P|R27ah)L`))UjXE+^K3ahwKIM4%wDP>4PJ;ZBgr<$bUe1SSo-*K~8!
z{MB5o%zS}UUMSepoA?b7+JF}d1sm+^VSvfa?+gL2#LyXaM-tNXhn?p`jlrX`DIrnY
zsoXLPYFRG~LLCK|zaVR+nOy)qa)|!Pw!=R&WOjaXHfbXAT)*8++x+stFVz5g)Q`0^
z(lrtGMavSCyAiXYARm%&#D^appgCM(8)aZiHhtlDDTy7d5J0OEz+&TqWs{*a8F}Pd
zVwT2q%l(qAFAiN%8k<`}xg;gke*P;ZUgslwjWznd#y~rdMf5*mla-v|b=KG!A?-7s
zIh-gK{>onrZi17(^q<cilKaC(p(3M;73}%!KswunU$%q}Lt|gQ9OuK;RR$`Pn<`>V
zQwlEog%acMjp(H)R8bEV+ro>r8?*cK(BX>{s`HKxk*N@&0J|gyLuJb}HDqZV>K!)!
zkb^5m5t=7ZwOCQY!WY<n5L{m-G-^C39r=KlZ1UALylxwGv1F*$tn<;U3yvyLN;>TW
zVa1=7bjWV%>cQazHEs9=d4I^}jcH*v+yc8Y8RYXG{yi4%m|`(u?f^~>mWo9}OjkhW
z(9x1@wHmHyEUYXO)GD?#c48L2<qEpGUrG;U#h>`-rB3Rplo)_e*Tbu-4$fX3L3^16
z>hP78FZEV0rxNm>cC{0t+CRxo3=4s8HdWaR-=yx3*<^3;I;=JtwHp3&tB>pD#G$+5
zY_kzx(7-$75uU)NZ9{^FK|xxGO|`8%28gj5X%%xjX30Vxt6QZRSqz*!InuG1;9d!&
zE{$1?UXH#gpGH6au7xA%5~|aFB}O3c2w~_$2Sg=RvPOAv5Z%!6vI>qVrmZH*&wbRd
zF8r@IfqcU_B9vT@Z!Cyke^95dKM@1Ow7y7wJTa9zqrRVZ=B8mv+qRGiM*Kwpm>Tea
z#l;9{<y5Y&^R<vvq>=TQf7z%(A*DGWEhOh0kgG>q+LT*;ceWh-L{fFLsx{@{3aXHW
zU-8!-v!xNdr^|_VERYTN5Q2dr8^DA*eie<aulbHp@h-s1SDe;ThCn@`+<*cRf=FE!
z7@|hFKkl+=X_5RNwgUDu4<l&hbSKH|;Z9!rG=_-p^fa^rnE%j@2-m9UqpDQI8P~wR
zHpQ`{tZrepWEP(AL{C!v_lPjKE(16mgTW+{RKIJ5_%hPlLNW7&+#eANbul{76@;-Q
zneH|mWLTES#5)J11%<+BROT7Ju34=w7yqL>`6BwCr!wf9qQ+I0kmg^Q@2uu@L*Ki<
z`rerDM*fWr^*B1KwfrYP<;IrrsxJa+aJtT4!onfKqJJ0HAHaiSw~;tJeq^4bSr)Df
zes5eCsFaoti*HTUmQzco*CsA-3~Hh-bi<-RU1>#kZASGT_boyq3b18E2sQ6Y2&7lo
z1=ay48UK5fk5Jvq?NAI2>A^;p(^AFMVM+EoB|AAL2KPb+GmEwQ7T6Gc&3s*Xl3<$S
zv0u3SGEskwdXO}^EK!=rm|82^JM(|YjS8dxi$Xy&7@=*(#MKid60ut1p9Dw!ateP?
zZ+oZxhE%o;*M2n|;1SGRLUP2xvi9p)LN?WsCi$=eLOLx+Bj0{;vh03uVt^y5ili6m
z2`+}GhmxVo%zK<lj)hI#x|v-!*PP|Ojr}Xm=s{Tb8eyozSm#FkVCoilUl7`RtT@aR
zj88MxUi%>lX37~ZN7hN=896~sc%tJ&nA(_m`NSCa1x^KodSoR{t~r+dIl$Md%B0s0
ze&%yf>+Hbk`E<?;U3%evJ&>W;e7aHeCFBX&E&3*~V$QGT|G6^k7zev3WP-%fpcwuW
z1@H53?=Q^+OZYs@+&@wA%H8TFT8uh`wr@?c24cYayL+eq0ufr&k83;L>j-re1Gin&
zx`PdmJeAQAr<KP9F}4>{t47L^1#!NjU))@Qok%Ox5~RW_hvJRar;Na8)%I-Qe=S4@
zj`%iGVsRu~Nd<LkTt;=HGK28qRb>N}=6y?!vWYAT$dMdN(Dk7bcoEcO%<8RUsp_qC
zvsM4QI5LpF-mjxPgerkVR0M+~$TWf~pTzbQEQE=PH0zE1lm;<pKJjP%bt0^qL=p2b
zYT0$`U_cC^e!WV}{hu=-s!UegwnQr>dDVsE2>v1~6SD6iD4L%zP>>t{XZ^fgq4~Z(
z@C0}J&v3>EQ~<Y;*g`!4rG+GqV5G}2%UXz94B~;qYAT^EI#QnDmk&;bo|L|{6`bTW
zY{@k-foiqcWX+#@-8{bm`a-qZu|~)KUv7nrr1Dh8EM4JZMqR))x_K%#lyCp29L>5Z
z$H0t+&HOw#_}zO4C9`T~k9nr9#o;{;vrD9_8=&jK<8v&e3`+~xGlzt!{M7+oh<-pj
ze4q@70dWbzUVd4G@pzf_rbF#Od2|kx=Cg*lbPnkJvp8s`_9n?v$oUL>9>^F!a?WE0
z=t=vg7x__58;T&EQ4^S@j}d<=cs`7c{Tp{+sDnRRtK>tv5V3d4_8XEv5@$STJ`v?(
zKX=ZNBi`YXE+2jhsHN?z1jsrUj?_^u`QjNWx;Q%Dk0V^+Qw8JXUePt-fycO7#QM*5
z-xE2-1Kl53c+z48oi;hImhHhftb&FeBKH*5z}!76Ug)tcDT<ii!9<`OX;b82*Cp{)
zPs}KMilLv5#;r!Sl=>Z7DAm%%2~Fv<Wn&`B`lk#-JE^1Jc~-g%vBiF3A7Iju=tDVS
zR_Y&O-+F1#C{mJ{0yF@X1k7+h%(Q$RKk7zZc4qb;y;m#JTz2Z+^f_&FpwSYH@wf><
z7*nCGwc>fvpgAcVEE(K`>-~D#D^|w-&%H6z(&S`u8)Lkg@Xd%b3}G>>WXmIv)Fbqr
zfX|95>f(yP&-1`}4NZ+Wr6PpD4`42m^$QI6>nMLgXCUy;zE_cRc7wz}#uh?agks$~
znO<7_#l{5*?C#JY#+~2OHcSTav85>u;uv)#=xpS26!b4G&G-Df&(=#}-4JFtnhB)r
zZSEi1f3#Vz`*;N&nwI}PsLm17brmX8_$<o!<BaY+%GmrYvV(@=V_vX`(BpPHnnid_
zS9oLqA8n8z9&?x|ndZE)x@8zbPA>h40CwmDB^X)p)6tB5$$*FvxMLb1vq&&V&G~F|
z(zn*ON6_wq^xNfA`1_^-D;n2-1s&xPoEBCqD0-ure-IDrjv*-jU+^Wzo$5<ep}fqe
zX$^ww(Xe%-T~KO>EFfuab**aR`08VOhi+zjY5QxyLfX>|A>i9}&5cyQ@*>FyX+>=Q
z>_WT(Fiz%uGdstY1%TON+L^6v`?5o01hZwQeQ%O(21>GE1#WpJgLl)|{g!Vej((4O
zeu3QMm=f@&H2oC(vGK2xr#dznjQPnszXk>UlO=jli1clCCW&~KATgqQO<EtiCijdb
z2&>FajG6$aj?&Q{zfA&b3Yk48G^`I{r~hJK6bAu#6EK9Y)kYJ6#{1Dx!QfQ8mSWP~
zbpwC5fq2`8&CF2M&jCM!Z|%V|>Fm>}MfhcxONiyd0XUAD%X0LmG9V*2b1X&=HfJC5
zM3%EpDWzgPP0ze$T^(B6l3Cjl$-WvKU7*ju3-@D#Zqj%6AM&o@fI1gZ`FHsOl!7ic
zi_6z4f()l!EfN5Md?Ktel;19};ToSr%L6Im`_Zuoz{3RS9K{FqD@{wG<zIna?pD<=
zgchFvdGx6g{H&y=@;d^yZ=VgmJS?hAS-x5LZSCT|;jnRZ2M0fedC+hr7cyDPYAwW9
zSAI$^qm8d-9B-E^yufDYqzJ!A^zi$LO@l#r=iAJ9A#^!`s$=2#9^K<ZJ1X$qaH07l
z^gj)bEblJptnw9l598USF-3$b7dJz($=uvj*749HUESxQWwkXaM}%%kvvJoSw=D<9
zOScF9EmPFs<;D%72C8D9h^V@lc?N6H`nD<3A9ttOyu2sI+e=d95r1DENYMHJm-X=K
zT~6{>y?KK}I)K+2m}TSwE9d7wa31o%YZHSYX%xG6$Ou#f6=8}$scl^D<r1S&M0C9|
zT54?aspS%6%w&oxN-Hy!%uZae4&?$(MFCM-F8awkY=@bypM1IIhLkeHy1XZObDjH~
zhnYg0jrng89&)OmG#);g&62#=pSqkK^5v4IZubZOzNLKGF#k5CO#D18Oid<Y=+5rm
z?ZTa{>dLXFDqEi);Q|y2A7A=apaSD|Eb0P`Trmu3I~TUF{AZDun6VA-dmbicV3Apv
zPZ$P`8iBn9QsTD}6c$Q+MqL4+oMk_pHohk1bwm4Hk4pX!C0*q>8GPtH+(JexS>VET
zN0k(IZ1+>F6G*<W;ty4=%L1>aopZ|GJ8qWPmN6gD8Q03n#owz2=m-gdCHpJ%G~;HX
zlo81b)p3e~myI{tIaW`)ubsOz{YzjvDXO+5h{X~5)@0MwVG7(kwnRCB1ipn#GQhca
z=55ES0yL6+niE?OW{5q{^DwQ>q6Vta1(2OPXIcruK(QC;?%Zx*k2Coeqd;s`p*rs0
z`C)y^<|8*QIQV#sZ8rE_g@+?w+r7lMwJ{;n)<<pj15eBGiq3iipt&NqP5H1W>WgEU
zeh>$A4EKypDZPEGJp^!S;7%f>rp%}g3^O#6rJ02Z=Prx*yNzJ&a`8chIR40v+;y*^
zyu26k%|{;M-?etaJpLXH*BLgv=4Iw)dCo}kKIQQ1nQjKgQ0SyhW=y$FXHPVMtm)Ja
zw~EUDbo+8e_1z1TZYiAV-wD4qz7kk<xhm|}a1SYiss^nb9X$x+Rgg2dzR|1DI@^U!
z$&VLSv}&tHDRZg|8NJ<NS?2Mk8VxS!Tt9v;RL7;6P5#wphawjzvrVT?GXo4h906gV
zf3Ix`t#xM><gn_9zS%o8d^<{<tpArpKM83W`Zm3sPO*N?Ip@~|vSG)+G5}2gCW)q3
zw~CFfE{W(MP98~MeSJ^g=WXLo7*Q%ITb5O?y}GiB_*5q@eu2MvJO<)=3jUl%g?T@_
z;7&M}vKW}iKIpzkk=0560U-nX?qwPO5|2%WF@^>7(O{cmAqJX;P^1?xh7i0L;5OkA
zu?|PY{yuVqg_ak!RG<<E7eou2h^E}QHM4<VUhql(lZ}3Gm$%)j;$8JqP6WSRP)j+Z
zYNd-Qb@Ls;*AA-w+PH9P@Vcm8;-GS&Do2<qU`qN2jc6U^ZQytM^kNn-YWQzV0d56I
z5rIe<*fy!5Qe=Mz92&k?-8X8GMw?p1F`L8QVlyyWl^DaFfDIH<Bg6Wxo&&XMkSq_x
zr^G+0zNfH-=h%mV#5On=AHtlvb~*$JSo%_aqJPbN+gN+kS=?hD{jb=#oj<z=@P+su
zb(0QrmI&gLb{5bjoNlCPW5c9d^>3pT(&v6!T#w0BphhD20p%0eANI?`Lo|>tJ@2z0
zwEjxJF#v|1hiyp-ed3{Xw3Jw}310oMDp$Fkg;{|b?pY!uBBRVqieg42pM7WmN0MgJ
zg2SYji$Fc>$it7F_Cn=-nnf_|QU}JExXDF6B<eP4Cq)BzE&0cO>V74nB>R6Q&E)6u
zn^+N{4Sz*-3*}b6dWC>~*5I;oFDHH5K^+-6doAL!^7eiyb-6xU4FzcXsL*}*B|b6R
z4AiVqKu5r1b@VTN;pWBFwy6ghR?481zo6fXq*9zMcwn~YUirdz**1CpdCd2-);*M>
zxHca!=?YRXZloN-C}c$HV2z<7`{1}F|9+F;y2NvjbKa$LalYz1j=gI@sNo1Pn6Vt}
zbv|g}_m_F3u4b!^%HfzLrvrkP?Y)BQuNXli`X(iTr6Oa770Tbg(f^BzIMhQlL886>
z4?DiTOz=?0pIP3V*bAR}1L)sboE<lx)av5S$I}dmG|rFb+@~{yzt@&zcOS{n%xWy~
zo+=1&-s8dy_P~c-jJVp;p?OCx?#7p8D#eXPF_M+bHG_zkW2#=xVCQEK?f7z1#*IxC
zKjB`)R4dF~kYexmJhc-y-wFJ$G+qACldG30vK1wt%QZCiVK_33%>?6O#6nO-H!Qfc
ziH2)_FkU)5EG;nX8Zq1hDtk_Su_1-99Thy1W}wT61_@`d!0@v45?t*aA^@ES;^4Z@
zA|ro@=H1!#G~h_A4qXYedBU^7!3A;2G9FoM!WQhGMhuYXuj)Qt1$c@kj50KwCt5lg
zd}28iced?oJW|gl?si;SBy&5IBYC2+qs#-<I8S^U?k16YRx}D{^!!etFIsQ1&kU|@
zsW{j;yduMurua1L{j??{^xG1U4hT?E|4e&<F=gR9@3@0?Ljbu$4or%WbPVFU|1`wr
zw}=tyxlMmeZhQY*EM$FJg{AdSuH=-K$qI1>cW~;r?nO#vY1Z4sqW?_^n_%SsrWYi4
z`U@7zMtTA^%x$xvWi%H~Y`y~zPnMLDju;C4{(9rSF)4H~p4!p(|J}iS&Ls&rSvB+t
z(z0L={+v#YoQaI*55`~pQW!U0ceXUpsllRJO<Z~MR+URHaWZDRulpF`By{a&bC&CT
z3@e+E?CRSy5wL+LxusRzc7EVGsYdd|xgF7aA?I}H|K=AHB9t59w2lv*tZI*M<<9DS
zu8vE<)n4)$?P_kH*NLZR%ZLXB{3Lx}kUk|;#uZkGK|f_7_%y{Z6ept<eYjHK!`4jW
zpNd~Nw9{SBL;H8VElw}0PZ{`eW|xkOS1#^h@5cX4ijM4Ey3mHdWnG067kd-FK@d`*
z)lC}_t`RQJzvk@vKF6T!Udi3WZNg^_&5o~HjQ8*XTYws`bf@9n&QG6H`C1}XiT?h7
zYXOo$YMX%vF<My`WG|L?0X6<pkbn_12{e|L&=Kt?@hS~<ar}lQP6;v`?FnYGZI4Tu
zyYwe557p!v*TLHkcfTtveD;4SBj3<KM5up)e=*0!e!<ax6|QN<MJIo0hMFV0U%tqa
z{;L^6RbD2yvqw6k7hIT3)E38?ho&dIs6YGKQSQUMG^Mtkln<(s4}Fed8ZJ)`n1D^Q
z0-gTZ`YN(VyL~&v-(B66G!bdP-|5&{@9|7T1Wu$Cu-fe!AAR|mipqdWaei(Yrfe%U
zRr<j|z`)=~h)`#E&$$vAWuKDc5*ha;#8T_r$!StaHC#-9r)RDQYaLllLphUc`}DhN
zT7mP?<LiCsMWV)M?yXpMXr^(q!<BAK;$2nXP2f(9#?730{<-&}|0zmK{~8B_BhxhL
z6UqD6sFIrd)3Y9<)noMtAA))8ZJ&jAd%n-z8g*VmTR`X#W|FT%_+MiO()--d*jF!}
zKS*lpJCdB>I$tQ3yWp@Jt-5iD#Z{BIk-Gsu#q>iJq(~GeXaHYo`}~N9O$BwIeo?FK
zT+lc3ssekSAIFrwxht=|XN73PLC(qi`?=;*yxaO=4k`PvTook~9ETYpmrquuGYueQ
zQr(5`jFw(y<>h(h#ynIZe+oyu)1i983jkF|xo2S1Kgz{rxxT;7Kbo+du+>nmb{A>?
z2>NRYA6J&mbNtzCwPmKxtScJggFKq83DLECTY040vPuOma+Eo8U<?b7|9BiH_pA3D
z3b%L>1|838TW|Aa?9$CLOev$JSI)QevV+$HqN%BToM__834euKnP4Yj2Bp~y^VpE!
zNpnEG_taP#TUA(I`Kb8yW$fkM0Wn0I!Iren{&cgow~TaNCTDm|w$1aOReps~A8m@d
zPAzgQJHF@p!c$#uuA;mSQyp(x?IJ+g{j!JC7_J`@k5wLiT_`KUe~=SsIDs!5(e%fk
zz_U6Eb=}_3cEI;TS)9`-S2|9hnO1H^`8=Q1guDA%?wH%gdioUjuEAb!@AiKvHb9I(
zJwLH9Y<gZy&mg3O93Ik_1aJqyQBhHaNEC<I4Bv`n<)?89=?fK!$e*$zheiK(Jv%TI
zWgVi9FFOQ()B@ttz^wl~=(5_)IU%h=U%!}-Z7pkydBOUZNqiM<^3h*$xgm+JE1}xM
z2>^X(a7;p8;q9V-$U*zLnNn^G2r`wNhyz8@!6h8oSqv8gUpnAvIp^oN$trVlQE+Wx
zJ&~HwjV64XIj_cf@yCC+m+ZVx4uyiq3zxo#xZPgv`lnBOjzou3IHT|g|Go-bge@DT
zb{5K>Rmp5tJ-Bl_qlm92GOxL+ixOt;(if~%4J(%l`wdq%%94W*C?R@7ga~D!d*^KE
zHI?7Qz#^O6x%@YIE&HXeZv$z~|8{wdJnJ!KpaRn#tvr;$tMY4h>Xh3=bpJDoNP4-%
zXG9puCpKaht$Bp70E~D&oV||A<;jVKl_mtXu)peIE%_aEUt3OErrg&YL$OhZE71QD
z8hq<J4|KX+2vNwdFK)g)2OWK!$~_e=*i;m4WF6gSa<kEsO=F_rMM=P&n-stSqYHqF
z)(O_h257?zQd<CT8oJ#TzQd%by56miR%VUS<NsniwBgq<JR8HYxj?A1aBRf?tK~=k
zf9sV%AGJG@pm|xh3U@6)dX{`7;^`X1ax4Z>dYrK>5yQWUuKrXyKSX;6J>e^F$nBlZ
zo8q(i?Yceb`a;jD;rfscJbaW&1`E|C&nmsaJaoCD9;G-IYVU<nE^Z89OY19SHlPh_
zdm1AGaYK+LJu;C5y}a(XDe>#JfJ_uesSb_%S3Mu;K9tVzJ5$b2YS4-trC!iZIdF^$
zN`6z(CJpWMy?y9xZK*L^=iJyt7Qr!=I(%{**UgyR4G=QGljonkx>pYP@d(y%s&kT^
zrLtS4Bd*9yYoGq(IU4$#-`a0?xizX`@SHTj^2PqEFt|0WM&Y{cS^smIONKiUA6^<7
z&37Inrcq5`^T$=O0XL^cC_y^|ap^XL-ACOt2C@d{_2-+-u>*SdZq%{+?{v&iGoNPe
z61b9oPZgV2i?=p53Q{}7?K=wBda!AAx)X1OBK+>l9Zb0u@_kJ)ug2NR;9T!4?A58Y
zM;v)?@bFWsbkIYn*wV~+>?J=d|K@;qcO{9q=d-|b`uuYTLN2SXAtefn`&qbijP94O
zDULA+VCfMQ-r_^z1sW)|;2uLS0xumdogk73Np|}5?$M0uJ%P<j&TYqPOgqtYxElnK
zD=YR0{F(v*;Djm_Nx&|95dTNTFVJFAeOkK#_)b2i^*0}MQyi^&JW#}pCpJ1$P{%w{
z2~Ix-axTtX9w>V_q36D_AiN0$)=+S*aF9K~m6gpR>}5;uZ_snG{Z<Qj7_=g%$U33B
zKkTM;slg+%Zk05e#&`l&=XjI(`wqgI4sfzcw&D@?oQF|-fg8DIQV54;2{A-F#AMw?
z!L*AP-41YiId*=yc{TqqHZ_!WZ?FeXX0I_2F2yfuY*2Shk3X6$w#*8k?`!HMr=5Kn
zl1nx;0Pwh)KWuHZ$9$e3u`p^&!i+V6eLjPAH@aJTurD6sT2p&P#ApA?`AEk6OP)^=
z&>iET=cv&lzD4Ia?msRZYjGR5na$)d`qL@Gc{<1aihp#e_e2k<3D}&**E~P-{@V${
z3iPg~<md^oj&``nX+;30Oc{*C!Vw(Uk}#2pV1$GX=W6ZT|9ZXLTwEJpqu5;EzF<vC
zlq@}5)FcGO$t`yaOhFP)Hm>xahboMtd!atvB}lhzp2yBK@m3oTau(BU4I?BEEbYl>
z3fxcTbcRSISbtxp7B)E~9z(YpNp;Bgct)XAovA3rZSB3|gH7v@hEcx%nm+W`0^YFK
zYccCgpNHESZxkp_g#0N}ixptTalu4O;olYfm;vJ+e!eH<2!(gLj&~V9bC=T<FM#dP
z@?~%{gfkUV`J1d#_s*B-1!W(4Kipyb`<BE5SsQK<s<B);dV}h?XJVZKT6a{;yu7FL
zXf1&UORZ8e+tk-z<aZ07HE_LNokN)1qucI-#zs#2M*Z6n@T2k)*(JW@=qnfj?1(7H
zpa;)H-1b*a+d_UhqOQ^QTYe!LEdQB*zq>5~w=wVJEqX7B`~#A&A1UTdaFHUkE9co%
zZ$~Ii)Y=A?=Qw|OyMl_;uA`e0$^Q;$N?IWr_(4S?)PF$vvHpu$TP8uCm?`jnBWC}h
z<RKDKUZlKYXAi1D#jPDMDY7|GnO%wQeWLbC%kD$w0mf)q`{U$`X`Ig3vozO-O{XW-
zT$Fwm;UJmY@!?*Q<Z8-$RI!ei??7(>3crg=sAaWHVlxUer*FPt67nkK`f5>A)Q<or
zg)D|5$eiTqG4#g|gn?fcYj#%F+qw&i9U2jk<plXS#iZdWDRBlB;QS@zy7KZNORn!6
zVKBT8NFo$s0yw;ka$<Ad7JpZ`x$k6G0pK+MT&p_2+K3Y&^MTUk<+-w?e%?2_Icj2-
zNBFE+dhru24QUQq*Smg=>x`-yRd|1>$VXwb%Z%~LRWb5@Fvr2zG>MmR>&s8Etz{t7
z!-WL;6AzDb0j97(dv(2lrtr%P?z6{vWm7uxL&v*5kq1Paj9v}rjK%o&#pUWNs5pM$
z5|?*xvk*vomxQm-<-C=kS&5XZ#Fhk|3w5tytQwCk+F~yh*MTHJ=&Cu(j{JL1{uZB`
z5f((s5)eS^ICFg-IuAAus^Q9o<ge??Umd&U@K*<b!_SM?`C}M$abF?dg8>(E3w^%v
zH}alU`;H1WI-k8Udx)p(_jxXBb_MRrU3SHVXYQVJ--MHsahb1^c&#ZX?|zMvfYT6a
zf}>^*eESd#HETbL#3U1IRc&e&p}RpiyT6V9j3|C~hlmL`$yaA1<=}@@o-O^sb=;Ad
zU}b3Eos{Im_ozZaGAO?suA;Qh^oJ6{rXm}=*9Cc)GG}k2jX8$0m^=mXUh=AGrEV$q
zUf?Y7afj6l;rY!q#(57pSK_CrBx5S!Z=E32K%=E@|3X4u92W>xPN`y+=j*%ok=(Q$
z<OJhMc3R(hLSn%HZx-C9n@(IlMWjWCMjWEtVT+srYiVEFmMa$V2ki{TmKGO>SHx7z
z6OKi3u9}Oj>1nC_Pp;)nj$2Cj<{aPJTi3Ket&N8yc4-K@+MNUs=XoSVU$T1<P43;&
zFCViR-wN>tnYh1NO)p^#QLZl56r0r&94nF9=nOq!ygLz8B*diQ0utnXpR{@LoGUD)
zeusR7?BzH^RQv*+P6EQ3%~Pf9mD(We=;0Pgx0Uj*!ix(-?lVma7tHE_Tq9?Ae+G+C
z;#5vU6n|C=kvb>OS+VM)4u8mW6pG925QhbCcE=MoPzon*d-QBp+!)AjxH4qsGf42-
zb}dxF4XzDzb}zbXs7p7K(&oE=k>PLP9_ilViTNyCqrRJdaX+@`n>$1?U=c7Dw`I|U
za|RJ_z^nHOgxNs?Nx1_{>zDhbSG63@RDY~_b?k6<L=y%~!BS-vj5-dq5#aiHyj(F8
zoTS^@?A;)c^Nywuq~y-bwmPUBmutgO`FPj%Ra_ROBez*G-(B^Zbb5w5w)c8|JY(f;
z0w&X0uriNJ5xK#*FrlWy9F4XG&s}yUGd<kr9KQ(H5}efzc%tz6IZUaBAnp~I6652Y
z-Yr{~mDX60iutw;JwM`Rao+1F1+m!J>`6;`fPY>M#ycHnNdj6*jy5A(X5y3_I(pxi
z8MIVbu&ywaDzg;1l}k7D3d)~W71#=L#Xb_OzudVXU(x*Lh21FrW5RM~|Ml0bcfFFW
z-jGPd`5EXCP<lCnt;=ubfET1V@r<=aYS#UhnU2ig)RRcHCekWijbVO80>H#3dsc;!
zz#o_z^IfQqVjH8lP}x1icM=R$f>@c_8|U=$o8|l>fBXenpCH+xYcmLHx$$l9PDe+{
z>HD1a9=0h7Co*AnN2vfWRWrqO+dLwd^mR@7Q9wxj5$pp$a^GuETJl^y@P7CVJ^tpz
zvC(wVLm9gK6!Dvks(3fB+LBVol0N4N;%yEbYkIfK%v&@U4=t~jnVk8^r_-Fxm&zui
z%AXqlaHe1?2XCFR>v3d_Nhd1>XXbyqW{70SMGnP`_0Mh#V>`8M8SE5)m@~Sd#~U&u
zsFo~cQLlbk)YTdu-2DapDOHP=rOF@M4Ea6mbKzg)98IVT8$Mm=!?!P@Bt5U~r5spN
z?O7M{BYo8v5c*g{Zj)KGU6+@>i1_^VAosx|j^P)<o1OAp*<fV6Jo-Lu0D5d&C|l=i
zE8OJA40(y;d#CMygodx$@-4SK<}l|V`ot>nhrbdNDXT?NP9Uyae8L@n;3dyW^zs*3
zVFSAbD-<yEBNF(O*iYqan*;`Vx9`;FH7-5qjz_rSqVjvu!z@=I5A@rgnLg5rvw@sv
zs8@=9aLS`iM{+LOfhY4;SnoL^OnRHcLEv!wLG-<+070HR|J*mm0C%V}B$ya`ijE66
zGPPZ@i3XqB;9cVN;hKS5oq;#(-G(nt4wj5I{g)sV3pvUkUk>@f{XeB3|BzWxq7!r%
zHD8p8+U5}FktLAj@pH!(U4-zrB2a4zn`)OhdRwTfZnUMI1592KsUFlY%G3Q2;Mi$w
z?}SL_q2m6+cuH(<VL4GnViZ&{7PiR3HD#tF&y|bgp`UJ@BHb-&^+LVFv8!*7*FCe(
zkoHaY98gWLwyG(4bv{3R+NKSkDKCu%Df<zLPks2EJjMv#J#|Q$*t*rL*5jusWNp%`
z<MfG}=w1ih_>hp||K<6(tZ0tM!{+aq!?6^<ffE6kDApq>Y48Jn${9Lt>voe*i6v&m
zdu$-F>5SiB$vONuIEssnze@ZjcP-W)?9T$~H2fxzTjKUx#GeIs0M`cR@_5MX`3Hg_
zu{jiI_8D#iU3^`UIK?r{!o%3%<*X@7FY9ICv8WS|&!cxBg1@DaW2H69A7?-d=40b|
z$A!Z=tc^Z+9A4<&FkndEfx8$rE5sp#_I@hG{B(TK=c4yYd-*OI$UB|%`y4tTF@(S~
zuimfD7PduW3c})-j{7$HC3Shod;?_q4N@&vdHxBPC)~+|1FS@LukJqnHr`=m(biQP
z#K^HGXfudWoqeUslYE282JxA4I6@H5cGbN1X9G+nsN-Rabfg)*s7+p@oPGHw=2=~p
zTp{nBH5l?)e?=vE?d?ojzK?^Cd^HpuazB`aj)E>twb}7Q-@g30sVX`a_w4~-1_Sfc
z4-QxHY+rxZ>j;UhGmc3C>D^x1JyE>jD7K9-r=+$S2Sa9Aw&QW_{M7;;hk1J3dK8Aq
zz=yR-vky}nGTExaz~VeZJtFE0E+6@z5YD?-?cWHyF3O|cMnk$W#Hkm?)O!4O7vG=W
z9C+PR+_1)~ht)5QH4Z+I@+Kci!XbX!%J6S@!$uBqp0d*$>X5vrI{z~s3_Y8t5cb_h
zZ*-MD1_4fg3FO}z`L+VYt*C%#<oTHVlIV3VP(;VO-!y{Kac7eDG(Wgrpx>VPF$r2n
zmM<+o*GBQFpTaMbOASW<oUQfkI;S&PLA>`)(ye_#qt#67)bUo#@8;NKZ-I35u-ALg
zfvA9)jJWvj7z$ZU_-ws43Z0u}8{azB$!POp)#;QJXgA^JU}l(8mtwxbKJK_*W4}k5
zuYf)90H;JelrJJ=jR|IawO;yi61k|FeGzIOhimX{)nG$^Zbre`G9CRf8@9X74cpM?
zMdZ)Zz3V-3s$(!gHwAmcFZ#)MGG-)1=wC;^fgK*%M@yfm;i`-Hh~@Ik6zzPhiFjCd
z#i=^2Wv2MdMRWg@U0yp>$D8KJiToBxdSceB2J8;((5~P`)jEuPJ_GD0sQv=UM7eaj
zo(~?C;tfO(+>Fm(_Ni^vRBeL9O_)X_nsEhJt8mBC#PTKxoH}hO-EqeD8mM+H4x?L0
zqMcOQ2uc~JcEu-=00~1(vzV%{^%G8-;L84+7WP^B6y=M8^VzojhBm&o?S9T&@WM==
zWX)S>9@GQ89W6iGZ~tq=EY8~#<RNAXYdiC5hSs=F&VtxMh~iD{yVx~-6;N)CVpc<V
zM7hF{($}RrZ+`bFkJZK}wj|^*&qZtQhNpXd(Gxxrn@mN7TDUn8Vt5m6-z_3hhmIuQ
z(?5el=yjq~udm-tjGl)F@!#o+aIVSGxlC`*%DY4IJJ}uu?7L}>h7R!4sP3yBwXk3z
zX-!jrH5^UdLhL>to0jvo=I;EK^q7LmOl&N(VV2wg7mM~U^K6TLwhG!X&vRs$bYR$<
zd0cR?ri2l8nfmOreXSg4=uJEfAF>Or*@e!WT7O#ePu-NL!3^1fRdP717rSKMRt!xh
zA$#p=Tacn7k6)KN4)cr3=V(ERV@YG#4fvN8?}O9EYfBk%@2eBrZxYx(aNmrOdSXY)
z-9JFB*N@sTxt?B7X-4=4BfidM^`LfGm=t6daW8(R1mpj;_a@WM0_}XL-mX8KQF<5M
zcD*x{<l)hajQJ}1&H7|-4#dW)FmG>Zp4aP6K)a5H(aa37{+P=`P4?#ba^=&U)!{n9
zi6)QKa#z&H@VZ%zh#U9rAe3p_8jj_@eSy?P4riFh$Rp%R@Y@%k&p;L(X|CZ1-BI&i
zZ_Xexr<>_1MV(rmV$k|A>7M~wD`E656_@j*O!tqfk%+ln@$D-})p%Q=B6Vb-XQj}T
z;JzUrhq^aZ23{SKHmn|c?JEx&51BpAKqjnGQ5?4;%@$zu4~#!saOKDk;$%TN)R#fs
z^lYU24C4dlmJ9ZI2a=?kxmZJKFLTsf$%jCcL^j1_`WSxiTTf_<_DajWR+u%OnS9`;
zVFsR)@<oRs-qw1-lH|!VT(ymkR5HRFU@gM-!*rhbYg3D(&t^lR#!n4ZWO71#)@Hb^
zBNREz*m~1FF*`<ICTmZV*2?gq^IfO>mBigMsJ){5k&Q;!DU|5LDxD!?#H~FiyMFz$
zAJpycHho<hD7F5|LFh@AfDWw?LH#dm2GXuGOmi*9HhXKB0>aqpF{9$df*wzZsqyPB
zg6>c?gf0^m9o`;Ks`#_F{aEHeFCX}=mjVykNkX2)U^8|8i*J^D+a@2UA`-lP>Z)9i
zkuioFoqSMcRs6vl6NkH(_(JbNW!w+`(JK$$ejNmV^~;N^ll9JK0rBB9%{nIjBwY?Y
zwc<EdxMH<1VA?dgWD7lSkdTk>r1bLjag)Z}f@3hIFt0W}uHOb}okOMQ$~NFe!F~K}
zFMD`Mzv}1U;b<;-Es@7hQFkN&U_2^HB#1JVFxQfbnbX0q?HU^*r87-@wJ~!)7Gb7P
zrZLG8;!kFaQ)C25Q#a4mJ?O%NuFMsE@Fx5uThed!vxyCkW4iP*{5>~xs}p@BIS=n!
zG~J5O*+1{PAaU2{qI){;fa0mH{C2h#<m76u&P6;VK-82nHU3rO+_z<Il1;9p>J(O2
zyWK>Ra&hKw(YP$3Ftx*P?O3540lx7wa#+p$EdG9&<eTVyoP{ry`u&&z!|0*Jbun9k
z?j0n+huqN9Z3yydFB<;7dMgWf4F3lVe%SePol-a9Zs*%Vb6`d6SB2I+O*CZ~A6+<a
zzoZ5Fy$Q%~8xC5iWf#F7VmleF73`0GOtpxTb1KoCTANG8dq;1yxe&cXBRL}^@dZ^f
zgN?7kwbWw+H_44D4*<cH&dY?eTkWm0en2d(Plg2Fk3bFu!fjCS;JcHmi5Zq$oEaDL
z^#cK48PC0u{iCRI4*nYL8Z9a=$FEe8Y(8~PW54>v9i$Mgq)PIGTBoEv4Uhl^?QxbQ
zxC}M@130(7>5&edC?bulf=HtGm?}D1q^T<tqnOZ4Lo@89PO-h=)Z8jZs>SGJRrEoc
zZKal5BYtmvI9IYll>L}RxA;u{f@@ws6ere%zQ#6quuV0(IQW3Y8s0MlPbyo{JmOaQ
z&1X!%4%|HK-CoCHP9k+uk`n#B@70vUDt=YLG4E;@C6@dwLp}ShIKgKUly5?JK0J4x
zuI9k2?M+xeZ!BOAwsA1y8Q~g-ns(;Y)g(0Q=EDVvb0tSyh-z}_&xEtX#G);yJ)9pu
z4ZRLnyE`}0jvtFa^j|&^Gg*Aj)=evaAE0td^~WJbvfwjwl(j5{DD5R>sq<-m<cBL(
zg3FcHiFhQ`VN5tyMHm$k*smGONH$VSXxD0KgFAVq5oSVKaFfa8CZ!+2@6F@&Y(bNl
z5EvHZVdU#^IAemrtw|3A8%9ZAaScZITj|obTat83Y8#%hK9-=Y>d^~nK1gFuGU_yN
z^)4!;Q|whY5dw&$^o#-JJ`6|lWShtaZGlsyUIcF}=NHD^JRRdGIcU)jUuIct@&G*n
zQ>Yl|6d_|$Un`5xOWEtcm*&Sic^)#FAv68+!g&lbC~Opi=?bWjja8Q@R}ABoG;>zQ
zs`%ZPoZ(>@VeSJx`_#+fp00vWc}DflS&uA@N`LEsVCaM_r7!$wIa|C187;9|fVoSd
zAl~RXRW*drqj6k+_d=A3m8X67?R9uP6^s@{d<-B@n8Q5`{iglpd2A8C<93=7n0T4p
zWD8mm*_{Us2_3EF=eLhUg^Kis`fY({r+=+Xk?*`vdNd1rW=>{2;=scxQ+I9OzfSJZ
znvw`>n-%qkTCgw{YBIo4!rP=Y`XRn;d#-U+lbQYIY98HHjMQ$*OBW&DMW+HaH|+Kz
zQ~CIz7=rPb3_b2y?X(@>-5!?Hc>TUdo9%atBXekt16tTwJRvN4)QGI4@>A+tjuUm?
z7J|i#f5eVHuJSGQ_Mo^KNAX02CxPKP{|4*xT1@x87)sD>;N^6sl-eP!i*tfv0YuO5
z1wm;aKQ>6(w0bofnG-$vjRGahFv7kM2fp)Tz<!<6zZ!^X-1nrzU*%>Os7w!wCN`U)
zgIc-Bj~u4=hx;9BF+VPnAVXg}G%U4RT^6WPTDYCblQ1zp)r?x;ywdc)fKF7H))p2<
zaX}XmNgxGuE!zi67ZB+J0{}x;DYq?79iC2OHN^}!_{3rC<u<l0Zjn2itJb2-?H;Lg
zRN1*}ZfJB@5=2&kS*bpjY^}@pZBMMbOR$VNXJu$A;`K2ctLZb+q7-J0Eg+QlCLF$Z
zTyiZm=2TO)NI%(Mry=~I0WT&i^}Y7<td^{dFC7W;okX|#wQ9k-Gq=6-Ap`G{E?8dL
z8?C&vkmD?~Ee`#C_JghLvLs%Q-0H!rI#vAL4eIAwJNA)k&j)br;0VlJ-q;9AU%%g|
z64|p4&1z{ZNBTi+^(w28X&cJOhn4jvzT&ckt{Ly+26bIgqIB}*svy2+H?^RP^rVn6
zvb1lMUBzx9PYVAj2s4Y%nbI)Ll?+{X_sp#Yt$Nfs^6xp*I`F}^#L2`^fi<R;l+-Uj
zvj3|!zv}{3H(-tGkC1B2k8ncYPadiVc1YA{XYz;n0xl3CV9xKpa4vkuiAu@mX*?;T
zt^yLDP#|lDCmQ~7xkpsjlsrcr)$`l!DO=-T&KSu3)5ApBm0<`MoT_X{A~!vTczNb4
zg#paE27Z8R9)=6{dN39>y9)C!dJfnAIZH%WN?HHDeE*=d^rB3LcAiwUHwiK`!5nZ)
zWcDG+a8uKv;@RR0zlg`=6=47FNoeZsikW;SU-b`Z_zUJSE1qRWoyR#ucGbO>8+qfT
zLp^%a-DsDWe8!`zDKv4yMs9hY;2fd-(&%AGlPA4NK;y#)XsLhy3vlfk#kA$y2f@9%
z-12}i+~F6DCEFUC9v88)HknMbT8Q&-;d3|MmEIaaMB6zh74mtt$6h*Zit6e~aeY}W
zFzk57>f4LtCk`c+T5iq`t-z`QTJ<2v(cEJBtYCAaYpN{NMGx0+gvC4toS8yzSRNHR
z_AzM*J_pz;R8440Z>M)RBlF4Dwv}YISakN5$t_xbqhLv&NGRXj0Nl4N4M_jMg?F=o
z6ln|+zgWk86bK+KvePuI+4d&@nd@k>wxja-mW6tXN5>u5?7jcWM)D&PjP4Y!hwEg*
zD6c+mIa{Os{w|}oY90dT_Zs=yVzt6Q-=g{;isJ;j6V=vk2e9~vnvIS1PMa12Zs$Ho
zJU3GrNc0kuD_8s497%{*QcaN0V3F)t^<b=!%az&58M6(N*7v_(2q@RNsgyf6p<$J%
zee^-LhBMz!9uNR4A6f;NgA?V@6xZ>!-R{(sVqJ2G7nmZP9(TmBoUs+q2@F|Z*goj*
zH16}mqi5}wY?<<k+TYkr@coq!pUi{%f3|t6`DTrSZ$xD7*0=euD?h8;d&N)YG;@lN
zHtXGq7ejR}85JAG-bv6s>oc3<b8vpr+qarCggOfuU4>d%>YqBYe{hd`a^(K;jKAw0
zyTZ3Is;jwwNZ;5l@BaAD6yfL<tJfvv$@%z7-mUCBx7l((ulm{_&C5@U*&KC_JXXtD
z)n)nnUDdjxwSM!HrFZ0>QArb=lbiGOg2&^N+BbL4o3$%?hX1*iKSsIsZysI9kd3dd
z5T3luCqc9zd*hMUhb?_x{@yN8pDyb^ZS^^Q*ALmZHTS*!?_Rz6_o0byS=q-nYc$WC
zxMNOHpJ>ziwoR7{mLwOvuR3<c_gSY-q5pxE#+LJW%jO)ssP=Bf%Cy7-XIRv^r{A!f
zvY0LJ+KgRB?YU16PMP6;?21TC$Abp}b<b^iL*6#lY%mPW+nm1ni1HV?#T(ZLB%Sss
lYxA0<;z>vJ^8Zu$@($yG;KNrh0}tO|@O1TaS?83{1OO_u+NJ;i

literal 0
HcmV?d00001

diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 36b63e7..aef3f68 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,79 +1,79 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-  xmlns:tools="http://schemas.android.com/tools"
-  android:layout_width="match_parent"
-  android:layout_height="match_parent"
-  android:gravity="center_horizontal"
-  android:orientation="vertical"
-  android:paddingBottom="@dimen/activity_vertical_margin"
-  android:paddingLeft="@dimen/activity_horizontal_margin"
-  android:paddingRight="@dimen/activity_horizontal_margin"
-  android:paddingTop="@dimen/activity_vertical_margin"
-  tools:context="com.android_app.matan.ara.sagi.thesocialnotework.LoginActivity">
+<?xml version="1.0" encoding="utf-8"?>
 
-  <!-- Login progress -->
-  <ProgressBar
-    android:id="@+id/login_progress"
-    style="?android:attr/progressBarStyleLarge"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_marginBottom="8dp"
-    android:visibility="gone" />
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:fitsSystemWindows="true"
+    android:id="@+id/login_form">
 
-  <ScrollView
-    android:id="@+id/login_form"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
 
-    <LinearLayout
-      android:id="@+id/email_login_form"
+
+  <LinearLayout
+      android:orientation="vertical"
       android:layout_width="match_parent"
       android:layout_height="wrap_content"
-      android:orientation="vertical">
+      android:paddingTop="56dp"
+      android:paddingLeft="24dp"
+      android:paddingRight="24dp">
 
-      <EditText
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"
-          android:id="@+id/al_username"
-          android:inputType="textPersonName"
-          android:hint="@string/prompt_username" />
+    <!-- Login progress -->
+    <ProgressBar
+        android:id="@+id/login_progress"
+        style="?android:attr/progressBarStyleLarge"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:visibility="gone" />
 
-      <EditText
-        android:id="@+id/al_password"
+    <ImageView android:src="@drawable/logo"
+        android:layout_width="wrap_content"
+        android:layout_height="72dp"
+        android:layout_marginBottom="24dp"
+        android:layout_gravity="center_horizontal" />
+
+    <!--  Email Label -->
+    <android.support.design.widget.TextInputLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:hint="@string/prompt_password"
-        android:imeActionId="@+id/login"
-        android:imeActionLabel="@string/action_sign_in_short"
-        android:imeOptions="actionUnspecified"
-        android:inputType="textPassword"
-        android:maxLines="1"
-        android:singleLine="true" />
-
-      <LinearLayout
-          android:orientation="horizontal"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp">
+      <EditText android:id="@+id/al_username"
           android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_gravity="center_horizontal">
+          android:inputType="textEmailAddress"
+          android:hint="Usename" />
+    </android.support.design.widget.TextInputLayout>
 
-        <Button
-          android:id="@+id/al_login_button"
-          style="?android:textAppearanceSmall"
-          android:layout_width="wrap_content"
+    <!--  Password Label -->
+    <android.support.design.widget.TextInputLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginBottom="8dp">
+      <EditText android:id="@+id/al_password"
+          android:layout_width="match_parent"
           android:layout_height="wrap_content"
-          android:layout_marginTop="16dp"
-          android:text="@string/action_login"
-          android:textStyle="bold" />
+          android:inputType="textPassword"
+          android:imeActionId="@+id/login"
+          android:hint="Password"/>
+    </android.support.design.widget.TextInputLayout>
 
-        <Button
-            style="?android:textAppearanceSmall"
-            android:id="@+id/al_register_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="16dp"
-            android:text="@string/action_register"
-            android:textStyle="bold" />
-      </LinearLayout>
+    <android.support.v7.widget.AppCompatButton
+        android:id="@+id/al_login_button"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="24dp"
+        android:layout_marginBottom="24dp"
+        android:padding="12dp"
+        android:text="Login"/>
 
-    </LinearLayout>
-  </ScrollView>
-</LinearLayout>
+    <TextView android:id="@+id/link_signup"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="24dp"
+        android:text="No account yet? Create one for FREE"
+        android:gravity="center"
+        android:textSize="16dip"/>
+
+  </LinearLayout>
+</ScrollView>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b69406c..0db53cb 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">TheSocialNotework</string>
+    <string name="app_name">TSN</string>
 
     <!-- Strings related to login -->
     <string name="prompt_email">Email</string>

From 6447da149967d9a12ce5cf5f29e76bf2aec10489 Mon Sep 17 00:00:00 2001
From: Aran Zaiger <aranzaiger@gmail.com>
Date: Sun, 3 Jul 2016 15:26:22 +0300
Subject: [PATCH 3/4] added note view layout

---
 app/src/main/res/layout/note_display_full.xml | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)
 create mode 100644 app/src/main/res/layout/note_display_full.xml

diff --git a/app/src/main/res/layout/note_display_full.xml b/app/src/main/res/layout/note_display_full.xml
new file mode 100644
index 0000000..6ffde10
--- /dev/null
+++ b/app/src/main/res/layout/note_display_full.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="New Text"
+        android:id="@+id/ndf_title_textview" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="New Text"
+        android:id="@+id/ndf_body_textview" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="New Text"
+        android:id="@+id/ndf_time_textview" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="New Text"
+        android:id="@+id/ndf_address_textview" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="New Text"
+        android:id="@+id/ndf_tags_textview" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="New Text"
+        android:id="@+id/ndf_permission_textview" />
+
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="New Text"
+        android:id="@+id/ndf_likes_textview" />
+
+</LinearLayout>
\ No newline at end of file

From 90d2438cb121b117483080b0c265043ffefdcca6 Mon Sep 17 00:00:00 2001
From: Sagi Dayan <sagidayan@gmail.com>
Date: Sun, 3 Jul 2016 15:36:31 +0300
Subject: [PATCH 4/4] Fixed Login - no Keyboard on start

---
 .../ara/sagi/thesocialnotework/LoginActivity.java   | 13 +++++++++++--
 app/src/main/res/layout/activity_login.xml          |  6 ++++--
 app/src/main/res/values/strings.xml                 |  1 +
 3 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
index 91f0196..8b71b22 100644
--- a/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
+++ b/app/src/main/java/com/android_app/matan/ara/sagi/thesocialnotework/LoginActivity.java
@@ -24,11 +24,14 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.view.View.OnClickListener;
+import android.view.Window;
+import android.view.WindowManager;
 import android.view.inputmethod.EditorInfo;
 import android.widget.ArrayAdapter;
 import android.widget.AutoCompleteTextView;
 import android.widget.Button;
 import android.widget.EditText;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 import android.widget.Toast;
 
@@ -78,13 +81,15 @@ public class LoginActivity extends AppCompatActivity{ // implements LoaderCallba
     private final String LOGIN_PATH = "/login";
 
     private LoginActivity self;
-
+    protected LinearLayout layout;
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
+        //Remove title bar
+        this.requestWindowFeature(Window.FEATURE_NO_TITLE);
         setContentView(R.layout.activity_login);
         this.self = this;
-
+        this.layout = (LinearLayout) findViewById(R.id.layout);
         mUsernameView = (EditText) findViewById(R.id.al_username);
         mPasswordView = (EditText) findViewById(R.id.al_password);
         mPasswordView.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@@ -117,6 +122,10 @@ public class LoginActivity extends AppCompatActivity{ // implements LoaderCallba
 
         mLoginFormView = findViewById(R.id.login_form);
         mProgressView = findViewById(R.id.login_progress);
+
+        // Remove Auto Focus from the Text Fields
+        layout.setFocusable(true);
+        layout.setFocusableInTouchMode(true);
     }
 
     private void populateAutoComplete() {
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index aef3f68..03073f0 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -14,7 +14,8 @@
       android:layout_height="wrap_content"
       android:paddingTop="56dp"
       android:paddingLeft="24dp"
-      android:paddingRight="24dp">
+      android:paddingRight="24dp"
+      android:id="@+id/layout">
 
     <!-- Login progress -->
     <ProgressBar
@@ -29,7 +30,8 @@
         android:layout_width="wrap_content"
         android:layout_height="72dp"
         android:layout_marginBottom="24dp"
-        android:layout_gravity="center_horizontal" />
+        android:layout_gravity="center_horizontal"
+        android:contentDescription="@string/logo" />
 
     <!--  Email Label -->
     <android.support.design.widget.TextInputLayout
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 0db53cb..5767cc2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -18,5 +18,6 @@
     <string name="title_activity_personal_space">PersonalSpaceActivity</string>
     <string name="nvf_private_label">Private</string>
     <string name="nvf_public_label">Public</string>
+    <string name="logo">Logo</string>
 
 </resources>