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

Hard-coded dimensions/strings moved to dimens.xml and strings.xml #428

Open
ashu-dadhich wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Hard-coded dimensions/strings moved to dimens.xml and strings.xml #428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
37 changes: 17 additions & 20 deletions app/src/main/res/layout/activity_circle_intro.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
>
android:layout_height="match_parent">


<android.support.v4.view.ViewPager
Expand All @@ -15,55 +12,55 @@
<LinearLayout
android:id="@+id/layoutDots"
android:layout_width="match_parent"
android:layout_height="40dp"
android:layout_height="@dimen/trustee_margin_top"
android:layout_alignParentBottom="true"
android:layout_marginBottom="15dp"
android:layout_marginBottom="@dimen/contacting_post_staff_marginTop_15"
android:gravity="center"
android:orientation="horizontal"></LinearLayout>

<View
android:id="@+id/horizontal_line"
android:layout_width="match_parent"
android:layout_height="0.75dp"
android:alpha=".5"
android:layout_above="@id/layoutDots"
android:background="@android:color/white"
/>
android:alpha="@integer/circle_intro_alpha"
android:background="@android:color/white" />

<ImageButton
android:id="@+id/btn_next"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="@dimen/activity_circle_intro_margin_bottom"
android:layout_marginRight="@dimen/activity_circle_intro_margin_right"
android:background="@null"
android:src="@drawable/ic_navigate_next_white_24dp"
android:layout_marginBottom="18dp"
android:layout_marginRight="28dp"/>
android:src="@drawable/ic_navigate_next_white_24dp" />

<Button
android:id="@+id/btn_skip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="@null"
android:text="Skip"
android:textColor="@android:color/white"
android:layout_marginBottom="7.5dp"
android:layout_marginLeft="20dp"/>
android:layout_marginLeft="@dimen/trustee_margin_bottom"
android:background="@null"
android:text="@string/skip"
android:textColor="@android:color/white" />

<Button
android:id="@+id/btn_done"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="7.5dp"
android:layout_marginRight="@dimen/trustee_margin_bottom"
android:background="@null"
android:text="Done"
android:text="@string/done"
android:textColor="@android:color/white"
android:layout_marginBottom="7.5dp"
android:layout_marginRight="20dp"
android:visibility="gone"/>
android:visibility="gone" />


</RelativeLayout>
268 changes: 134 additions & 134 deletions app/src/main/res/layout/activity_trustees.xml
View file
Open in desktop

Large diffs are not rendered by default.

33 changes: 18 additions & 15 deletions app/src/main/res/layout/fragment_assault_awareness.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_app"
android:paddingBottom="@dimen/activity_horizontal_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_horizontal_margin"
android:background="@color/background_app"
tools:context="com.peacecorps.pcsa.sexual_assault_awareness.MainFragment">

<LinearLayout
Expand All @@ -19,41 +19,44 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/sexual_assault_subtitle"
android:textColor="@color/primary_text_default_material_dark"
android:textSize="@dimen/sub_title_font"
android:textStyle="bold"
android:text="@string/sexual_assault_subtitle"
/>
android:textStyle="bold" />

<Button
android:id="@+id/wasButton"
style="@style/NavigateButton"
android:layout_marginTop="@dimen/fragment_main_marginTop_20"
android:text="@string/was_assault"
android:textSize="18sp"
android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
android:textSize="@dimen/text_size_normal" />

<Button
android:id="@+id/commonButton"
style="@style/NavigateButton"
android:textSize="18sp"
android:layout_marginTop="@dimen/fragment_main_marginTop_20"
android:text="@string/common_questions"
android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
android:textSize="@dimen/text_size_normal" />

<Button
android:id="@+id/impactButton"
style="@style/NavigateButton"
android:textSize="18sp"
android:layout_marginTop="@dimen/fragment_main_marginTop_20"
android:text="@string/impact"
android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
android:textSize="@dimen/text_size_normal" />

<Button
android:id="@+id/harassmentButton"
style="@style/NavigateButton"
android:textSize="18sp"
android:layout_marginTop="@dimen/fragment_main_marginTop_20"
android:text="@string/harassment"
android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
android:textSize="@dimen/text_size_normal" />

<Button
android:id="@+id/helpingButton"
style="@style/NavigateButton"
android:text="@string/helping_others"
android:layout_marginTop="@dimen/fragment_main_marginTop_20"/>
android:layout_marginTop="@dimen/fragment_main_marginTop_20"
android:text="@string/helping_others" />

</LinearLayout>

Expand Down
30 changes: 15 additions & 15 deletions app/src/main/res/layout/fragment_confidentiality.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_app"
android:paddingBottom="@dimen/activity_horizontal_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_horizontal_margin"
android:background="@color/background_app"
tools:context="com.peacecorps.pcsa.support_services.ConfidentialityFragment">

<LinearLayout
Expand All @@ -19,44 +19,44 @@
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/confidentiality_subtitle"
android:textColor="@color/primary_text_default_material_dark"
android:textSize="@dimen/sub_title_font"
android:textStyle="bold"
android:text="@string/confidentiality_subtitle"
/>
android:textStyle="bold" />

