diff --git a/app/src/main/java/io/syng/activity/BaseActivity.java b/app/src/main/java/io/syng/activity/BaseActivity.java index 52532f8..39795f3 100644 --- a/app/src/main/java/io/syng/activity/BaseActivity.java +++ b/app/src/main/java/io/syng/activity/BaseActivity.java @@ -51,9 +51,7 @@ import static android.view.View.VISIBLE; public abstract class BaseActivity extends AppCompatActivity implements OnClickListener, OnDAppClickListener, OnProfileClickListener, OnLongClickListener, ProfilesChangeListener { - -// private static final Logger logger = LoggerFactory.getLogger("SyngApplication"); - + private static final int DRAWER_CLOSE_DELAY_SHORT = 200; private static final int DRAWER_CLOSE_DELAY_LONG = 400; diff --git a/app/src/main/java/io/syng/fragment/ConsoleFragment.java b/app/src/main/java/io/syng/fragment/ConsoleFragment.java index 5190fe3..e4432c2 100644 --- a/app/src/main/java/io/syng/fragment/ConsoleFragment.java +++ b/app/src/main/java/io/syng/fragment/ConsoleFragment.java @@ -11,12 +11,12 @@ import android.support.v4.app.Fragment; import android.text.method.ScrollingMovementMethod; import android.view.LayoutInflater; import android.view.View; +import android.view.View.OnClickListener; import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; import com.bumptech.glide.Glide; -import com.getbase.floatingactionbutton.FloatingActionButton; import com.squareup.leakcanary.RefWatcher; import org.ethereum.android.service.ConnectorHandler; @@ -42,7 +42,7 @@ import io.syng.app.SyngApplication; import io.syng.entity.LogEntry; -public class ConsoleFragment extends Fragment implements ConnectorHandler, View.OnClickListener { +public class ConsoleFragment extends Fragment implements ConnectorHandler, OnClickListener { private static final String ACTION_RECEIVE = "dapp://syng.io/dapps/wallet/#/tab/receive"; private static final String ACTION_SEND = "dapp://syng.io/dapps/wallet/#/tab/send/"; @@ -93,13 +93,8 @@ public class ConsoleFragment extends Fragment implements ConnectorHandler, View. Glide.with(this).load(R.drawable.syng_text).into(syngText); Glide.with(this).load(R.drawable.syng_logo).into(syngLogo); - FloatingActionButton fabSend = (FloatingActionButton)view.findViewById(R.id.fab_send); -// fabSend.setTitle("Send"); - fabSend.setOnClickListener(this); - - FloatingActionButton fabReceive = (FloatingActionButton)view.findViewById(R.id.fab_receive); -// fabReceive.setTitle("Receive"); - fabReceive.setOnClickListener(this); + view.findViewById(R.id.fab_send).setOnClickListener(this); + view.findViewById(R.id.fab_receive).setOnClickListener(this); return view; } diff --git a/app/src/main/res/drawable/fab_label_background.xml b/app/src/main/res/drawable/fab_label_background.xml new file mode 100644 index 0000000..5860560 --- /dev/null +++ b/app/src/main/res/drawable/fab_label_background.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/style-test.xml b/app/src/main/res/values/style-test.xml index f430f86..51fee9e 100644 --- a/app/src/main/res/values/style-test.xml +++ b/app/src/main/res/values/style-test.xml @@ -28,8 +28,8 @@ \ No newline at end of file