Skip to content

Commit

Permalink
added find your courses design
Browse files Browse the repository at this point in the history
pending images viewpager
  • Loading branch information
rogergcc committed Jul 28, 2020
1 parent 1c00ab8 commit 5ecf154
Show file tree
Hide file tree
Showing 16 changed files with 369 additions and 33 deletions.
25 changes: 25 additions & 0 deletions .idea/jarRepositories.xml

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

2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<img src="/screenshots/screenshot-1587165564580.jpg" height="480" width="270" hspace="5">

<img src="/screenshots/screenshot-1587165595487.jpg" height="480" width="270" hspace="5">

<img src="/screenshots/screenshot-1595979675211.jpg" height="480" width="270" hspace="5">

</div>

19 changes: 11 additions & 8 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,23 @@
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity
android:name=".matchcourses.MatchesCoursesActivity"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar">

<!-- <activity-->
<!-- android:screenOrientation="portrait"-->
<!-- android:theme="@style/AppTheme.NoActionBar"-->
<!-- android:name=".GamePlayActivity">-->

<!-- </activity>-->

</activity>
<!-- <activity -->
<!-- android:screenOrientation="portrait" -->
<!-- android:theme="@style/AppTheme.NoActionBar" -->
<!-- android:name=".GamePlayActivity"> -->
<!-- </activity> -->
<activity
android:name=".CourseStaggedActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan"></activity>
android:windowSoftInputMode="adjustPan" />
<activity
android:name=".DashboardCourseActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
Expand Down
22 changes: 14 additions & 8 deletions app/src/main/java/com/appsnipp/education/MainActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,21 @@

import android.content.Intent;
import android.os.Bundle;
import android.view.MenuItem;

import androidx.annotation.NonNull;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import com.google.android.material.navigation.NavigationView;
import androidx.fragment.app.Fragment;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.appcompat.app.ActionBarDrawerToggle;
import androidx.appcompat.app.AppCompatActivity;
import androidx.appcompat.app.AppCompatDelegate;
import androidx.appcompat.widget.Toolbar;
import android.view.MenuItem;
import androidx.coordinatorlayout.widget.CoordinatorLayout;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.fragment.app.Fragment;

import com.appsnipp.education.matchcourses.MatchesCoursesActivity;
import com.google.android.material.bottomnavigation.BottomNavigationView;
import com.google.android.material.navigation.NavigationView;

public class MainActivity extends AppCompatActivity
implements NavigationView.OnNavigationItemSelectedListener {
Expand All @@ -40,11 +43,14 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {

break;
case R.id.navigationHome:

// intentGetStarted = new Intent(MainActivity.this, MatchesCoursesActivity.class);
// startActivity(intentGetStarted);
break;
case R.id.navigationSearch:
// intentGetStarted = new Intent(MainActivity.this, GamePlayActivity.class);
// startActivity(intentGetStarted);
intentGetStarted = new Intent(MainActivity.this, MatchesCoursesActivity.class);
startActivity(intentGetStarted);
break;
case R.id.navigationMenu:
DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
/*
* Copyright (c) 2020. rogergcc
*/

package com.appsnipp.education.matchcourses;

import android.os.Bundle;

import androidx.appcompat.app.AppCompatActivity;

import com.appsnipp.education.R;

public class MatchesCoursesActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_matches_courses);
}
}
14 changes: 14 additions & 0 deletions app/src/main/res/drawable/ic_account_box_black_24dp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!--
~ Copyright (c) 2020. rogergcc
-->

<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#000"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#000000"
android:pathData="M3,5v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2L5,3c-1.11,0 -2,0.9 -2,2zM15,9c0,1.66 -1.34,3 -3,3s-3,-1.34 -3,-3 1.34,-3 3,-3 3,1.34 3,3zM6,17c0,-2 4,-3.1 6,-3.1s6,1.1 6,3.1v1L6,18v-1z" />
</vector>
14 changes: 14 additions & 0 deletions app/src/main/res/drawable/ic_play.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<!--
~ Copyright (c) 2020. rogergcc
-->

