Skip to content

Commit

Permalink
AppTheme updated!
Browse files Browse the repository at this point in the history
Description: Beer Filter checkbox are using Material
Design color, which was updated.

Commit:[Commit type]

TaskNumber:#5 #4
  • Loading branch information
brunomateus committed Feb 26, 2016
1 parent b8b4a52 commit 84257fa
Show file tree
Hide file tree
Showing 5 changed files with 18 additions and 21 deletions.
12 changes: 6 additions & 6 deletions app/app.iml
Original file line number Diff line number Diff line change
Expand Up @@ -78,18 +78,18 @@
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="jdk" jdkName="Android API 23 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="library-2.4.0" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-23.1.0" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
<orderEntry type="library" exported="" name="androidannotations-api-3.3" level="project" />
<orderEntry type="library" exported="" name="support-v4-21.0.2" level="project" />
<orderEntry type="library" exported="" name="eazegraph-1.2.2" level="project" />
<orderEntry type="library" exported="" name="recyclerview-v7-21.0.2" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="junit-4.12" level="project" />
<orderEntry type="library" exported="" name="support-annotations-21.0.2" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-21.0.2" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-23.1.0" level="project" />
<orderEntry type="library" exported="" name="support-v4-23.1.0" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-23.1.0" level="project" />
<orderEntry type="library" exported="" name="ProviGen-lib-2.0.1" level="project" />
<orderEntry type="library" exported="" name="appcompat-v7-21.0.2" level="project" />
<orderEntry type="library" exported="" name="support-annotations-23.1.0" level="project" />
</component>
</module>
12 changes: 6 additions & 6 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -20,8 +20,8 @@ apt {
}

android {
compileSdkVersion 21
buildToolsVersion "21.1.1"
compileSdkVersion 23
buildToolsVersion "23.0.2"

defaultConfig {
applicationId "br.com.androidzin.brunomateus.beerstodrink"
Expand All @@ -47,10 +47,10 @@ dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'org.androidannotations:androidannotations-api:3.3'
compile 'com.github.provigen:ProviGen-lib:2.0.+'
compile 'com.android.support:appcompat-v7:21.0.2'
compile 'com.android.support:cardview-v7:21.0.2'
compile 'com.android.support:recyclerview-v7:21.0.2'
compile 'com.android.support:support-v4:21.0.2'
compile 'com.android.support:appcompat-v7:23.1.0'
compile 'com.android.support:cardview-v7:23.1.0'
compile 'com.android.support:recyclerview-v7:23.1.0'
compile 'com.android.support:support-v4:23.1.0'
compile 'com.github.blackfizz:eazegraph:1.2.2@aar'
compile 'com.nineoldandroids:library:2.4.0'
}
Original file line number Diff line number Diff line change
@@ -1,18 +1,13 @@
package br.com.androidzin.brunomateus.beerstodrink;

import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.DialogInterface;
import android.database.Cursor;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v4.app.DialogFragment;
import android.support.v4.app.LoaderManager;
import android.support.v4.content.CursorLoader;
import android.support.v4.content.Loader;
import android.util.Log;
import android.widget.ArrayAdapter;
import android.support.v7.app.AlertDialog;

import java.util.ArrayList;

Expand Down Expand Up @@ -40,7 +35,7 @@ public void setListener(FilterCountryListener listener) {
@NonNull
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
AlertDialog.Builder b = new AlertDialog.Builder(getActivity());
AlertDialog.Builder b = new AlertDialog.Builder(getActivity(), R.style.AppTheme);
getCountries();
b.setTitle(R.string.filter_country)
.setMultiChoiceItems(countries, checked, new DialogInterface.OnMultiChoiceClickListener() {
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@

<color name="amber_light">#FFECB3</color>
<color name="amber">#FFC107</color>
<color name="amber_dark">#FF6F00</color>
<color name="amber_dark">#FFA000</color>

</resources>
4 changes: 3 additions & 1 deletion app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/amber</item>
<item name="colorPrimaryDark">@color/amber_dark</item>
<item name="colorAccent">@color/amber_light</item>
<item name="colorAccent">#FF9800</item>
<item name="android:textColorPrimary">#212121</item>
<item name="android:textColorSecondary">#727272</item>item>
</style>

</resources>

0 comments on commit 84257fa

Please sign in to comment.