Browse Source

Fix colors

connman
adityapk00 6 years ago
parent
commit
f2f66fa622
  1. 9
      app/src/main/java/com/adityapk/zcash/zqwandroid/MainActivity.kt
  2. 8
      app/src/main/java/com/adityapk/zcash/zqwandroid/TransactionItemFragment.kt
  3. 8
      app/src/main/res/layout/activity_main.xml
  4. 6
      app/src/main/res/layout/fragment_transaction_item.xml

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

@ -15,9 +15,7 @@ import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.content_main.*
import okhttp3.*
import okio.ByteString
import java.text.DateFormat
import java.text.DecimalFormat
import java.util.*
class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInteractionListener {
@ -82,15 +80,16 @@ class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInte
}
}
client = OkHttpClient()
start()
makeAPICalls()
balanceUSD.setOnClickListener { view ->
Toast.makeText(applicationContext, "1 ZEC = $${DecimalFormat("#.##").format(DataModel.mainResponseData?.zecprice)}", Toast.LENGTH_LONG).show()
}
updateUI()
}
private fun start() {
private fun makeAPICalls() {
val request = Request.Builder().url("ws://10.0.2.2:8237").build()
val listener = EchoWebSocketListener()
val ws = client?.newWebSocket(request, listener)
@ -105,7 +104,7 @@ class MainActivity : AppCompatActivity(), TransactionItemFragment.OnFragmentInte
val bal = DataModel.mainResponseData?.balance ?: 0.0
val zPrice = DataModel.mainResponseData?.zecprice ?: 0.0
val balText = DecimalFormat("#.########").format(bal)
val balText = DecimalFormat("#0.00000000").format(bal)
balance.text = "ZEC " + balText.substring(0, balText.length - 4)
balanceSmall.text = balText.substring(balText.length - 4, balText.length)

8
app/src/main/java/com/adityapk/zcash/zqwandroid/TransactionItemFragment.kt

@ -9,6 +9,7 @@ import android.support.v4.app.Fragment
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import android.widget.ImageView
import android.widget.TextView
import com.beust.klaxon.Klaxon
import kotlinx.android.synthetic.main.fragment_transaction_item.*
@ -56,7 +57,12 @@ class TransactionItemFragment : Fragment() {
txt.text = DateFormat.getDateInstance().format(Date((tx?.datetime ?: 0 )* 1000))
val amt = view.findViewById<TextView>(R.id.txamt)
amt.text = (if (tx?.type == "send") "" else "+") + tx?.amount
amt.text = (if (tx?.type == "send") "" else "+") + tx?.amount + " ZEC"
if (tx?.type == "send") {
val col = view.findViewById<ImageView>(R.id.typeColor)
col.setImageResource(R.color.colorAccent)
}
if (param2 == "odd")
view.findViewById<ConstraintLayout>(R.id.outlineLayout).background = null

8
app/src/main/res/layout/activity_main.xml

@ -29,7 +29,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
app:srcCompat="@android:drawable/ic_btn_speak_now" app:backgroundTint="@color/colorPrimary"/>
app:srcCompat="@android:drawable/ic_btn_speak_now" app:backgroundTint="@color/colorAccent"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab2"
@ -37,7 +37,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
app:srcCompat="@android:drawable/ic_menu_camera" app:backgroundTint="@color/colorPrimary"/>
app:srcCompat="@android:drawable/ic_menu_camera" app:backgroundTint="@color/colorAccent"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab1"
@ -45,7 +45,7 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
app:srcCompat="@android:drawable/arrow_down_float" app:backgroundTint="@color/colorPrimary"/>
app:srcCompat="@android:drawable/arrow_down_float" app:backgroundTint="@color/colorAccent"/>
<android.support.design.widget.FloatingActionButton
android:id="@+id/fab"
@ -53,6 +53,6 @@
android:layout_height="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="@dimen/fab_margin"
app:srcCompat="@android:drawable/ic_menu_add" app:backgroundTint="@color/colorPrimary"/>
app:srcCompat="@android:drawable/ic_menu_add" app:backgroundTint="@color/colorAccent"/>
</android.support.design.widget.CoordinatorLayout>

6
app/src/main/res/layout/fragment_transaction_item.xml

@ -11,7 +11,7 @@
<ImageView
android:src="@color/colorPrimary"
android:layout_width="8dp"
android:layout_height="0dp" android:id="@+id/imageView5" app:layout_constraintTop_toTopOf="parent"
android:layout_height="0dp" android:id="@+id/typeColor" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toLeftOf="@id/txdate" app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBaseline_toBaselineOf="parent" android:layout_marginLeft="8dp"
@ -22,9 +22,9 @@
android:layout_height="wrap_content"
android:text="Date" android:id="@+id/txdate"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toRightOf="@+id/imageView5"
app:layout_constraintLeft_toRightOf="@+id/typeColor"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView5" android:layout_marginStart="16dp"
app:layout_constraintStart_toEndOf="@+id/typeColor" android:layout_marginStart="16dp"
android:layout_marginTop="8dp" android:layout_marginBottom="8dp"
app:layout_constraintEnd_toStartOf="@+id/txamt" android:layout_marginEnd="7dp"
/>

Loading…
Cancel
Save