Skip to content

Commit

Permalink
merge master
Browse files Browse the repository at this point in the history
  • Loading branch information
@dinhvh
dinhvh committed Nov 21, 2014
2 parents 6c44adb + adc731e commit 39beeb5
Show file tree
Hide file tree
Showing 45 changed files with 495 additions and 521 deletions.
22 changes: 22 additions & 0 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,25 @@ node_modules
npm-debug.log

*~

#OS X System Files
.DS_Store

# Xcode
#
build/
*.pbxuser
!default.pbxuser
*.mode1v3
!default.mode1v3
*.mode2v3
!default.mode2v3
*.perspectivev3
!default.perspectivev3
xcuserdata
*.xccheckout
*.moved-aside
DerivedData
*.hmap
*.ipa
*.xcuserstate
11 changes: 7 additions & 4 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,17 +42,20 @@ of your first [pull request][].
issue that you are planning to work on that bug or feature so that it can
be assigned to you.

1. Follow the normal process of [forking][] the project, and setup a new
2. Follow the normal process of [forking][] the project, and setup a new
branch to work in. It's important that each group of changes be done in
separate branches in order to ensure that a pull request only includes the
commits related to that bug or feature.

1. Do your best to have [well-formed commit messages][] for each change.
3. Do your best to have [well-formed commit messages][] for each change.
This provides consistency throughout the project, and ensures that commit
messages are able to be formatted properly by various git tools.
messages are able to be formatted properly by various git tools. If you
are contributing to the codebase, make sure your code adheres to the
appropriate [style guide][].

1. Finally, push the commits to your fork and submit a [pull request][].
4. Finally, push the commits to your fork and submit a [pull request][].

[forking]: https://help.github.com/articles/fork-a-repo
[well-formed commit messages]: http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html
[style guide]: https://github.com/google/physical-web/wiki/Coding-Style-Guides
[pull request]: https://help.github.com/articles/creating-a-pull-request
1 change: 1 addition & 0 deletions CONTRIBUTORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ jcrabtr
jonathanstark
keremgocen
matthewsibigtroth
morganchen12
meriac
MrNice
Peeja
Expand Down
13 changes: 10 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,14 @@ The number of smart objects is going to explode, both in our homes and in public
##Open Design
The Physical Web must be an open standard that everyone can use. This can’t be a product that is locked down by a single company. Like many web specifications, this is an open source design that is being released early so everyone can experiment and comment on it. There is much to discuss and add to this specification.

##Start Here
The best place to start is with the [Introduction](http://github.com/google/physical-web/blob/master/documentation/introduction.md) document.
##Contents
* [Introduction/FAQ](http://github.com/google/physical-web/blob/master/documentation/introduction.md) Most common questions
* [Getting started guide](http://github.com/google/physical-web/blob/master/documentation/getting_started.md) How you can try it out
* [Technical Overview](https://github.com/google/physical-web/blob/master/documentation/technical_overview.md)
* [URI Beacon Spec](https://github.com/google/uribeacon) Partner repo with code/examples for the beacons themselves

##Beacons
Our most common request is how to get URIBeacons. There are a number of firmware examples for Arduino, Raspberry Pi, node and many more in our [firmware folder](https://github.com/google/physical-web/tree/master/firmware) but this is all being moved to the [URI Beacon repo](https://github.com/google/uribeacon) so be sure to check there as well.

A BLE beacon maker is about to sell premade URIbeacons, we hope to announce that soon.

If you'd like to jump right in, check out the [Getting started guide](http://github.com/google/physical-web/blob/master/documentation/getting_started.md).
2 changes: 1 addition & 1 deletion ...oid/PhysicalWeb/app/src/main/java/org/physical_web/physicalweb/NearbyBeaconsFragment.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public class NearbyBeaconsFragment extends ListFragment implements MetadataResol
private HashMap<String, MetadataResolver.UrlMetadata> mUrlToUrlMetadata;
private AnimationDrawable mScanningAnimationDrawable;
private boolean mIsDemoMode;
private static final int BEACON_EXPIRATION_DURATION = 5;
private static final int BEACON_EXPIRATION_DURATION = 120;

public static NearbyBeaconsFragment newInstance(boolean isDemoMode) {
NearbyBeaconsFragment nearbyBeaconsFragment = new NearbyBeaconsFragment();
Expand Down
2 changes: 1 addition & 1 deletion android/PhysicalWeb/app/src/main/res/anim/fade_in_activity.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
android:valueFrom="0"
android:valueTo="1"
android:propertyName="alpha"
android:duration="500" />
android:duration="500"/>
</set>
16 changes: 8 additions & 8 deletions android/PhysicalWeb/app/src/main/res/anim/fade_in_and_slide_up.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,14 @@
<set xmlns:android="http://schemas.android.com/apk/res/android">

<alpha
android:interpolator="@android:anim/decelerate_interpolator"
android:fromAlpha="0"
android:toAlpha="1"
android:duration="400" />
android:interpolator="@android:anim/decelerate_interpolator"
android:fromAlpha="0"
android:toAlpha="1"
android:duration="400"/>

<translate
android:interpolator="@android:anim/decelerate_interpolator"
android:fromYDelta="40%"
android:toYDelta="0%"
android:duration="400" />
android:interpolator="@android:anim/decelerate_interpolator"
android:fromYDelta="40%"
android:toYDelta="0%"
android:duration="400"/>
</set>
4 changes: 2 additions & 2 deletions android/PhysicalWeb/app/src/main/res/anim/fade_in_and_slide_up_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@
android:valueFrom="0"
android:valueTo="1"
android:propertyName="alpha"
android:duration="400" />
android:duration="400"/>
<objectAnimator xmlns:android="http://schemas.android.com/apk/res/android"
android:interpolator="@android:anim/decelerate_interpolator"
android:valueFrom="350"
android:valueTo="0"
android:propertyName="y"
android:duration="400" />
android:duration="400"/>
</set>
2 changes: 1 addition & 1 deletion android/PhysicalWeb/app/src/main/res/anim/fade_out_fragment.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@
android:valueFrom="1"
android:valueTo="0"
android:propertyName="alpha"
android:duration="500" />
android:duration="500"/>
</set>
8 changes: 4 additions & 4 deletions android/PhysicalWeb/app/src/main/res/drawable-xxhdpi/found_beacon_card.xml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid
android:color="#ffffffff">
android:color="#ffffffff">
</solid>
<corners
android:radius="2dp">
android:radius="2dp">
</corners>
</shape>
6 changes: 3 additions & 3 deletions android/PhysicalWeb/app/src/main/res/drawable-xxhdpi/scanning_animation.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
android:oneshot="false">
<item android:drawable="@drawable/ic_scanning_0" android:duration="1000" />
<item android:drawable="@drawable/ic_scanning_1" android:duration="1000" />
<item android:drawable="@drawable/ic_scanning_2" android:duration="1000" />
<item android:drawable="@drawable/ic_scanning_0" android:duration="1000"/>
<item android:drawable="@drawable/ic_scanning_1" android:duration="1000"/>
<item android:drawable="@drawable/ic_scanning_2" android:duration="1000"/>
</animation-list>
10 changes: 5 additions & 5 deletions android/PhysicalWeb/app/src/main/res/layout/activity_main.xml
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity"
android:id="@+id/main_activity_container">
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MainActivity"
android:id="@+id/main_activity_container">
</RelativeLayout>
44 changes: 22 additions & 22 deletions android/PhysicalWeb/app/src/main/res/layout/fragment_about.xml
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,38 @@
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffffffff"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical">
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#ffffffff"
android:clickable="true"
android:focusable="true"
android:focusableInTouchMode="true"
android:orientation="vertical">

<WebView
android:layout_width="match_parent"
android:layout_height="0dp"
android:id="@+id/about_webview"
android:layout_weight="1"/>
android:layout_width="match_parent"
android:layout_height="0dp"
android:id="@+id/about_webview"
android:layout_weight="1"/>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:gravity="bottom">
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingTop="5dp"
android:paddingBottom="5dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:gravity="bottom">

<TextView
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:fontFamily="sans-serif-light"
android:text="@string/about_app_title"
android:textColor="#5A5A5A"
android:textSize="10sp"/>

<TextView
<TextView
android:id="@+id/version"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
Expand Down
122 changes: 61 additions & 61 deletions android/PhysicalWeb/app/src/main/res/layout/fragment_beacon_config.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,80 +19,80 @@


<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="vertical"
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="match_parent"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:orientation="vertical"
android:background="@drawable/found_beacon_card"
android:paddingTop="20dp"
android:paddingBottom="20dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:id="@+id/edit_card">
android:focusable="true"
android:focusableInTouchMode="true"
android:gravity="center">

<TextView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/config_address_label"
android:gravity="start"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingBottom="10dp"
android:textSize="16sp"
android:fontFamily="sans-serif-light"/>
android:orientation="vertical"
android:background="@drawable/found_beacon_card"
android:paddingTop="20dp"
android:paddingBottom="20dp"
android:paddingLeft="20dp"
android:paddingRight="20dp"
android:id="@+id/edit_card">

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text=""
android:gravity="start"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:textSize="16sp"
android:fontFamily="sans-serif-light"
android:id="@+id/edit_card_address"/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/config_address_label"
android:gravity="start"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingBottom="10dp"
android:textSize="16sp"
android:fontFamily="sans-serif-light"/>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/config_edit_url_label"
android:gravity="start"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="50dp"
android:textSize="16sp"
android:fontFamily="sans-serif-light"
android:labelFor="@+id/edit_card_url"/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text=""
android:gravity="start"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:textSize="16sp"
android:fontFamily="sans-serif-light"
android:id="@+id/edit_card_address"/>

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/config_edit_url_label"
android:gravity="start"
android:paddingLeft="10dp"
android:paddingRight="10dp"
android:paddingTop="50dp"
android:textSize="16sp"
android:fontFamily="sans-serif-light"
android:labelFor="@+id/edit_card_url"/>

<EditText
style="@style/RobotoEditTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text=""
android:imeOptions="actionDone"
android:inputType="textUri"
android:id="@+id/edit_card_url"/>
style="@style/RobotoEditTextStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text=""
android:imeOptions="actionDone"
android:inputType="textUri"
android:id="@+id/edit_card_url"/>

<Button
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/config_save_url_button"
android:background="@android:color/transparent"
android:paddingTop="30dp"
android:gravity="end"
android:fontFamily="sans-serif-medium"
android:textSize="14sp"
android:textColor="@color/config_save_url_button"
android:id="@+id/edit_card_save"/>
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/config_save_url_button"
android:background="@android:color/transparent"
android:paddingTop="30dp"
android:gravity="end"
android:fontFamily="sans-serif-medium"
android:textSize="14sp"
android:textColor="@color/config_save_url_button"
android:id="@+id/edit_card_save"/>
</LinearLayout>

</LinearLayout>
Expand Down
Loading

0 comments on commit 39beeb5

Please sign in to comment.