Commit fed0ca8b authored by Max Lv's avatar Max Lv

Refine cloud icons

parent 5fa01f67
...@@ -162,6 +162,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener { ...@@ -162,6 +162,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
private val text2 = itemView.findViewById<TextView>(android.R.id.text2) private val text2 = itemView.findViewById<TextView>(android.R.id.text2)
private val traffic = itemView.findViewById<TextView>(R.id.traffic) private val traffic = itemView.findViewById<TextView>(R.id.traffic)
private val edit = itemView.findViewById<View>(R.id.edit) private val edit = itemView.findViewById<View>(R.id.edit)
private val subscription = itemView.findViewById<View>(R.id.subscription)
private val adContainer = itemView.findViewById<LinearLayout>(R.id.ad_container) private val adContainer = itemView.findViewById<LinearLayout>(R.id.ad_container)
init { init {
...@@ -169,7 +170,12 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener { ...@@ -169,7 +170,12 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
item = ProfileManager.getProfile(item.id)!! item = ProfileManager.getProfile(item.id)!!
startConfig(item) startConfig(item)
} }
subscription.setOnClickListener {
item = ProfileManager.getProfile(item.id)!!
startConfig(item)
}
TooltipCompat.setTooltipText(edit, edit.contentDescription) TooltipCompat.setTooltipText(edit, edit.contentDescription)
TooltipCompat.setTooltipText(subscription, subscription.contentDescription)
itemView.setOnClickListener(this) itemView.setOnClickListener(this)
val share = itemView.findViewById<View>(R.id.share) val share = itemView.findViewById<View>(R.id.share)
share.setOnClickListener { share.setOnClickListener {
...@@ -277,6 +283,8 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener { ...@@ -277,6 +283,8 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
val editable = isProfileEditable(item.id) val editable = isProfileEditable(item.id)
edit.isEnabled = editable edit.isEnabled = editable
edit.alpha = if (editable) 1F else .5F edit.alpha = if (editable) 1F else .5F
subscription.isEnabled = editable
subscription.alpha = if (editable) 1F else .5F
var tx = item.tx var tx = item.tx
var rx = item.rx var rx = item.rx
statsCache[item.id]?.apply { statsCache[item.id]?.apply {
...@@ -302,7 +310,11 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener { ...@@ -302,7 +310,11 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
} }
if (item.subscription == Profile.SubscriptionStatus.Active) { if (item.subscription == Profile.SubscriptionStatus.Active) {
itemView.findViewById<View>(R.id.subscription).visibility = View.VISIBLE edit.visibility = View.GONE
subscription.visibility = View.VISIBLE
} else {
edit.visibility = View.VISIBLE
subscription.visibility = View.GONE
} }
} }
......
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp"
android:height="20dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFFFF"
android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM19,18H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h0.71C7.37,7.69 9.48,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3s-1.34,3 -3,3z"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android" <vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20dp" android:width="24dp"
android:height="20dp" android:height="24dp"
android:viewportWidth="24.0" android:tint="?attr/colorControlNormal"
android:viewportHeight="24.0"> android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path <path
android:fillColor="#FF000000" android:fillColor="#FF000000"
android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM19,18H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h0.71C7.37,7.69 9.48,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3s-1.34,3 -3,3z"/> android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM19,18H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h0.71C7.37,7.69 9.48,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3s-1.34,3 -3,3z" />
</vector> </vector>
...@@ -19,19 +19,6 @@ ...@@ -19,19 +19,6 @@
android:layout_marginLeft="16dp" android:layout_marginLeft="16dp"
> >
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/subscription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/subscriptions"
android:focusable="true"
android:paddingTop="15dp"
android:paddingEnd="4dp"
android:visibility="visible"
app:srcCompat="@drawable/ic_cloud_queue"/>
<TextView <TextView
android:id="@android:id/text1" android:id="@android:id/text1"
android:layout_width="0dp" android:layout_width="0dp"
...@@ -46,6 +33,18 @@ ...@@ -46,6 +33,18 @@
android:textStyle="bold" android:textStyle="bold"
tools:text="@string/profile_name"/> tools:text="@string/profile_name"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/subscription"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/subscriptions"
android:focusable="true"
android:padding="12dp"
android:visibility="gone"
app:srcCompat="@drawable/ic_cloud_queue"/>
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
android:id="@+id/edit" android:id="@+id/edit"
android:layout_width="wrap_content" android:layout_width="wrap_content"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment