Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Low Fidelity Prototype for Home Page #548

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# Auto detect text files and perform LF normalization
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it required?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just included the .gitattributes file to fix the line endings formatting but forgot to add the file to the .gitignore.

* text=auto
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
.idea
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we already have a gitignore file. Add these there only

*.li
24 changes: 24 additions & 0 deletions .idea/Travel-Mate.iml

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

29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml

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

8 changes: 8 additions & 0 deletions .idea/modules.xml

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

6 changes: 6 additions & 0 deletions .idea/vcs.xml

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

178 changes: 178 additions & 0 deletions .idea/workspace.xml

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

Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,9 @@ private Fragment getFragmentByNavMenuItemId(int id) {
case R.id.nav_utility:
fragment = UtilitiesFragment.newInstance();
break;

//Work In Progress Offline Maps
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change shouldnt be a part of this commit

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I was meaning to ignore this file change but it still got mixed in the commit.

case R.id.nav_offlinemaps:
break;
case R.id.nav_about_us:
fragment = AboutUsFragment.newInstance();
break;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ protected void onCreate(Bundle savedInstanceState) {
setSupportActionBar(toolbar);

ButterKnife.bind(this);

//Testing for layout
recyclerView.setLayoutManager(new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL));

mHandler = new Handler(Looper.getMainLooper());
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package io.github.project_travel_mate.utilities;

import android.content.Intent;
import android.support.v4.app.Fragment;

import adapters.CardViewOptionsAdapter;

public class OfflineMapsFragment extends Fragment implements CardViewOptionsAdapter.OnItemClickListener {
@Override
public void onItemClick(int position) {
Intent intent;
}
}
Binary file added Android/app/src/main/res/drawable/ic_maps.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 11 additions & 8 deletions Android/app/src/main/res/layout/city_history_listitem.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_margin="5dp"
android:paddingStart="5dp"
android:paddingEnd="5dp">
android:orientation="vertical"
android:paddingEnd="5dp"
android:paddingStart="5dp">

<TextView
android:id="@+id/heading"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textSize="18sp"
android:textColor="@color/black"
android:id="@+id/heading"/>
android:textSize="18sp"
android:textStyle="bold" />

<utils.ExpandableTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/text"
android:textColor="@color/black"
android:textSize="14sp"/>
android:textSize="14sp" />

<View
android:layout_width="fill_parent"
android:layout_height="1dp"
Expand Down
9 changes: 9 additions & 0 deletions Android/app/src/main/res/layout/fragment_offlinemaps.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<android.widget.ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="match_parent">

<android.support.v7.widget.RecyclerView
android:id="@+id/offlinemaps_list_recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.widget.ScrollView>
Loading