Skip to content

Commit

Permalink
[Rea][Ref]: Renamed all variables to be shorter for readablity
Browse files Browse the repository at this point in the history 
Renamed variables that started "com_ovrhere_currConv_..." to just
"currConv_..." or "currconv_...".
  • Loading branch information
@iamovrhere
iamovrhere committed Oct 7, 2014
1 parent 9ee714e commit f0f0266
Show file tree
Hide file tree
Showing 24 changed files with 206 additions and 206 deletions.
6 changes: 3 additions & 3 deletions res/layout-w720dp/fragment_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,17 +25,17 @@
android:baselineAligned="false"
>
<include layout="@layout/viewstub_main_input_views"
android:id="@+id/com_ovrhere_currConv_main_inputViews"
android:id="@+id/currConv_main_inputViews"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:layout_marginRight="@dimen/activity_horizontal_margin"
/>

<ListView android:id="@+id/com_ovrhere_currConv_main_listView"
<ListView android:id="@+id/currConv_main_listView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1.0"
android:cacheColorHint="@color/com_ovrhere_currConv_listFade"
android:cacheColorHint="@color/currconv_listFade"
/>
</LinearLayout>
16 changes: 8 additions & 8 deletions res/layout/fragment_currency_value.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/com_ovrhere_currConv_frag_currVal"
android:id="@+id/currConv_frag_currVal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
Expand All @@ -28,7 +28,7 @@
>

<TextView
android:id="@+id/com_ovrhere_currConv_frag_currVal_text_symbol"
android:id="@+id/currConv_frag_currVal_text_symbol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
Expand All @@ -38,12 +38,12 @@
android:textAppearance="?android:attr/textAppearanceLarge" />

<TextView
android:id="@+id/com_ovrhere_currConv_frag_currVal_text_currValue"
android:id="@+id/currConv_frag_currVal_text_currValue"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_toLeftOf="@+id/com_ovrhere_currConv_frag_currVal_text_currCode"
android:layout_toRightOf="@+id/com_ovrhere_currConv_frag_currVal_text_symbol"
android:layout_toLeftOf="@+id/currConv_frag_currVal_text_currCode"
android:layout_toRightOf="@+id/currConv_frag_currVal_text_symbol"
android:text="0.00"
android:lines="1"
android:ellipsize="marquee"
Expand All @@ -52,7 +52,7 @@
/>

<ImageView
android:id="@+id/com_ovrhere_currConv_frag_currVal_img_currFlag"
android:id="@+id/currConv_frag_currVal_img_currFlag"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
Expand All @@ -62,12 +62,12 @@
tools:ignore="ContentDescription" />

<TextView
android:id="@+id/com_ovrhere_currConv_frag_currVal_text_currCode"
android:id="@+id/currConv_frag_currVal_text_currCode"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginLeft="10dp"
android:layout_toLeftOf="@+id/com_ovrhere_currConv_frag_currVal_img_currFlag"
android:layout_toLeftOf="@+id/currConv_frag_currVal_img_currFlag"
android:text="XYZ"
android:textAppearance="?android:attr/textAppearanceLarge"
/>
Expand Down
8 changes: 4 additions & 4 deletions res/layout/fragment_main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,16 @@
android:paddingTop="@dimen/activity_vertical_margin"
>
<include layout="@layout/viewstub_main_input_views"
android:id="@+id/com_ovrhere_currConv_main_inputViews"
android:id="@+id/currConv_main_inputViews"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
/>

<ListView android:id="@+id/com_ovrhere_currConv_main_listView"
<ListView android:id="@+id/currConv_main_listView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/com_ovrhere_currConv_main_listView_topPadding"
android:cacheColorHint="@color/com_ovrhere_currConv_listFade" />
android:layout_marginTop="@dimen/currConv_main_listView_topPadding"
android:cacheColorHint="@color/currconv_listFade" />
</LinearLayout>
68 changes: 34 additions & 34 deletions res/layout/viewstub_main_input_views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,94 +21,94 @@
>

<TextView
android:id="@+id/com_ovrhere_currConv_main_text_currSymbol"
android:id="@+id/currConv_main_text_currSymbol"
android:layout_width="wrap_content"
android:layout_height="wrap_content"

android:layout_alignParentLeft="true"
android:layout_alignBaseline="@+id/com_ovrhere_currConv_main_edittext_valueToConv"
android:layout_alignBaseline="@+id/currConv_main_edittext_valueToConv"

android:text="@string/com_ovrhere_currConv_USD_symbol"
android:text="@string/currConv_USD_symbol"
android:textAppearance="?android:attr/textAppearanceLarge" />

<EditText
android:id="@+id/com_ovrhere_currConv_main_edittext_valueToConv"
android:id="@+id/currConv_main_edittext_valueToConv"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
android:lines="1"
android:minWidth="@dimen/com_ovrhere_currConv_main_input_minWidth"
android:minWidth="@dimen/currConv_main_input_minWidth"
android:inputType="numberDecimal"
android:layout_marginTop="@dimen/com_ovrhere_currConv_main_generalPadding"
android:layout_alignTop="@+id/com_ovrhere_currConv_main_spinner_currencySource"
android:layout_alignBottom="@+id/com_ovrhere_currConv_main_spinner_currencySource"
android:layout_toRightOf="@+id/com_ovrhere_currConv_main_text_currSymbol"
android:layout_toLeftOf="@+id/com_ovrhere_currConv_main_spinner_currencySource"
android:layout_marginTop="@dimen/currConv_main_generalPadding"
android:layout_alignTop="@+id/currConv_main_spinner_currencySource"
android:layout_alignBottom="@+id/currConv_main_spinner_currencySource"
android:layout_toRightOf="@+id/currConv_main_text_currSymbol"
android:layout_toLeftOf="@+id/currConv_main_spinner_currencySource"

android:layout_marginLeft="@dimen/com_ovrhere_currConv_main_generalPadding"
android:layout_marginLeft="@dimen/currConv_main_generalPadding"

android:maxLength="100000000001"
/>

<ImageView
android:id="@+id/com_overhere_currConv_main_image_currFlag"
android:id="@+id/currConv_main_image_currFlag"
android:layout_width="wrap_content"
android:layout_height="@dimen/com_ovrhere_currConv_main_sourceFlag_width"
android:layout_height="@dimen/currConv_main_sourceFlag_width"
android:scaleType="fitCenter"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:src="@drawable/ic_flag_error"
android:contentDescription="@string/com_ovrhere_currConv_USD_name"
android:contentDescription="@string/currConv_USD_name"

/>
<!-- Work around to get the image view to appear + disappear
without the spinner jumping left -->
<View android:id="@+id/com_ovrhere_currConv_main_dummyLeft"
<View android:id="@+id/currConv_main_dummyLeft"
android:layout_height="1dp"
android:layout_width="match_parent"
android:layout_toLeftOf="@+id/com_overhere_currConv_main_image_currFlag"
android:layout_toLeftOf="@+id/currConv_main_image_currFlag"
/>

<Spinner
android:id="@+id/com_ovrhere_currConv_main_spinner_currencySource"
android:layout_width="@dimen/com_ovrhere_currConv_main_spinner_width"
android:layout_height="@dimen/com_ovrhere_currConv_main_spinner_height"
android:layout_marginLeft="@dimen/com_ovrhere_currConv_main_generalPadding"
android:layout_marginRight="@dimen/com_ovrhere_currConv_main_generalPadding"
android:layout_alignTop="@+id/com_overhere_currConv_main_image_currFlag"
android:layout_alignRight="@+id/com_ovrhere_currConv_main_dummyLeft"
android:id="@+id/currConv_main_spinner_currencySource"
android:layout_width="@dimen/currConv_main_spinner_width"
android:layout_height="@dimen/currConv_main_spinner_height"
android:layout_marginLeft="@dimen/currConv_main_generalPadding"
android:layout_marginRight="@dimen/currConv_main_generalPadding"
android:layout_alignTop="@+id/currConv_main_image_currFlag"
android:layout_alignRight="@+id/currConv_main_dummyLeft"

/>


<Spinner
android:id="@+id/com_ovrhere_currConv_main_spinner_currencyDest"
android:id="@+id/currConv_main_spinner_currencyDest"
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_progressSpin"
android:layout_height="@dimen/currConv_main_spinner_height"
android:minWidth="@dimen/currConv_main_spinner_width"
android:layout_below="@+id/currConv_main_progressSpin"
android:layout_centerHorizontal="true"
android:layout_marginTop="@dimen/com_ovrhere_currConv_main_destSpinner_topPadding" />
android:layout_marginTop="@dimen/currConv_main_destSpinner_topPadding" />



<TextView
android:id="@+id/com_ovrhere_currConv_main_text_warning"
android:id="@+id/currConv_main_text_warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/com_ovrhere_currConv_main_spinner_currencySource"
android:layout_below="@+id/currConv_main_spinner_currencySource"
android:layout_centerHorizontal="true"
android:text="@string/com_ovrhere_currConv_cachedRate_warning"
android:text="@string/currConv_cachedRate_warning"
android:gravity="center"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="@color/com_ovrhere_currConv_warningColor"
android:textColor="@color/currconv_warningColor"
/>

<ProgressBar
android:id="@+id/com_ovrhere_currConv_main_progressSpin"
android:id="@+id/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_below="@+id/currConv_main_text_warning"
android:layout_centerHorizontal="true"
style="@android:style/Widget.ProgressBar.Small"
/>
Expand Down
2 changes: 1 addition & 1 deletion res/values-normal/limits.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
This is the setting for LARGER devices -->
<eat-comment />
<!-- True for wider devices. -->
<item name="com_ovrhere_currConv_showFlags" type="bool"
<item name="currconv_showflags" type="bool"
>1</item>
</resources>
2 changes: 1 addition & 1 deletion res/values-small-land/limits.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
This is the setting for LARGER devices -->
<eat-comment />
<!-- True for wider devices. -->
<item name="com_ovrhere_currConv_showFlags" type="bool"
<item name="currconv_showflags" type="bool"
>1</item>
</resources>
2 changes: 1 addition & 1 deletion res/values-w320dp/limits.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
This is the setting for LARGER devices -->
<eat-comment />
<!-- True for wider devices. -->
<item name="com_ovrhere_currConv_showFlags" type="bool"
<item name="currconv_showflags" type="bool"
>1</item>
</resources>
16 changes: 8 additions & 8 deletions res/values/colors.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,23 @@
-->
<resources>
<!-- The approximation of black for this project. -->
<color name="com_ovrhere_currConv_black">#080808</color>
<color name="currConv_black">#080808</color>

<!-- Background color -->
<color name="com_ovrhere_currConv_background">#e8f6f7</color>
<color name="currconv_background">#e8f6f7</color>
<!-- Action bar color -->
<!-- <color name="com_ovrhere_currConv_actionBar">#BAE6EA</color> -->
<color name="com_ovrhere_currConv_actionBar">#333</color>
<!-- <color name="currConv_actionBar">#BAE6EA</color> -->
<color name="currconv_actionBar">#333</color>
<!-- List fade color -->
<color name="com_ovrhere_currConv_listFade">@color/com_ovrhere_currConv_background</color>
<color name="currconv_listFade">@color/currconv_background</color>

<!-- The colour used for warnings. -->
<color name="com_ovrhere_currConv_warningColor">#aa1111</color>
<color name="currconv_warningColor">#aa1111</color>

<!-- Currency output list colours: The colour for even rows.
Starting at 2nd row. -->
<color name="com_ovrhere_currConv_outputEven">#99c6f1f4</color>
<color name="currconv_outputEven">#99c6f1f4</color>
<!-- Currency output list colours: The colour for odd rows.
Starting in first row. Transparent-->
<color name="com_ovrhere_currConv_outputOdd">#0fff</color>
<color name="currconv_outputOdd">#0fff</color>
</resources>
20 changes: 10 additions & 10 deletions res/values/currency_codes_symbols.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,28 +30,28 @@
<!-- Short codes first. -->
<eat-comment />
<!-- The code for USD -->
<string name="com_ovrhere_currConv_USD_code" >USD</string>
<string name="currConv_USD_code" >USD</string>
<!-- The code for CAD -->
<string name="com_ovrhere_currConv_CAD_code" >CAD</string>
<string name="currConv_CAD_code" >CAD</string>
<!-- The code for EUR -->
<string name="com_ovrhere_currConv_EUR_code" >EUR</string>
<string name="currConv_EUR_code" >EUR</string>
<!-- The code for GBP -->
<string name="com_ovrhere_currConv_GBP_code" >GBP</string>
<string name="currConv_GBP_code" >GBP</string>
<!-- The code for JPY -->
<string name="com_ovrhere_currConv_JPY_code" >JPY</string>
<string name="currConv_JPY_code" >JPY</string>

