This repository was archived by the owner on Mar 17, 2019. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 9
Material Design #51
Merged
Merged
Material Design #51
Changes from all commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
8d423f1
Merge pull request #2 from jaypoulz/jpCleanup
bdonald25 e0f8a8c
merge conflict
bdonald25 e12e994
merge conflict
bdonald25 2134b31
setting up android
bdonald25 350eb38
Extracted changes for the Android L preview branch
jaypoulz a0f3105
Fixed the merge conflict in this branch as well
jaypoulz f5bdf5b
pulled androidL branch from upstream
bdonald25 a58ab43
adding material design
bdonald25 4c5e40e
android 5 toolbar
bdonald25 c8c5740
toolbar
bdonald25 8a3b5fc
material design action bar looks good but isense logo won't show up
bdonald25 5ec91b0
motion is now being moved to material design as well
bdonald25 92ea202
better animations
bdonald25 178351a
fixed wierd dialog problems
bdonald25 6225cf9
gradle gitignore
bdonald25 f4f623a
gradle
bdonald25 def565d
finished the dialogs
bdonald25 d033e6d
layouts keep getting better
bdonald25 8811594
grandle stuff
bdonald25 cffbdc7
merge conflict
bdonald25 89a1200
fix gitignore
bdonald25 0fe716d
fixed gitignore
bdonald25 04b9b4e
up buttons and finished dialogs
bdonald25 08940a7
merge conflict
bdonald25 f82d35c
material design is done
bdonald25 f1634fc
fixed issues with pull request
bdonald25 File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| apply plugin: 'android' | ||
|
|
||
| dependencies { | ||
| compile fileTree(dir: 'libs', include: '*.jar') | ||
| compile project(':Libs:iSENSE Imports') | ||
| } | ||
|
|
||
| android { | ||
| compileSdkVersion 19 | ||
| buildToolsVersion "20.0.0" | ||
|
|
||
| sourceSets { | ||
| main { | ||
| manifest.srcFile 'AndroidManifest.xml' | ||
| java.srcDirs = ['src'] | ||
| resources.srcDirs = ['src'] | ||
| aidl.srcDirs = ['src'] | ||
| renderscript.srcDirs = ['src'] | ||
| res.srcDirs = ['res'] | ||
| assets.srcDirs = ['assets'] | ||
| } | ||
|
|
||
| // Move the tests to tests/java, tests/res, etc... | ||
| instrumentTest.setRoot('tests') | ||
|
|
||
| // Move the build types to build-types/<type> | ||
| // For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ... | ||
| // This moves them out of them default location under src/<type>/... which would | ||
| // conflict with src/ being used by the main source set. | ||
| // Adding new build types or product flavors should be accompanied | ||
| // by a similar customization. | ||
| debug.setRoot('build-types/debug') | ||
| release.setRoot('build-types/release') | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1,2 @@ | ||
| target=android-19 | ||
| android.library.reference.1=../../Libs/iSENSE Imports | ||
| android.library.reference.1=../iSENSE Imports | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This worries me slightly.. why doesn't it go back through the /Libs directory for iSENSE Imports? The code change implies iSENSE Imports is in the /Apps directory now. That or Canobie is in the /Libs. |
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent" | ||
| android:background="@drawable/main_background" | ||
| android:keepScreenOn="true" | ||
| android:orientation="vertical" > | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop = "10dp" | ||
| android:layout_marginLeft="50dp" | ||
| android:layout_marginRight="50dp" | ||
| android:orientation="vertical" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/menuPrompt" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:gravity="center" | ||
| android:paddingBottom="15dp" | ||
| android:text="@string/menuDirections" | ||
| android:textSize="15sp" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/time" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:gravity="center_horizontal" | ||
| android:text="@string/timeElapsed" | ||
| android:textSize="14sp" | ||
| android:textStyle="bold" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/ridename" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center_horizontal" | ||
| android:gravity="center_horizontal" | ||
| android:text="@string/rideAndSeat" | ||
| android:textSize="14sp" /> | ||
| </LinearLayout> | ||
|
|
||
|
|
||
| <LinearLayout | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="0dip" | ||
| android:layout_weight="1" | ||
| android:orientation="vertical" > | ||
|
|
||
| <Button | ||
| android:id="@+id/startStop" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent" | ||
| android:layout_marginBottom="20dp" | ||
| android:layout_marginLeft="50dp" | ||
| android:layout_marginRight="50dp" | ||
| android:layout_marginTop="20dp" | ||
| android:text="@string/startString" | ||
| android:background="@drawable/button_rsense" | ||
| android:textColor="#0066FF" | ||
| android:textSize="30sp" /> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginBottom="20dp" | ||
| android:layout_marginLeft="50dp" | ||
| android:layout_marginRight="50dp" | ||
| android:orientation="vertical" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/values" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center_horizontal" | ||
| android:background="@android:color/transparent" | ||
| android:text="@string/xyz" | ||
| android:textSize="24sp" | ||
| android:textStyle="bold" | ||
| android:typeface="monospace"/> | ||
|
|
||
| <ToggleButton | ||
| android:id="@+id/tbGravity" | ||
| android:layout_gravity="center" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textOff="Do Not Include Gravity" | ||
| android:textOn="Include Gravity" /> | ||
| </LinearLayout> | ||
|
|
||
| </LinearLayout> | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,96 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent" | ||
| android:background="@drawable/main_background" | ||
| android:keepScreenOn="true" | ||
| android:orientation="vertical" > | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginTop = "10dp" | ||
| android:layout_marginLeft="50dp" | ||
| android:layout_marginRight="50dp" | ||
| android:orientation="vertical" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/menuPrompt" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:gravity="center" | ||
| android:paddingBottom="15dp" | ||
| android:text="@string/menuDirections" | ||
| android:textSize="15sp" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/time" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:gravity="center_horizontal" | ||
| android:text="@string/timeElapsed" | ||
| android:textSize="14sp" | ||
| android:textStyle="bold" /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/ridename" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center_horizontal" | ||
| android:gravity="center_horizontal" | ||
| android:text="@string/rideAndSeat" | ||
| android:textSize="14sp" /> | ||
| </LinearLayout> | ||
|
|
||
|
|
||
| <LinearLayout | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="0dip" | ||
| android:layout_weight="1" | ||
| android:orientation="vertical" > | ||
|
|
||
| <Button | ||
| android:id="@+id/startStop" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent" | ||
| android:layout_marginBottom="20dp" | ||
| android:layout_marginLeft="50dp" | ||
| android:layout_marginRight="50dp" | ||
| android:layout_marginTop="20dp" | ||
| android:text="@string/startString" | ||
| android:background="@drawable/button_rsense" | ||
| android:textColor="#0066FF" | ||
| android:textSize="30sp" /> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginBottom="20dp" | ||
| android:layout_marginLeft="50dp" | ||
| android:layout_marginRight="50dp" | ||
| android:orientation="vertical" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/values" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center_horizontal" | ||
| android:background="@android:color/transparent" | ||
| android:text="@string/xyz" | ||
| android:textSize="24sp" | ||
| android:textStyle="bold" | ||
| android:typeface="monospace"/> | ||
|
|
||
| <ToggleButton | ||
| android:id="@+id/tbGravity" | ||
| android:layout_gravity="center" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:textOff="Do Not Include Gravity" | ||
| android:textOn="Include Gravity" /> | ||
| </LinearLayout> | ||
|
|
||
| </LinearLayout> | ||
|
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent" | ||
| android:keepScreenOn="true" | ||
| android:orientation="vertical" > | ||
|
|
||
| <LinearLayout | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="wrap_content" | ||
| android:background="@android:color/black" | ||
| android:orientation="vertical" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/values" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:background="@android:color/black" | ||
| android:gravity="center" | ||
| android:text="@string/yString" | ||
| android:textColor="@android:color/white" | ||
| android:textSize="18sp" | ||
| android:textStyle="bold" /> | ||
|
|
||
|
|
||
| </LinearLayout> | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/lalala" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center_horizontal" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/textView1" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/gravity" | ||
| android:textAppearance="?android:attr/textAppearanceMedium" | ||
| android:textColor="@android:color/black" | ||
| android:textSize="18sp" | ||
| android:textStyle="bold" /> | ||
|
|
||
| <Switch | ||
| android:id="@+id/switch1" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_marginLeft="10dp" | ||
| android:textOff="" | ||
| android:textOn="" | ||
| android:checked="false" /> | ||
| </LinearLayout> | ||
|
|
||
| <Button | ||
| android:id="@+id/startStop" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="0dp" | ||
| android:layout_marginBottom="10dp" | ||
| android:layout_marginLeft="20dp" | ||
| android:layout_marginRight="20dp" | ||
| android:layout_marginTop="10dp" | ||
| android:layout_weight="0.79" | ||
| android:background="@drawable/button_rsense" | ||
| android:text="@string/holdToStart" | ||
| android:textColor="#0066FF" | ||
| android:textSize="30sp" /> | ||
|
|
||
| </LinearLayout> |
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is it really "L", not "20" or something of the like?