<vector android:height="24dp"
android:tint="#DCDCDC"
android:viewportHeight="24"
android:viewportWidth="24"
android:width="24dp"
xmlns:android="http://schemas.android.com/apk/res/android">
<path
android:fillColor="@android:color/white"
android:pathData="M8,5v14l11,-7z" />
</vector>
61 changes: 53 additions & 8 deletions app/src/main/res/drawable/ic_user.xml
Original file line number Diff line number Diff line change
@@ -1,9 +1,54 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="55.0"
android:viewportHeight="55.0">
<path
android:fillColor="#FF000000"
android:pathData="M55,27.5C55,12.34 42.66,0 27.5,0S0,12.34 0,27.5c0,8.01 3.44,15.23 8.93,20.26l-0.03,0.02l0.89,0.75c0.06,0.05 0.12,0.09 0.18,0.14c0.47,0.39 0.96,0.77 1.47,1.13c0.16,0.12 0.32,0.23 0.49,0.35c0.53,0.37 1.08,0.72 1.64,1.05c0.12,0.07 0.25,0.14 0.37,0.21c0.61,0.35 1.24,0.68 1.88,0.98c0.05,0.02 0.09,0.04 0.14,0.06c2.09,0.97 4.32,1.68 6.65,2.11c0.06,0.01 0.12,0.02 0.18,0.03c0.72,0.13 1.46,0.22 2.2,0.29c0.09,0.01 0.18,0.01 0.27,0.02C26,54.96 26.74,55 27.5,55c0.75,0 1.49,-0.04 2.22,-0.1c0.09,-0.01 0.19,-0.01 0.28,-0.02c0.74,-0.07 1.46,-0.16 2.18,-0.29c0.06,-0.01 0.13,-0.02 0.19,-0.03c2.3,-0.41 4.49,-1.11 6.56,-2.06c0.08,-0.04 0.15,-0.07 0.23,-0.1c0.62,-0.29 1.22,-0.6 1.81,-0.94c0.15,-0.08 0.29,-0.17 0.44,-0.25c0.54,-0.32 1.07,-0.65 1.58,-1c0.19,-0.13 0.37,-0.26 0.55,-0.39c0.44,-0.32 0.87,-0.64 1.29,-0.98c0.09,-0.08 0.19,-0.14 0.28,-0.22l0.92,-0.76l-0.03,-0.02C51.52,42.8 55,35.55 55,27.5zM2,27.5C2,13.44 13.44,2 27.5,2S53,13.44 53,27.5c0,7.58 -3.33,14.39 -8.59,19.06c-0.29,-0.2 -0.59,-0.38 -0.89,-0.54l-8.47,-4.23c-0.76,-0.38 -1.23,-1.14 -1.23,-1.99v-2.96c0.2,-0.24 0.4,-0.52 0.62,-0.82c1.1,-1.55 1.98,-3.27 2.62,-5.12c1.27,-0.6 2.09,-1.86 2.09,-3.29v-3.55c0,-0.87 -0.32,-1.71 -0.89,-2.37v-4.67c0.05,-0.52 0.24,-3.45 -1.88,-5.86C34.52,9.06 31.54,8 27.5,8s-7.02,1.07 -8.87,3.17c-2.12,2.42 -1.93,5.34 -1.88,5.86v4.67c-0.57,0.66 -0.89,1.5 -0.89,2.37v3.55c0,1.1 0.49,2.13 1.34,2.82c0.81,3.17 2.48,5.57 3.09,6.39v2.89c0,0.82 -0.44,1.57 -1.16,1.96l-7.91,4.31c-0.25,0.14 -0.5,0.3 -0.75,0.48C5.28,41.79 2,35.02 2,27.5zM42.46,48.13c-0.35,0.25 -0.71,0.5 -1.07,0.74c-0.17,0.11 -0.33,0.22 -0.5,0.32c-0.47,0.29 -0.95,0.57 -1.44,0.83c-0.11,0.06 -0.22,0.11 -0.33,0.17c-1.13,0.58 -2.29,1.07 -3.49,1.48c-0.04,0.01 -0.08,0.03 -0.13,0.04c-0.63,0.21 -1.26,0.39 -1.9,0.55c-0,0 -0,0 -0.01,0c-0.65,0.16 -1.3,0.29 -1.96,0.4c-0.02,0 -0.04,0.01 -0.05,0.01c-0.62,0.1 -1.25,0.17 -1.88,0.23c-0.11,0.01 -0.22,0.02 -0.33,0.03C28.75,52.97 28.13,53 27.5,53c-0.63,0 -1.27,-0.03 -1.89,-0.08c-0.11,-0.01 -0.22,-0.01 -0.33,-0.03c-0.63,-0.06 -1.26,-0.13 -1.89,-0.23c-0.03,-0 -0.06,-0.01 -0.08,-0.01c-1.32,-0.22 -2.62,-0.55 -3.89,-0.97c-0.04,-0.01 -0.08,-0.03 -0.12,-0.04c-0.63,-0.21 -1.25,-0.45 -1.86,-0.71c-0,-0 -0.01,-0 -0.01,-0.01c-0.58,-0.25 -1.14,-0.52 -1.71,-0.82c-0.07,-0.04 -0.15,-0.07 -0.22,-0.11c-0.51,-0.27 -1.01,-0.57 -1.5,-0.88c-0.15,-0.09 -0.29,-0.19 -0.44,-0.28c-0.45,-0.3 -0.9,-0.61 -1.34,-0.93c-0.05,-0.03 -0.09,-0.07 -0.13,-0.1c0.03,-0.02 0.06,-0.04 0.1,-0.05l7.91,-4.31c1.36,-0.74 2.2,-2.16 2.2,-3.71l-0,-3.6l-0.23,-0.28c-0.02,-0.03 -2.18,-2.65 -3,-6.22l-0.09,-0.4l-0.34,-0.22c-0.48,-0.31 -0.77,-0.83 -0.77,-1.39v-3.55c0,-0.47 0.2,-0.9 0.56,-1.22l0.33,-0.3v-5.57l-0.01,-0.13c-0,-0.02 -0.3,-2.43 1.4,-4.36C21.58,10.84 24.06,10 27.5,10c3.43,0 5.9,0.83 7.35,2.47c1.69,1.91 1.41,4.36 1.41,4.38l-0.01,5.7l0.33,0.3c0.36,0.32 0.56,0.76 0.56,1.22v3.55c0,0.71 -0.49,1.36 -1.18,1.58l-0.5,0.15l-0.16,0.5c-0.59,1.83 -1.43,3.53 -2.5,5.03c-0.26,0.37 -0.52,0.7 -0.74,0.95l-0.25,0.28V39.8c0,1.61 0.9,3.06 2.34,3.78l8.47,4.23c0.05,0.03 0.11,0.05 0.16,0.08C42.68,47.98 42.57,48.05 42.46,48.13z" />
<vector android:height="48dp"
android:viewportHeight="512"
android:viewportWidth="512"
android:width="48dp"
xmlns:android="http://schemas.android.com/apk/res/android">
<path
android:fillColor="#ecf4ff"
android:pathData="M256,256m-256,0a256,256 0,1 1,512 0a256,256 0,1 1,-512 0" />
<path
android:fillColor="#ddeafb"
android:pathData="m409.033,50.759c31.881,42.688 50.759,95.656 50.759,153.033 0,141.385 -114.615,256 -256,256 -57.377,0 -110.345,-18.878 -153.033,-50.759 46.678,62.501 121.233,102.967 205.241,102.967 141.385,0 256,-114.615 256,-256 0,-84.008 -40.466,-158.563 -102.967,-205.241z" />
<path
android:fillColor="#524798"
android:pathData="m451.192,421.619c-20.667,-48.06 -68.434,-81.716 -124.068,-81.716h-142.248c-55.634,0 -103.401,33.656 -124.068,81.716 46.958,55.288 116.971,90.381 195.192,90.381s148.234,-35.093 195.192,-90.381z" />
<path
android:fillColor="#453d81"
android:pathData="m451.192,421.619c-10.105,-23.498 -26.7,-43.537 -47.513,-57.898 -46.915,58.56 -119.015,96.071 -199.887,96.071 -52.141,0 -100.638,-15.592 -141.091,-42.363 -0.652,1.385 -1.287,2.78 -1.893,4.19 46.958,55.288 116.971,90.381 195.192,90.381s148.234,-35.093 195.192,-90.381z" />
<path
android:fillColor="#ffd064"
android:pathData="m345.242,83.768 l-22.62,-21.507c-11.333,-10.775 -27.709,-14.373 -42.514,-9.34l-81.263,27.623c-21.343,7.255 -35.696,27.294 -35.696,49.836v37.66l4,11.695h183.466l4,-11.695v-62.43c-0.001,-8.257 -3.389,-16.152 -9.373,-21.842z" />
<path
android:fillColor="#ffc250"
android:pathData="m345.242,83.768 l-22.62,-21.507c-11.333,-10.775 -27.709,-14.373 -42.514,-9.34l-30.859,10.49c9.374,0.791 18.39,4.715 25.449,11.426l22.62,21.507c5.984,5.689 9.372,13.585 9.372,21.842v61.549h43.925l4,-11.695v-62.43c-0.001,-8.257 -3.389,-16.152 -9.373,-21.842z" />
<path
android:fillColor="#ffcbbe"
android:pathData="m348.51,202.426c-9.81,20.831 -10.655,48.526 1.661,54.326s33.128,-12.491 42.939,-33.322c9.81,-20.831 3.471,-33.272 -8.845,-39.072s-25.944,-2.763 -35.755,18.068z" />
<path
android:fillColor="#eaac9d"
android:pathData="m270.59,397.916h-23.42c-30.625,0 -55.451,-24.826 -55.451,-55.451v-61.085h134.322v61.085c0.001,30.624 -24.826,55.451 -55.451,55.451z" />
<path
android:fillColor="#df9380"
android:pathData="m284.979,281.38v61.085c0,27.622 -20.199,50.519 -46.63,54.745 2.874,0.459 5.818,0.706 8.821,0.706h23.42c30.625,0 55.451,-24.826 55.451,-55.451v-61.085z" />
<path
android:fillColor="#ffcbbe"
android:pathData="m337.226,150.653h-156.691c-9.603,0 -17.388,7.785 -17.388,17.388v61.9c0,33.69 16.771,65.17 44.732,83.964l27.821,18.7c2.829,1.901 5.834,3.419 8.943,4.553 0,0 13.002,0.665 19.528,-0.314 9.844,-1.477 20.807,-6.201 20.807,-6.201l24.902,-16.738c27.961,-18.794 44.732,-50.274 44.732,-83.964v-61.9c0.002,-9.603 -7.783,-17.388 -17.386,-17.388z" />
<path
android:fillColor="#eaac9d"
android:pathData="m326.154,150.653v79.287c0,33.69 -16.771,65.17 -44.732,83.964l-27.821,18.7c-2.829,1.902 -5.847,3.419 -8.956,4.553 12.295,4.484 26.229,2.966 37.416,-4.553l27.821,-18.7c27.961,-18.794 44.732,-50.274 44.732,-83.964v-61.9c0,-9.603 -7.785,-17.388 -17.388,-17.388h-11.072z" />
<path
android:fillColor="#eaac9d"
android:pathData="m348.51,202.426c-9.81,20.831 -10.655,48.526 1.661,54.326s33.128,-12.491 42.939,-33.322c9.81,-20.831 3.471,-33.272 -8.845,-39.072s-25.944,-2.763 -35.755,18.068z" />
<path
android:fillColor="#ffcbbe"
android:pathData="m169.251,202.426c9.81,20.831 10.655,48.526 -1.661,54.326s-33.128,-12.491 -42.939,-33.322 -3.471,-33.272 8.844,-39.072c12.317,-5.8 25.946,-2.763 35.756,18.068z" />
<path
android:fillColor="#5e54ac"
android:pathData="M213.163,210.591m-11.574,0a11.574,11.574 0,1 1,23.148 0a11.574,11.574 0,1 1,-23.148 0" />
<path
android:fillColor="#5e54ac"
android:pathData="M303.449,210.591m-11.574,0a11.574,11.574 0,1 1,23.148 0a11.574,11.574 0,1 1,-23.148 0" />
<path
android:fillColor="#e28086"
android:pathData="m258.386,286.636c-13.232,0 -25.624,-6.514 -33.149,-17.425 -2.37,-3.437 -1.506,-8.145 1.932,-10.515 3.437,-2.37 8.145,-1.506 10.515,1.932 4.702,6.818 12.441,10.889 20.702,10.889s16,-4.071 20.702,-10.889c2.37,-3.437 7.079,-4.302 10.515,-1.932 3.437,2.371 4.302,7.078 1.932,10.515 -7.525,10.911 -19.917,17.425 -33.149,17.425z" />
</vector>
15 changes: 15 additions & 0 deletions app/src/main/res/drawable/play_course.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2020. rogergcc
-->

