Skip to content

Commit

Permalink
Optional color filter for xkcd
Browse files Browse the repository at this point in the history
  • Loading branch information
HannahMitt committed Aug 23, 2015
1 parent 9797c75 commit c7106c4
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 16 deletions.
12 changes: 12 additions & 0 deletions app/src/main/java/com/morristaedt/mirror/MirrorActivity.java
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
package com.morristaedt.mirror;

import android.content.Intent;
import android.graphics.ColorFilter;
import android.graphics.ColorMatrixColorFilter;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.text.TextUtils;
Expand Down Expand Up @@ -96,6 +98,16 @@ protected void onCreate(Bundle savedInstanceState) {
mStockText = (TextView) findViewById(R.id.stock_text);
mXKCDImage = (ImageView) findViewById(R.id.xkcd_image);

//Negative of XKCD image
float[] colorMatrixNegative = {
-1.0f, 0, 0, 0, 255, //red
0, -1.0f, 0, 0, 255, //green
0, 0, -1.0f, 0, 255, //blue
0, 0, 0, 1.0f, 0 //alpha
};
ColorFilter colorFilterNegative = new ColorMatrixColorFilter(colorMatrixNegative);
// mXKCDImage.setColorFilter(colorFilterNegative); // not inverting for now

setViewState();
}

Expand Down
33 changes: 17 additions & 16 deletions app/src/main/res/layout/activity_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,13 @@
android:layout_height="wrap_content"
tools:text="Partly Cloudy" />

<ImageView
android:id="@+id/xkcd_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="60dp"
android:visibility="gone" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
Expand All @@ -58,43 +65,37 @@
android:layout_height="wrap_content"
android:drawableRight="@drawable/bike"
android:visibility="gone"
tools:visibility="visible"
tools:text="Don't Bike Today" />
tools:text="Don't Bike Today"
tools:visibility="visible" />

<TextView
android:id="@+id/water_plants"
style="@style/MirrorListText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"
android:drawableRight="@drawable/air_plant"
android:text="@string/water_plants" />
android:text="@string/water_plants"
android:visibility="gone"
tools:visibility="visible" />

<TextView
android:id="@+id/grocery_list"
style="@style/MirrorListText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"
android:drawableRight="@drawable/grocery_bag"
android:text="@string/grocery_list" />
android:text="@string/grocery_list"
android:visibility="gone"
tools:visibility="visible" />

<TextView
android:id="@+id/stock_text"
style="@style/MirrorListText"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:visibility="gone"
tools:visibility="visible"
tools:text="$ETSY $13.46" />

<ImageView
android:id="@+id/xkcd_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="gone" />
tools:text="$ETSY $13.46"
tools:visibility="visible" />

</LinearLayout>

Expand Down

0 comments on commit c7106c4

Please sign in to comment.