Skip to content

Commit

Permalink
Merge pull request #653 from jjoseba/ui-improvements
Browse files Browse the repository at this point in the history 
Disabled collapsing toolbar layout
  • Loading branch information
@alexlittle
alexlittle committed Jan 24, 2018
2 parents c58260a + 35c68fb commit 422087a
Show file tree
Hide file tree
Showing 3 changed files with 59 additions and 134 deletions.
8 changes: 6 additions & 2 deletions app/src/main/java/org/digitalcampus/oppia/activity/CourseIndexActivity.java
View file
Expand Up @@ -91,6 +91,8 @@ public void onCreate(Bundle savedInstanceState) {
prefs.registerOnSharedPreferenceChangeListener(this);
loadingCourseView = findViewById(R.id.loading_course);

/*
----- CollapsingToolbar layout
FloatingActionButton myFab = (FloatingActionButton) findViewById(R.id.scorecard_fab);
if (myFab != null) {
myFab.setOnClickListener(new View.OnClickListener() {
Expand All @@ -102,7 +104,7 @@ public void onClick(View v) {
startActivityForResult(i, 1);
}
});
}
}*/

Bundle bundle = this.getIntent().getExtras();
if (bundle != null) {
Expand Down Expand Up @@ -146,14 +148,16 @@ public void onStart() {
if (course.getImageFile() != null) {
BitmapDrawable bm = ImageUtils.LoadBMPsdcard(course.getImageFileFromRoot(), this.getResources(),
R.drawable.dc_logo);
/*
----- CollapsingToolbar layout
ImageView backdrop = (ImageView) findViewById(R.id.appbar_backdrop);
TextView description = (TextView) findViewById(R.id.appbar_description);
if (backdrop != null) {
backdrop.setImageDrawable(bm);
}
if (description != null) {
description.setText(course.getMultiLangInfo().getDescription(prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage())));
}
}*/
}
}

Expand Down
156 changes: 34 additions & 122 deletions app/src/main/res/layout/activity_course_index.xml
View file
@@ -1,133 +1,45 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
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:fitsSystemWindows="true">

<android.support.v7.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior" />

<android.support.design.widget.AppBarLayout
android:id="@+id/main.appbar"
android:layout_height="190dp"
android:layout_width="match_parent"
android:fitsSystemWindows="true">
<android.support.design.widget.CollapsingToolbarLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
app:expandedTitleTextAppearance="@style/ScrollableLayoutHeaderText"
app:collapsedTitleTextAppearance="@style/CollapsedToolbarHeader"
app:layout_scrollFlags="scroll|exitUntilCollapsed">

<FrameLayout
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_collapseMode="parallax"
app:layout_collapseParallaxMultiplier="0.45">

<ImageView
android:id="@+id/appbar_backdrop"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="?attr/actionBarSize"
android:paddingLeft="5dp"
android:scaleType="fitStart"
android:fitsSystemWindows="false"
android:src="@drawable/default_course"
android:alpha="0.4"
android:contentDescription="@string/title_activity_course_index" />
android:orientation="vertical" >

<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/appbar_description"
android:paddingTop="?attr/actionBarSize"
android:paddingLeft="35dp"
android:paddingRight="20dp"
android:textColor="@color/text_dark"
android:maxLines="3"
/>
</FrameLayout>

<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:minHeight="?attr/actionBarSize"
app:theme="@style/Oppia.Theme.Dark"
app:contentInsetLeft="0dp"
app:contentInsetStart="0dp"
app:contentInsetStartWithNavigation="0dp"
style="@style/ActionBar.Solid.Om"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
android:fitsSystemWindows="false"
app:layout_collapseMode="pin">
</android.support.v7.widget.Toolbar>
</android.support.design.widget.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout>
<include android:id="@+id/toolbar" layout="@layout/toolbar" />

<android.support.v4.widget.NestedScrollView
<LinearLayout
android:id="@+id/loading_course"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true"
app:layout_behavior="@string/appbar_scrolling_view_behavior">

<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_gravity="center"
android:gravity="center"
android:orientation="vertical">

<ProgressBar
android:id="@+id/progressBar2"
style="?android:attr/progressBarStyleLarge"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
>
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@+id/loading_course">

<ProgressBar
style="?android:attr/progressBarStyleLarge"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:id="@+id/progressBar2"
android:layout_gravity="center_horizontal" />

<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/loading_course"
android:id="@+id/textView"
android:layout_gravity="center"
style="@style/SmallTextLight" />
</LinearLayout>
android:layout_gravity="center_horizontal"/>

<ListView
android:id="@+id/section_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:cacheColorHint="#00000000"
android:clipToPadding="false"
android:divider="@color/list_divider"
android:dividerHeight="0dp"
android:foreground="?android:windowContentOverlay"
android:listSelector="@drawable/background_change_pressed"
android:paddingTop="@dimen/fab_bottom_margin"
/>

</FrameLayout>
</android.support.v4.widget.NestedScrollView>
<TextView
android:id="@+id/textView"
style="@style/SmallTextLight"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="@string/loading_course"/>
</LinearLayout>

<android.support.design.widget.FloatingActionButton
android:id="@+id/scorecard_fab"
<ListView
android:layout_below="@id/toolbar"
android:id="@+id/section_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_margin="@dimen/activity_horizontal_margin"
android:src="@drawable/ic_scorecard"
app:layout_anchor="@id/main.appbar"
app:backgroundTint="@color/highlight_mid"
app:layout_anchorGravity="bottom|right|end" />

</android.support.design.widget.CoordinatorLayout>
android:divider="@color/list_divider"
android:dividerHeight="1dp"
android:listSelector="@drawable/background_change_pressed"
android:cacheColorHint="#00000000"
android:foreground="?android:windowContentOverlay"
/>

</RelativeLayout>
29 changes: 19 additions & 10 deletions app/src/main/res/values/styles.xml
View file
Expand Up @@ -49,12 +49,12 @@
<item name="android:textColor">@color/text_dark</item>
</style>

<style name="MediumTextItalic">
<style name="MediumTextItalic">
<item name="android:textSize">14sp</item>
<item name="android:textStyle">italic</item>
<item name="android:textColor">@color/text_light</item>
</style>

<style name="SmallTextLight">
<item name="android:textSize">12sp</item>
<item name="android:textStyle">normal</item>
Expand Down Expand Up @@ -96,7 +96,7 @@
<item name="android:textStyle">normal</item>
<item name="android:textColor">@color/text_dark</item>
</style>

<style name="NormalTextBoldDark">
<item name="android:textSize">16sp</item>
<item name="android:textStyle">bold</item>
Expand Down Expand Up @@ -143,13 +143,13 @@
</style>

<style name="Highlight.Label" parent="android:TextAppearance">
<item name="android:textSize">12sp</item>
<item name="android:layout_marginTop">-5dp</item>
<item name="android:textAllCaps">true</item>
<item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
<item name="android:textColor">@color/highlight_label</item>
</style>
<item name="android:textSize">12sp</item>
<item name="android:layout_marginTop">-5dp</item>
<item name="android:textAllCaps">true</item>
<item name="android:gravity">center</item>
<item name="android:singleLine">true</item>
<item name="android:textColor">@color/highlight_label</item>
</style>

<style name="Oppia.Theme.InputError" parent="android:TextAppearance">
<item name="android:textSize">12sp</item>
Expand Down Expand Up @@ -198,5 +198,14 @@
<item name="fontPath">fonts/lato.ttf</item>
</style>

<style name="Oppia.Theme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
</style>

<style name="Oppia.Theme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>

<style name="Oppia.Theme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>


</resources>

0 comments on commit 422087a

Please sign in to comment.