Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
com.ccwangluo.accelerator
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
sheteng
com.ccwangluo.accelerator
Commits
f5036bbd
Commit
f5036bbd
authored
Nov 19, 2017
by
Mygod
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Refrain from using SMART_BANNER to prevent its weirdness
parent
36edc2e7
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
72 additions
and
83 deletions
+72
-83
mobile/src/main/res/drawable/background_profile.xml
mobile/src/main/res/drawable/background_profile.xml
+1
-0
mobile/src/main/res/layout/layout_profile.xml
mobile/src/main/res/layout/layout_profile.xml
+69
-76
mobile/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
.../main/scala/com/github/shadowsocks/ProfilesFragment.scala
+2
-7
No files found.
mobile/src/main/res/drawable/background_profile.xml
View file @
f5036bbd
...
@@ -20,4 +20,5 @@
...
@@ -20,4 +20,5 @@
<solid
android:color=
"@android:color/white"
/>
<solid
android:color=
"@android:color/white"
/>
</shape>
</shape>
</item>
</item>
<item
android:drawable=
"?android:attr/selectableItemBackground"
/>
</layer-list>
</layer-list>
mobile/src/main/res/layout/layout_profile.xml
View file @
f5036bbd
...
@@ -3,89 +3,82 @@
...
@@ -3,89 +3,82 @@
<LinearLayout
<LinearLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
android:id=
"@+id/
indicator
"
android:id=
"@+id/
content
"
android:orientation=
"vertical"
android:orientation=
"vertical"
android:background=
"@drawable/background_profile"
android:background=
"@drawable/background_profile"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
>
android:layout_height=
"wrap_content"
android:paddingLeft=
"8dp"
android:paddingRight=
"4dp"
android:paddingTop=
"8dp"
android:paddingBottom=
"8dp"
android:focusable=
"true"
android:nextFocusRight=
"@+id/edit"
>
<LinearLayout
<LinearLayout
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:orientation=
"vertical"
android:layout_marginStart=
"8dp"
android:paddingLeft=
"8dp"
android:id=
"@+id/container"
>
android:paddingRight=
"4dp"
<TextView
android:paddingTop=
"8dp"
android:id=
"@android:id/text1"
android:paddingBottom=
"8dp"
android:layout_width=
"0dp"
android:focusable=
"true"
android:nextFocusRight=
"@+id/edit"
android:id=
"@+id/content"
android:background=
"?android:attr/selectableItemBackground"
>
<LinearLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"8dp"
android:layout_gravity=
"center_vertical"
android:id=
"@+id/container"
>
android:layout_weight=
"1"
<TextView
android:textAppearance=
"?android:attr/textAppearanceMedium"
android:id=
"@android:id/text1"
android:textColor=
"?android:attr/textColorPrimary"
android:layout_width=
"0dp"
android:textStyle=
"bold"
android:layout_height=
"wrap_content"
android:gravity=
"center_vertical"
android:layout_gravity=
"center_vertical"
android:maxLines=
"2"
android:layout_weight=
"1"
android:ellipsize=
"end"
/>
android:textAppearance=
"?android:attr/textAppearanceMedium"
<android.support.v7.widget.AppCompatImageView
android:textColor=
"?android:attr/textColorPrimary"
android:id=
"@+id/share"
android:textStyle=
"bold"
android:layout_width=
"wrap_content"
android:gravity=
"center_vertical"
android:maxLines=
"2"
android:ellipsize=
"end"
/>
<android.support.v7.widget.AppCompatImageView
android:id=
"@+id/share"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:padding=
"8dp"
android:layout_gravity=
"top"
app:srcCompat=
"@drawable/ic_social_share"
android:background=
"?attr/selectableItemBackgroundBorderless"
android:contentDescription=
"@string/share"
android:focusable=
"true"
android:nextFocusLeft=
"@+id/container"
/>
<android.support.v7.widget.AppCompatImageView
android:id=
"@+id/edit"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:padding=
"8dp"
android:layout_gravity=
"top"
app:srcCompat=
"@drawable/ic_image_edit"
android:background=
"?attr/selectableItemBackgroundBorderless"
android:contentDescription=
"@string/edit"
android:focusable=
"true"
/>
</LinearLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"8dp"
android:padding=
"8dp"
android:layout_marginEnd=
"8dp"
>
android:layout_gravity=
"top"
<TextView
app:srcCompat=
"@drawable/ic_social_share"
android:id=
"@android:id/text2"
android:background=
"?attr/selectableItemBackgroundBorderless"
android:layout_width=
"wrap_content"
android:contentDescription=
"@string/share"
android:layout_height=
"wrap_content"
android:focusable=
"true"
android:layout_alignParentStart=
"true"
android:nextFocusLeft=
"@+id/container"
/>
android:layout_toStartOf=
"@+id/traffic"
<android.support.v7.widget.AppCompatImageView
android:layout_marginEnd=
"8dp"
android:id=
"@+id/edit"
android:layout_marginBottom=
"8dp"
android:layout_width=
"wrap_content"
android:maxLines=
"2"
android:layout_height=
"wrap_content"
android:ellipsize=
"end"
android:padding=
"8dp"
android:textAppearance=
"?android:attr/textAppearanceSmall"
android:layout_gravity=
"top"
android:textColor=
"?android:attr/textColorSecondary"
/>
app:srcCompat=
"@drawable/ic_image_edit"
<TextView
android:background=
"?attr/selectableItemBackgroundBorderless"
android:id=
"@+id/traffic"
android:contentDescription=
"@string/edit"
android:layout_width=
"wrap_content"
android:focusable=
"true"
/>
android:layout_height=
"wrap_content"
android:layout_gravity=
"bottom"
android:layout_alignParentEnd=
"true"
android:layout_marginBottom=
"8dp"
android:ellipsize=
"end"
android:textAppearance=
"?android:attr/textAppearanceSmall"
android:textColor=
"?android:attr/textColorSecondary"
/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
<RelativeLayout
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:layout_marginStart=
"8dp"
android:layout_marginEnd=
"8dp"
>
<TextView
android:id=
"@android:id/text2"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_alignParentStart=
"true"
android:layout_toStartOf=
"@+id/traffic"
android:layout_marginEnd=
"8dp"
android:layout_marginBottom=
"8dp"
android:maxLines=
"2"
android:ellipsize=
"end"
android:textAppearance=
"?android:attr/textAppearanceSmall"
android:textColor=
"?android:attr/textColorSecondary"
/>
<TextView
android:id=
"@+id/traffic"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_gravity=
"bottom"
android:layout_alignParentEnd=
"true"
android:layout_marginBottom=
"8dp"
android:ellipsize=
"end"
android:textAppearance=
"?android:attr/textAppearanceSmall"
android:textColor=
"?android:attr/textColorSecondary"
/>
</RelativeLayout>
</LinearLayout>
</LinearLayout>
mobile/src/main/scala/com/github/shadowsocks/ProfilesFragment.scala
View file @
f5036bbd
...
@@ -21,7 +21,6 @@
...
@@ -21,7 +21,6 @@
package
com.github.shadowsocks
package
com.github.shadowsocks
import
android.content._
import
android.content._
import
android.content.res.Configuration
import
android.os.Bundle
import
android.os.Bundle
import
android.support.design.widget.Snackbar
import
android.support.design.widget.Snackbar
import
android.support.v7.widget.RecyclerView.ViewHolder
import
android.support.v7.widget.RecyclerView.ViewHolder
...
@@ -137,13 +136,9 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic
...
@@ -137,13 +136,9 @@ final class ProfilesFragment extends ToolbarFragment with Toolbar.OnMenuItemClic
adView
=
new
AdView
(
getActivity
)
adView
=
new
AdView
(
getActivity
)
adView
.
setLayoutParams
(
params
)
adView
.
setLayoutParams
(
params
)
adView
.
setAdUnitId
(
"ca-app-pub-9097031975646651/7760346322"
)
adView
.
setAdUnitId
(
"ca-app-pub-9097031975646651/7760346322"
)
adView
.
setAdSize
(
AdSize
.
FLUID
)
if
(
getResources
().
getConfiguration
().
orientation
==
Configuration
.
ORIENTATION_LANDSCAPE
)
itemView
.
findViewById
[
LinearLayout
](
R
.
id
.
content
).
addView
(
adView
)
adView
.
setAdSize
(
AdSize
.
FULL_BANNER
)
else
adView
.
setAdSize
(
AdSize
.
SMART_BANNER
)
itemView
.
findViewById
[
LinearLayout
](
R
.
id
.
indicator
).
addView
(
adView
)
// Load Ad
// Load Ad
val
adBuilder
=
new
AdRequest
.
Builder
()
val
adBuilder
=
new
AdRequest
.
Builder
()
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment