Add exposed values and bump up to 6.0.1
diff --git a/app/Android.mk b/app/Android.mk
new file mode 100644
index 0000000..d2af668
--- /dev/null
+++ b/app/Android.mk
@@ -0,0 +1,3 @@
+LOCAL_PATH := $(call my-dir)
+
+include $(LOCAL_PATH)/src/main/Android.mk
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index c3dcb15..a15b989 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -14,7 +14,7 @@
minSdkVersion 22
targetSdkVersion 22
versionCode 6
- versionName "6.0.0"
+ versionName "6.0.1"
}
buildTypes {
debug {
diff --git a/app/src/main/Android.mk b/app/src/main/Android.mk
new file mode 100644
index 0000000..e9fa469
--- /dev/null
+++ b/app/src/main/Android.mk
@@ -0,0 +1,22 @@
+LOCAL_PATH := $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_CERTIFICATE := platform
+LOCAL_MODULE_TAGS := optional
+LOCAL_PACKAGE_NAME := AboutBliss
+LOCAL_PRIVILEGED_MODULE := true
+
+LOCAL_STATIC_JAVA_LIBRARIES := \
+ android-support-v4 \
+ android-support-v7-cardview \
+ android-support-v7-palette \
+ android-support-design
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res $(cardview_dir)
+LOCAL_SRC_FILES := $(call all-java-files-under,java)
+
+include $(BUILD_PACKAGE)
+
+include $(CLEAR_VARS)
+
+include $(BUILD_MULTI_PREBUILT)
diff --git a/app/src/main/java/bliss/about/activities/MainActivity.java b/app/src/main/java/bliss/about/activities/MainActivity.java
index 9edd820..b9b8da5 100644
--- a/app/src/main/java/bliss/about/activities/MainActivity.java
+++ b/app/src/main/java/bliss/about/activities/MainActivity.java
@@ -50,7 +50,7 @@
.addProfiles(
new ProfileDrawerItem().withName("Team Bliss").withIcon(getResources().getDrawable(R.drawable.bliss_logo))
)
- .withHeaderBackground(android.R.color.black)
+ .withHeaderBackground(getResources().getColor(R.color.header_background))
.withSelectionFirstLine(getResources().getString(R.string.app_long_name))
.withSelectionSecondLine(Build.DEVICE)
.withSavedInstance(savedInstanceState)
diff --git a/app/src/main/java/bliss/about/fragments/HomeFragment.java b/app/src/main/java/bliss/about/fragments/HomeFragment.java
index cefda74..f452780 100644
--- a/app/src/main/java/bliss/about/fragments/HomeFragment.java
+++ b/app/src/main/java/bliss/about/fragments/HomeFragment.java
@@ -29,8 +29,8 @@
ObservableScrollView content = (ObservableScrollView) root.findViewById(R.id.HomeContent);
FloatingActionButton fab = (FloatingActionButton) root.findViewById(R.id.apply_btn);
- fab.setColorNormal(getResources().getColor(R.color.accent));
- fab.setColorPressed(getResources().getColor(R.color.accent_pressed));
+ fab.setColorNormal(getResources().getColor(R.color.fab));
+ fab.setColorPressed(getResources().getColor(R.color.fab_pressed));
fab.setColorRipple(getResources().getColor(R.color.semitransparent_white));
fab.show(true);
fab.attachToScrollView(content);
diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml
index 6b11dde..df8314a 100644
--- a/app/src/main/res/values-v21/styles.xml
+++ b/app/src/main/res/values-v21/styles.xml
@@ -6,7 +6,6 @@
<item name="android:colorPrimaryDark">@color/primary_dark</item>
<item name="android:colorAccent">@color/accent</item>
<item name="android:statusBarColor">@color/primary_dark</item>
- <item name="android:navigationBarColor">@color/primary_dark</item>
<item name="android:windowAnimationStyle">@style/WindowAnimationTransition</item>
<item name="android:windowContentTransitions">true</item>
<item name="android:windowAllowEnterTransitionOverlap">true</item>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index cbcd446..e309538 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -4,11 +4,16 @@
<color name="primary_dark">#000000</color>
<color name="primary_pressed">#4a777777</color>
+ <color name="header_background">@color/primary</color>
+
<color name="accent">#e91e63</color>
- <color name="ripple_accent">#80e91e63</color>
- <color name="accent_pressed">#ec407a</color>
<color name="accent_secondary">@color/accent</color>
+ <color name="ripple_accent">#80e91e63</color>
+
+ <color name="fab">@color/accent</color>
+ <color name="fab_pressed">#ec407a</color>
+
<color name="cardsbg">#80000000</color>
<!-- Color for Backgrounds -->
<color name="dark_bg">#303030</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aa042aa..a66077a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -54,7 +54,7 @@
<!-- About -->
<string name="about">"About Bliss"</string>
- <string name="app_version">"v6.0.0"</string>
+ <string name="app_version">"v6.0.1"</string>
<string name="web">XDA</string>
<string name="gplus">GOOGLE+</string>