Skip to content

Commit

Permalink
Merge pull request #826 from OpenSRP/togo_release
Browse files Browse the repository at this point in the history 
update togo app icon
  • Loading branch information
@rkodev
rkodev authored Sep 18, 2019
2 parents d601b22 + 5245bf1 commit b701adc
Show file tree
Hide file tree
Showing 12 changed files with 922 additions and 2 deletions.
4 changes: 2 additions & 2 deletions opensrp-chw/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,8 +181,8 @@ android {
togo {
dimension = 'baseDimension'
applicationIdSuffix ".togo"
versionCode 4
versionName "1.0.3"
versionCode 5
versionName "1.0.4"
buildConfigField "String", 'opensrp_url', '"https://wcaro-togo.smartregister.org/opensrp/"'
buildConfigField "String", 'opensrp_url_debug', '"https://unicefwcaro-stage.smartregister.org/opensrp/"'
buildConfigField "String[]", "ALLOWED_LOCATION_LEVELS_DEBUG", '{"Country", "Clinic" , "CHSS" , "CHA", "Supervisor", "CHW"}'
Expand Down
184 changes: 184 additions & 0 deletions opensrp-chw/src/chad/res/layout/activity_login.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/canvasSV"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:isScrollContainer="true">

<RelativeLayout
android:id="@+id/login_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:background="#F6F6F6"
android:paddingBottom="@dimen/login_bottom_margin">


<!-- Top section -->
<LinearLayout
android:id="@+id/top_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="vertical"
android:paddingTop="@dimen/login_logo_top_padding">

<ImageView
android:id="@+id/login_logo"
android:layout_width="match_parent"
android:layout_height="@dimen/login_logo_height"
android:layout_gravity="center"
android:layout_marginTop="60dp"
android:layout_marginBottom="60dp"
android:layout_weight="1"
android:contentDescription="@string/logo"
android:scaleType="fitCenter"
android:src="@drawable/ic_logo" />

<TextView
android:id="@+id/login_title_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:gravity="center_horizontal"
android:text="@string/login_title"
android:textColor="#272727"
android:textSize="@dimen/login_title_text_size"
android:textStyle="bold"
android:typeface="sans" />

<TextView
android:id="@+id/login_build_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:gravity="center_horizontal"
android:text="@string/app_version"
android:textColor="#999999"
android:textSize="@dimen/login_build_text_view_textSize" />

</LinearLayout>

<!-- Middle section -->
<LinearLayout
android:id="@+id/middle_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/top_section"
android:layout_marginTop="@dimen/login_middle_section_padding_top"
android:orientation="vertical"
android:paddingLeft="@dimen/login_horizontal_margin"
android:paddingRight="@dimen/login_horizontal_margin">

<EditText
android:id="@+id/login_user_name_edit_text"
android:layout_width="match_parent"
android:layout_height="@dimen/login_view_component_height"
android:layout_weight="8"
android:background="@drawable/rounded_corner_edit_text_bg"
android:cursorVisible="true"
android:ems="10"
android:hint="@string/username"
android:imeOptions="actionNext"
android:inputType="text"
android:lines="1"
android:paddingLeft="10dp"
android:textColor="#666666"
android:textColorHint="#bfbfbf"
android:textCursorDrawable="@null"
android:textSize="@dimen/login_edit_text_textSize"
android:typeface="sans" />

<EditText
android:id="@+id/login_password_edit_text"
android:layout_width="match_parent"
android:layout_height="@dimen/login_view_component_height"
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:layout_weight="8"
android:background="@drawable/rounded_corner_edit_text_bg"
android:cursorVisible="true"
android:ems="10"
android:hint="@string/password"
android:imeActionId="@integer/login"
android:inputType="textPassword"
android:lines="1"
android:paddingLeft="10dp"
android:textColor="#666666"
android:textColorHint="#bfbfbf"
android:textCursorDrawable="@null"
android:textSize="@dimen/login_edit_text_textSize"
android:typeface="sans" />

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/checkbox_margin_top">

<CheckBox
android:id="@+id/login_show_password_checkbox"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginLeft="3dp"
android:layout_marginTop="15dp"
android:layout_marginRight="5dp"
android:button="@drawable/white_checkbox_bg_selector" />

<TextView
android:id="@+id/login_show_password_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/login_show_password_checkbox"
android:text="@string/show_password_text"
android:textColor="#585858"
android:textSize="@dimen/login_edit_text_textSize" />
</RelativeLayout>

<Button
android:id="@+id/login_login_btn"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:layout_weight="8"
android:background="@drawable/login_button_bg"
android:ems="10"
android:shadowColor="#ffffff"
android:shadowDx="0"
android:shadowDy="1"
android:shadowRadius="0.5"
android:text="@string/login_text"
android:textAllCaps="true"
android:textColor="@color/white"
android:textSize="18sp" />

</LinearLayout>
<!-- Bottom section -->

<LinearLayout
android:id="@+id/bottom_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/middle_section"
android:layout_alignParentBottom="true"
android:orientation="vertical"
android:paddingTop="30dp">


<ImageView
android:id="@+id/opensrp_logo_image_view"
android:layout_width="wrap_content"
android:layout_height="@dimen/login_opensrp_logo_height"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:adjustViewBounds="false"
android:cropToPadding="false"
android:scaleType="centerInside"
android:src="@drawable/ic_opensrp_logo_round" />
</LinearLayout>
</RelativeLayout>
</ScrollView>
184 changes: 184 additions & 0 deletions opensrp-chw/src/drc/res/layout/activity_login.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,184 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/canvasSV"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
android:isScrollContainer="true">

<RelativeLayout
android:id="@+id/login_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_weight="1.0"
android:background="#F6F6F6"
android:paddingBottom="@dimen/login_bottom_margin">


<!-- Top section -->
<LinearLayout
android:id="@+id/top_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:orientation="vertical"
android:paddingTop="@dimen/login_logo_top_padding">

<ImageView
android:id="@+id/login_logo"
android:layout_width="match_parent"
android:layout_height="@dimen/login_logo_height"
android:layout_gravity="center"
android:layout_marginTop="60dp"
android:layout_marginBottom="60dp"
android:layout_weight="1"
android:contentDescription="@string/logo"
android:scaleType="fitCenter"
android:src="@drawable/ic_logo" />

<TextView
android:id="@+id/login_title_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="5dp"
android:gravity="center_horizontal"
android:text="@string/login_title"
android:textColor="#272727"
android:textSize="@dimen/login_title_text_size"
android:textStyle="bold"
android:typeface="sans" />

<TextView
android:id="@+id/login_build_text_view"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="5dp"
android:gravity="center_horizontal"
android:text="@string/app_version"
android:textColor="#999999"
android:textSize="@dimen/login_build_text_view_textSize" />

</LinearLayout>

<!-- Middle section -->
<LinearLayout
android:id="@+id/middle_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/top_section"
android:layout_marginTop="@dimen/login_middle_section_padding_top"
android:orientation="vertical"
android:paddingLeft="@dimen/login_horizontal_margin"
android:paddingRight="@dimen/login_horizontal_margin">

<EditText
android:id="@+id/login_user_name_edit_text"
android:layout_width="match_parent"
android:layout_height="@dimen/login_view_component_height"
android:layout_weight="8"
android:background="@drawable/rounded_corner_edit_text_bg"
android:cursorVisible="true"
android:ems="10"
android:hint="@string/username"
android:imeOptions="actionNext"
android:inputType="text"
android:lines="1"
android:paddingLeft="10dp"
android:textColor="#666666"
android:textColorHint="#bfbfbf"
android:textCursorDrawable="@null"
android:textSize="@dimen/login_edit_text_textSize"
android:typeface="sans" />

<EditText
android:id="@+id/login_password_edit_text"
android:layout_width="match_parent"
android:layout_height="@dimen/login_view_component_height"
android:layout_gravity="center_horizontal"
android:layout_marginTop="15dp"
android:layout_weight="8"
android:background="@drawable/rounded_corner_edit_text_bg"
android:cursorVisible="true"
android:ems="10"
android:hint="@string/password"
android:imeActionId="@integer/login"
android:inputType="textPassword"
android:lines="1"
android:paddingLeft="10dp"
android:textColor="#666666"
android:textColorHint="#bfbfbf"
android:textCursorDrawable="@null"
android:textSize="@dimen/login_edit_text_textSize"
android:typeface="sans" />

<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/checkbox_margin_top">

<CheckBox
android:id="@+id/login_show_password_checkbox"
android:layout_width="20dp"
android:layout_height="20dp"
android:layout_centerVertical="true"
android:layout_marginLeft="3dp"
android:layout_marginTop="15dp"
android:layout_marginRight="5dp"
android:button="@drawable/white_checkbox_bg_selector" />

<TextView
android:id="@+id/login_show_password_text_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toRightOf="@id/login_show_password_checkbox"
android:text="@string/show_password_text"
android:textColor="#585858"
android:textSize="@dimen/login_edit_text_textSize" />
</RelativeLayout>

<Button
android:id="@+id/login_login_btn"
android:layout_width="match_parent"
android:layout_height="55dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="20dp"
android:layout_weight="8"
android:background="@drawable/login_button_bg"
android:ems="10"
android:shadowColor="#ffffff"
android:shadowDx="0"
android:shadowDy="1"
android:shadowRadius="0.5"
android:text="@string/login_text"
android:textAllCaps="true"
android:textColor="@color/white"
android:textSize="18sp" />

</LinearLayout>
<!-- Bottom section -->

<LinearLayout
android:id="@+id/bottom_section"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/middle_section"
android:layout_alignParentBottom="true"
android:orientation="vertical"
android:paddingTop="30dp">


<ImageView
android:id="@+id/opensrp_logo_image_view"
android:layout_width="wrap_content"
android:layout_height="@dimen/login_opensrp_logo_height"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:adjustViewBounds="false"
android:cropToPadding="false"
android:scaleType="centerInside"
android:src="@drawable/ic_opensrp_logo_round" />
</LinearLayout>
</RelativeLayout>
</ScrollView>
Loading

0 comments on commit b701adc

Please sign in to comment.