Skip to content

Commit

Permalink
Resolved master conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@nattyco
nattyco committed Oct 18, 2016
1 parent bd45277 commit a18d21b
Show file tree
Hide file tree
Showing 4 changed files with 33 additions and 38 deletions.
2 changes: 1 addition & 1 deletion ...ter/incoming_crypto/developer/bitdubai/version_1/IncomingCryptoTransactionPluginRoot.java
View file
Expand Up @@ -87,7 +87,7 @@ public class IncomingCryptoTransactionPluginRoot extends AbstractPlugin implemen
@NeededPluginReference(platform = Platforms.BLOCKCHAINS , layer = Layers.CRYPTO_NETWORK , plugin = Plugins.BITCOIN_NETWORK)
private TransactionSender<CryptoTransaction> bitcoinNetworkManager;

@NeededPluginReference(platform = Platforms.BLOCKCHAINS , layer = Layers.CRYPTO_NETWORK , plugin = Plugins.FERMAT_NETWORK)
//@NeededPluginReference(platform = Platforms.BLOCKCHAINS , layer = Layers.CRYPTO_NETWORK , plugin = Plugins.FERMAT_NETWORK)
private TransactionSender<CryptoTransaction> fermatNetworkManager;

static Map<String, LogLevel> newLoggingLevel = new HashMap<String, LogLevel>();
Expand Down
9 changes: 6 additions & 3 deletions ...a/com/bitdubai/sub_app/intra_user_community/fragmentFactory/IntraUserFragmentFactory.java
View file
Expand Up @@ -6,8 +6,10 @@
import com.bitdubai.fermat_android_api.layer.definition.wallet.interfaces.ReferenceAppFermatSession;
import com.bitdubai.fermat_ccp_api.layer.module.intra_user.interfaces.IntraUserModuleManager;
import com.bitdubai.fermat_pip_api.layer.network_service.subapp_resources.SubAppResourcesProviderManager;
import com.bitdubai.sub_app.intra_user_community.fragments.BrowserTabFragment;
import com.bitdubai.sub_app.intra_user_community.fragments.ConnectionNotificationsFragment;
import com.bitdubai.sub_app.intra_user_community.fragments.ConnectionOtherProfileFragment;
import com.bitdubai.sub_app.intra_user_community.fragments.ConnectionTabListFragment;
import com.bitdubai.sub_app.intra_user_community.fragments.ConnectionsListFragment;
import com.bitdubai.sub_app.intra_user_community.fragments.ConnectionsWorldFragment;

Expand All @@ -27,7 +29,7 @@ public AbstractFermatFragment getFermatFragment(IntraUserFragmentsEnumType fragm

switch (fragments) {
case CWP_WALLET_STORE_ALL_FRAGMENT:
currentFragment = ConnectionsWorldFragment.newInstance();
currentFragment = BrowserTabFragment.newInstance(); //ConnectionsWorldFragment.newInstance();
break;
case CCP_SUB_APP_INTRA_USER_COMMUNITY_CONNECTION_DETAIL_FRAGMENT:
currentFragment = null;
Expand All @@ -39,10 +41,11 @@ public AbstractFermatFragment getFermatFragment(IntraUserFragmentsEnumType fragm
currentFragment = ConnectionOtherProfileFragment.newInstance();
break;
case CCP_SUB_APP_INTRA_USER_COMMUNITY_CONNECTION_WORLD_FRAGMENT:
currentFragment = ConnectionsWorldFragment.newInstance();
currentFragment = BrowserTabFragment.newInstance();
//currentFragment = ConnectionsWorldFragment.newInstance();
break;
case CCP_SUB_APP_INTRA_USER_COMMUNITY_CONNECTION_FRIEND_LIST_FRAGMENT:
currentFragment = ConnectionsListFragment.newInstance();
currentFragment = ConnectionTabListFragment.newInstance();
break;
default:
throw new FragmentNotFoundException("Fragment not found", new Exception(), fragments.toString(), "Swith failed");
Expand Down
12 changes: 6 additions & 6 deletions ...src/main/java/com/bitdubai/sub_app/intra_user_community/fragments/BrowserTabFragment.java
View file
Expand Up @@ -225,13 +225,13 @@ public void run() {

if(location!=null){
if(location.getLatitude() == 0)
// showErrorGPS();
Toast.makeText(getActivity(), getResources().getString(R.string.turn_on_gps), Toast.LENGTH_SHORT);
// showErrorGPS();
Toast.makeText(getActivity(), getResources().getString(R.string.turn_on_gps), Toast.LENGTH_SHORT);
else
//update profile to reresh location
if(!location.getLatitude().equals(identity.getLocation().getLatitude()) )
moduleManager.updateIntraUserIdentity(identity.getPublicKey(),identity.getAlias(),"",
identity.getProfileImage(), identity.getAccuracy(),identity.getFrequency(),location);
//update profile to reresh location
if(!location.getLatitude().equals(identity.getLocation().getLatitude()) )
moduleManager.updateIntraUserIdentity(identity.getPublicKey(),identity.getAlias(),"",
identity.getProfileImage(), identity.getAccuracy(),identity.getFrequency(),location);
}


Expand Down
48 changes: 20 additions & 28 deletions ...p-intra-wallet-user-community-bitdubai/src/main/res/layout/fragment_connections_world.xml
View file
Expand Up @@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#010c12"
android:background="#FFF"
android:gravity="center"
android:orientation="vertical">

Expand All @@ -12,24 +12,24 @@
android:layout_height="1dp"
android:background="#ffffff" />

<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe"
<android.support.v4.widget.SwipeRefreshLayout
android:id="@+id/swipe"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="2dp"
android:paddingEnd="1dp"
android:paddingLeft="1dp"
android:paddingRight="1dp"
android:paddingStart="1dp">

<android.support.v7.widget.RecyclerView
android:id="@+id/gridView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingBottom="2dp"
android:paddingEnd="1dp"
android:paddingLeft="1dp"
android:paddingRight="1dp"
android:paddingStart="1dp">
android:layout_margin="0.5dp"
tools:listitem="@layout/row_connections_world" />

<android.support.v7.widget.RecyclerView
android:id="@+id/gridView"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_margin="0.5dp"
tools:listitem="@layout/row_connections_world" />

</android.support.v4.widget.SwipeRefreshLayout>
</android.support.v4.widget.SwipeRefreshLayout>

<LinearLayout
android:id="@+id/search_empty_view"
Expand Down Expand Up @@ -77,24 +77,16 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:src="@drawable/img_home_empty"
android:src="@drawable/nousergray_icon"
tools:ignore="ContentDescription" />

<com.bitdubai.fermat_android_api.layer.definition.wallet.views.FermatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="10dp"
android:text="There are no users"
android:textColor="#ffffff"
android:textSize="16sp"
tools:ignore="HardcodedText" />

<com.bitdubai.fermat_android_api.layer.definition.wallet.views.FermatTextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="available"
android:textColor="#ffffff"
android:textSize="16sp"
android:text="NO USERS"
android:textColor="#b7b7b7"
android:textSize="21sp"
tools:ignore="HardcodedText" />

</LinearLayout>
Expand Down

0 comments on commit a18d21b

Please sign in to comment.