Browse Source

Update connection + disconnect, add Settings UI

connman
Aditya Kulkarni 6 years ago
parent
commit
84cecf1094
  1. 2
      app/src/main/java/com/adityapk/zcash/zqwandroid/DataModel.kt
  2. 30
      app/src/main/java/com/adityapk/zcash/zqwandroid/MainActivity.kt
  3. 28
      app/src/main/java/com/adityapk/zcash/zqwandroid/ScrollingActivity.kt
  4. 17
      app/src/main/java/com/adityapk/zcash/zqwandroid/SettingsActivity.kt
  5. 48
      app/src/main/res/layout/activity_scrolling.xml
  6. 35
      app/src/main/res/layout/activity_settings.xml
  7. 18
      app/src/main/res/layout/content_scrolling.xml
  8. 9
      app/src/main/res/menu/menu_scrolling.xml
  9. 90
      app/src/main/res/values/strings.xml

2
app/src/main/java/com/adityapk/zcash/zqwandroid/DataModel.kt

@ -41,7 +41,7 @@ object DataModel {
}
}
fun setConnString(value: String, context: Context) {
fun setConnString(value: String?, context: Context) {
val settings = context.getSharedPreferences("ConnInfo", 0)
val editor = settings.edit()
editor.putString("connstring", value)

30
app/src/main/java/com/adityapk/zcash/zqwandroid/MainActivity.kt

@ -88,15 +88,18 @@ class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInte
// Attempt a connection to the server. If there is no saved connection, we'll set the connection status
// to None
private fun makeConnection() {
if (connStatus == ConnectionStatus.CONNECTED || connStatus == ConnectionStatus.CONNECTING) {
return
}
val connString = DataModel.getConnString(applicationContext)
if (connString.isNullOrBlank()) {
// The user might have just disconnected, so make sure we are disconnected
ws?.close(1000, "disconnected")
return
}
// If already connected, then nothing else is to be done.
if (connStatus == ConnectionStatus.CONNECTED || connStatus == ConnectionStatus.CONNECTING) {
return
}
// Update status to connecting, so we can update the UI
connStatus = ConnectionStatus.CONNECTING
@ -106,6 +109,7 @@ class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInte
val listener = EchoWebSocketListener()
ws = client.newWebSocket(request, listener)
updateUI()
}
@ -241,11 +245,21 @@ class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInte
// automatically handle clicks on the Home/Up button, so long
// as you specify a parent activity in AndroidManifest.xml.
return when (item.itemId) {
R.id.action_settings -> true
R.id.action_settings -> {
val intent = Intent(this, SettingsActivity::class.java)
startActivity(intent)
return true
}
else -> super.onOptionsItemSelected(item)
}
}
override fun onResume() {
makeConnection()
makeAPICalls()
super.onResume()
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
when(requestCode) {
QrReaderActivity.REQUEST_CONNDATA -> {
@ -269,12 +283,11 @@ class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInte
private fun disconnected() {
connStatus = ConnectionStatus.DISCONNECTED
DataModel.clear()
updateUI()
}
private inner class EchoWebSocketListener : WebSocketListener() {
private val NORMAL_CLOSURE_STATUS = 1000
private val TAG = "MainActivity"
override fun onOpen(webSocket: WebSocket, response: Response) {
Log.d(TAG, "Opened Websocket")
@ -292,7 +305,7 @@ class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInte
}
override fun onClosing(webSocket: WebSocket, code: Int, reason: String?) {
webSocket.close(NORMAL_CLOSURE_STATUS, null)
webSocket.close(1000, null)
Log.i(TAG,"Closing : $code / $reason")
disconnected()
}
@ -303,4 +316,5 @@ class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInte
}
}
private val TAG = "MainActivity"
}

28
app/src/main/java/com/adityapk/zcash/zqwandroid/ScrollingActivity.kt

@ -1,28 +0,0 @@
package com.adityapk.zcash.zqwandroid
import android.os.Bundle
import android.support.design.widget.FloatingActionButton
import android.support.design.widget.Snackbar
import android.support.v7.app.AppCompatActivity
import android.support.v7.widget.Toolbar
import android.view.View
class ScrollingActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
title = "Scrolling"
setContentView(R.layout.activity_scrolling)
val toolbar = findViewById<View>(R.id.toolbar) as Toolbar
setSupportActionBar(toolbar)
val fab = findViewById<View>(R.id.fab) as FloatingActionButton
fab.setOnClickListener { view ->
Snackbar.make(view, "Replace with your own action", Snackbar.LENGTH_LONG)
.setAction("Action", null).show()
}
supportActionBar!!.setDisplayHomeAsUpEnabled(true)
}
}