<TextView
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/confidentiaity_margin_bottom"
android:gravity="center"
android:layout_marginTop="45dp"
android:text="@string/confidentiality_center_text"
android:textColor="@color/primary_text_default_material_dark"
android:textSize="@dimen/center_font"
android:textStyle="bold"
android:text="@string/confidentiality_center_text"
/>
android:textStyle="bold" />

<Button
android:id="@+id/staffButton"
style="@style/NavigateButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/fragment_main_marginTop_35"
android:gravity="center"
android:text="@string/role_staff"
android:layout_marginTop="@dimen/fragment_main_marginTop_35"/>
android:text="@string/role_staff" />

<Button
android:id="@+id/communityButton"
style="@style/NavigateButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/community_title"
android:layout_marginTop="@dimen/fragment_main_marginTop_35"/>
android:layout_marginTop="@dimen/fragment_main_marginTop_35"
android:text="@string/community_title" />

<Button
android:id="@+id/assaultedButton"
style="@style/NavigateButton"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/assaulted_title"
android:layout_marginTop="@dimen/fragment_main_marginTop_35"/>
android:layout_marginTop="@dimen/fragment_main_marginTop_35"
android:text="@string/assaulted_title" />
</LinearLayout>
</ScrollView>
44 changes: 23 additions & 21 deletions app/src/main/res/layout/fragment_radar.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,60 +3,62 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/background_app"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:background="@color/background_app"
tools:context="com.peacecorps.pcsa.safety_tools.RadarFragment">

<TextView
android:id="@+id/radar_sub"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textStyle="bold"
android:gravity="center"
android:text="@string/radar_subtitle"
android:textColor="@color/primary_text_default_material_dark"
android:textSize="@dimen/sub_title_font"
android:text="@string/radar_subtitle"
/>
android:textStyle="bold" />

<LinearLayout
android:id="@+id/radar_controller"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/radar_sub"
android:orientation="horizontal"
android:layout_marginTop="@dimen/fragment_main_marginTop_20">
android:layout_marginTop="@dimen/fragment_main_marginTop_20"
android:orientation="horizontal">

<ImageView
android:id="@+id/prev_step"
android:layout_width="@dimen/icon_size_radar"
android:layout_height="@dimen/icon_size_radar"
android:id="@+id/prev_step"

android:layout_gravity="center_horizontal"
android:src="@drawable/ic_arrow_left"
android:layout_weight="0.5"/>
<include android:id="@+id/steps_text"
android:layout_weight="@integer/circle_intro_alpha"
android:src="@drawable/ic_arrow_left" />

<include
android:id="@+id/steps_text"
layout="@layout/textview"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
layout="@layout/textview"/>
android:layout_gravity="center_vertical" />

<ImageView
android:id="@+id/next_step"
android:layout_width="@dimen/icon_size_radar"
android:layout_height="@dimen/icon_size_radar"
android:id="@+id/next_step"
android:layout_gravity="center_horizontal"
android:src="@drawable/ic_arrow_right"
android:layout_weight="0.5"/>
android:layout_weight="@integer/circle_intro_alpha"
android:src="@drawable/ic_arrow_right" />

</LinearLayout>

<android.support.v4.view.ViewPager
xmlns:android="http://schemas.android.com/apk/res/android"
<android.support.v4.view.ViewPager xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/pager"
android:layout_below="@id/radar_controller"
android:layout_width="match_parent"
android:layout_marginTop="@dimen/fragment_main_marginTop_20"
android:layout_height="@dimen/radar_viewpager_height" />
android:layout_height="@dimen/radar_viewpager_height"
android:layout_below="@id/radar_controller"
android:layout_marginTop="@dimen/fragment_main_marginTop_20" />

</RelativeLayout>
23 changes: 12 additions & 11 deletions app/src/main/res/layout/fragment_reporting_contact_other_staff.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
android:orientation="vertical"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingStart="@dimen/activity_horizontal_margin"
>
android:paddingStart="@dimen/activity_horizontal_margin">

<TextView
android:layout_width="fill_parent"
Expand All @@ -33,12 +32,13 @@
<ImageView
android:layout_width="0dp"
android:layout_height="@dimen/icon_size_poststaff"
android:layout_weight="2" />
android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_two" />

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5">
android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_five">

<include
android:id="@+id/pcsaves"
layout="@layout/button"
Expand All @@ -58,14 +58,15 @@
android:id="@+id/link_to_post_staff"
android:layout_width="0dp"
android:layout_height="@dimen/icon_size_poststaff"
android:layout_weight="2"
android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_two"
android:gravity="center"
android:src="@drawable/ic_arrow_left" />

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5">
android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_five">

<include
android:id="@+id/ova"
layout="@layout/button"
Expand All @@ -83,12 +84,12 @@
<ImageView
android:layout_width="0dp"
android:layout_height="@dimen/icon_size_poststaff"
android:layout_weight="2" />
android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_two" />

<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="5">
android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_five">

<include
android:id="@+id/oig"
Expand All @@ -107,12 +108,12 @@
<ImageView
android:layout_width="0dp"
android:layout_height="@dimen/icon_size_poststaff"
android:layout_weight="2" />
android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_two" />

<LinearLayout
android:layout_width="0dp"
android:layout_width="@dimen/intro_layout_height"
android:layout_height="wrap_content"
android:layout_weight="5">
android:layout_weight="@integer/reporting_contact_other_staff_weight_sum_five">

<include
android:id="@+id/ocrd"
Expand Down
Loading