Skip to content

Commit

Permalink
Login changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@droiddevgeeks
droiddevgeeks committed May 22, 2017
1 parent 1dd204f commit 3c0433d
Show file tree
Hide file tree
Showing 14 changed files with 438 additions and 1 deletion.
27 changes: 27 additions & 0 deletions .idea/misc.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion app/src/main/java/com/andesfit/android/MainActivity.java
View file
Expand Up @@ -19,7 +19,7 @@ public class MainActivity extends AppCompatActivity
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
setContentView(R.layout.create_account_layout);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar);

Expand Down
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/account_login_bg.xml
View file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/listview_background_shape">
<solid android:color="@color/account_btn" />
</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/create_ac_editbox_bg.xml
View file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/listview_background_shape">
<solid android:color="@android:color/white" />
</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/fb_login_bg.xml
View file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/listview_background_shape">
<solid android:color="@color/fb_btn" />
</shape>
5 changes: 5 additions & 0 deletions app/src/main/res/drawable/login_button_bg.xml
View file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/listview_background_shape">
<solid android:color="@color/login" />
</shape>
7 changes: 7 additions & 0 deletions app/src/main/res/layout/activity_main.xml
View file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent">

</LinearLayout>
102 changes: 102 additions & 0 deletions app/src/main/res/layout/common_login_page.xml
View file
@@ -0,0 +1,102 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_window"
android:orientation="vertical">

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:src="@drawable/logo_app"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@drawable/bg_desk_translucent"
android:gravity="center"
android:orientation="vertical"
android:paddingLeft="30dp"
android:paddingRight="30dp">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="@dimen/login_button_row"
android:gravity="center"
android:orientation="horizontal"
android:layout_marginTop="10dp">

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:text="@string/login_option"
android:textStyle="bold"
android:textColor="@color/select_text"
android:textSize="@dimen/login_page_text"/>

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="10dp"
android:layout_marginLeft="10dp"
android:src="@drawable/arrow_downward"/>

</LinearLayout>

<TextView
android:id="@+id/btnFBLogin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/fb_login_bg"
android:gravity="center"
android:minHeight="@dimen/login_button_row"
android:text="@string/login_option_fb"
android:textColor="@android:color/white"
android:textSize="@dimen/login_page_text"/>

<TextView
android:id="@+id/btnCreateAccount"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@drawable/account_login_bg"
android:gravity="center"
android:minHeight="@dimen/login_button_row"
android:text="@string/login_option_account"
android:textColor="@android:color/white"
android:textSize="@dimen/login_page_text"/>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:background="@android:color/transparent"
android:gravity="center"
android:minHeight="@dimen/login_button_row"
android:text="@string/OR"
android:textColor="@color/Or"
android:textSize="@dimen/login_page_text"/>

<TextView
android:id="@+id/btnLogin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:background="@drawable/login_button_bg"
android:gravity="center"
android:minHeight="@dimen/login_button_row"
android:text="@string/login"
android:textColor="@android:color/white"
android:textSize="@dimen/login_page_text"/>

</LinearLayout>


</RelativeLayout>
99 changes: 99 additions & 0 deletions app/src/main/res/layout/create_account_layout.xml
View file
@@ -0,0 +1,99 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/myhealth_bg"
android:orientation="vertical">

<ImageView
android:layout_width="200dp"
android:layout_height="200dp"
android:layout_centerHorizontal="true"
android:layout_marginTop="50dp"
android:scaleType="fitXY"
android:contentDescription="@string/login"
android:src="@drawable/logo_sign_up"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="@android:color/white"
android:orientation="vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp">


<EditText
android:id="@+id/edtEmail"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/create_ac_editbox_bg"
android:hint="@string/email"
android:textColorHint="@color/hint"
android:inputType="textEmailAddress"
android:textSize="@dimen/login_page_text"/>

<EditText
android:id="@+id/estPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:background="@drawable/create_ac_editbox_bg"
android:hint="@string/password"
android:textColorHint="@color/hint"
android:inputType="textPassword"
android:textSize="@dimen/login_page_text"/>

<EditText
android:id="@+id/edtCnfPassword"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:background="@drawable/create_ac_editbox_bg"
android:hint="@string/confirm_password"
android:inputType="textPassword"
android:textColorHint="@color/hint"
android:textSize="@dimen/login_page_text"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="25dp"
android:orientation="horizontal">

<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:contentDescription="@string/term_checkbox"
android:src="@drawable/tickbox_selected"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_marginStart="10dp"
android:text="@string/term"
android:textSize="@dimen/term"/>

</LinearLayout>


<TextView
android:id="@+id/btnSubmit"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="100dp"
android:background="@drawable/login_button_bg"
android:gravity="center"
android:minHeight="@dimen/login_button_row"
android:text="@string/submit"
android:textColor="@android:color/white"
android:textSize="@dimen/login_page_text"/>

</LinearLayout>


</RelativeLayout>
56 changes: 56 additions & 0 deletions app/src/main/res/layout/profile_setting_1.xml
View file
@@ -0,0 +1,56 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@drawable/bg_window"
android:orientation="vertical">

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:contentDescription="@null"
android:src="@drawable/logo_app"/>

<TextView
android:id="@+id/welcomeText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_centerInParent="true"
android:text="@string/welcome_text"
android:layout_marginTop="20dp"
android:visibility="invisible"
android:textColor="@android:color/white"
android:textSize="@dimen/login_page_text"/>

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:layout_below="@+id/welcomeText"
android:layout_centerInParent="true"
android:text="@string/welcome_text"
android:layout_marginTop="20dp"
android:textColor="@android:color/white"
android:textSize="@dimen/login_page_text"/>


<TextView
android:id="@+id/btnLogin"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
android:background="@drawable/login_button_bg"
android:layout_alignParentBottom="true"
android:gravity="center"
android:orientation="vertical"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:minHeight="@dimen/login_button_row"
android:text="@string/start"
android:textColor="@android:color/white"
android:textSize="@dimen/login_page_text"/>
</RelativeLayout>

0 comments on commit 3c0433d

Please sign in to comment.