basic colour and logo

Jenkinsfile

@@ -0,0 +1,58 @@
+#!/usr/bin/env groovy
+
+pipeline {
+    agent {
+     label 'android-worker'
+    }
+
+    environment {
+            PIPELINE_JOBS_NAME = 'edx-app-android-pipeline'
+            ANDROID_HOME = '/opt/android-sdk-linux'
+            APK_PATH = 'OpenEdXMobile/build/outputs/apk/prod/debuggable'
+            CONFIG_REPO_NAME = 'edx-mobile-config'
+    }       
+
+    stages {
+        stage('checkingout configs') { 
+            steps {
+                sh 'mkdir -p edx-mobile-config'
+                dir('edx-mobile-config'){
+                    sshagent(credentials: ['jenkins-worker', 'jenkins-worker-pem'], ignoreMissing: true) {
+                    checkout changelog: false, poll: false, scm: [
+                        $class: 'GitSCM', 
+                        branches: 
+    // Using specific branch to avoid Firebase config limitations
+                                //[[name: '*/master']],
+                                [[name: 'naveed/automation_configs']],
+                        doGenerateSubmoduleConfigurations: false, 
+                        extensions: 
+                                [[$class: 'CloneOption', honorRefspec: true,
+                                    noTags: true, shallow: true]], 
+                        submoduleCfg: [], 
+                        userRemoteConfigs: 
+                                    [[credentialsId: 'jenkins-worker',
+                                    refspec: '+refs/heads/*:refs/remotes/origin/*', 
+                                    url: "git@github.com:edx/${CONFIG_REPO_NAME}.git"]]
+                            ]
+                    }
+                }
+            }
+        }
+        stage('compiling edx-app-android') {
+            steps {
+                writeFile file: './OpenEdXMobile/edx.properties', text: 'edx.dir = \'../edx-mobile-config/prod/\''  
+                sh 'bash ./resources/compile_android.sh'
+            }
+        }
+        stage('valdiate compiled app') {
+            steps {
+                sh 'bash ./resources/validate_builds.sh'
+            }
+        }
+        stage('archive the build') {
+            steps {
+                archiveArtifacts artifacts: "$APK_PATH/*.apk", onlyIfSuccessful: true
+            }
+        }
+    }
+} 

OpenEdXMobile/AndroidManifest.xml

@@ -150,11 +150,6 @@
             android:label="@string/title_download"
             android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
 
-        <activity
-            android:name=".view.DiscoverCoursesActivity"
-            android:label="@string/label_discover"
-            android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
-
         <activity
             android:name=".view.ViewSubjectsActivity"
             android:label="@string/browse_by_subject"
@@ -165,6 +160,11 @@
             android:label="@string/label_discover"
             android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
 
+        <activity
+            android:name="org.edx.mobile.view.ProgramInfoActivity"
+            android:label="@string/label_discover"
+            android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
+
         <activity
             android:name="org.edx.mobile.view.CourseDetailActivity"
             android:label="@string/label_find_courses"
@@ -177,9 +177,8 @@
             android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
 
         <activity
-            android:name=".view.NativeFindCoursesActivity"
-            android:label="@string/label_find_courses"
-            android:screenOrientation="portrait"
+            android:name=".view.DiscoveryActivity"
+            android:label="@string/label_discover"
             android:theme="@style/AppTheme.NoActionBar.TranslucentStatusBar" />
 
         <activity

OpenEdXMobile/build.gradle

@@ -17,7 +17,7 @@ buildscript {
         classpath "com.newrelic.agent.android:agent-gradle-plugin:5.4.1"
 
         classpath 'com.facebook.testing.screenshot:plugin:0.8.0'
-        classpath 'com.google.gms:google-services:4.0.1'
+        classpath 'com.google.gms:google-services:4.2.0'
     }
 }
 
@@ -130,13 +130,15 @@ dependencies {
     // For the optional Nullable annotation
     implementation "com.android.support:support-annotations:${SUPPORT_LIBRARY_VERSION}"
 
-    implementation "com.google.android.gms:play-services-plus:15.0.1"
-    implementation "com.google.android.gms:play-services-analytics:16.0.1"
-    implementation "com.google.android.gms:play-services-auth:15.0.1"
-    implementation "com.google.android.gms:play-services-ads:15.0.1"
+    implementation "com.google.android.gms:play-services-plus:16.0.0"
+    implementation "com.google.android.gms:play-services-analytics:16.0.6"
+    implementation "com.google.android.gms:play-services-auth:16.0.1"
     // Google Firebase
-    implementation "com.google.firebase:firebase-core:16.0.1"
-    implementation "com.google.firebase:firebase-messaging:17.1.0"
+    implementation "com.google.firebase:firebase-core:16.0.6"
+    implementation "com.google.firebase:firebase-messaging:17.3.4"
+
+//    Exo Player
+    implementation 'com.google.android.exoplayer:exoplayer:2.9.2'
 
     implementation 'com.facebook.android:facebook-login:4.36.0'
     implementation 'com.google.code.gson:gson:2.7'
@@ -456,6 +458,11 @@ android {
              maxHeapSize '1g'
          }
     }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 

