Browse Source

Make things dark.

chat
Mark Meister 5 years ago
parent
commit
1dd1d1f415
  1. 4
      app/build.gradle
  2. 7
      app/src/main/java/org/myhush/silentdragon/MainActivity.kt
  3. 5
      app/src/main/res/color/white_text_selector.xml
  4. BIN
      app/src/main/res/drawable-hdpi/ic_send_icon.png
  5. BIN
      app/src/main/res/drawable-mdpi/ic_send_icon.png
  6. BIN
      app/src/main/res/drawable-xhdpi/ic_send_icon.png
  7. BIN
      app/src/main/res/drawable-xxhdpi/ic_send_icon.png
  8. BIN
      app/src/main/res/drawable-xxxhdpi/ic_send_icon.png
  9. 5
      app/src/main/res/drawable/balance_selector.xml
  10. 5
      app/src/main/res/drawable/ic_account_balance_white_24dp.xml
  11. 5
      app/src/main/res/drawable/ic_account_balance_white_24dp_unselected.xml
  12. 5
      app/src/main/res/drawable/ic_file_download_white_24dp.xml
  13. 5
      app/src/main/res/drawable/ic_file_download_white_24dp_unselected.xml
  14. 5
      app/src/main/res/drawable/ic_send_white_24dp.xml
  15. 5
      app/src/main/res/drawable/ic_send_white_24dp_unselected.xml
  16. 18
      app/src/main/res/drawable/layout_border.xml
  17. 5
      app/src/main/res/drawable/receive_selector.xml
  18. 5
      app/src/main/res/drawable/send_selector.xml
  19. 4
      app/src/main/res/layout/content_main.xml
  20. 6
      app/src/main/res/menu/menu_nav.xml
  21. 10
      app/src/main/res/values/colors.xml
  22. 4
      app/src/main/res/values/styles.xml

4
app/build.gradle

