Skip to content
Open
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: 1 addition & 1 deletion .idea/.name

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

2 changes: 1 addition & 1 deletion .idea/compiler.xml

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

2 changes: 1 addition & 1 deletion .idea/encodings.xml

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

4 changes: 2 additions & 2 deletions .idea/gradle.xml

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

29 changes: 1 addition & 28 deletions .idea/misc.xml

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

2 changes: 1 addition & 1 deletion .idea/modules.xml

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

6 changes: 3 additions & 3 deletions ParseLoginUI/ParseLoginUI.iml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":ParseLoginUI" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="FragmentBasics2" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<module external.linked.project.id=":ParseLoginUI" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Near" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
Expand Down Expand Up @@ -88,10 +88,10 @@
</content>
<orderEntry type="jdk" jdkName="Android API 22 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="ParseFacebookUtilsV4-1.9.4" level="project" />
<orderEntry type="library" exported="" name="support-v4-22.0.0" level="project" />
<orderEntry type="library" exported="" name="Parse-1.9.4" level="project" />
<orderEntry type="library" exported="" name="bolts-android-1.2.0" level="project" />
<orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
<orderEntry type="library" exported="" name="bolts-android-1.2.0" level="project" />
<orderEntry type="library" exported="" name="ParseFacebookUtilsV4-1.9.4" level="project" />
</component>
</module>
Binary file modified ParseLoginUI/build/intermediates/bundles/debug/classes.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<item android:color="@color/com_parse_ui_parse_login_help_button_label"/>

</selector>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/color/com_parse_ui_parse_login_help_button_label_selector.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/color/com_parse_ui_parse_login_help_button_label_selector.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<item android:drawable="@color/com_parse_ui_facebook_login_button"/>

</selector>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/drawable/com_parse_ui_facebook_login_button_background_selector.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/drawable/com_parse_ui_facebook_login_button_background_selector.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<item android:drawable="@color/com_parse_ui_parse_login_button"/>

</selector>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/drawable/com_parse_ui_parse_login_button_background_selector.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/drawable/com_parse_ui_parse_login_button_background_selector.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<item android:drawable="@color/com_parse_ui_twitter_login_button"/>

</selector>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/drawable/com_parse_ui_twitter_login_button_background_selector.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/drawable/com_parse_ui_twitter_login_button_background_selector.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
<include layout="@layout/com_parse_ui_parse_login_third_party_section" />
</LinearLayout>
</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_fragment.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_help_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_help_fragment.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
</ScrollView>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout-land/com_parse_ui_parse_signup_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout-land/com_parse_ui_parse_signup_fragment.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
android:layout_height="wrap_content"
android:src="@drawable/com_parse_ui_app_logo"
android:contentDescription="@string/com_parse_ui_logo_content_description" />
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_app_logo.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_app_logo.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@
android:layout_marginBottom="@dimen/com_parse_ui_small_vertical_spacing"
android:text="@string/com_parse_ui_forgot_password_button_label" />
</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_form.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_form.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
<include layout="@layout/com_parse_ui_parse_login_third_party_section" />
</LinearLayout>
</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_fragment.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
android:layout_marginTop="@dimen/com_parse_ui_xlarge_vertical_spacing"
android:text="@string/com_parse_ui_login_help_submit_button_label" />
</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_help_form.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_help_form.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
android:layout_height="wrap_content"
android:layout_weight="0.5" />
</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_help_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_help_fragment.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
android:text="@string/com_parse_ui_twitter_login_button_label"
android:visibility="gone" />
</merge>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_third_party_section.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_third_party_section.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@
android:text="@string/com_parse_ui_create_account_button_label" />

</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_signup_form.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_signup_form.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
android:layout_weight="0.5" />