OpenEdXMobile/res/drawable/edx_segmented_control_middle_background.xml

@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:state_enabled="false" android:state_focused="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/edx_brand_gray_back" />
+            <stroke android:width="@dimen/edx_line" android:color="@color/black" />
+        </shape>
+    </item>
+    <item android:state_checked="true" android:state_enabled="false">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/edx_brand_gray_back" />
+            <stroke android:width="@dimen/edx_hairline" android:color="@color/edx_brand_gray_back" />
+        </shape>
+    </item>
+    <item android:state_checked="true" android:state_focused="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/edx_brand_primary_base" />
+            <stroke android:width="@dimen/edx_line" android:color="@color/black" />
+        </shape>
+    </item>
+    <item android:state_checked="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/edx_brand_primary_base" />
+            <stroke android:width="@dimen/edx_hairline" android:color="@color/edx_brand_primary_base" />
+        </shape>
+    </item>
+    <item android:state_focused="true">
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <stroke android:width="@dimen/edx_line" android:color="@color/black" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle">
+            <solid android:color="@color/white" />
+            <stroke android:width="@dimen/edx_hairline" android:color="@color/edx_brand_gray_back" />
+        </shape>
+    </item>
+</selector>

OpenEdXMobile/res/layout/activity_discovery_launch.xml

@@ -26,15 +26,15 @@
                 android:layout_height="@dimen/logo_height"
                 android:layout_marginTop="@dimen/logo_top_margin"
                 android:contentDescription="@string/phonetic_app_name"
-                android:src="@drawable/launch_screen_logo" />
+                android:src="@drawable/youngsphere_logo" />
 
             <TextView
                 android:id="@+id/tv_launch_text"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/widget_margin_double"
                 android:text="@string/launch_text"
-                android:textColor="@color/edx_brand_primary_base"
+                android:textColor="@color/edx_success_accent"
                 android:textSize="@dimen/edx_xx_large" />
 
             <android.support.v7.widget.SearchView

OpenEdXMobile/res/layout/activity_launch.xml

@@ -16,7 +16,7 @@
             android:layout_centerHorizontal="true"
             android:layout_marginTop="60dp"
             android:contentDescription="@string/phonetic_app_name"
-            android:src="@drawable/launch_screen_logo" />
+            android:src="@drawable/youngsphere_logo" />
 
         <LinearLayout
             android:id="@+id/bottom_layout"
@@ -32,17 +32,17 @@
 
             <Button
                 android:id="@+id/sign_up_btn"
-                style="@style/bold_white_text"
+                style="@style/bold_orange_text"
                 android:layout_width="match_parent"
                 android:layout_height="50dp"
                 android:layout_gravity="center_vertical"
                 android:layout_marginBottom="5dp"
-                android:background="@drawable/edx_brand_button"
+                android:background="@drawable/bt_google"
                 android:contentDescription="@string/sign_up_and_learn"
                 android:focusable="true"
                 android:padding="5dp"
                 android:text="@string/sign_up_and_learn"
-                android:textColor="@android:color/white"
+                android:textColor="@color/white"
                 android:textSize="16sp" />
 
             <Button

OpenEdXMobile/res/layout/activity_login.xml

@@ -49,7 +49,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
                         android:contentDescription="@string/phonetic_app_name"
-                        android:src="@drawable/login_screen_logo" />
+                        android:src="@drawable/youngsphere_logo" />
                 </FrameLayout>
 
                 <LinearLayout

OpenEdXMobile/res/layout/auth_panel.xml

@@ -16,6 +16,7 @@
             android:layout_width="0dp"
             android:layout_height="@dimen/auth_panel_btn_height"
             android:layout_weight="1"
+            android:background="@drawable/bt_google"
             android:focusable="true"
             android:text="@string/launch_register"
             android:textColor="@color/white"
@@ -31,6 +32,7 @@
             style="@style/edX.Widget.BorderedButton"
             android:layout_width="@dimen/auth_panel_login_btn_width"
             android:layout_height="@dimen/auth_panel_btn_height"
+            android:background="@android:color/holo_green_light"
             android:focusable="true"
             android:text="@string/launch_login"
             android:textColor="@color/edx_brand_primary_accent"

OpenEdXMobile/res/layout/content_error.xml

@@ -26,6 +26,7 @@
             style="@style/edX.Widget.RegularButton"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:background="@drawable/edx_enroll_button"
             android:visibility="gone"
             tools:text="Reload"
             tools:visibility="visible" />

OpenEdXMobile/res/layout/course_card.xml

@@ -67,11 +67,11 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_vertical"
                 android:contentDescription="@string/new_course_content"
-                android:paddingLeft="@dimen/widget_margin_half"
                 android:paddingStart="@dimen/widget_margin_half"
