This repository has been 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
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #76 from bdonald25/picturesMaterial
Pictures app -> Material Design
- Loading branch information
Showing
31 changed files
with
487 additions
and
288 deletions.
There are no files selected for viewing
This file contains 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 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 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 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 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 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 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,52 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:orientation="vertical" > | ||
|
|
||
| <ScrollView | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_alignParentTop="true" | ||
| android:layout_above="@+id/LinearLayoutButtons" > | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/LinearLayout1" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/textView5" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/aboutApp" | ||
| android:textSize="16sp" | ||
| android:padding="10dp"/> | ||
|
|
||
| </LinearLayout> | ||
| </ScrollView> | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/LinearLayoutButtons" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_alignParentBottom="true" | ||
| android:orientation="vertical" | ||
| android:background="@android:color/transparent" > | ||
|
|
||
| <View | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="1dp" | ||
| android:background="?android:attr/dividerVertical" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/okButton" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:text="@android:string/ok" | ||
| style="?android:attr/buttonBarButtonStyle"/> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| </RelativeLayout> |
This file contains 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,36 +1,60 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" > | ||
|
|
||
|
|
||
| <CheckBox | ||
| android:id="@+id/checkContinuous" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/continuous" /> | ||
| <!--This view forces the dialog to match_parent without it the dialog is really small, bug with Android L?--> | ||
| <View | ||
| android:id="@+id/divider" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="1dp"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/textView1" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:padding = "10dp" | ||
| android:text="@string/interval" /> | ||
| <TextView | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:layout_gravity="center" | ||
| android:text="@string/continuouSingle" | ||
| android:textSize="16sp" | ||
| android:padding="10dp"/> | ||
|
|
||
| <EditText | ||
| android:id="@+id/etInterval" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:ems="10" | ||
| android:inputType="number" > | ||
| </EditText> | ||
| <CheckBox | ||
| android:id="@+id/checkContinuous" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/continuous" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/description_okay" | ||
| style="?android:attr/buttonBarButtonStyle" | ||
| <TextView | ||
| android:id="@+id/textView1" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:padding = "10dp" | ||
| android:text="@string/interval" /> | ||
|
|
||
| <EditText | ||
| android:id="@+id/etInterval" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/okay" /> | ||
|
|
||
| android:ems="10" | ||
| android:inputType="number" /> | ||
| <LinearLayout | ||
| android:id="@+id/LinearLayoutButtons" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_alignParentBottom="true" | ||
| android:background="@android:color/transparent" | ||
| android:orientation="vertical"> | ||
| <View | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="1dp" | ||
| android:background="?android:attr/dividerVertical" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/description_okay" | ||
| style="?android:attr/buttonBarButtonStyle" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/okay" /> | ||
| </LinearLayout> | ||
|
|
||
| </LinearLayout> |
This file contains 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,53 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent" | ||
| android:orientation="vertical" > | ||
|
|
||
| <ScrollView | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_alignParentTop="true" | ||
| android:layout_above="@+id/LinearLayoutButtons" > | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/LinearLayout1" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" > | ||
|
|
||
| <TextView | ||
| android:id="@+id/textView2" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/helpText" | ||
| android:textSize="16sp" | ||
| android:padding="10dp"/> | ||
|
|
||
|
|
||
| </LinearLayout> | ||
|
|
||
| </ScrollView> | ||
|
|
||
| <LinearLayout | ||
| android:id="@+id/LinearLayoutButtons" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_alignParentBottom="true" | ||
| android:background="@android:color/transparent" | ||
| android:orientation="vertical"> | ||
| <View | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="1dp" | ||
| android:background="?android:attr/dividerVertical" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/okButton" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:text="@android:string/ok" | ||
| style="?android:attr/buttonBarButtonStyle"/> | ||
|
|
||
| </LinearLayout> | ||
|
|
||
| </RelativeLayout> |
This file contains 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,59 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" > | ||
|
|
||
| <!--This view forces the dialog to match_parent without it the dialog is really small, bug with Android L?--> | ||
| <View | ||
| android:id="@+id/divider" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="1dp"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/tvStep1" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/step1" | ||
| android:layout_marginTop="20dp" | ||
| android:layout_gravity="center" | ||
| android:textAppearance="?android:attr/textAppearanceMedium" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/buttonProject" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/selectProject"/> | ||
|
|
||
| <TextView | ||
| android:id="@+id/tvStep2" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/step2" | ||
| android:layout_marginTop="40dp" | ||
| android:layout_gravity="center" | ||
| android:textAppearance="?android:attr/textAppearanceMedium" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/buttonCredentials" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/uploadCredentials" | ||
| /> | ||
|
|
||
| <TextView | ||
| android:id="@+id/tvOr" | ||
| android:layout_width="wrap_content" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/or" | ||
| android:layout_gravity="center" | ||
| android:textAppearance="?android:attr/textAppearanceMedium" /> | ||
|
|
||
| <Button | ||
| android:id="@+id/buttonKey" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/uploadKey" | ||
| android:layout_marginBottom = "20dp"/> | ||
|
|
||
| </LinearLayout> |
Oops, something went wrong.