Mirrors/chaosflix
2
0
Fork 0
mirror of https://github.com/NiciDieNase/chaosflix synced 2025-02-17 05:28:24 +00:00
Code Issues Projects Releases Packages Wiki Activity

update colors and other small changes

Browse source
This commit is contained in:
Felix 2017-09-21 21:37:07 +02:00
parent c5c440c1f8
commit b50a795e77
7 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
touch/src/main/java/de/nicidienase/chaosflix/touch/activities/BrowseActivity.java
View file

@ -2,6 +2,7 @@ package de.nicidienase.chaosflix.touch.activities;
import android.os.Bundle;
import android.os.PersistableBundle;
import android.provider.MediaStore;
import android.support.annotation.Nullable;
import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
@ -15,12 +16,18 @@ import android.view.Gravity;
import android.view.Menu;
import android.view.View;
import java.util.ArrayList;
import java.util.List;
import de.nicidienase.chaosflix.R;
import de.nicidienase.chaosflix.common.entities.recording.Conference;
import de.nicidienase.chaosflix.common.entities.recording.Event;
import de.nicidienase.chaosflix.common.entities.recording.Metadata;
import de.nicidienase.chaosflix.common.network.MediaApiService;
import de.nicidienase.chaosflix.touch.fragments.ConferencesTabBrowseFragment;
import de.nicidienase.chaosflix.touch.fragments.EventDetailsFragment;
import de.nicidienase.chaosflix.touch.fragments.EventsFragment;
import io.reactivex.Observable;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.disposables.CompositeDisposable;
import io.reactivex.disposables.Disposable;
@ -82,7 +89,7 @@ public class BrowseActivity extends TouchBaseActivity implements
@Override
protected void onStop() {
super.onStop();
mDisposables.dispose();
mDisposables.clear();
}
private int getNumColumns() {
@ -126,6 +133,7 @@ public class BrowseActivity extends TouchBaseActivity implements
.subscribe(mediaApiService -> {
mediaApiService.getEvent(e.getApiID())
.subscribe(event -> {
EventDetailsFragment detailsFragment = EventDetailsFragment.newInstance(event);
FragmentManager fm = getSupportFragmentManager();

3
touch/src/main/res/layout/fragment_event_details_new.xml
View file

@ -20,6 +20,7 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true"
app:contentScrim="?attr/colorPrimary"
app:statusBarScrim="?attr/colorPrimary"
app:expandedTitleMarginStart="25dp"
app:titleEnabled="false"
app:layout_scrollFlags="scroll|exitUntilCollapsed|snap">
@ -61,7 +62,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
app:popupTheme="@style/ThemeOverlay.AppCompat.Light"/>
app:popupTheme="@style/AppTheme"/>
</android.support.design.widget.CollapsingToolbarLayout>

6
touch/src/main/res/layout/fragment_tab_pager_layout.xml
View file

@ -7,11 +7,7 @@
android:layout_height="match_parent"
android:fitsSystemWindows="true">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"/>
<include layout="@layout/toolbar"/>
<android.support.design.widget.TabLayout
android:id="@+id/sliding_tabs"

6
touch/src/main/res/layout/recycler_view_toolbar_layout.xml
View file

@ -6,11 +6,7 @@
android:layout_height="match_parent"
android:orientation="vertical">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"/>
<include layout="@layout/toolbar"/>
<android.support.v7.widget.RecyclerView
android:id="@+id/list"

12
touch/src/main/res/layout/toolbar.xml Normal file
View file

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v7.widget.Toolbar
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?attr/actionBarSize"
android:background="@color/primary"
tools:showIn="@layout/fragment_tab_pager_layout"/>

4
touch/src/main/res/values/colors.xml
View file

@ -1,5 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="primary">#ee4c4c</color>
<color name="primary_dark">#dc4646</color>
<color name="accent">#f8dede</color>
<color name="primary_500">#3F51B5</color>
<color name="black_trans80">#33000000</color>
</resources>

4
touch/src/main/res/values/styles.xml
View file

@ -2,5 +2,9 @@
<resources>
<style name="AppTheme" parent="@style/Theme.AppCompat.Light.NoActionBar">
<item name="android:windowContentTransitions">true</item>
<item name="android:colorPrimary">@color/primary</item>
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorAccent">@color/accent</item>
<!--<item name="android:navigationBarColor">@color/accent</item>-->
</style>
</resources>