17
app/src/main/java/com/adityapk/zcash/zqwandroid/SettingsActivity.kt

@ -0,0 +1,17 @@
package com.adityapk.zcash.zqwandroid
import android.support.v7.app.AppCompatActivity
import android.os.Bundle
import kotlinx.android.synthetic.main.activity_settings.*
class SettingsActivity : AppCompatActivity() {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_settings)
btnDisconnect.setOnClickListener {
DataModel.setConnString(null, applicationContext)
}
}
}

48
app/src/main/res/layout/activity_scrolling.xml

@ -1,48 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".ScrollingActivity">
<android.support.design.widget.AppBarLayout
android:id="@+id/app_bar"
android:fitsSystemWindows="true"
android:layout_height="@dimen/app_bar_height"
android:layout_width="match_parent"
android:theme="@style/AppTheme.AppBarOverlay">
<android.support.design.widget.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
android:fitsSystemWindows="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:toolbarId="@+id/toolbar"
app:layout_scrollFlags="scroll|exitUntilCollapsed"
app:contentScrim="?attr/colorPrimary">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_height="?attr/actionBarSize"
android:layout_width="match_parent"
app:layout_collapseMode="pin"
app:popupTheme="@style/AppTheme.PopupOverlay"/>
</android.support.design.widget.CollapsingToolbarLayout>
</android.support.design.widget.AppBarLayout>
<include layout="@layout/content_scrolling"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/fab_margin"
app:layout_anchor="@id/app_bar"
app:layout_anchorGravity="bottom|end"
app:srcCompat="@android:drawable/ic_dialog_email" app:elevation="0dp"/>
</android.support.design.widget.CoordinatorLayout>

35
app/src/main/res/layout/activity_settings.xml

@ -0,0 +1,35 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".SettingsActivity">
<android.support.constraint.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent" android:id="@+id/scrollView2"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintBottom_toBottomOf="parent">
<LinearLayout android:layout_width="0dp" android:layout_height="wrap_content"
android:orientation="vertical"
android:id="@+id/linearLayout" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintBottom_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"/>
<TextView
android:text="Connected To 192.168.5.148"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/textView"
app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="16dp"
app:layout_constraintStart_toStartOf="parent" android:layout_marginStart="16dp"/>
<Button
android:text="Disconnect"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/btnDisconnect"
app:layout_constraintTop_toBottomOf="@+id/textView" android:layout_marginEnd="16dp"
app:layout_constraintEnd_toEndOf="parent"/>
</android.support.constraint.ConstraintLayout>
</android.support.constraint.ConstraintLayout>

18
app/src/main/res/layout/content_scrolling.xml

@ -1,18 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<android.support.v4.widget.NestedScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_scrolling"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".ScrollingActivity">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_margin="@dimen/text_margin"
android:text="@string/large_text"/>
</android.support.v4.widget.NestedScrollView>

9
app/src/main/res/menu/menu_scrolling.xml

@ -1,9 +0,0 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:context="com.adityapk.zcash.zqwandroid.ScrollingActivity">
<item android:id="@+id/action_settings"
android:title="@string/action_settings"
android:orderInCategory="100"
app:showAsAction="never"/>
</menu>

90
app/src/main/res/values/strings.xml

