This repository has been archived by the owner on May 6, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 332
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 #771 from edx/bguertin/MA-2378
New Logistration
- Loading branch information
Showing
33 changed files
with
578 additions
and
184 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
10 changes: 10 additions & 0 deletions
10
VideoLocker/res/drawable-v21/light_selectable_rounded_box_overlay.xml
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,10 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<ripple xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:color="@color/white"> | ||
<item android:id="@android:id/mask"> | ||
<shape android:shape="rectangle"> | ||
<corners android:radius="@dimen/edx_box_radius" /> | ||
<solid android:color="@color/transparent_white_26" /> | ||
</shape> | ||
</item> | ||
</ripple> |
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,15 +1,20 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<item android:state_enabled="false"> | ||
<shape android:shape="rectangle"> | ||
<solid android:color="@color/edx_brand_primary_x_light" /> | ||
<corners android:radius="@dimen/edx_box_radius" /> | ||
</shape> | ||
</item> | ||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<item> | ||
<shape android:shape="rectangle"> | ||
<solid android:color="@color/edx_brand_primary_base" /> | ||
<corners android:radius="@dimen/edx_box_radius" /> | ||
</shape> | ||
<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<item android:state_enabled="false"> | ||
<shape android:shape="rectangle"> | ||
<solid android:color="@color/edx_brand_primary_x_light" /> | ||
<corners android:radius="@dimen/edx_box_radius" /> | ||
</shape> | ||
</item> | ||
<item> | ||
<shape android:shape="rectangle"> | ||
<solid android:color="@color/edx_brand_primary_base" /> | ||
<corners android:radius="@dimen/edx_box_radius" /> | ||
</shape> | ||
</item> | ||
</selector> | ||
</item> | ||
</selector> | ||
<item android:drawable="@drawable/light_selectable_box_overlay" /> | ||
</layer-list> |
15 changes: 15 additions & 0 deletions
15
VideoLocker/res/drawable/light_selectable_rounded_box_overlay.xml
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,15 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<selector xmlns:android="http://schemas.android.com/apk/res/android"> | ||
<item android:state_pressed="true"> | ||
<shape android:shape="rectangle"> | ||
<corners android:radius="@dimen/edx_box_radius" /> | ||
<solid android:color="@color/transparent_white_10" /> | ||
</shape> | ||
</item> | ||
<item> | ||
<shape android:shape="rectangle"> | ||
<corners android:radius="@dimen/edx_box_radius" /> | ||
<solid android:color="@android:color/transparent" /> | ||
</shape> | ||
</item> | ||
</selector> |
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,57 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<layout xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
||
<LinearLayout | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:background="@drawable/launch_background" | ||
android:gravity="center_horizontal" | ||
android:orientation="vertical" | ||
android:splitMotionEvents="false"> | ||
|
||
<ImageView | ||
android:id="@+id/edx_logo" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_marginTop="75dp" | ||
android:layout_marginBottom="75dp" | ||
android:contentDescription="@string/app_name" | ||
android:src="@drawable/edx_logo" /> | ||
|
||
<LinearLayout | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:layout_marginLeft="50dp" | ||
android:layout_marginRight="50dp" | ||
android:orientation="vertical"> | ||
|
||
<Button | ||
android:id="@+id/explore_subjects" | ||
style="@style/edX.Widget.BrandPillButton" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:text="@string/launch_explore_subjects" /> | ||
|
||
<Button | ||
android:id="@+id/discover_courses" | ||
style="@style/edX.Widget.BrandPillButton" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:layout_marginTop="24dp" | ||
android:text="@string/launch_discover_courses" /> | ||
|
||
</LinearLayout> | ||
|
||
<android.support.v4.widget.Space | ||
android:layout_width="0dp" | ||
android:layout_height="0dp" | ||
android:layout_weight="1" /> | ||
|
||
<fragment | ||
android:tag="org.edx.mobile.view.LogInSignUpFragment" | ||
android:name="org.edx.mobile.view.LogInSignUpFragment" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" /> | ||
|
||
</LinearLayout> | ||
</layout> |
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,26 +1,39 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:background="@color/grey_act_background" | ||
android:orientation="vertical"> | ||
|
||
<View | ||
android:id="@+id/offline_bar" | ||
style="@style/offline_bar" | ||
android:visibility="gone" | ||
android:layout_alignParentTop="true"/> | ||
|
||
<org.edx.mobile.view.custom.EdxWebView | ||
android:id="@+id/webview" | ||
<RelativeLayout | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:layout_height="0dp" | ||
android:layout_weight="1" | ||
android:background="@color/grey_act_background" | ||
android:layout_below="@id/offline_bar"/> | ||
android:orientation="vertical"> | ||
|
||
<View | ||
android:id="@+id/offline_bar" | ||
style="@style/offline_bar" | ||
android:layout_alignParentTop="true" | ||
android:visibility="gone" /> | ||
|
||
<org.edx.mobile.view.custom.EdxWebView | ||
android:id="@+id/webview" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:layout_below="@id/offline_bar" | ||
android:background="@color/grey_act_background" /> | ||
|
||
<include layout="@layout/loading_indicator" /> | ||
<include layout="@layout/loading_indicator" /> | ||
|
||
<TextView | ||
android:id="@+id/offline_mode_message" | ||
style="@style/offline_mode_message"/> | ||
</RelativeLayout> | ||
<TextView | ||
android:id="@+id/offline_mode_message" | ||
style="@style/offline_mode_message" /> | ||
</RelativeLayout> | ||
|
||
<fragment | ||
android:name="org.edx.mobile.view.LogInSignUpFragment" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:tag="org.edx.mobile.view.LogInSignUpFragment" /> | ||
</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
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,38 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<layout xmlns:android="http://schemas.android.com/apk/res/android"> | ||
|
||
<LinearLayout | ||
android:id="@+id/container" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:background="@color/transparent_black_80" | ||
android:orientation="horizontal"> | ||
|
||
<Button | ||
android:id="@+id/sign_up" | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_weight="1" | ||
android:background="@drawable/light_selectable_box_overlay" | ||
android:padding="@dimen/edx_margin" | ||
android:text="@string/launch_register" | ||
android:textColor="@color/white" | ||
android:textSize="@dimen/edx_base" /> | ||
|
||
<View | ||
android:layout_width="@dimen/edx_hairline" | ||
android:layout_height="match_parent" | ||
android:background="@color/edx_grayscale_neutral_base" /> | ||
|
||
<Button | ||
android:id="@+id/log_in" | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_weight="1" | ||
android:background="@drawable/light_selectable_box_overlay" | ||
android:padding="@dimen/edx_margin" | ||
android:text="@string/login" | ||
android:textColor="@color/white" | ||
android:textSize="@dimen/edx_base" /> | ||
</LinearLayout> | ||
</layout> |
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
Oops, something went wrong.