@ -8,8 +8,8 @@ android {
applicationId "org.myhush.silentdragon"
minSdkVersion 19
targetSdkVersion 28
versionCode 6
versionName "0.3.2"
versionCode 1
versionName "0.0.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}

7
app/src/main/java/org/myhush/silentdragon/MainActivity.kt

@ -19,11 +19,11 @@ import android.widget.Button
import android.widget.ScrollView
import android.widget.TextView
import android.widget.Toast
import org.myhush.silentdragon.DataModel.ConnectionStatus
import org.myhush.silentdragon.DataModel.connStatus
import com.beust.klaxon.Klaxon
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.content_main.*
import org.myhush.silentdragon.DataModel.ConnectionStatus
import org.myhush.silentdragon.DataModel.connStatus
import java.text.DecimalFormat
@ -104,7 +104,8 @@ class MainActivity : AppCompatActivity(),
runOnUiThread {
Log.i(TAG, "Updating UI $updateTxns")
bottomNav.menu.findItem(R.id.action_bal).isChecked = true
bottomNav.itemIconTintList = null
bottomNav.menu.findItem(R.id.action_bal)?.isChecked = true
when (connStatus) {
ConnectionStatus.DISCONNECTED -> {
setMainStatus("No Connection")

5
app/src/main/res/color/white_text_selector.xml

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:color="@color/white_selected" android:state_checked="true" />
<item android:color="@color/white_unselected" />
</selector>

BIN
app/src/main/res/drawable-hdpi/ic_send_icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 924 B

BIN
app/src/main/res/drawable-mdpi/ic_send_icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 613 B

BIN
app/src/main/res/drawable-xhdpi/ic_send_icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

BIN
app/src/main/res/drawable-xxhdpi/ic_send_icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

BIN
app/src/main/res/drawable-xxxhdpi/ic_send_icon.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

5
app/src/main/res/drawable/balance_selector.xml

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_account_balance_white_24dp" android:state_checked="true" />
<item android:drawable="@drawable/ic_account_balance_white_24dp_unselected" android:state_checked="false" />
</selector>

5
app/src/main/res/drawable/ic_account_balance_white_24dp.xml

@ -0,0 +1,5 @@
<vector android:height="24dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFFFF" android:pathData="M4,10v7h3v-7L4,10zM10,10v7h3v-7h-3zM2,22h19v-3L2,19v3zM16,10v7h3v-7h-3zM11.5,1L2,6v2h19L21,6l-9.5,-5z"/>
</vector>

5
app/src/main/res/drawable/ic_account_balance_white_24dp_unselected.xml

@ -0,0 +1,5 @@
<vector android:height="24dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#66FFFFFF" android:pathData="M4,10v7h3v-7L4,10zM10,10v7h3v-7h-3zM2,22h19v-3L2,19v3zM16,10v7h3v-7h-3zM11.5,1L2,6v2h19L21,6l-9.5,-5z"/>
</vector>

5
app/src/main/res/drawable/ic_file_download_white_24dp.xml

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
</vector>

5
app/src/main/res/drawable/ic_file_download_white_24dp_unselected.xml

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#66FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z"/>
</vector>

5
app/src/main/res/drawable/ic_send_white_24dp.xml

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
</vector>

5
app/src/main/res/drawable/ic_send_white_24dp_unselected.xml

@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#66FFFFFF"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
</vector>

18
app/src/main/res/drawable/layout_border.xml

@ -3,18 +3,18 @@
<item>
<shape
android:shape="rectangle">
<stroke android:width="1dp" android:color="#E3E3E3" />
<solid android:color="#FFF" />
<stroke android:width="1dp" android:color="#0f0" />
<solid android:color="#0ff" />
</shape>
</item>
<item android:top="1dp">
<shape
android:shape="rectangle">
<stroke android:width="1dp" android:color="#FFF" />
<solid android:color="#00000000" />
</shape>
</item>
<!-- <item android:top="1dp">-->
<!-- <shape-->
<!-- android:shape="rectangle">-->
<!-- <stroke android:width="1dp" android:color="@color/colorPrimary" />-->
<!-- <solid android:color="#00000000" />-->
<!-- </shape>-->
<!-- </item>-->
</layer-list>

5
app/src/main/res/drawable/receive_selector.xml

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_file_download_white_24dp" android:state_checked="true" />
<item android:drawable="@drawable/ic_file_download_white_24dp_unselected" android:state_checked="false" />
</selector>

5
app/src/main/res/drawable/send_selector.xml

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/ic_send_white_24dp" android:state_checked="true" />
<item android:drawable="@drawable/ic_send_white_24dp_unselected" android:state_checked="false" />
</selector>

4
app/src/main/res/layout/content_main.xml

@ -134,7 +134,9 @@
android:layout_width="match_parent"
android:layout_height="0dp" app:menu="@menu/menu_nav"
android:id="@+id/bottomNav"
app:itemIconTint="@null"
app:itemTextColor="@color/white_text_selector"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintBottom_toBottomOf="parent" android:background="@drawable/layout_border"/>
app:layout_constraintBottom_toBottomOf="parent" />
</android.support.constraint.ConstraintLayout>

6
app/src/main/res/menu/menu_nav.xml

@ -5,9 +5,9 @@
<item android:id="@+id/action_send"
android:title="Send"
android:orderInCategory="300"
app:showAsAction="never" android:icon="@drawable/ic_send_icon"/>
<item android:title="Balance" android:id="@+id/action_bal" android:icon="@android:drawable/ic_dialog_dialer"
app:showAsAction="never" android:icon="@drawable/send_selector"/>
<item android:title="Balance" android:id="@+id/action_bal" android:icon="@drawable/balance_selector"
android:orderInCategory="200"/>
<item android:title="Receive" android:id="@+id/action_recieve" android:icon="@android:drawable/stat_sys_download"
<item android:title="Receive" android:id="@+id/action_recieve" android:icon="@drawable/receive_selector"
android:orderInCategory="100"/>
</menu>

10
app/src/main/res/values/colors.xml

@ -1,7 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#008577</color>
<color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#D81B60</color>
<color name="colorPrimary">#292B2F</color>
<color name="colorPrimaryDark">#1D1F21</color>
<color name="colorAccent">#4CD0C3</color>
<color name="windowBackground">#2F3237</color>
<color name="light_grey">#E3E3E3</color>
<color name="white_selected">#E0FFFFFF</color>
<color name="white_unselected">#66FFFFFF</color>
</resources>

4
app/src/main/res/values/styles.xml

@ -1,7 +1,7 @@
<resources>
<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.AppCompat">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
@ -12,6 +12,6 @@
<item name="windowNoTitle">true</item>
</style>
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar"/>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light"/>
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Dark"/>
</resources>

Loading…
Cancel
Save