@ -2,95 +2,7 @@
<string name="app_name">zec-qt-wallet-android</string>
<string name="action_settings">Settings</string>
<string name="title_activity_scrolling">ScrollingActivity</string>
<string name="large_text">
"Material is the metaphor.\n\n"
"A material metaphor is the unifying theory of a rationalized space and a system of motion."
"The material is grounded in tactile reality, inspired by the study of paper and ink, yet "
"technologically advanced and open to imagination and magic.\n"
"Surfaces and edges of the material provide visual cues that are grounded in reality. The "
"use of familiar tactile attributes helps users quickly understand affordances. Yet the "
"flexibility of the material creates new affordances that supercede those in the physical "
"world, without breaking the rules of physics.\n"
"The fundamentals of light, surface, and movement are key to conveying how objects move, "
"interact, and exist in space and in relation to each other. Realistic lighting shows "
"seams, divides space, and indicates moving parts.\n\n"
"Bold, graphic, intentional.\n\n"
"The foundational elements of print based design typography, grids, space, scale, color, "
"and use of imagery guide visual treatments. These elements do far more than please the "
"eye. They create hierarchy, meaning, and focus. Deliberate color choices, edge to edge "
"imagery, large scale typography, and intentional white space create a bold and graphic "
"interface that immerse the user in the experience.\n"
"An emphasis on user actions makes core functionality immediately apparent and provides "
"waypoints for the user.\n\n"
"Motion provides meaning.\n\n"
"Motion respects and reinforces the user as the prime mover. Primary user actions are "
"inflection points that initiate motion, transforming the whole design.\n"
"All action takes place in a single environment. Objects are presented to the user without "
"breaking the continuity of experience even as they transform and reorganize.\n"
"Motion is meaningful and appropriate, serving to focus attention and maintain continuity. "
"Feedback is subtle yet clear. Transitions are efficient yet coherent.\n\n"
"3D world.\n\n"
"The material environment is a 3D space, which means all objects have x, y, and z "
"dimensions. The z-axis is perpendicularly aligned to the plane of the display, with the "
"positive z-axis extending towards the viewer. Every sheet of material occupies a single "
"position along the z-axis and has a standard 1dp thickness.\n"
"On the web, the z-axis is used for layering and not for perspective. The 3D world is "
"emulated by manipulating the y-axis.\n\n"
"Light and shadow.\n\n"
"Within the material environment, virtual lights illuminate the scene. Key lights create "
"directional shadows, while ambient light creates soft shadows from all angles.\n"
"Shadows in the material environment are cast by these two light sources. In Android "
"development, shadows occur when light sources are blocked by sheets of material at "
"various positions along the z-axis. On the web, shadows are depicted by manipulating the "
"y-axis only. The following example shows the card with a height of 6dp.\n\n"
"Resting elevation.\n\n"
"All material objects, regardless of size, have a resting elevation, or default elevation "
"that does not change. If an object changes elevation, it should return to its resting "
"elevation as soon as possible.\n\n"
"Component elevations.\n\n"
"The resting elevation for a component type is consistent across apps (e.g., FAB elevation "
"does not vary from 6dp in one app to 16dp in another app).\n"
"Components may have different resting elevations across platforms, depending on the depth "
"of the environment (e.g., TV has a greater depth than mobile or desktop).\n\n"
"Responsive elevation and dynamic elevation offsets.\n\n"
"Some component types have responsive elevation, meaning they change elevation in response "
"to user input (e.g., normal, focused, and pressed) or system events. These elevation "
"changes are consistently implemented using dynamic elevation offsets.\n"
"Dynamic elevation offsets are the goal elevation that a component moves towards, relative "
"to the component’s resting state. They ensure that elevation changes are consistent "
"across actions and component types. For example, all components that lift on press have "
"the same elevation change relative to their resting elevation.\n"
"Once the input event is completed or cancelled, the component will return to its resting "
"elevation.\n\n"
"Avoiding elevation interference.\n\n"
"Components with responsive elevations may encounter other components as they move between "
"their resting elevations and dynamic elevation offsets. Because material cannot pass "
"through other material, components avoid interfering with one another any number of ways, "
"whether on a per component basis or using the entire app layout.\n"
"On a component level, components can move or be removed before they cause interference. "
"For example, a floating action button (FAB) can disappear or move off screen before a "
"user picks up a card, or it can move if a snackbar appears.\n"
"On the layout level, design your app layout to minimize opportunities for interference. "
"For example, position the FAB to one side of stream of a cards so the FAB won’t interfere "
"when a user tries to pick up one of cards.\n\n"
</string>
<string name="title_activity_receive">ReceiveActivity</string>
<string name="title_activity_send">SendActivity</string>

Loading…
Cancel
Save