update

bannedbook · Apr 20, 2020 · 4c013a9 · 4c013a9
1 parent 9757cc8
commit 4c013a9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/build.gradle b/build.gradle
@@ -14,8 +14,8 @@ buildscript {
         junitVersion = '4.13'
         androidTestVersion = '1.2.0'
         androidEspressoVersion = '3.2.0'
-        versionCode = 5000662
-        versionName = '5.0.6.2-nightly'
+        versionCode = 5000668
+        versionName = '5.0.6.3-nightly'
         resConfigs = ['ar', 'es', 'fa', 'fr', 'ja', 'ko', 'ru', 'tr', 'zh-rCN', 'zh-rTW']
     }
 

diff --git a/gitupdate.bat b/gitupdate.bat
@@ -3,6 +3,6 @@ git pull origin master
 git add -A
 git commit -m "update"
 git push origin master
-git tag -a v5.0.6.2 -m "release v5.0.6.2"
+git tag -a v5.0.6.3 -m "release v5.0.6.3"
 git push origin --tags
 pause
diff --git a/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt b/mobile/src/main/java/com/github/shadowsocks/ProfilesFragment.kt
@@ -127,8 +127,10 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
                 }
             }.asSequence().toList().reversed()) {
                 try {
-                    val viewHolder = profilesList.findViewHolderForAdapterPosition(i) as ProfileViewHolder
-                    if (true /*viewHolder.item.isBuiltin()*/) {
+                    var viewHolder = profilesList.findViewHolderForAdapterPosition(i)
+					if(viewHolder==null)continue
+					viewHolder = viewHolder  as ProfileViewHolder
+                    if (i<9 /*viewHolder.item.isBuiltin()*/) {
                         viewHolder.populateUnifiedNativeAdView(nativeAd!!, nativeAdView!!)
                         // might be in the middle of a layout after scrolling, need to wait
                         withContext(Dispatchers.Main) { profilesAdapter.notifyItemChanged(i) }
@@ -265,7 +267,7 @@ class ProfilesFragment : ToolbarFragment(), Toolbar.OnMenuItemClickListener {
             // This method tells the Google Mobile Ads SDK that you have finished populating your
             // native ad view with this native ad.
             adView.setNativeAd(nativeAd)
-            adView.setBackgroundColor(Color.WHITE) //Adding dividing line for ads
+            //adView.setBackgroundColor(Color.WHITE) //Adding dividing line for ads
             adContainer.setPadding(0,1,0,0)  //Adding dividing line for ads
             adContainer.addView(adView)
             adHost = this

diff --git a/mobile/src/main/res/layout/layout_profile.xml b/mobile/src/main/res/layout/layout_profile.xml
@@ -102,12 +102,11 @@
             android:textColor="?android:attr/textColorSecondary"
             tools:text="@string/traffic"/>
     </RelativeLayout>
-<!-- android:background="#cccccc" Adding dividing line for ads -->
     <LinearLayout
-        android:background="#cccccc"
         android:id="@+id/ad_container"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+		android:layout_marginTop="5dp"
         android:layout_marginLeft="16dp"
         android:orientation="vertical" />
 </LinearLayout>