Merge pull request #6 from b-lam/develop

Changed to dark status bar icons
b-lam · Apr 8, 2017 · 549653d · 549653d
2 parents 1bcd3fa + 3cb79cd
commit 549653d
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 6 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.b_lam.resplash"
         minSdkVersion 22
         targetSdkVersion 25
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 3
+        versionName "1.0.2"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         buildConfigField("String", "UNSPLASH_APPLICATION_ID", UNSPLASH_APPLICATION_ID)
         buildConfigField("String", "UNSPLASH_SECRET", UNSPLASH_SECRET)

diff --git a/app/resplash-1.0.1.apk b/app/resplash-1.0.1.apk
diff --git a/app/src/main/res/layout/activity_search.xml b/app/src/main/res/layout/activity_search.xml
@@ -27,7 +27,7 @@
                 android:layout_height="wrap_content"
                 android:background="@android:color/transparent"
                 android:hint="@string/search_hint"
-                android:textColorHint="@color/Link_Water"
+                android:textColorHint="@color/md_grey_700"
                 android:textColor="@color/colorText"
                 android:imeOptions="actionSearch"
                 android:inputType="text"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -4,7 +4,8 @@
     <color name="colorPrimaryDark">#36393c</color>
     <color name="colorAccent">#26292c</color>
     <color name="colorText">#000000</color>
-    <color name="Link_Water">#d1d2d4</color>
+    <color name="Link_Water">#F5F5F5</color>
+    <color name="Old_Link_Water">#d1d2d4</color>
     <color name="primary_text_material_dark">#36393c</color>
     <color name="Black_Glass">#6e000000</color>
     <color name="Light_Grey">#f4f4f4</color>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -71,9 +71,9 @@
     <string name="about_unsplash_title">Unsplash.com</string>
     <string name="about_unsplash_subtitle">Free (do whatever you want) high-resolution photos</string>
     <string name="about_version_title">Version</string>
-    <string name="about_version_subtitle">1.0.1</string>
+    <string name="about_version_subtitle">1.0.2</string>
     <string name="about_changelog_title">Changelog</string>
-    <string name="changelog">v1.0.0 - Initial Release \nv1.0.1 - Fixed loading bug</string>
+    <string name="changelog">v1.0.0 - Initial Release\nv1.0.1 - Fixed loading bug\nv1.0.2 - Changed to dark status bar icons</string>
     <string name="about_introduction_title">Introduction</string>
     <string name="about_github_title">GitHub</string>
     <string name="about_author_title">Brandon Lam</string>