Alawn/shadowsocks-android
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refine layout for #598

Browse Source
This commit is contained in:
Mygod
2016-03-12 11:18:21 +08:00
parent 0aad8f13ed
commit 8fd8514cc2
2 changed files with 18 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/res/layout/layout_quick_switch.xml
+14 -24
View File
@@ -1,34 +1,24 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"
android:clickable="true"
android:foreground="@android:color/transparent"
android:layout_width="match_parent"
android:layout_height="match_parent">
<android.support.v7.widget.CardView
android:layout_height="260dp"
android:layout_width="match_parent"
<android.support.v7.widget.CardView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_margin="8dp"
android:layout_gravity="center_vertical"
android:clickable="true"
app:cardElevation="5dp"
app:cardBackgroundColor="#EEEEEE"
>
app:cardBackgroundColor="#EEEEEE">
<LinearLayout
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<include layout="@layout/toolbar_light_dark"/>
<include layout="@layout/toolbar_light_dark"/>
<android.support.v7.widget.RecyclerView
<android.support.v7.widget.RecyclerView
android:id="@+id/profilesList"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
</LinearLayout>
</android.support.v7.widget.CardView>
</LinearLayout>
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
</LinearLayout>
</android.support.v7.widget.CardView>
src/main/scala/com/github/shadowsocks/ShadowsocksQuickSwitchActivity.scala
+4 -5
View File
@@ -27,11 +27,7 @@ class ShadowsocksQuickSwitchActivity extends AppCompatActivity {
def bind(item: Profile) {
this.item = item
text.setText(item.name)
if (item.id == ShadowsocksApplication.profileId) {
text.setChecked(true)
} else {
text.setChecked(false)
}
text.setChecked(item.id == ShadowsocksApplication.profileId)
}
def onClick(v: View) {
@@ -74,5 +70,8 @@ class ShadowsocksQuickSwitchActivity extends AppCompatActivity {
profilesList.setLayoutManager(lm)
profilesList.setItemAnimator(new DefaultItemAnimator)
profilesList.setAdapter(profilesAdapter)
if (ShadowsocksApplication.profileId >= 0) lm.scrollToPosition(profilesAdapter.profiles.zipWithIndex.collectFirst {
case (profile, i) if profile.id == ShadowsocksApplication.profileId => i + 1
}.getOrElse(0))
}
}