</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_signup_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_signup_fragment.xml -->
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/values/colors.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/values/colors.xml -->
<eat-comment/>
<color name="com_parse_ui_facebook_login_button">#3B5998</color>
<color name="com_parse_ui_facebook_login_button_focus">#304F8B</color>
Expand All @@ -16,7 +16,7 @@
<color name="com_parse_ui_twitter_login_button">#2DAAE2</color>
<color name="com_parse_ui_twitter_login_button_focus">#2788BE</color>
<color name="com_parse_ui_twitter_login_button_push">#2588B5</color>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/values/dimens.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/values/dimens.xml -->
<eat-comment/>
<dimen name="com_parse_ui_horizontal_margin">16dp</dimen>
<dimen name="com_parse_ui_large_vertical_spacing">24dp</dimen>
Expand All @@ -25,7 +25,7 @@
<dimen name="com_parse_ui_vertical_margin">16dp</dimen>
<dimen name="com_parse_ui_vertical_spacing">16dp</dimen>
<dimen name="com_parse_ui_xlarge_vertical_spacing">36dp</dimen>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/values/strings.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/values/strings.xml -->
<eat-comment/>
<plurals name="com_parse_ui_password_too_short_toast">
<item quantity="one">Password must be at least %d character long</item>
Expand Down Expand Up @@ -81,7 +81,7 @@
<string name="com_parse_ui_twitter_login_failed_toast">Twitter login failed</string>
<string name="com_parse_ui_username_input_hint">Username</string>
<string name="com_parse_ui_username_taken_toast">Username is already taken, please choose a different one</string>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/values/styles.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/values/styles.xml -->
<eat-comment/>
<style name="ParseLoginUI"/>
<style name="ParseLoginUI.Button" parent="@android:style/Widget.Button">
Expand Down
Binary file modified ParseLoginUI/build/intermediates/bundles/release/classes.jar
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<item android:color="@color/com_parse_ui_parse_login_help_button_label"/>

</selector>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/color/com_parse_ui_parse_login_help_button_label_selector.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/color/com_parse_ui_parse_login_help_button_label_selector.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<item android:drawable="@color/com_parse_ui_facebook_login_button"/>

</selector>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/drawable/com_parse_ui_facebook_login_button_background_selector.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/drawable/com_parse_ui_facebook_login_button_background_selector.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<item android:drawable="@color/com_parse_ui_parse_login_button"/>

</selector>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/drawable/com_parse_ui_parse_login_button_background_selector.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/drawable/com_parse_ui_parse_login_button_background_selector.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
<item android:drawable="@color/com_parse_ui_twitter_login_button"/>

</selector>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/drawable/com_parse_ui_twitter_login_button_background_selector.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/drawable/com_parse_ui_twitter_login_button_background_selector.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
<include layout="@layout/com_parse_ui_parse_login_third_party_section" />
</LinearLayout>
</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_fragment.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
</FrameLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_help_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_help_fragment.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
</ScrollView>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout-land/com_parse_ui_parse_signup_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout-land/com_parse_ui_parse_signup_fragment.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
android:layout_height="wrap_content"
android:src="@drawable/com_parse_ui_app_logo"
android:contentDescription="@string/com_parse_ui_logo_content_description" />
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_app_logo.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_app_logo.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@
android:layout_marginBottom="@dimen/com_parse_ui_small_vertical_spacing"
android:text="@string/com_parse_ui_forgot_password_button_label" />
</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_form.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_form.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
<include layout="@layout/com_parse_ui_parse_login_third_party_section" />
</LinearLayout>
</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_fragment.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@
android:layout_marginTop="@dimen/com_parse_ui_xlarge_vertical_spacing"
android:text="@string/com_parse_ui_login_help_submit_button_label" />
</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_help_form.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_help_form.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
android:layout_height="wrap_content"
android:layout_weight="0.5" />
</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_help_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_help_fragment.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
android:text="@string/com_parse_ui_twitter_login_button_label"
android:visibility="gone" />
</merge>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_login_third_party_section.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_login_third_party_section.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -75,4 +75,4 @@
android:text="@string/com_parse_ui_create_account_button_label" />

</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_signup_form.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_signup_form.xml -->
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,4 @@
android:layout_weight="0.5" />

</LinearLayout>
<!-- From: file:/F:/FragmentBasics2/ParseLoginUI/res/layout/com_parse_ui_parse_signup_fragment.xml -->
<!-- From: file:/E:/sunny/github/Near/ParseLoginUI/res/layout/com_parse_ui_parse_signup_fragment.xml -->
Loading