Trip Reminder Dialog and Checkbox Styling

peacecorps · Aug 18, 2015 · 677434a · 677434a
2 parents 33d7055 + 1bb6244
commit 677434a
Show file tree

Hide file tree

Showing 33 changed files with 1,771 additions and 1 deletion.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -71,6 +71,7 @@
         <activity android:name="com.peacecorps.malaria.EffectivenessFragmentActivity"/>
         <activity android:name="com.peacecorps.malaria.ThirdAnalyticFragment"/>
         <activity android:name="com.peacecorps.malaria.DayFragmentActivity"/>
+<<<<<<< HEAD
         <activity android:name="com.peacecorps.malaria.TripIndicatorFragmentActivity"
                   android:launchMode="singleTask"
                   />
@@ -91,6 +92,9 @@
 
 
 
+=======
+        <activity android:name="com.peacecorps.malaria.TripIndicatorFragmentActivity"/>
+>>>>>>> ankita-gsoc-gradlebuild
     </application>
 
 </manifest>
diff --git a/res/drawable/progress_bg.xml b/res/drawable/progress_bg.xml
@@ -5,7 +5,11 @@
         <shape>
             <corners android:radius="5dip" />
 
+<<<<<<< HEAD
             <solid android:color="#fff9e2ce" />
+=======
+            <solid android:color="#fff9b9a8" />
+>>>>>>> ankita-gsoc-gradlebuild
         </shape>
     </item>
 </selector>
diff --git a/res/layout/day_dialog.xml b/res/layout/day_dialog.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
+<<<<<<< HEAD
     android:layout_height="wrap_content"
     android:background="@drawable/dialog_background"
     android:id="@+id/dialogMedGroup">
@@ -35,12 +36,27 @@
             </TextView>
 
         </LinearLayout>
+=======
+    android:layout_height="200dp"
+    android:background="@drawable/background"
+    android:id="@+id/dialogMedGroup">
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <LinearLayout
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+>>>>>>> ankita-gsoc-gradlebuild
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:orientation="horizontal">
 
+<<<<<<< HEAD
             <ImageView
                 android:id="@+id/image"
                 android:layout_width="60dp"
@@ -57,6 +73,24 @@
                 android:text="Change Entry!"
                 android:layout_toRightOf="@+id/image"
                 android:layout_margin="10dp" />
+=======
+        <ImageView
+        android:id="@+id/image"
+        android:layout_width="60dp"
+        android:layout_height="60dp"
+        android:layout_marginRight="5dp"
+        android:background="@drawable/drug_normal"
+            android:layout_margin="10dp" />
+
+        <TextView
+        android:id="@+id/text"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:textColor="@color/golden_brown"
+        android:text="Change Entry!"
+        android:layout_toRightOf="@+id/image"
+            android:layout_margin="10dp" />
+>>>>>>> ankita-gsoc-gradlebuild
 
         </LinearLayout>
 
@@ -66,6 +100,7 @@
             android:layout_height="fill_parent"
             android:orientation="vertical" >
 
+<<<<<<< HEAD
             <RadioGroup
                 android:id="@+id/radioGroup"
                 android:layout_width="wrap_content"
@@ -130,5 +165,65 @@
         </LinearLayout>
 
     </LinearLayout>
+=======
+        <RadioGroup
+            android:id="@+id/radioGroup"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content" >
+
+            <RadioButton
+                android:id="@+id/radioYes"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="Yes"
+                android:checked="true" />
+
+            <RadioButton
+                android:id="@+id/radioNo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="No" />
+
+        </RadioGroup>
+        </LinearLayout>
+        </LinearLayout>
+    </ScrollView>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.29"
+        android:gravity="center|bottom"
+        android:orientation="horizontal"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentLeft="true"
+        android:layout_alignParentStart="true">
+    <Button
+        android:id="@+id/dialogButtonOK"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="OK"
+        android:layout_marginTop="5dp"
+        android:layout_marginRight="10dp"
+        android:layout_marginLeft="5dp"
+        android:background="@color/light_red"
+        android:textColor="@color/white"
+        />
+
+        <Button
+            android:id="@+id/dialogButtonCancel"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="Cancel"
+            android:layout_marginTop="5dp"
+            android:layout_marginRight="5dp"
+            android:layout_marginLeft="10dp"
+            android:background="@color/light_red"
+            android:textColor="@color/white"
+
+            />
+   </LinearLayout>
+>>>>>>> ankita-gsoc-gradlebuild
 
 </RelativeLayout>
diff --git a/res/layout/effectiveness_fragment.xml b/res/layout/effectiveness_fragment.xml
@@ -19,7 +19,11 @@
         android:textSize="25sp"
         android:gravity="center"
         android:textStyle="bold"
+<<<<<<< HEAD
         android:id="@+id/eam"
+=======
+
+>>>>>>> ankita-gsoc-gradlebuild
 
         />
     <View android:layout_width="match_parent"
