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 #516 from jjoseba/issue-421
New styles (Material design)
- Loading branch information
Showing
43 changed files
with
943 additions
and
596 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
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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,14 +1,33 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merge xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:layout_width="fill_parent" | ||
android:layout_height="fill_parent" | ||
> | ||
<android.support.design.widget.CoordinatorLayout | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||
android:id="@+id/coordinator" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent"> | ||
|
||
<android.support.v4.view.ViewPager | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:id="@+id/activity_about_pager" | ||
android:layout_width="fill_parent" | ||
android:layout_height="fill_parent" > | ||
android:layout_height="fill_parent" | ||
app:layout_behavior="@string/appbar_scrolling_view_behavior" > | ||
</android.support.v4.view.ViewPager> | ||
|
||
</merge> | ||
<android.support.design.widget.AppBarLayout | ||
android:id="@+id/appbar" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
|
||
<include android:id="@+id/toolbar" layout="@layout/toolbar" /> | ||
|
||
<android.support.design.widget.TabLayout | ||
android:id="@+id/tabs_toolbar" | ||
android:layout_width="match_parent" | ||
android:background="@color/highlight_label" | ||
android:layout_height="wrap_content" | ||
style="@style/Oppia.ToolbarTheme.AppTabLayout" | ||
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/> | ||
</android.support.design.widget.AppBarLayout> | ||
|
||
</android.support.design.widget.CoordinatorLayout> |
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,33 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<merge xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:tools="http://schemas.android.com/tools" | ||
android:layout_width="fill_parent" | ||
android:layout_height="fill_parent" | ||
android:orientation="vertical"> | ||
|
||
<android.support.v4.view.ViewPager | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:id="@+id/activity_widget_pager" | ||
android:layout_width="fill_parent" | ||
android:layout_height="fill_parent"> | ||
</android.support.v4.view.ViewPager> | ||
|
||
</merge> | ||
<android.support.design.widget.CoordinatorLayout | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||
android:id="@+id/coordinator" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent"> | ||
|
||
<android.support.v4.view.ViewPager | ||
android:id="@+id/activity_widget_pager" | ||
android:layout_width="fill_parent" | ||
android:layout_height="fill_parent" | ||
app:layout_behavior="@string/appbar_scrolling_view_behavior" > | ||
</android.support.v4.view.ViewPager> | ||
|
||
<android.support.design.widget.AppBarLayout | ||
android:id="@+id/appbar" | ||
android:layout_width="match_parent" | ||
android:layout_height="wrap_content" | ||
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"> | ||
|
||
<include android:id="@+id/toolbar" layout="@layout/toolbar" /> | ||
|
||
<android.support.design.widget.TabLayout | ||
android:id="@+id/tabs_toolbar" | ||
android:layout_width="match_parent" | ||
android:background="@color/highlight_label" | ||
android:layout_height="wrap_content" | ||
style="@style/Oppia.ToolbarTheme.AppTabLayout" | ||
android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"/> | ||
</android.support.design.widget.AppBarLayout> | ||
|
||
</android.support.design.widget.CoordinatorLayout> |
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 |
---|---|---|
@@ -1,114 +1,142 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:layout_width="fill_parent" | ||
android:layout_height="fill_parent" | ||
android:orientation="vertical" > | ||
|
||
<org.digitalcampus.oppia.application.ScheduleReminders | ||
android:id="@+id/schedule_reminders" | ||
android:background="@drawable/message_background" | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:visibility="gone" /> | ||
<android.support.v4.widget.DrawerLayout | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:id="@+id/drawer"> | ||
|
||
<FrameLayout | ||
android:layout_width="fill_parent" | ||
android:layout_height="fill_parent"> | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent"> | ||
|
||
<LinearLayout | ||
android:id="@+id/loading_courses" | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:gravity="center" | ||
android:orientation="vertical"> | ||
|
||
<TextView | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_margin="2dip" | ||
android:gravity="center" | ||
android:text="@string/loading_courses" | ||
android:textSize="18sp" | ||
android:textColor="@color/text_light"/> | ||
</LinearLayout> | ||
|
||
<LinearLayout | ||
android:layout_height="fill_parent" | ||
android:orientation="vertical" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent"> | ||
android:paddingTop="@dimen/tool_bar_top_padding" | ||
android:layout_marginTop="?attr/actionBarSize"> | ||
|
||
<ListView | ||
android:id="@+id/course_list" | ||
<org.digitalcampus.oppia.application.ScheduleReminders | ||
android:id="@+id/schedule_reminders" | ||
android:background="@drawable/message_background" | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:listSelector="@drawable/background_change_pressed" | ||
android:divider="@color/list_divider" | ||
android:dividerHeight="1dp" | ||
android:cacheColorHint="#00000000" | ||
android:scrollingCache="false" /> | ||
|
||
<LinearLayout | ||
android:id="@+id/no_courses" | ||
android:visibility="gone" /> | ||
|
||
<FrameLayout | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:gravity="center" | ||
android:orientation="vertical" | ||
android:visibility="gone" > | ||
android:layout_height="fill_parent"> | ||
|
||
<TextView | ||
android:id="@+id/manage_courses_text" | ||
android:layout_width="wrap_content" | ||
<LinearLayout | ||
android:id="@+id/loading_courses" | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:layout_margin="2dip" | ||
android:gravity="center" | ||
android:text="@string/no_courses" | ||
android:textSize="18sp" | ||
android:textColor="@color/text_light"/> | ||
android:orientation="vertical"> | ||
|
||
<Button | ||
android:id="@+id/manage_courses_btn" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_margin="10dp" | ||
android:gravity="center" | ||
android:text="@string/title_download_activity"/> | ||
</LinearLayout> | ||
<TextView | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_margin="2dip" | ||
android:gravity="center" | ||
android:text="@string/loading_courses" | ||
android:textSize="18sp" | ||
android:textColor="@color/text_light"/> | ||
</LinearLayout> | ||
|
||
</LinearLayout> | ||
<LinearLayout | ||
android:orientation="vertical" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent"> | ||
|
||
<LinearLayout | ||
android:id="@+id/home_messages" | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:background="@drawable/message_background" | ||
android:orientation="horizontal" | ||
android:padding="5dp" | ||
android:weightSum="1.0" | ||
android:visibility="gone" > | ||
|
||
<LinearLayout | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_weight="0.6" > | ||
<ListView | ||
android:id="@+id/course_list" | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:listSelector="@drawable/background_change_pressed" | ||
android:divider="@color/list_divider" | ||
android:dividerHeight="1dp" | ||
android:cacheColorHint="#00000000" | ||
android:scrollingCache="false" /> | ||
|
||
<LinearLayout | ||
android:id="@+id/no_courses" | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:gravity="center" | ||
android:orientation="vertical" | ||
android:visibility="gone" > | ||
|
||
<TextView | ||
android:id="@+id/manage_courses_text" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_margin="2dip" | ||
android:gravity="center" | ||
android:text="@string/no_courses" | ||
android:textSize="18sp" | ||
android:textColor="@color/text_light"/> | ||
|
||
<TextView | ||
android:id="@+id/home_message" | ||
<Button | ||
android:id="@+id/manage_courses_btn" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_margin="10dp" | ||
android:gravity="center" | ||
android:text="@string/title_download_activity"/> | ||
</LinearLayout> | ||
|
||
</LinearLayout> | ||
|
||
<LinearLayout | ||
android:id="@+id/home_messages" | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:gravity="center_vertical" | ||
android:textSize="14sp" | ||
android:textColor="@color/text_dark"/> | ||
</LinearLayout> | ||
|
||
<Button | ||
android:id="@+id/message_action_button" | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_weight=".4" | ||
android:gravity="center_vertical|center" | ||
android:text="@string/scan_media_download_button" | ||
android:textColor="@color/text_dark"/> | ||
android:background="@drawable/message_background" | ||
android:orientation="horizontal" | ||
android:padding="5dp" | ||
android:weightSum="1.0" | ||
android:visibility="gone" > | ||
|
||
<LinearLayout | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_weight="0.6" > | ||
|
||
<TextView | ||
android:id="@+id/home_message" | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:gravity="center_vertical" | ||
android:textSize="14sp" | ||
android:textColor="@color/text_dark"/> | ||
</LinearLayout> | ||
|
||
<Button | ||
android:id="@+id/message_action_button" | ||
android:layout_width="0dp" | ||
android:layout_height="wrap_content" | ||
android:layout_weight=".4" | ||
android:gravity="center_vertical|center" | ||
android:text="@string/scan_media_download_button" | ||
android:textColor="@color/text_dark"/> | ||
</LinearLayout> | ||
</FrameLayout> | ||
|
||
</LinearLayout> | ||
<include android:id="@+id/toolbar" layout="@layout/toolbar" /> | ||
|
||
</FrameLayout> | ||
|
||
</LinearLayout> | ||
<android.support.design.widget.NavigationView | ||
android:layout_width="wrap_content" | ||
android:layout_height="match_parent" | ||
android:layout_gravity="start" | ||
android:fitsSystemWindows="true" | ||
android:id="@+id/navigation_view" | ||
app:headerLayout="@layout/drawer_header" | ||
app:theme="@style/Oppia.Theme" | ||
app:menu="@menu/drawer_main" /> | ||
|
||
</android.support.v4.widget.DrawerLayout> |
Oops, something went wrong.