Tweaks to intro text and locking screen orientation

cmsc436 · May 2, 2017 · 3b6fc59 · 3b6fc59
1 parent cccdc12
commit 3b6fc59
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 13 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -10,7 +10,9 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme.ColorBlind">
-        <activity android:name=".IntroActivity">
+        <activity
+            android:name=".IntroActivity"
+            android:screenOrientation="landscape">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
 
@@ -19,10 +21,13 @@
         </activity>
         <activity
             android:name=".ui.CoordinatorActivity"
+            android:screenOrientation="landscape"
             android:theme="@style/AppTheme.Fullscreen">
         </activity>
 
-        <activity android:name=".MainActivity"/>
+        <activity
+            android:name=".MainActivity"
+            android:screenOrientation="landscape"/>
     </application>
 
 </manifest>
diff --git a/app/src/main/res/layout/activity_intro_1.xml b/app/src/main/res/layout/activity_intro_1.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/linearLayout2"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="@dimen/fab_margin">
+              android:id="@+id/linearLayout2"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:padding="@dimen/fab_margin">
 
     <TextView
         android:layout_width="wrap_content"
@@ -15,13 +15,14 @@
         android:textAlignment="center"
         android:textColor="@android:color/black"
         android:textSize="40sp"
-        android:textStyle="bold" />
+        android:textStyle="bold"/>
 
     <TextView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingTop="30dp"
         android:text="@string/intro_instructions"
-        android:textColor="@android:color/black" />
+        android:textAppearance="?android:textAppearanceLarge"
+        android:textColor="@android:color/black"/>
 
 </LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -12,10 +12,7 @@
     <string name="main_actions_header">Welcome, %s</string>
 
     <string name="icon_for_current_test">Icon for current test</string>
-    <string name="intro_instructions">This application is designed to … \n\n There will be a
-        number of tests that you will complete on a given day.  When you do not have a selection
-        of tests to perform for a day, you can practice these tests through this app as well.
-        \n\n You also are able to track your progress among each test. </string>
+    <string name="intro_instructions">This application is designed to track your performance on various tests.\n\nEach time you open this application, if you have tests assigned by your doctor, there will be a pop-up asking you to complete them. If you choose not to complete them in that given moment, you can come back to them by clicking the DAILY button. You also have the option to practice the various tests prescribed. You are also able to track your progress within each test.\n\nIf there are problems when completing your test, you can go to the feedback section to report the problems, which will be sent to your doctor.</string>
     <string name="introscreen_continue">ENTER</string>
     <string name="introscreen_next_text">NEXT</string>
     <string name="welcome">Welcome to the Test Suite</string>