Skip to content
This repository has been archived by the owner on Nov 6, 2018. It is now read-only.

GUI enhancements for buttons and edittext #15

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

GUI enhancements for buttons and edittext #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ff0b8f4
GUI enhancements for buttons
AkankshaBodhankar Mar 3, 2016
3485b75
Updates rounded_edittext.xml to enhance GUI
AkankshaBodhankar Mar 7, 2016
03e0046
Update rounded_edittext.xml
AkankshaBodhankar Mar 7, 2016
e3cb42d
GUI enhancement for edit text
AkankshaBodhankar Mar 7, 2016
6bfb328
Merge pull request #1 from AkankshaBodhankar/AkankshaBodhankar-patch-1
AkankshaBodhankar Mar 7, 2016
11a44d1
Update rounded_edittext.xml
AkankshaBodhankar Mar 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions PeaceTrack/app/src/main/res/drawable/button_shape.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
<corners
android:radius="6dp"
/>
<solid
android:color="#223875"
/>

<padding
android:left="0dp"
android:top="0dp"
android:right="0dp"
android:bottom="0dp"
/>
<size
android:width="250dp"
android:height="60dp"
/>
<stroke
android:width="1dp"
android:color="#878787"
/>
</shape>
1 change: 1 addition & 0 deletions PeaceTrack/app/src/main/res/drawable/rounded_edittext.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle" android:padding="10dp">
<solid android:color="#FFFFFF"/>

<corners
android:bottomRightRadius="5dp"
android:bottomLeftRadius="5dp"
Expand Down
4 changes: 3 additions & 1 deletion PeaceTrack/app/src/main/res/layout/activity_addactivity.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,7 +227,9 @@
android:text="@string/save"
android:textColor="@android:color/white"
android:textSize="22sp"
android:textStyle="bold" />
android:textStyle="bold"
android:background="@drawable/button_shape"
/>
</LinearLayout>

</ScrollView>
4 changes: 3 additions & 1 deletion PeaceTrack/app/src/main/res/layout/activity_addcohort.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,9 @@
android:text="@string/save"
android:textColor="@android:color/white"
android:textSize="22sp"
android:textStyle="bold" />
android:textStyle="bold"
android:background="@drawable/button_shape"
/>

</LinearLayout>
</ScrollView>
8 changes: 6 additions & 2 deletions PeaceTrack/app/src/main/res/layout/activity_addindicators.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,9 @@
android:text="@string/addanotheroutput"
android:textColor="@android:color/white"
android:textSize="22sp"
android:textStyle="bold" />
android:textStyle="bold"
android:background="@drawable/button_shape"
/>

<Button
android:id="@+id/save"
Expand All @@ -137,6 +139,8 @@
android:text="@string/save"
android:textColor="@android:color/white"
android:textSize="22sp"
android:textStyle="bold" />
android:textStyle="bold"
android:background="@drawable/button_shape"
/>
</LinearLayout>
</ScrollView>
4 changes: 3 additions & 1 deletion PeaceTrack/app/src/main/res/layout/activity_addmeasurement.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@
android:text="@string/save"
android:textColor="@android:color/white"
android:textSize="22sp"
android:textStyle="bold" />
android:textStyle="bold"
android:background="@drawable/button_shape"
/>

</LinearLayout>
</ScrollView>
8 changes: 6 additions & 2 deletions PeaceTrack/app/src/main/res/layout/activity_cohortdetails.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@
android:padding="10dp"
android:text="@string/addnewactivity"
android:textStyle="bold"
android:id="@+id/addnewactivitybutton"/>
android:id="@+id/addnewactivitybutton"
android:background="@drawable/button_shape"
/>
<Button
android:textSize="22sp"
android:textColor="@android:color/white"
Expand All @@ -102,6 +104,8 @@
android:padding="10dp"
android:text="@string/addnewmeasurement"
android:textStyle="bold"
android:id="@+id/addnewmeasurementbutton"/>
android:id="@+id/addnewmeasurementbutton"
android:background="@drawable/button_shape"
/>
</LinearLayout>
</ScrollView>
5 changes: 4 additions & 1 deletion PeaceTrack/app/src/main/res/layout/activity_login.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,10 @@
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:text="@string/addacountbutton" />
android:text="@string/addacountbutton"
android:textColor="@android:color/white"
android:background="@drawable/button_shape"
/>

</RelativeLayout>

Expand Down
8 changes: 6 additions & 2 deletions PeaceTrack/app/src/main/res/layout/activity_measurementdetails.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,9 @@
android:padding="10dp"
android:text="@string/addnewactivity"
android:textStyle="bold"
android:id="@+id/addnewactivitybutton"/>
android:id="@+id/addnewactivitybutton"
android:background="@drawable/button_shape"
/>
<Button
android:textSize="22sp"
android:textColor="@android:color/white"
Expand All @@ -102,6 +104,8 @@
android:padding="10dp"
android:text="@string/addnewmeasurement"
android:textStyle="bold"
android:id="@+id/addnewmeasurementbutton"/>
android:id="@+id/addnewmeasurementbutton"
android:background="@drawable/button_shape"
/>
</LinearLayout>
</ScrollView>
20 changes: 16 additions & 4 deletions PeaceTrack/app/src/main/res/layout/activity_welcome.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,30 +27,42 @@
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:padding="20dp"
android:text="@string/cohort" />
android:text="@string/cohort"
android:textColor="@android:color/white"
android:background="@drawable/button_shape"
/>

<Button
android:id="@+id/impactButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:padding="20dp"
android:text="@string/impact" />
android:text="@string/impact"
android:textColor="@android:color/white"
android:background="@drawable/button_shape"
/>

<Button
android:id="@+id/addActivityButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:padding="20dp"
android:text="@string/quickactivity" />
android:text="@string/quickactivity"
android:textColor="@android:color/white"
android:background="@drawable/button_shape"
/>

<Button
android:id="@+id/addMeasurementButton"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:padding="20dp"
android:text="@string/quickmeasurement" />
android:text="@string/quickmeasurement"
android:textColor="@android:color/white"
android:background="@drawable/button_shape"
/>

</LinearLayout>