Merge pull request #2 from chimdi2000/malaria-setup-screen

Malaria setup screen

AndroidManifest.xml

@@ -1,24 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.example.viewpagertest"
+    package="com.peacecorps.malaria"
     android:installLocation="internalOnly"
     android:versionCode="1"
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="11"
+        android:minSdkVersion="14"
         android:targetSdkVersion="19" />
 
     <uses-permission android:name="android.permission.VIBRATE" />
     <uses-permission android:name="android.permission.WAKE_LOCK" />
     <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED" />
     <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
+
         android:allowBackup="true"
         android:icon="@drawable/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@android:style/Theme.Holo.Light.DarkActionBar" >
         <service android:name="com.peacecorps.malaria.AlarmService" >
         </service>
 
@@ -30,15 +32,15 @@
         </receiver>
         <receiver
             android:name="com.peacecorps.malaria.AlarmHandlerClass"
-            android:exported="true" >
+            android:exported="false" >
             <intent-filter>
-                <action android:name="com.example.viewpagertest.START_ALARM" />
-                
+                <action android:name="com.peacecorps.malaria.START_ALARM" />
+
             </intent-filter>
         </receiver>
 
         <activity
-            android:name="com.peacecorps.malaria.UserMedicineSettingsFragment"
+            android:name="com.peacecorps.malaria.UserMedicineSettingsFragmentActivity"
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
@@ -58,10 +60,9 @@
                 </action>
             </intent-filter>
         </activity>
-        <activity
-            android:name="com.peacecorps.malaria.AlertDialogFragment"
-            android:label="@string/app_name" >
-        </activity>
+        <activity android:name="com.peacecorps.malaria.InfoHubFragmentActivity"/>
+
+        <activity android:name="com.peacecorps.malaria.PeaceCorpsPolicyFragmentActivity"/>
     </application>
 
 </manifest>

project.properties

@@ -11,6 +11,5 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
-android.library.reference.1=..\\appcompat_v7_3
-android.library.reference.2=../ViewPagerIndicator
+target=android-19
+android.library.reference.1=../ViewPagerIndicator

res/layout/activity_main.xml

@@ -1,58 +1,85 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+
+    android:orientation="vertical"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_gravity="center"
+    android:layout_height="wrap_content"
     android:background="@drawable/background"
-    android:orientation="vertical" >
+    android:layout_gravity="center"
+
+    >
+
+
+  <android.support.v4.view.ViewPager
 
-    <android.support.v4.view.ViewPager
         android:id="@+id/vPager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_weight="1" />
+        android:layout_weight="1"
+        />
+
 
     <com.viewpagerindicator.CirclePageIndicator
+
         android:id="@+id/vIndicator"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
         android:padding="10dip"
-        android:textColor="@color/view_pager_indicator_text_color"
+        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:textColor="#2FB3E3"
+
+        app:footerLineHeight="1dp"
         app:footerIndicatorHeight="3dp"
         app:footerIndicatorStyle="underline"
-        app:footerLineHeight="1dp"
+        app:selectedColor="#FFFFFF"
         app:selectedBold="true"
-        app:selectedColor="@color/white" />
+        />
 
-    <View
+
+
+   <View 
+       android:layout_height="0.5dp"
         android:layout_width="200dp"
-        android:layout_height="0.5dp"
+        android:background="#000000"
         android:layout_gravity="center_horizontal"
-        android:background="@color/black" />
-
+
+       />
+
     <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="30dp"
-        android:orientation="horizontal"
-        android:paddingBottom="5dp" >
 
-        <Button
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginRight="15dp"
-            android:adjustViewBounds="true"
-            android:background="@drawable/home_icon_normal"
-            android:scaleType="fitCenter" />
+                  android:orientation="horizontal"
+                  android:layout_width="wrap_content"
+                  android:layout_height="wrap_content"
+                  android:layout_gravity="center_horizontal"
+                  android:layout_marginTop="30dp"
+                  android:paddingBottom="5dp"
+
+
+
+                  >
+
+            <Button
+                    android:id="@+id/homeButton"
+
+                    android:background="@drawable/home_icon_normal"
+                    android:layout_width="30dp"
+                       android:layout_height="30dp"
+                    android:adjustViewBounds="true"
+                    android:layout_marginRight="15dp"
+                   android:scaleType="fitCenter" 
+
+                    />
+
 
         <Button
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_marginLeft="15dp"
-            android:adjustViewBounds="true"
-            android:background="@drawable/info_hub_inactive_normal"
-            android:scaleType="fitCenter" />
-    </LinearLayout>
+               android:background="@drawable/info_hub_inactive_normal"
+               android:id="@+id/infoButton"
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:adjustViewBounds="true"
+                android:layout_marginLeft="15dp"
+                android:scaleType="fitCenter"
+ />
 
-</LinearLayout>
+        </LinearLayout>
+    </LinearLayout>