+                android:paddingLeft="@dimen/widget_margin_half"
                 android:text="@string/new_course_content"
                 android:textAllCaps="true"
-                android:textColor="@color/edx_brand_primary_accent"
+                android:textColor="@android:color/holo_orange_dark"
                 android:textSize="@dimen/edx_x_small"
                 tools:targetApi="17" />
         </LinearLayout>

OpenEdXMobile/res/layout/delete_successful_dialog.xml

@@ -61,7 +61,7 @@
             android:layout_height="35dip"
             android:layout_gravity="center|center_horizontal"
             android:layout_weight="0.5"
-            android:background="@android:color/white"
+            android:background="@color/edx_success_accent"
             android:text="@string/label_ok"
             android:textAllCaps="true"
             android:textSize="15sp" />

OpenEdXMobile/res/layout/fragment_account.xml

@@ -31,11 +31,13 @@
             <TextView
                 android:id="@+id/feedback_btn"
                 style="@style/account_option"
+                android:background="@color/edx_success_accent"
                 android:text="@string/label_submit_feedback" />
 
             <TextView
                 android:id="@+id/logout_btn"
                 style="@style/account_option"
+                android:background="@android:color/holo_orange_dark"
                 android:text="@string/logout" />
 
         </LinearLayout>

OpenEdXMobile/res/layout/fragment_dashboard_error_layout.xml

@@ -21,6 +21,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/widget_margin"
             android:textSize="@dimen/edx_large"
+            android:textStyle="bold"
             tools:text="Error text" />
 
     </LinearLayout>

OpenEdXMobile/res/layout/fragment_edit_user_profile.xml

@@ -70,12 +70,12 @@
                     android:background="?android:attr/selectableItemBackground"
                     android:contentDescription="@string/edit_user_profile_change_photo_description"
                     android:drawablePadding="@dimen/x_small_icon_margin"
+                    android:focusable="true"
                     android:gravity="center_vertical"
                     android:paddingLeft="@dimen/edx_margin"
                     android:paddingRight="@dimen/edx_margin"
                     android:text="@string/edit_user_profile_change_photo"
-                    android:focusable="true"
-                    android:textColor="@color/disableable_button_text"
+                    android:textColor="@color/edx_success_text"
                     android:textSize="@dimen/edx_x_small" />
             </LinearLayout>
 

OpenEdXMobile/res/layout/fragment_find_courses.xml

@@ -13,9 +13,11 @@
         android:layout_height="wrap_content"
         android:clipToPadding="false"
         android:divider="@android:color/transparent"
-        android:dividerHeight="@dimen/widget_margin"
+        android:dividerHeight="@dimen/widget_margin_half"
         android:drawSelectorOnTop="false"
         android:listSelector="@android:color/transparent"
+        android:paddingBottom="@dimen/widget_margin_half"
+        android:paddingTop="@dimen/widget_margin_half"
         tools:listitem="@layout/row_course_list" />
 
     <include layout="@layout/loading_indicator" />

OpenEdXMobile/res/layout/fragment_main_discovery.xml

@@ -0,0 +1,23 @@
+<layout xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <LinearLayout
+        android:id="@+id/root"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:orientation="vertical">
+
+        <RadioGroup
+            android:id="@+id/options"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:clipToPadding="true"
+            android:orientation="horizontal"
+            android:padding="@dimen/edx_margin" />
+
+        <FrameLayout
+            android:id="@+id/fl_container"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent" />
+
+    </LinearLayout>
+</layout>

OpenEdXMobile/res/layout/fragment_my_courses_list.xml

@@ -19,7 +19,9 @@
                 android:layout_height="wrap_content"
                 android:clipToPadding="false"
                 android:divider="@android:color/transparent"
-                android:dividerHeight="@dimen/widget_margin"
+                android:dividerHeight="@dimen/widget_margin_half"
+                android:paddingTop="@dimen/widget_margin_half"
+                android:paddingBottom="@dimen/widget_margin_half"
                 android:drawSelectorOnTop="false"
                 android:listSelector="@android:color/transparent"
                 tools:listitem="@layout/row_course_list" />

OpenEdXMobile/res/layout/fragment_user_profile.xml

@@ -34,9 +34,9 @@
                     android:id="@+id/name_text"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:layout_marginBottom="@dimen/widget_margin"
                     android:layout_marginTop="@dimen/widget_margin"
-                    android:textColor="@color/edx_brand_primary_base"
+                    android:layout_marginBottom="@dimen/widget_margin"
+                    android:textColor="@android:color/holo_orange_dark"
                     android:textSize="@dimen/edx_xx_large"
                     tools:text="username" />
 
@@ -105,7 +105,7 @@
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/x_small_icon_margin"
-                        android:textColor="@color/edx_brand_primary_accent"
+                        android:textColor="@color/edx_success_accent"
                         android:textSize="@dimen/edx_x_small"
                         android:visibility="gone"
                         tools:text="@string/profile_sharing_limited_by_you"