Skip to content

U
uBus
Commit 84f099ef authored by Pearl Jen Santos's avatar Pearl Jen Santos
Browse files
Options

Finished layout save for the change in toolbar

parent 4863d05c
Hide whitespace changes
Inline Side-by-side
Showing with 496 additions and 242 deletions
mobile-app/10-31-15/Project/app/app.iml
View file @ 84f099ef
...@@ -72,9 +72,11 @@ ...@@ -72,9 +72,11 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/dex-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/appcompat-v7/23.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/cardview-v7/23.1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/design/23.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/recyclerview-v7/23.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.android.support/support-v4/23.1.0/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/exploded-aar/com.pkmmte.view/circularimageview/1.1/jars" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jacoco" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" /> <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaResources" />
...@@ -93,6 +95,8 @@ ...@@ -93,6 +95,8 @@
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" /> <orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" /> <orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
<orderEntry type="library" exported="" name="circularimageview-1.1" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" /> <orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
<orderEntry type="library" exported="" name="design-23.1.0" level="project" /> <orderEntry type="library" exported="" name="design-23.1.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" /> <orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
......
mobile-app/10-31-15/Project/app/build.gradle
View file @ 84f099ef
...@@ -23,4 +23,6 @@ dependencies { ...@@ -23,4 +23,6 @@ dependencies {
compile fileTree(dir: 'libs', include: ['*.jar']) compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:23.0.1' compile 'com.android.support:appcompat-v7:23.0.1'
compile 'com.android.support:design:23.1.0' compile 'com.android.support:design:23.1.0'
compile 'com.android.support:cardview-v7:23.1.1'
compile 'com.pkmmte.view:circularimageview:1.1'
} }
mobile-app/10-31-15/Project/app/src/main/java/com/example/pearlsantos/project/ActionBarAttempt.java
View file @ 84f099ef
...@@ -38,13 +38,9 @@ import java.util.Locale; ...@@ -38,13 +38,9 @@ import java.util.Locale;
public class ActionBarAttempt extends AppCompatActivity { public class ActionBarAttempt extends AppCompatActivity {
private DrawerLayout mDrawerLayout; private DrawerLayout mDrawerLayout;
private ListView mDrawerList;
private ActionBarDrawerToggle mDrawerToggle;
private CharSequence mDrawerTitle;
private CharSequence mTitle;
private String[] options;
private NavigationView nvDrawer; private NavigationView nvDrawer;
// private int[] optionIcons = {R.mipmap.ic_search, R.mipmap.ic_search, R.mipmap.ic_search, R.mipmap.ic_settings, R.mipmap.ic_logout};; Toolbar toolbar;
ActionBar actionBar;
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
...@@ -52,20 +48,22 @@ public class ActionBarAttempt extends AppCompatActivity { ...@@ -52,20 +48,22 @@ public class ActionBarAttempt extends AppCompatActivity {
setContentView(R.layout.activity_action_bar_attempt); setContentView(R.layout.activity_action_bar_attempt);
//setting the toolbar //setting the toolbar
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); toolbar = (Toolbar) findViewById(R.id.toolbar);
setSupportActionBar(toolbar); setSupportActionBar(toolbar);
actionBar = getSupportActionBar();
final ActionBar actionBar = getSupportActionBar();
actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setHomeButtonEnabled(true); actionBar.setHomeButtonEnabled(true);
actionBar.setDisplayShowTitleEnabled(true); actionBar.setDisplayShowTitleEnabled(true);
toolbar.setNavigationIcon(R.drawable.ic_action_menu); toolbar.setNavigationIcon(R.drawable.ic_action_menu);
mTitle = mDrawerTitle = "About";
options = getResources().getStringArray(R.array.options);
mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); mDrawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout);
nvDrawer = (NavigationView) findViewById(R.id.left_drawer); nvDrawer = (NavigationView) findViewById(R.id.left_drawer);
setupDrawerContent(nvDrawer); setupDrawerContent(nvDrawer);
FragmentManager fragmentManager = getSupportFragmentManager();
fragmentManager.beginTransaction().replace(R.id.content_frame, new SearchFragment()).commit();
//mDrawerList = (ListView) findViewById(R.id.left_drawer); //mDrawerList = (ListView) findViewById(R.id.left_drawer);
...@@ -127,21 +125,22 @@ public class ActionBarAttempt extends AppCompatActivity { ...@@ -127,21 +125,22 @@ public class ActionBarAttempt extends AppCompatActivity {
Class fragmentClass; Class fragmentClass;
switch(menuItem.getItemId()){ switch(menuItem.getItemId()){
case R.id.search: // case R.id.search:
fragmentClass = SearchFragment.class; // fragmentClass = SearchFragment.class;
break; // break;
case R.id.schedules:
fragmentClass = Schedules.class;
break;
case R.id.editProfile: case R.id.editProfile:
fragmentClass = ChangeInfoFragment.class; fragmentClass = ChangeInfoFragment.class;
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setHomeButtonEnabled(true);
actionBar.setDisplayShowTitleEnabled(true);
toolbar.setNavigationIcon(R.drawable.ic_action_menu);
break; break;
case R.id.viewPastTrips: case R.id.viewPastTrips:
fragmentClass = PastTrips.class; fragmentClass = PastTrips.class;
break; break;
case R.id.settings: case R.id.settings:
//settings //settings
fragmentClass = Help.class; fragmentClass = Settings.class;
break; break;
case R.id.logout: case R.id.logout:
//logout //logout
......
mobile-app/10-31-15/Project/app/src/main/java/com/example/pearlsantos/project/SearchFragment.java
View file @ 84f099ef
...@@ -8,6 +8,8 @@ import android.support.v4.app.Fragment; ...@@ -8,6 +8,8 @@ import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentActivity;
import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentManager;
import android.os.Bundle; import android.os.Bundle;
import android.support.v7.app.ActionBar;
import android.support.v7.widget.Toolbar;
import android.text.format.DateFormat; import android.text.format.DateFormat;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
...@@ -47,7 +49,8 @@ public class SearchFragment extends Fragment { ...@@ -47,7 +49,8 @@ public class SearchFragment extends Fragment {
} }
}); });
// Toolbar toolbar = (Toolbar) rootView.findViewById(R.id.toolbar);
// toolbar.setNavigationIcon(R.mipmap.ic_search);
return rootView; return rootView;
......
mobile-app/10-31-15/Project/app/src/main/java/com/example/pearlsantos/project/Settings.java 0 → 100644
View file @ 84f099ef
package com.example.pearlsantos.project;
import android.os.Bundle;
import android.support.v4.app.Fragment;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;
/**
* Created by Pearl Santos on 11/20/2015.
*/
public class Settings extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle SavedInstance) {
View rootView = inflater.inflate(R.layout.fragment_settings, container, false);
return rootView;
}
}
mobile-app/10-31-15/Project/app/src/main/res/drawable/underline.xml
View file @ 84f099ef
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
<solid <solid
android:color="@color/deep_orange_500"/> android:color="@color/deep_orange_500"/>
<size <size
android:height="1dp" android:height="3dp"
android:width="70dp"/> android:width="300dp"/>
</shape> </shape>
\ No newline at end of file
mobile-app/10-31-15/Project/app/src/main/res/drawable/underline2.xml 0 → 100644
View file @ 84f099ef
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="@color/deep_orange_400"/>
<size
android:height="1dp"
android:width="300dp"/>
</shape>
mobile-app/10-31-15/Project/app/src/main/res/layout/activity_action_bar_attempt.xml
View file @ 84f099ef
...@@ -17,12 +17,22 @@ ...@@ -17,12 +17,22 @@
android:background="#ff5722" android:background="#ff5722"
app:contentInsetEnd="0dp" app:contentInsetEnd="0dp"
app:contentInsetStart="0dp" app:contentInsetStart="0dp"
/> >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="5dp"
android:text="title"
android:textAppearance="@style/TextAppearance.AppCompat.Widget.ActionBar.Title"/>
</android.support.v7.widget.Toolbar>
<FrameLayout <FrameLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/content_frame" android:id="@+id/content_frame"
/> />
</LinearLayout> </LinearLayout>
<!-- The navigation drawer --> <!-- The navigation drawer -->
<!--<ListView android:id="@+id/left_drawer"--> <!--<ListView android:id="@+id/left_drawer"-->
...@@ -35,6 +45,7 @@ ...@@ -35,6 +45,7 @@
<!--android:background="@color/deep_orange_300"/>--> <!--android:background="@color/deep_orange_300"/>-->
<android.support.design.widget.NavigationView <android.support.design.widget.NavigationView
app:headerLayout="@layout/header"
android:id="@+id/left_drawer" android:id="@+id/left_drawer"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
......
mobile-app/10-31-15/Project/app/src/main/res/layout/activity_login__screen.xml
View file @ 84f099ef
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="@style/TextAppearance.AppCompat.Headline"
android:hint="Reserve your tickets." android:hint="Reserve your tickets."
android:layout_gravity="center" android:layout_gravity="center"
android:id="@+id/textView" android:id="@+id/textView"
......
mobile-app/10-31-15/Project/app/src/main/res/layout/activity_past_trips.xml
View file @ 84f099ef
...@@ -6,7 +6,5 @@ ...@@ -6,7 +6,5 @@
android:paddingBottom="@dimen/activity_vertical_margin" android:paddingBottom="@dimen/activity_vertical_margin"
tools:context="com.example.pearlsantos.project.PastTrips"> tools:context="com.example.pearlsantos.project.PastTrips">
<TextView android:text="@string/hello_world" android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</RelativeLayout> </RelativeLayout>
mobile-app/10-31-15/Project/app/src/main/res/layout/confirmation.xml
View file @ 84f099ef
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view = "http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardCornerRadius="5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
>
<LinearLayout
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/LinearLayout1" android:id="@+id/LinearLayout1"
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -21,7 +31,7 @@ ...@@ -21,7 +31,7 @@
android:text="00 " android:text="00 "
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
<TextView <TextView
android:id="@+id/noOfSeatsLabel" android:id="@+id/noOfSeatsLabel"
...@@ -30,7 +40,7 @@ ...@@ -30,7 +40,7 @@
android:text="Seats Reserved!" android:text="Seats Reserved!"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="@style/TextAppearance.AppCompat.Title" />
</LinearLayout> </LinearLayout>
...@@ -61,6 +71,7 @@ ...@@ -61,6 +71,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_gravity="center"
android:layout_weight="2"> android:layout_weight="2">
<TextView <TextView
...@@ -68,25 +79,23 @@ ...@@ -68,25 +79,23 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="From" android:text="From"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="@style/TextAppearance.AppCompat.Button" />
<TextView <TextView
android:id="@+id/from" android:id="@+id/from"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="PlaceA" android:text="PLACE A"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<TextView <TextView
android:id="@+id/depTime" android:id="@+id/depTime"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="ETD 00:00" android:text="ETD 00:00"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
</LinearLayout> </LinearLayout>
...@@ -95,6 +104,7 @@ ...@@ -95,6 +104,7 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="vertical" android:orientation="vertical"
android:layout_gravity="center"
android:layout_weight="2"> android:layout_weight="2">
<TextView <TextView
...@@ -102,23 +112,22 @@ ...@@ -102,23 +112,22 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="To" android:text="To"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="@style/TextAppearance.AppCompat.Button" />
<TextView <TextView
android:id="@+id/to" android:id="@+id/to"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="PlaceB" android:text="PLACE B"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
<TextView <TextView
android:id="@+id/arrTime" android:id="@+id/arrTime"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="ETA 00:00" android:text="ETA 00:00"
android:layout_marginLeft="20dp"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="@style/TextAppearance.AppCompat.Body2" />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
...@@ -148,8 +157,9 @@ ...@@ -148,8 +157,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginLeft="10dp"
android:text="00" android:text="00"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
...@@ -161,22 +171,37 @@ ...@@ -161,22 +171,37 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_weight="2" android:layout_weight="2"
android:orientation="horizontal" > android:orientation="vertical" >
<TextView <TextView
android:id="@+id/purchaseLabel" android:id="@+id/purchaseLabel"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="left"
android:text="TOTAL: P " android:text="TOTAL:"
android:textAppearance="?android:attr/textAppearanceLarge" /> android:textAppearance="@style/TextAppearance.AppCompat.Button" />
<TextView
android:id="@+id/purchase" <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_weight="2"
android:text="00" android:orientation="horizontal" >
android:textAppearance="?android:attr/textAppearanceMedium" /> <TextView
android:id="@+id/purchaseLabelP"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:text="P"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
<TextView
android:id="@+id/purchase"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left"
android:layout_marginLeft="5dp"
android:text="00.00"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
</LinearLayout>
...@@ -200,3 +225,4 @@ ...@@ -200,3 +225,4 @@
android:layout_marginRight="20dp"/> android:layout_marginRight="20dp"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
mobile-app/10-31-15/Project/app/src/main/res/layout/fragment_about.xml
View file @ 84f099ef
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view = "http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardCornerRadius="5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
android:layout_marginTop="10dp"
>
<LinearLayout
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.example.pearlsantos.project.Help" tools:context="com.example.pearlsantos.project.Help"
...@@ -9,11 +19,12 @@ ...@@ -9,11 +19,12 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="@style/TextAppearance.AppCompat.Display1"
android:text="About uBus" android:text="About uBus"
android:layout_gravity="top|center" android:layout_gravity="top|center"
android:layout_marginTop="20dp"
android:layout_marginBottom="50dp"
android:id="@+id/about" android:id="@+id/about"
android:layout_weight="1"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
...@@ -22,10 +33,11 @@ ...@@ -22,10 +33,11 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:layout_marginLeft="20dp" android:layout_marginLeft="20dp"
android:text="uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor " android:layout_marginBottom="40dp"
android:text=" uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor uBus is lorem ipsum dolor "
android:layout_gravity="center" android:layout_gravity="center"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:id="@+id/uBus_about" android:id="@+id/uBus_about"
android:layout_weight="2"
android:layout_centerVertical="true" android:layout_centerVertical="true"
android:layout_centerHorizontal="true" /> android:layout_centerHorizontal="true" />
...@@ -39,10 +51,12 @@ ...@@ -39,10 +51,12 @@
android:text="OK" android:text="OK"
android:id="@+id/okayButton" android:id="@+id/okayButton"
android:layout_gravity="right" android:layout_gravity="right"
android:layout_weight="1" /> android:layout_marginRight="15dp"
android:layout_marginBottom="10dp"/>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>
\ No newline at end of file
mobile-app/10-31-15/Project/app/src/main/res/layout/fragment_changeinfo.xml
View file @ 84f099ef
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app = "http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
> >
<!--
**************************IMPORTANT***********************************
change this id attribute values as "frag2_icon" and "frag2_text" for
fragment_layout_two.xml and "frag3_icon" and "frag3_text" for
fragment_layout_three.xml
**********************************************************************
-->
<LinearLayout
android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_weight="1">
<TextView
android:gravity="center"
android:id="@+id/frag1_text"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="10dp"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Change Info"/>
</LinearLayout>
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_weight="1"> android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:background="@color/deep_orange_500">
<EditText <LinearLayout
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<com.pkmmte.view.CircularImageView
android:id="@+id/profile_image"
app:border="true"
app:border_color="@color/white"
app:border_width="4dp"
app:shadow="true"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_margin="10dp"
android:src="@mipmap/ic_launcher"
android:layout_centerVertical="true"
android:layout_alignParentStart="true" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_gravity="center"
android:layout_marginRight="10dp">
<EditText
android:layout_width="242dp"
android:layout_height="match_parent"
android:id="@+id/firstNameChange"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColorHint="@color/white"
android:hint="Kunyari"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/lastNameChange"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColorHint="@color/white"
android:hint="Lang"/>
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:inputType="textPersonName" android:orientation="vertical"
android:hint="Name" android:layout_marginLeft="10dp">
android:ems="20" <TextView
android:id="@+id/editText" /> android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Upload Photo"
android:layout_marginTop="5dp"
android:layout_marginBottom="2dp"
android:textAppearance="@style/TextAppearance.AppCompat.Button"
android:textColorLink="@color/blue_500"
android:clickable="true"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Delete Photo"
android:layout_marginBottom="5dp"
android:textAppearance="@style/TextAppearance.AppCompat.Button"
android:textColorLink="@color/blue_500"
android:clickable="true"/>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="10dp"
android:hint="0917 123 4567"
android:textAppearance="@style/TextAppearance.AppCompat.Title"
android:textColorHint="@color/white"/>
</LinearLayout>
</LinearLayout> </LinearLayout>
<android.support.v7.widget.CardView
xmlns:card_view = "http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content"
card_view:cardCornerRadius="5dp"
android:layout_marginLeft="10dp"
android:layout_marginRight="10dp"
>
<LinearLayout <LinearLayout
android:orientation="vertical" android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_weight="1"> android:layout_height="wrap_content"
android:layout_gravity="center_horizontal">
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Change Password"
android:layout_margin="10dp"
android:textAppearance="@style/TextAppearance.AppCompat.Headline"/>
<EditText <EditText
android:layout_width="wrap_content" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/editText2" android:hint="Old Password"
android:ems="20" android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:hint="Number" /> android:layout_margin="5dp"/>
<EditText
</LinearLayout> android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="New Password"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:layout_margin="5dp"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Re-enter New Password"
android:textAppearance="@style/TextAppearance.AppCompat.Body2"
android:layout_margin="5dp"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout> </LinearLayout>
\ No newline at end of file
mobile-app/10-31-15/Project/app/src/main/res/layout/fragment_pasttrips.xml
View file @ 84f099ef
...@@ -5,22 +5,6 @@ ...@@ -5,22 +5,6 @@
android:orientation="vertical" android:orientation="vertical"
> >
<!--
**************************IMPORTANT***********************************
change this id attribute values as "frag2_icon" and "frag2_text" for
fragment_layout_two.xml and "frag3_icon" and "frag3_text" for
fragment_layout_three.xml
**********************************************************************
-->
<TextView
android:id="@+id/frag2_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Past Trips"/>
<ListView <ListView
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
mobile-app/10-31-15/Project/app/src/main/res/layout/fragment_search.xml
View file @ 84f099ef
...@@ -7,119 +7,144 @@ ...@@ -7,119 +7,144 @@
tools:context="com.example.pearlsantos.project.SearchFragment" tools:context="com.example.pearlsantos.project.SearchFragment"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <android.support.v7.widget.CardView
xmlns:card_view = "http://schemas.android.com/apk/res-auto"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="fill_parent"
android:orientation="vertical"
android:layout_gravity="center"
android:layout_marginLeft="30dp"
android:layout_marginRight="30dp"
android:layout_marginTop="10dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:text="Saan ka pupunta?"
android:layout_marginBottom="5dp"
android:id="@+id/destinationLabel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall" card_view:cardCornerRadius="5dp"
android:text="GALING" android:layout_margin="10dp"
android:id="@+id/fromLabelSearch" >
android:layout_marginBottom="5dp" />
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Pangunahing Terminal"
android:id="@+id/fromSearch"
android:layout_marginBottom="5dp" />
<LinearLayout <LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="fill_parent"
<TextView android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="PAPUNTANG"
android:id="@+id/toLabelSearch"
android:layout_marginBottom="5dp" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/change"
android:src="@mipmap/ic_change"
android:layout_gravity="right" />
</LinearLayout>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Destinasyon"
android:id="@+id/toSearch"
android:layout_marginBottom="5dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="BUS LINER"
android:id="@+id/busLinersLabel"
android:layout_marginBottom="5dp" />
<Spinner
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/busLiners"
android:layout_marginBottom="5dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall"
android:text="ANONG ORAS?"
android:id="@+id/timeLabel"
android:layout_marginBottom="5dp" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge" android:layout_marginLeft="30dp"
android:id="@+id/digitalClock" /> android:layout_marginRight="30dp"
android:layout_marginTop="10dp"
>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Headline"
android:text="Saan ka pupunta?"
android:layout_marginBottom="5dp"
android:id="@+id/destinationLabel" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Button"
android:text="GALING"
android:id="@+id/fromLabelSearch"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"/>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Pangunahing Terminal"
android:id="@+id/fromSearch"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"/>
<LinearLayout
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:textAppearance="@style/TextAppearance.AppCompat.Button"
android:text="PAPUNTANG"
android:id="@+id/toLabelSearch"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"/>
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/change"
android:src="@mipmap/ic_change"
android:layout_gravity="right" />
</LinearLayout>
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="Destinasyon"
android:id="@+id/toSearch"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Button"
android:text="BUS LINER"
android:id="@+id/busLinersLabel"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"/>
<Spinner
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/busLiners"
android:textAppearance="@style/TextAppearance.AppCompat.Spinner"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textAppearance="@style/TextAppearance.AppCompat.Button"
android:text="ANONG ORAS?"
android:id="@+id/timeLabel"
android:layout_marginBottom="5dp"
android:layout_marginLeft="10dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:textAppearance="?android:attr/textAppearanceLarge"
android:id="@+id/digitalClock" />
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal"
android:layout_marginBottom="5dp"
android:gravity="right">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ULITIN"
android:id="@+id/reset"
android:layout_gravity="center_horizontal" />
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="HANAPIN"
android:id="@+id/searchFor"
android:layout_gravity="center_horizontal" />
</LinearLayout>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:orientation="horizontal"
android:gravity="right">
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="ULITIN"
android:id="@+id/reset"
android:layout_gravity="center_horizontal" />
<Button </LinearLayout>
android:layout_width="wrap_content" </android.support.v7.widget.CardView>
<ListView
android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="HANAPIN" android:id="@+id/schedule"
android:id="@+id/searchFor"
android:layout_gravity="center_horizontal" /> android:layout_gravity="center_horizontal" />
</LinearLayout>
</LinearLayout>
</LinearLayout> </LinearLayout>
mobile-app/10-31-15/Project/app/src/main/res/layout/fragment_settings.xml
View file @ 84f099ef
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="@style/TextAppearance.AppCompat.Button"
android:text="SORT AVAILABLE TRIPS BY" android:text="SORT AVAILABLE TRIPS BY"
android:id="@+id/textView4" android:id="@+id/textView4"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
...@@ -27,12 +27,13 @@ ...@@ -27,12 +27,13 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:drawableBottom="@drawable/underline2"
android:id="@+id/spinner"/> android:id="@+id/spinner"/>
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="@style/TextAppearance.AppCompat.Button"
android:text="CLEAR DATA" android:text="CLEAR DATA"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:id="@+id/textView5" android:id="@+id/textView5"
...@@ -41,32 +42,35 @@ ...@@ -41,32 +42,35 @@
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginBottom="10dp">
android:layout_marginBottom="5dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceMedium"
android:layout_marginTop="10dp" android:layout_marginTop="5dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="5dp"
android:drawableBottom="@drawable/underline2"
android:text="Clear Search Data" android:text="Clear Search Data"
android:id="@+id/clearSearchData" android:id="@+id/clearSearchData"/>
android:drawableBottom="@drawable/underline" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:orientation="horizontal" android:orientation="horizontal"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:drawableBottom="@drawable/underline2"
android:layout_marginBottom="10dp"> android:layout_marginBottom="10dp">
<TextView <TextView
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginTop="10dp" android:layout_marginTop="5dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="5dp"
android:textAppearance="?android:attr/textAppearanceLarge" android:drawableBottom="@drawable/underline2"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="Clear Past Trips" android:text="Clear Past Trips"
android:id="@+id/clearPastTrips"/> android:id="@+id/clearPastTrips"/>
</LinearLayout> </LinearLayout>
......
mobile-app/10-31-15/Project/app/src/main/res/layout/header.xml 0 → 100644
View file @ 84f099ef
<?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"
android:layout_width="match_parent"
android:layout_height="192dp"
android:padding="16dp"
android:background="@color/deep_orange_500">
<com.pkmmte.view.CircularImageView
android:id="@+id/profile_image"
app:border="true"
app:border_color="@color/white"
app:border_width="4dp"
app:shadow="true"
android:layout_width="100dp"
android:layout_height="100dp"
android:src="@mipmap/ic_launcher"
android:layout_centerVertical="true"
android:layout_alignParentStart="true" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginRight="5dp"
android:text="Kunyari"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"
android:id="@+id/textView6"
android:layout_alignTop="@+id/profile_image"
android:layout_centerHorizontal="true"
android:layout_marginBottom="5dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Lang"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"
android:id="@+id/textView8"
android:layout_alignTop="@+id/textView6"
android:layout_toEndOf="@+id/textView6"
android:layout_marginBottom="5dp"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="0917 123 4567"
android:layout_marginBottom="5dp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"
android:id="@+id/textView9"
android:layout_below="@+id/textView6"
android:layout_alignStart="@+id/textView6" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="LOAD: "
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"
android:id="@+id/textView10"
android:layout_below="@+id/textView9"
android:layout_alignStart="@+id/textView9" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="P100.00"
android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textColor="@color/white"
android:id="@+id/textView11"
android:layout_below="@+id/textView9"
android:layout_toEndOf="@+id/textView10" />
</RelativeLayout>
\ No newline at end of file
mobile-app/10-31-15/Project/app/src/main/res/menu/drawer_view.xml
View file @ 84f099ef
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android"> <menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:checkableBehavior="single"> <group android:checkableBehavior="single">
<item <!--<item-->
android:id="@+id/search" <!--android:id="@+id/search"-->
android:icon="@mipmap/ic_search" <!--android:checked="true"-->
android:title="Search"/> <!--android:icon="@mipmap/ic_search"-->
<item <!--android:title="Search"/>-->
android:id="@+id/schedules" <!--<item-->
android:icon="@mipmap/ic_new_profile" <!--android:id="@+id/schedules"-->
android:title="Edit Profile"/> <!--android:icon="@mipmap/ic_new_profile"-->
<!--android:title="Schedules"/>-->
<item <item
android:id="@+id/editProfile" android:id="@+id/editProfile"
android:icon="@mipmap/ic_new_profile" android:icon="@mipmap/ic_new_profile"
......
mobile-app/10-31-15/Project/app/src/main/res/menu/menu_action_bar_attempt.xml
View file @ 84f099ef
...@@ -4,11 +4,11 @@ ...@@ -4,11 +4,11 @@
tools:context="com.example.pearlsantos.project.ActionBarAttempt"> tools:context="com.example.pearlsantos.project.ActionBarAttempt">
<item android:id="@+id/action_search" <!--<item android:id="@+id/action_search"-->
android:title="Search" <!--android:title="Search"-->
android:icon="@mipmap/ic_search" <!--android:icon="@mipmap/ic_search"-->
android:orderInCategory="100" <!--android:orderInCategory="100"-->
app:showAsAction="ifRoom|collapseActionView" <!--app:showAsAction="ifRoom|collapseActionView"-->
app:actionViewClass="android.support.v7.widget.SearchView"/> <!--app:actionViewClass="android.support.v7.widget.SearchView"/>-->
</menu> </menu>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment