Skip to content

Commit

Permalink
version 1.5.14 release
Browse files Browse the repository at this point in the history 
New in version 1.5.14
- Added exchange history log
- Can send alt-coins from bitcoin wallet and vise-versa
- Make exchange rates appear faster in the UI
- Fix rare crash when viewing the exchange status of Peercoin or NuBits
  • Loading branch information
@erasmospunk
erasmospunk committed Apr 29, 2015
1 parent 65c924c commit f306fe9
Show file tree
Hide file tree
Showing 8 changed files with 238 additions and 437 deletions.
6 changes: 6 additions & 0 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -79,6 +79,12 @@ For now test it manually by installing it `adb install -r wallet/wallet-release.

## Version history

New in version 1.5.14
- Added exchange history log
- Can send alt-coins from bitcoin wallet and vise-versa
- Make exchange rates appear faster in the UI
- Fix rare crash when viewing the exchange status of Peercoin or NuBits

New in version 1.5.13
- Integrated exchange (beta)
- Rebranding of Darkcoin to Dash
Expand Down
2 changes: 1 addition & 1 deletion wallet/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
android:name="com.coinomi.wallet.ui.SignTransactionActivity"
android:screenOrientation="portrait"
android:theme="@style/AppThemeNoTitleBar"
android:windowSoftInputMode="adjustResize" >
android:windowSoftInputMode="stateHidden" >
</activity>
<activity
android:name="com.coinomi.wallet.ui.ScanActivity"
Expand Down
5 changes: 0 additions & 5 deletions wallet/src/main/java/com/coinomi/wallet/WalletApplication.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,6 @@
import com.coinomi.wallet.util.LinuxSecureRandom;
import com.coinomi.wallet.util.NetworkUtils;
import com.google.common.collect.ImmutableList;
import com.squareup.okhttp.Cache;
import com.squareup.okhttp.ConnectionSpec;
import com.squareup.okhttp.OkHttpClient;

import org.acra.annotation.ReportsCrashes;
import org.acra.sender.HttpSender;
Expand All @@ -42,10 +39,8 @@
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.concurrent.TimeUnit;

import javax.annotation.Nullable;

Expand Down
1 change: 1 addition & 0 deletions wallet/src/main/java/com/coinomi/wallet/ui/BaseWalletActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ public Configuration getConfiguration() {
public void replaceFragment(Fragment fragment, int container) {
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();

transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
// Replace whatever is in the fragment_container view with this fragment,
// and add the transaction to the back stack so the user can navigate back
transaction.replace(container, fragment);
Expand Down
1 change: 1 addition & 0 deletions wallet/src/main/java/com/coinomi/wallet/ui/SignTransactionActivity.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ public void onSignResult(final @Nullable Exception error, final @Nullable Exchan
finish();
} else {
FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
transaction.setTransition(FragmentTransaction.TRANSIT_FRAGMENT_FADE);
transaction.replace(R.id.container, TradeStatusFragment.newInstance(exchange, true));
transaction.commit();
}
Expand Down
140 changes: 66 additions & 74 deletions wallet/src/main/res/layout/fragment_make_transaction.xml
View file
Original file line number Diff line number Diff line change
@@ -1,100 +1,92 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:coinomi="http://schemas.android.com/apk/res-auto"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.coinomi.wallet.ui.MakeTransactionFragment">
android:fillViewport="true">


<ScrollView
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin">

<TextView
android:id="@+id/transaction_info"
style="@style/NormalText"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="0.2"
android:gravity="bottom"
tools:text="@string/tx_confirm_timer_message" />

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="0dp"
android:layout_weight="0.8"
android:gravity="center_vertical"
android:orientation="vertical"
android:paddingBottom="@dimen/activity_vertical_margin"
android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin">

<TextView
android:id="@+id/transaction_info"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="0.2"
android:gravity="bottom"
tools:text="@string/tx_confirm_timer_message"
style="@style/NormalText" />
<com.coinomi.wallet.ui.widget.TransactionAmountVisualizer
android:id="@+id/transaction_amount_visualizer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_margin"
android:gravity="center_vertical" />

<LinearLayout
<com.coinomi.wallet.ui.widget.SendOutput
android:id="@+id/transaction_trade_withdraw"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.8"
android:paddingTop="@dimen/activity_vertical_margin"
android:paddingBottom="@dimen/activity_vertical_margin"
android:gravity="center_vertical"
android:orientation="vertical">
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="@dimen/standard_margin" />

<com.coinomi.wallet.ui.widget.TransactionAmountVisualizer
android:id="@+id/transaction_amount_visualizer"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/standard_margin"
android:gravity="center_vertical" />
</LinearLayout>

<com.coinomi.wallet.ui.widget.SendOutput
android:id="@+id/transaction_trade_withdraw"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/standard_margin"
android:layout_gravity="center_vertical" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">

</LinearLayout>
<TextView
android:id="@+id/enter_password_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/enter_password"
android:textAppearance="?android:attr/textAppearanceMedium" />

<LinearLayout
<EditText
android:id="@+id/password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:ems="10"
android:inputType="textPassword" />

<TextView
android:id="@+id/enter_password_label"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/enter_password"
android:textAppearance="?android:attr/textAppearanceMedium" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="bottom">

<EditText
android:id="@+id/password"
android:layout_width="match_parent"
<Button
android:id="@+id/button_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ems="10"
android:inputType="textPassword" />
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:text="@string/button_confirm" />

<RelativeLayout
android:layout_width="match_parent"
<include
layout="@layout/powered_by_shapeshift"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="bottom">

<Button
android:id="@+id/button_confirm"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:text="@string/button_confirm" />

<include
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:layout_alignBottom="@id/button_confirm"
layout="@layout/powered_by_shapeshift"/>
</RelativeLayout>
</LinearLayout>
android:layout_alignBottom="@id/button_confirm"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true" />
</RelativeLayout>
</LinearLayout>
</ScrollView>
</FrameLayout>
</LinearLayout>
</ScrollView>
Loading

0 comments on commit f306fe9

Please sign in to comment.