@@ -40,8 +44,12 @@
                 android:text="@string/dump_test"
                 android:textColor="@color/black"
                 android:layout_height="wrap_content"
+<<<<<<< HEAD
                 android:id="@+id/effectivenessLabel"
                 android:textSize="20sp"/>
+=======
+                android:id="@+id/effectivenessLabel"/>
+>>>>>>> ankita-gsoc-gradlebuild
         </LinearLayout>
     </ScrollView>
 </LinearLayout>
diff --git a/res/layout/fragment_second_analytic_screen.xml b/res/layout/fragment_second_analytic_screen.xml
@@ -31,7 +31,10 @@
             android:id="@+id/firstMonthProgressLabel"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
+<<<<<<< HEAD
             android:textSize="18sp"
+=======
+>>>>>>> ankita-gsoc-gradlebuild
 
 
             />
@@ -74,7 +77,10 @@
             android:id="@+id/secondMonthProgressLabel"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
+<<<<<<< HEAD
             android:textSize="18sp"
+=======
+>>>>>>> ankita-gsoc-gradlebuild
 
             />
 
@@ -99,7 +105,10 @@
             android:id="@+id/secondMonthProgressPercent"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
+<<<<<<< HEAD
             android:textSize="18sp"
+=======
+>>>>>>> ankita-gsoc-gradlebuild
             />
 
     </LinearLayout>
@@ -117,7 +126,10 @@
             android:id="@+id/thirdMonthProgressLabel"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
+<<<<<<< HEAD
             android:textSize="18sp"
+=======
+>>>>>>> ankita-gsoc-gradlebuild
 
             />
 
@@ -141,7 +153,10 @@
             android:id="@+id/thirdMonthProgressPercent"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
+<<<<<<< HEAD
             android:textSize="18sp"
+=======
+>>>>>>> ankita-gsoc-gradlebuild
             />
 
     </LinearLayout>
@@ -158,18 +173,29 @@
             android:id="@+id/fourthMonthProgressLabel"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
+<<<<<<< HEAD
             android:textSize="18sp"
+=======
+>>>>>>> ankita-gsoc-gradlebuild
 
             />
 
         <ProgressBar android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:progress="80"
+<<<<<<< HEAD
             android:progressDrawable="@drawable/saf_progress_bar"
             android:layout_weight="1"
             style="?android:attr/progressBarStyleHorizontal"
             android:id="@+id/fourthMonthProgressBar"
             android:background="@drawable/progress_bg"
+=======
+            android:progressDrawable="@drawable/saf_progress_bar_green"
+            android:layout_weight="1"
+            style="?android:attr/progressBarStyleHorizontal"
+            android:id="@+id/fourthMonthProgressBar"
+            android:background="@drawable/progress_bg_green"
+>>>>>>> ankita-gsoc-gradlebuild
             android:layout_marginRight="5dp"
             android:layout_marginLeft="5dp"
             android:onClick="sendMonth"
@@ -183,7 +209,10 @@
             android:id="@+id/fourthMonthProgressPercent"
             android:textStyle="bold"
             android:textColor="@color/golden_brown"
+<<<<<<< HEAD
             android:textSize="18sp"
+=======
+>>>>>>> ankita-gsoc-gradlebuild
             />
 
     </LinearLayout>
@@ -193,7 +222,10 @@
     <LinearLayout android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical"
+<<<<<<< HEAD
         android:background="@drawable/graph_bg"
+=======
+>>>>>>> ankita-gsoc-gradlebuild
         android:id="@+id/graphView"
         >
 

diff --git a/res/layout/info_hub_screen.xml b/res/layout/info_hub_screen.xml
@@ -49,7 +49,10 @@
                     <TextView android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:text="@string/info_hub_title_label"
+<<<<<<< HEAD
                         android:id="@+id/ih"
+=======
+>>>>>>> ankita-gsoc-gradlebuild
                         android:textColor="@color/golden_brown"
                         android:textSize="25sp"
                         android:textStyle="bold"

diff --git a/res/layout/peace_corps_policy_fragment.xml b/res/layout/peace_corps_policy_fragment.xml
@@ -19,7 +19,11 @@
               android:textSize="25sp"
               android:gravity="center"
               android:textStyle="bold"
+<<<<<<< HEAD
               android:id="@+id/pcp"
+=======
+
+>>>>>>> ankita-gsoc-gradlebuild
 
             />
     <View android:layout_width="match_parent"
@@ -39,7 +43,10 @@
               android:padding="5dp"
               android:text="@string/dump_test"
               android:textColor="@color/black"
+<<<<<<< HEAD
               android:textSize="20sp"
+=======
+>>>>>>> ankita-gsoc-gradlebuild
               android:layout_height="wrap_content"
               android:id="@+id/peaceCorpsPolicyLabel"
             />