Skip to content

Commit

Permalink
Updated iconography, edited actionbar styles, added new flags imgs
Browse files Browse the repository at this point in the history
[Add][Mod]: Added & replaced images for flags including a new error flag
to serve as default (in the occurrance of errors).
[Mod]: Added error flag to row views.
[Mod]: Added error flag to main frag & a progress spinner.
[Mod]: Changed actionbar color
[Mod]: Updated styling of actionbar & background (light.darkbar + blue
background)
[Mod]: Added new launcher icons
  • Loading branch information
iamovrhere committed Sep 9, 2014
1 parent 20cd7f8 commit 9cf01e6
Show file tree
Hide file tree
Showing 17 changed files with 54 additions and 8 deletions.
Binary file modified ic_launcher-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/ic_flag_cad.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added res/drawable-xhdpi/ic_flag_error.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/ic_flag_eur.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/ic_flag_gbp.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/ic_flag_jpy.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/ic_flag_usd.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified res/drawable-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion res/layout/fragment_currency_value.xml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:src="@android:drawable/star_big_on"
android:src="@drawable/ic_flag_error"
tools:ignore="ContentDescription" />

<TextView
Expand Down
15 changes: 13 additions & 2 deletions res/layout/fragment_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
android:scaleType="fitCenter"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:src="@drawable/ic_flag_usd"
android:src="@drawable/ic_flag_error"
android:contentDescription="@string/com_ovrhere_currConv_USD_name"
/>

Expand All @@ -81,7 +81,7 @@
android:layout_width="wrap_content"
android:layout_height="@dimen/com_ovrhere_currConv_main_spinner_height"
android:minWidth="@dimen/com_ovrhere_currConv_main_spinner_width"
android:layout_below="@+id/com_ovrhere_currConv_main_text_warning"
android:layout_below="@+id/com_ovrhere_currConv_main_progressSpin"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/com_ovrhere_currConv_main_destSpinner_topPadding" />

Expand All @@ -98,6 +98,15 @@
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/com_ovrhere_currConv_warningColor"
/>

<ProgressBar
android:id="@+id/com_ovrhere_currConv_main_progressSpin"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/com_ovrhere_currConv_main_text_warning"
android:layout_centerHorizontal="true"
style="@android:style/Widget.ProgressBar.Small"
/>

<ListView
android:id="@+id/com_ovrhere_currConv_main_listView"
Expand All @@ -108,5 +117,7 @@
android:layout_marginTop="@dimen/com_ovrhere_currConv_main_listView_topPadding"
android:cacheColorHint="@color/com_ovrhere_currConv_listFade"
/>



</RelativeLayout>
2 changes: 1 addition & 1 deletion res/values-v11/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
Base application theme for API 11+. This theme completely replaces
AppBaseTheme from res/values/styles.xml on API 11+ devices.
-->
<style name="AppBaseTheme" parent="Theme.AppCompat.Light">
<style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- API 11 theme customizations can go here. -->
</style>

Expand Down
2 changes: 1 addition & 1 deletion res/values-v14/styles.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
AppBaseTheme from BOTH res/values/styles.xml and
res/values-v11/styles.xml on API 14+ devices.
-->
<style name="AppBaseTheme" parent="Theme.AppCompat.Light">
<style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- API 14 theme customizations can go here. -->
</style>

Expand Down
3 changes: 2 additions & 1 deletion res/values/colors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,8 @@
<!-- Background color -->
<color name="com_ovrhere_currConv_background">#e8f6f7</color>
<!-- Action bar color -->
<color name="com_ovrhere_currConv_actionBar">#BAE6EA</color>
<!-- <color name="com_ovrhere_currConv_actionBar">#BAE6EA</color> -->
<color name="com_ovrhere_currConv_actionBar">#333</color>
<!-- List fade color -->
<color name="com_ovrhere_currConv_listFade">@color/com_ovrhere_currConv_background</color>

Expand Down
38 changes: 36 additions & 2 deletions res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,17 +1,51 @@
<resources>
<!--
Copyright 2014 Jason J.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<resources xmlns:tools="http://schemas.android.com/tools"
xmlns:android="http://schemas.android.com/apk/res/android">

<!--
Base application theme, dependent on API level. This theme is replaced
by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-->
<style name="AppBaseTheme" parent="Theme.AppCompat.Light">
<style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!--
Theme customizations available in newer API levels can go in
res/values-vXX/styles.xml, while customizations related to
backward-compatibility can go here.
-->
</style>
<style name="CustomActionBarTheme"
parent="@style/Theme.AppCompat.Light.DarkActionBar">
<item name="android:windowBackground">@color/com_ovrhere_currConv_background</item>
<item name="android:actionBarStyle" tools:targetApi="11">@style/MyActionBar</item>

<!-- Support library compatibility -->
<item name="actionBarStyle">@style/MyActionBar</item>
</style>

<!-- General styles for the action bar -->
<style name="MyActionBar"
parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<item name="android:windowBackground">@color/com_ovrhere_currConv_background</item>
<item name="android:background">@color/com_ovrhere_currConv_actionBar</item>

<!-- Support library compatibility -->
<item name="background">@color/com_ovrhere_currConv_actionBar</item>
</style>

<!-- Application theme. -->
<style name="AppTheme" parent="AppBaseTheme">
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
Expand Down

0 comments on commit 9cf01e6

Please sign in to comment.