enabled ActivityBar in Chat Activity

smukov · Jun 26, 2016 · 511024c · 511024c
1 parent 76da927
commit 511024c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 4 deletions.
diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml
@@ -36,7 +36,7 @@
             android:name=".ChatActivity"
             android:label="@string/title_activity_chat"
             android:parentActivityName=".NavigationActivity"
-            android:theme="@style/AppTheme.NoActionBar">
+            >
             <meta-data
                 android:name="android.support.PARENT_ACTIVITY"
                 android:value="com.thesis.smukov.anative.NavigationActivity" />

diff --git a/Android/app/src/main/java/com/thesis/smukov/anative/Chat/ChatMessage.java b/Android/app/src/main/java/com/thesis/smukov/anative/Chat/ChatMessage.java
@@ -31,15 +31,12 @@ public void setMessage(String message) {
     public long getUserId() {
         return userId;
     }
-
     public void setUserId(long userId) {
         this.userId = userId;
     }
-
     public String getDate() {
         return dateTime;
     }
-
     public void setDate(String dateTime) {
         this.dateTime = dateTime;
     }

diff --git a/Android/app/src/main/java/com/thesis/smukov/anative/ChatActivity.java b/Android/app/src/main/java/com/thesis/smukov/anative/ChatActivity.java
@@ -28,6 +28,7 @@ public class ChatActivity extends AppCompatActivity {
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_chat);
+        setTitle("Dr. Gregory House");//hard-coded now, it should be the other person's name
         initControls();
     }