Skip to content

Commit

Permalink
botones redondos y boton help activo
Browse files Browse the repository at this point in the history
  • Loading branch information
crisposada committed Apr 15, 2018
1 parent d77080f commit 6c0e786
Show file tree
Hide file tree
Showing 12 changed files with 142 additions and 73 deletions.
1 change: 1 addition & 0 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
<activity android:name="es.indios.markn.ui.init.InitActivity"/>

<activity android:name="es.indios.markn.ui.signup.SignUpActivity"/>
<activity android:name="es.indios.markn.ui.help.HelpActivity"/>


<service android:name="es.indios.markn.data.sync.IndicationsSyncService"/>
Expand Down
19 changes: 19 additions & 0 deletions app/src/main/java/es/indios/markn/ui/help/HelpActivity.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
package es.indios.markn.ui.help;

import android.app.Activity;
import android.os.Bundle;

import es.indios.ribot.androidboilerplate.R;

/**
* Created by CristinaPosada on 15/04/2018.
*/

public class HelpActivity extends Activity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_help);

}
}
4 changes: 3 additions & 1 deletion app/src/main/java/es/indios/markn/ui/init/InitActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import es.indios.markn.data.sync.TopologySyncService;
import es.indios.markn.ui.base.BaseActivity;
import es.indios.markn.ui.guide.GuideFragment;
import es.indios.markn.ui.help.HelpActivity;
import es.indios.markn.ui.login.LoginActivity;
import es.indios.markn.ui.main.BeaconsAdapter;
import es.indios.markn.ui.scheduler.SchedulerFragment;
Expand Down Expand Up @@ -125,7 +126,8 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {

break;
case R.id.action_help:

Intent intent_help = new Intent(this, HelpActivity.class);
startActivity(intent_help);
break;
case R.id.action_logout:
mInitPresenter.logout();
Expand Down
4 changes: 0 additions & 4 deletions app/src/main/java/es/indios/markn/ui/login/LoginActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,10 +91,6 @@ public void onClick(View view) {
case R.id.textview_create_account:
Intent intent = new Intent(this, SignUpActivity.class);
startActivity(intent);
<<<<<<< HEAD
//finish();
=======
>>>>>>> 99f73515b38641d16e602404d9928d2ee313f743
break;
default:
break;
Expand Down
14 changes: 14 additions & 0 deletions app/src/main/res/drawable/borde_redondo.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="#ffffff"/>

<stroke android:width="2dp"
android:color="#ffffff"/>

<padding android:left="1dp"
android:top="1dp"
android:right="1dp"
android:bottom="1dp"/>

<corners android:radius="30px"/>
</shape>
14 changes: 14 additions & 0 deletions app/src/main/res/drawable/borde_redondo_blue.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/orange"/>

<stroke android:width="2dp"
android:color="@color/orange"/>

<padding android:left="1dp"
android:top="1dp"
android:right="1dp"
android:bottom="1dp"/>

<corners android:radius="30px"/>
</shape>
14 changes: 14 additions & 0 deletions app/src/main/res/drawable/borde_redondo_blue_clarity.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<solid android:color="@color/primary"/>

<stroke android:width="2dp"
android:color="@color/primary"/>

<padding android:left="1dp"
android:top="1dp"
android:right="1dp"
android:bottom="1dp"/>

<corners android:radius="30px"/>
</shape>
114 changes: 60 additions & 54 deletions app/src/main/res/layout/activity_help.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,16 @@

<TextView
android:id="@+id/help"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:textSize="20dp"
android:textStyle="bold"
android:gravity="center"
android:text="@string/help"
android:layout_centerHorizontal="true"
android:textColor="@color/white"
android:layout_marginTop="20dp"
/>
android:text="@string/help" />

<ScrollView
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand All @@ -25,8 +26,7 @@
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="80dp"
android:layout_marginBottom="80dp"
android:layout_marginTop="90dp"
android:background="@color/blue_dark"
>

Expand All @@ -36,137 +36,143 @@
android:layout_marginRight="5dp"
android:layout_marginLeft="5dp">

<ImageView
android:id="@+id/image_schedule_help"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="5dp"
android:layout_centerHorizontal="true"
android:background="@drawable/borde_redondo"
android:src="@drawable/ic_date_range_black_24dp"
/>
<TextView
android:id="@+id/help_scheduler"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:textSize="15dp"
android:textStyle="bold"
android:gravity="center"
android:layout_below="@+id/image_schedule_help"
android:text="@string/bottom_scheduler"
android:background="@color/white"
android:background="@drawable/borde_redondo"
android:layout_marginTop="5dp"
/>
<TextView
android:id="@+id/text_help_schedule"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_below="@+id/help_scheduler"
android:textSize="12dp"
android:textSize="15dp"
android:gravity="center"
android:text="@string/help_shecule"
android:background="@color/white"
android:background="@drawable/borde_redondo"
android:layout_marginTop="5dp"
/>

<ImageView
android:id="@+id/image_schedule_help"
android:id="@+id/image_teachers_help"
android:layout_width="wrap_content"
android:layout_height="300dp"
android:layout_marginTop="5dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_centerInParent="true"
android:background="@drawable/borde_redondo"
android:layout_below="@+id/text_help_schedule"
android:src="@drawable/schedule1"
android:src="@drawable/ic_person_black_24dp"
android:layout_marginTop="30dp"
/>
<TextView
android:id="@+id/help_teachers"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/image_schedule_help"
android:layout_height="match_parent"
android:layout_below="@+id/image_teachers_help"
android:textSize="15dp"
android:textStyle="bold"
android:gravity="center"
android:text="@string/bottom_professors"
android:background="@color/white"
android:layout_marginTop="30dp"
android:background="@drawable/borde_redondo"
android:layout_marginTop="5dp"

/>
<TextView
android:id="@+id/text_help_teachers"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_below="@+id/help_teachers"
android:textSize="12dp"
android:textSize="15dp"
android:gravity="center"
android:text="@string/help_teachers"
android:background="@color/white"
android:background="@drawable/borde_redondo"
android:layout_marginTop="5dp"
/>
<ImageView
android:id="@+id/image_teachers_help"
android:id="@+id/image_guide_help"
android:layout_width="wrap_content"
android:layout_height="300dp"
android:layout_marginTop="5dp"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_centerInParent="true"
android:layout_below="@+id/text_help_teachers"
android:src="@drawable/teachers"
android:background="@drawable/borde_redondo"
android:src="@drawable/ic_my_location_black_24dp"
android:layout_marginTop="30dp"
/>
<TextView
android:id="@+id/help_guide"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/image_teachers_help"
android:layout_height="match_parent"
android:layout_below="@+id/image_guide_help"
android:textSize="15dp"
android:textStyle="bold"
android:gravity="center"
android:text="@string/bottom_guide"
android:background="@color/white"
android:layout_marginTop="30dp"
android:background="@drawable/borde_redondo"
android:layout_marginTop="5dp"
/>
<TextView
android:id="@+id/text_help_guide"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_below="@+id/help_guide"
android:textSize="12dp"
android:textSize="15dp"
android:gravity="center"
android:text="@string/help_guide"
android:background="@color/white"
android:background="@drawable/borde_redondo"
android:layout_marginTop="5dp"
/>
<ImageView
android:id="@+id/image_guide_help"
android:id="@+id/image_menu_help"
android:layout_width="wrap_content"
android:layout_height="300dp"
android:layout_marginTop="5dp"
android:layout_height="wrap_content"
android:layout_marginTop="30dp"
android:layout_centerVertical="true"
android:layout_centerInParent="true"
android:layout_below="@+id/text_help_guide"
android:src="@drawable/teachers"
android:src="@drawable/ic_notifications_black_24dp"
android:background="@drawable/borde_redondo"
/>
<TextView
android:id="@+id/help_menu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/image_guide_help"
android:layout_height="match_parent"
android:layout_below="@+id/image_menu_help"
android:textSize="15dp"
android:textStyle="bold"
android:gravity="center"
android:text="@string/help_menu"
android:background="@color/white"
android:layout_marginTop="30dp"
android:background="@drawable/borde_redondo"
android:layout_marginTop="5dp"
/>
<TextView
android:id="@+id/text_help_menu"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:layout_below="@+id/help_menu"
android:textSize="12dp"
android:textSize="15dp"
android:gravity="center"
android:text="@string/help_menu_text"
android:background="@color/white"
android:layout_marginTop="5dp"
/>
<ImageView
android:id="@+id/image_menu_help"
android:layout_width="wrap_content"
android:layout_height="300dp"
android:background="@drawable/borde_redondo"
android:layout_marginTop="5dp"
android:layout_centerVertical="true"
android:layout_centerInParent="true"
android:layout_below="@+id/text_help_menu"
android:src="@drawable/menu"
/>

</RelativeLayout>
</ScrollView>

Expand Down
11 changes: 6 additions & 5 deletions app/src/main/res/layout/activity_login.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
android:textAllCaps="false"
android:layout_marginRight="5dp"
android:text="@string/text_create_account"
android:background="@color/orange"
android:background="@drawable/borde_redondo_blue"
/>

<Button
Expand All @@ -48,7 +48,7 @@
android:textAllCaps="false"
android:layout_marginLeft="5dp"
android:text="@string/text_guest_session"
android:background="@color/orange"
android:background="@drawable/borde_redondo_blue"
android:focusable="true" />

</TableRow>
Expand All @@ -64,15 +64,15 @@
android:textAllCaps="false"
android:text="@string/bottom_login"
android:textSize="12sp"
android:background="@color/primary"
android:background="@drawable/borde_redondo_blue_clarity"
/>


<EditText
android:id="@+id/password_edittext"
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@color/white"
android:background="@drawable/borde_redondo"
android:gravity="center"
android:layout_above="@+id/login_button"
android:textSize="12sp"
Expand All @@ -83,11 +83,12 @@
android:id="@+id/email_edittext"
android:layout_width="match_parent"
android:layout_height="40dp"
android:background="@color/white"
android:background="@drawable/borde_redondo"
android:gravity="center"
android:layout_above="@id/password_edittext"
android:inputType="textEmailAddress"
android:textSize="12sp"
android:layout_marginBottom="5dp"
android:hint="@string/text_email"/>

<TextView
Expand Down
Loading

0 comments on commit 6c0e786

Please sign in to comment.