Fix #737 by using support vector drawables
@@ -26,19 +26,19 @@ resolvers += Resolver.jcenterRepo
|
||||
|
||||
resolvers += "JRAF" at "http://JRAF.org/static/maven/2"
|
||||
|
||||
useSupportVectors
|
||||
|
||||
libraryDependencies ++= Seq(
|
||||
"dnsjava" % "dnsjava" % "2.1.7",
|
||||
"com.github.kevinsawicki" % "http-request" % "6.0",
|
||||
"eu.chainfire" % "libsuperuser" % "1.0.0.201602271131",
|
||||
"net.glxn.qrgen" % "android" % "2.0",
|
||||
"com.google.android.gms" % "play-services-base" % "9.0.2",
|
||||
"com.google.android.gms" % "play-services-ads" % "9.0.2",
|
||||
"com.google.android.gms" % "play-services-analytics" % "9.0.2",
|
||||
"com.google.android.gms" % "play-services-ads" % "9.2.0",
|
||||
"com.google.android.gms" % "play-services-analytics" % "9.2.0",
|
||||
"com.android.support" % "design" % "24.0.0",
|
||||
"com.android.support" % "gridlayout-v7" % "24.0.0",
|
||||
"com.android.support" % "cardview-v7" % "24.0.0",
|
||||
"com.github.jorgecastilloprz" % "fabprogresscircle" % "1.01",
|
||||
"com.j256.ormlite" % "ormlite-core" % "4.48",
|
||||
"com.j256.ormlite" % "ormlite-android" % "4.48",
|
||||
"com.twofortyfouram" % "android-plugin-api-for-locale" % "1.0.2",
|
||||
"com.github.clans" % "fab" % "1.6.4",
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
addSbtPlugin("org.scala-android" % "sbt-android" % "1.6.5")
|
||||
|
||||
addSbtPlugin("com.timushev.sbt" % "sbt-updates" % "0.1.10")
|
||||
|
||||
addSbtPlugin("net.virtual-void" % "sbt-dependency-graph" % "0.8.2")
|
||||
|
||||
|
After Width: | Height: | Size: 610 B |
|
After Width: | Height: | Size: 251 B |
|
After Width: | Height: | Size: 480 B |
|
After Width: | Height: | Size: 226 B |
|
After Width: | Height: | Size: 719 B |
|
After Width: | Height: | Size: 301 B |
|
After Width: | Height: | Size: 950 B |
|
After Width: | Height: | Size: 373 B |
@@ -66,7 +66,7 @@
|
||||
<android.support.design.widget.FloatingActionButton android:id="@+id/fab" android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
app:backgroundTint="@color/material_blue_grey_700"
|
||||
android:src="@drawable/ic_start_idle"
|
||||
app:srcCompat="@drawable/ic_start_idle"
|
||||
app:pressedTranslationZ="6dp" app:borderWidth="0dp" />
|
||||
</com.github.jorgecastilloprz.FABProgressCircle>
|
||||
</RelativeLayout>
|
||||
|
||||
@@ -27,7 +27,6 @@
|
||||
android:id="@+id/fab_manual_add"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic_content_create"
|
||||
app:fab_colorNormal="@color/material_accent_500"
|
||||
app:fab_colorPressed="@color/material_accent_700"
|
||||
app:fab_colorRipple="@android:color/white"
|
||||
@@ -38,7 +37,6 @@
|
||||
android:id="@+id/fab_qrcode_add"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic_image_camera_alt"
|
||||
app:fab_colorNormal="@color/material_accent_500"
|
||||
app:fab_colorPressed="@color/material_accent_700"
|
||||
app:fab_colorRipple="@android:color/white"
|
||||
@@ -49,7 +47,6 @@
|
||||
android:id="@+id/fab_nfc_add"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic_device_nfc"
|
||||
app:fab_colorNormal="@color/material_accent_500"
|
||||
app:fab_colorPressed="@color/material_accent_700"
|
||||
app:fab_colorRipple="@android:color/white"
|
||||
@@ -60,7 +57,6 @@
|
||||
android:id="@+id/fab_import_add"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:src="@drawable/ic_content_paste"
|
||||
app:fab_colorNormal="@color/material_accent_500"
|
||||
app:fab_colorPressed="@color/material_accent_700"
|
||||
app:fab_colorRipple="@android:color/white"
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!-- Based on: https://github.com/android/platform_frameworks_base/blob/master/core/res/res/layout/select_dialog_singlechoice_material.xml -->
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:id="@+id/container"
|
||||
@@ -31,7 +32,7 @@
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="5dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:src="@drawable/ic_social_share"
|
||||
app:srcCompat="@drawable/ic_social_share"
|
||||
android:background="?attr/selectableItemBackgroundBorderless"
|
||||
android:contentDescription="@string/share"
|
||||
android:focusable="true"
|
||||
|
||||
@@ -13,7 +13,7 @@ import android.support.v7.widget.RecyclerView.ViewHolder
|
||||
import android.support.v7.widget.Toolbar.OnMenuItemClickListener
|
||||
import android.support.v7.widget.helper.ItemTouchHelper
|
||||
import android.support.v7.widget.helper.ItemTouchHelper.SimpleCallback
|
||||
import android.support.v7.widget.{DefaultItemAnimator, LinearLayoutManager, RecyclerView, Toolbar}
|
||||
import android.support.v7.widget._
|
||||
import android.text.style.TextAppearanceSpan
|
||||
import android.text.{SpannableStringBuilder, Spanned, TextUtils}
|
||||
import android.util.Log
|
||||
@@ -251,13 +251,18 @@ final class ProfileManagerActivity extends AppCompatActivity with OnMenuItemClic
|
||||
def initFab() {
|
||||
menu = findViewById(R.id.menu).asInstanceOf[FloatingActionMenu]
|
||||
menu.setClosedOnTouchOutside(true)
|
||||
val dm = AppCompatDrawableManager.get
|
||||
val manualAddFAB = findViewById(R.id.fab_manual_add).asInstanceOf[FloatingActionButton]
|
||||
manualAddFAB.setImageDrawable(dm.getDrawable(this, R.drawable.ic_content_create))
|
||||
manualAddFAB.setOnClickListener(this)
|
||||
val qrcodeAddFAB = findViewById(R.id.fab_qrcode_add).asInstanceOf[FloatingActionButton]
|
||||
qrcodeAddFAB.setImageDrawable(dm.getDrawable(this, R.drawable.ic_image_camera_alt))
|
||||
qrcodeAddFAB.setOnClickListener(this)
|
||||
val nfcAddFAB = findViewById(R.id.fab_nfc_add).asInstanceOf[FloatingActionButton]
|
||||
nfcAddFAB.setImageDrawable(dm.getDrawable(this, R.drawable.ic_device_nfc))
|
||||
nfcAddFAB.setOnClickListener(this)
|
||||
val importAddFAB = findViewById(R.id.fab_import_add).asInstanceOf[FloatingActionButton]
|
||||
importAddFAB.setImageDrawable(dm.getDrawable(this, R.drawable.ic_content_paste))
|
||||
importAddFAB.setOnClickListener(this)
|
||||
}
|
||||
|
||||
|
||||
@@ -45,6 +45,7 @@ import java.util.concurrent.TimeUnit
|
||||
import android.app.Application
|
||||
import android.content.pm.PackageManager
|
||||
import android.preference.PreferenceManager
|
||||
import android.support.v7.app.AppCompatDelegate
|
||||
import com.github.shadowsocks.database.{DBHelper, ProfileManager}
|
||||
import com.github.shadowsocks.utils.{Key, Utils}
|
||||
import com.google.android.gms.analytics.{GoogleAnalytics, HitBuilders}
|
||||
@@ -95,6 +96,7 @@ class ShadowsocksApplication extends Application {
|
||||
override def onCreate() {
|
||||
java.lang.System.setProperty(LocalLog.LOCAL_LOG_LEVEL_PROPERTY, "ERROR")
|
||||
app = this
|
||||
AppCompatDelegate.setCompatVectorFromResourcesEnabled(true)
|
||||
val tm = TagManager.getInstance(this)
|
||||
val pending = tm.loadContainerPreferNonDefault("GTM-NT8WS8", R.raw.gtm_default_container)
|
||||
val callback = new ResultCallback[ContainerHolder] {
|
||||
|
||||