agorise
/
crystal-wallet-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

New unit test implementation github style for some UI implementations

master
dtvv 2018-08-23 23:45:15 -05:00
parent 096171f327
commit 1fce05145d
4 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/src/main/AndroidManifest.xml
View File

@ -17,7 +17,7 @@
android:supportsRtl="true"
android:configChanges="locale"
android:theme="@style/AppTheme">
<activity android:name=".tests.activities.dialogs.Test_CrystalDialogActivity">
<activity android:name=".activities.LicenseActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -92,8 +92,16 @@
<!--Test activities-->
<activity android:name=".tests.activities.dialogs.Test_DialogMaterialActivity">
</activity>
<!--<activity android:name=".activities.Test_CrystalDialogActivity">
</activity>-->
<activity android:name=".tests.activities.dialogs.Test_LoadingActivity">
</activity>
<activity android:name=".tests.activities.dialogs.Test_CrystalDialogActivity">
</activity>
<activity android:name=".tests.activities.dialogs.Test_GIFActivity">
</activity>
<activity android:name=".tests.activities.dialogs.Test_ToastActivity">
</activity>
<activity android:name=".tests.activities.dialogs.Test_VideoActivity">
</activity>
</application>

8
app/src/main/java/cy/agorise/crystalwallet/activities/BoardActivity.java
View File

@ -47,6 +47,7 @@ import cy.agorise.crystalwallet.fragments.ContactsFragment;
import cy.agorise.crystalwallet.fragments.ReceiveTransactionFragment;
import cy.agorise.crystalwallet.fragments.SendTransactionFragment;
import cy.agorise.crystalwallet.fragments.TransactionsFragment;
import cy.agorise.crystalwallet.views.natives.GIFView;
import de.hdodenhof.circleimageview.CircleImageView;
import cy.agorise.crystalwallet.viewmodels.CryptoNetBalanceListViewModel;
@ -73,7 +74,7 @@ public class BoardActivity extends CustomActivity {
public FloatingActionButton fabAddContact;
@BindView(R.id.imagevieGIF)
public ImageView imagevieGIF;
public GIFView imagevieGIF;
public BoardPagerAdapter boardAdapter;
@ -112,9 +113,8 @@ public class BoardActivity extends CustomActivity {
/*
* Set the bubbles animation
* */
final RequestOptions options = new RequestOptions();
options.centerCrop();
Glide.with(this).asGif().load(R.raw.burbujas).apply(options).into(imagevieGIF);
imagevieGIF.centerCrop();
imagevieGIF.load(R.raw.burbujas);
/*
* Listener tabLayout to resalt text when clicked

19
app/src/main/java/cy/agorise/crystalwallet/network/WebSocketThread.java
View File

@ -156,13 +156,6 @@ public class WebSocketThread extends Thread {
canChange = false;
/*
* Show the loading activity so user can see the progress
* */
if(activity!=null){
LoadingActivity.show(activity);
}
// Moves the current Thread into the background
android.os.Process.setThreadPriority(android.os.Process.THREAD_PRIORITY_BACKGROUND);
@ -180,13 +173,6 @@ public class WebSocketThread extends Thread {
WebSocketThread.currentThreads.put(this.getId(),this);
mWebSocket.connect();
/*
* Hide the loading activity, now it is not more necesary
* */
if(activity!=null){
LoadingActivity.dismiss();
}
/*
*
* Websocket success response
@ -198,11 +184,6 @@ public class WebSocketThread extends Thread {
} catch (final Exception e) {
Log.e(TAG, "WebSocketException. Msg: "+e.getMessage());
/*
* Hide the loading activity, now it is not more necesary
* */
LoadingActivity.dismiss();
//Deliver error to user
if(activity!=null){

2
app/src/main/res/layout/board.xml
View File

@ -31,7 +31,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
<ImageView
<cy.agorise.crystalwallet.views.natives.GIFView
android:id="@+id/imagevieGIF"
android:layout_width="match_parent"
android:layout_height="match_parent"