<!-- Symbols most symbols not required. -->
<eat-comment />
<!-- The symbol for USD -->
<string name="com_ovrhere_currConv_USD_symbol" >$</string>
<string name="currConv_USD_symbol" >$</string>
<!-- The symbol for CAD -->
<string name="com_ovrhere_currConv_CAD_symbol" >$</string>
<string name="currConv_CAD_symbol" >$</string>
<!-- The symbol for EUR -->
<string name="com_ovrhere_currConv_EUR_symbol" >€</string>
<string name="currConv_EUR_symbol" >€</string>
<!-- The symbol for GBP -->
<string name="com_ovrhere_currConv_GBP_symbol" >£</string>
<string name="currConv_GBP_symbol" >£</string>
<!-- The symbol for JPY -->
<string name="com_ovrhere_currConv_JPY_symbol" >¥</string>
<string name="currConv_JPY_symbol" >¥</string>

<!-- Long names. Migrated to strings.xml for translation purposes -->
<eat-comment />
Expand Down
34 changes: 17 additions & 17 deletions res/values/default_exchange_rates.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,29 +21,29 @@

<!-- The currency update time (UTC/GMT) for default values.
Should be of the form "yyyy-mm-dd hh:mm:ss.SSS+0000" -->
<item name="com_ovrhere_currConv_defRate_updateTime"
<item name="currConv_defRate_updateTime"
format="string" type="string" >2014-09-08 19:08:14.000+0000</item>

<!-- The order of the rates given for all default rates. -->
<string-array name="com_ovrhere_currConv_rateOrder" >
<item >@string/com_ovrhere_currConv_USD_code</item>
<item >@string/com_ovrhere_currConv_CAD_code</item>
<item >@string/com_ovrhere_currConv_EUR_code</item>
<item >@string/com_ovrhere_currConv_GBP_code</item>
<item >@string/com_ovrhere_currConv_JPY_code</item>
<string-array name="currConv_rateOrder" >
<item >@string/currConv_USD_code</item>
<item >@string/currConv_CAD_code</item>
<item >@string/currConv_EUR_code</item>
<item >@string/currConv_GBP_code</item>
<item >@string/currConv_JPY_code</item>
</string-array>

<!-- The rates from USD -> currencies in com_ovrhere_currConv_rateOrder -->
<string-array name="com_ovrhere_currConv_USD_defRates" >
<!-- The rates from USD -> currencies in currConv_rateOrder -->
<string-array name="currConv_USD_defRates" >
<item format="float">1.00</item> <!-- USD -->
<item format="float">1.0967</item> <!-- CAD -->
<item format="float">0.7750</item> <!-- EUR -->
<item format="float">0.6205</item> <!-- GBP -->
<item format="float">105.9535</item> <!-- JPY -->
</string-array>

<!-- The rates from CAD -> currencies in com_ovrhere_currConv_rateOrder -->
<string-array name="com_ovrhere_currConv_CAD_defRates" >
<!-- The rates from CAD -> currencies in currConv_rateOrder -->
<string-array name="currConv_CAD_defRates" >
<item format="float">0.9118</item> <!-- USD -->
<item format="float">1.00</item> <!-- CAD -->
<item format="float">0.7067</item> <!-- EUR -->
Expand All @@ -52,8 +52,8 @@
</string-array>


<!-- The rates from EUR -> currencies in com_ovrhere_currConv_rateOrder -->
<string-array name="com_ovrhere_currConv_EUR_defRates" >
<!-- The rates from EUR -> currencies in currConv_rateOrder -->
<string-array name="currConv_EUR_defRates" >
<item format="float">1.2903</item> <!-- USD -->
<item format="float">1.4151</item> <!-- CAD -->
<item format="float">1.00</item> <!-- EUR -->
Expand All @@ -62,8 +62,8 @@
</string-array>


<!-- The rates from GBP -> currencies in com_ovrhere_currConv_rateOrder -->
<string-array name="com_ovrhere_currConv_GBP_defRates" >
<!-- The rates from GBP -> currencies in currConv_rateOrder -->
<string-array name="currConv_GBP_defRates" >
<item format="float">1.6116</item> <!-- USD -->
<item format="float">1.7675</item> <!-- CAD -->
<item format="float">1.2490</item> <!-- EUR -->
Expand All @@ -72,8 +72,8 @@
</string-array>


<!-- The rates from JPY -> currencies in com_ovrhere_currConv_rateOrder -->
<string-array name="com_ovrhere_currConv_JPY_defRates" >
<!-- The rates from JPY -> currencies in currConv_rateOrder -->
<string-array name="currConv_JPY_defRates" >
<item format="float">0.0094</item> <!-- USD -->
<item format="float">0.0104</item> <!-- CAD -->
<item format="float">0.0073</item> <!-- EUR -->
Expand Down
Loading

0 comments on commit f0f0266

Please sign in to comment.