<shape xmlns:android="http://schemas.android.com/apk/res/android">

<solid android:color="@color/grey_light" />

<corners
android:bottomLeftRadius="20dp"
android:bottomRightRadius="20dp"
android:topLeftRadius="20dp"
android:topRightRadius="20dp" />

</shape>
94 changes: 94 additions & 0 deletions app/src/main/res/layout/activity_matches_courses.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,94 @@
<?xml version="1.0" encoding="utf-8"?><!--
~ Copyright (c) 2020. rogergcc
-->

<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"

android:padding="@dimen/nav_header_vertical_spacing"
android:background="@color/contentBodyColor"
tools:context=".matchcourses.MatchesCoursesActivity">


<TextView
android:id="@+id/tv_find_title"
style="@style/viewParent.headerText"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:text="Find your \nmatches courses"
android:textSize="28sp"

app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<ImageView
android:id="@+id/imageView2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="24dp"
android:layout_marginEnd="8dp"
android:src="@drawable/ic_user"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />

<TextView
android:textColor="@color/contentTextColor"
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="20dp"
android:text="10 course available"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/tv_find_title" />

<LinearLayout

android:id="@+id/ll_popular"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="16dp"
android:layout_marginEnd="8dp"
android:orientation="vertical"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/textView3">


<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">

<TextView
style="@style/viewParent.headerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_horizontal_margin"
android:layout_marginBottom="@dimen/activity_horizontal_margin"
android:text="Popular Courses" />

<TextView
style="@style/viewParent.headerText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/activity_horizontal_margin"
android:layout_marginBottom="@dimen/activity_horizontal_margin"
android:layout_alignParentEnd="true"
android:text=". ." />
</RelativeLayout>

<include layout="@layout/item_popular_course_playing" />

<include layout="@layout/item_popular_course" />

<include layout="@layout/item_popular_course" />

<include layout="@layout/item_popular_course" />
</LinearLayout>


</androidx.constraintlayout.widget.ConstraintLayout>
9 changes: 2 additions & 7 deletions app/src/main/res/layout/card_course_item.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@


<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/rl_locations"
android:layout_width="0dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/card_margin"

Expand Down
Loading

0 comments on commit 5ecf154

Please sign in to comment.