Lint (#52)

* Lint #Fix #51 * One more duplicated ID
Alkarex · Apr 19, 2020 · 1a36625 · 1a36625
1 parent 9249f87
commit 1a36625
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 6 deletions.
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
@@ -342,7 +342,7 @@
                     android:paddingTop="12dip" >
 
                     <TextView
-                        android:id="@+id/TitleName"
+                        android:id="@+id/TitleName2"
                         android:layout_width="wrap_content"
                         android:layout_height="0dip"
                         android:layout_weight="1"
@@ -469,7 +469,7 @@
                     android:paddingTop="12dip" >
 
                     <TextView
-                        android:id="@+id/TitleName"
+                        android:id="@+id/TitleName3"
                         android:layout_width="wrap_content"
                         android:layout_height="0dip"
                         android:layout_weight="1"
@@ -524,7 +524,7 @@
                     </LinearLayout>
 
                     <ImageView
-                        android:id="@+id/SettingSyncStatus"
+                        android:id="@+id/SettingSyncStatus2"
                         android:layout_width="80dip"
                         android:layout_height="wrap_content"
                         android:src="@drawable/setting_browser_choice" >
@@ -789,7 +789,7 @@
                     android:paddingTop="12dip" >
 
                     <TextView
-                        android:id="@+id/TitleName"
+                        android:id="@+id/TitleName4"
                         android:layout_width="wrap_content"
                         android:layout_height="0dip"
                         android:layout_weight="1"

diff --git a/app/src/main/res/layout/single_item_view.xml b/app/src/main/res/layout/single_item_view.xml
@@ -158,7 +158,7 @@
                         android:layout_height="fill_parent" />
 
                     <TextView
-                        android:id="@+id/BtnText"
+                        android:id="@+id/BtnText2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginLeft="5dip"

diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
@@ -41,7 +41,6 @@
     <string name="TxtSendItemContentTo">发送条目内容至…</string>
     <string name="TxtHelp">帮助</string>
     <string name="TxtLogout">登出</string>
-    <string name="TxtShareWithNote">分享并添加笔记</string>
     <string name="TxtSettingAutoSync">自动同步</string>
     <string name="TxtSettingAutoSyncIntro">在此项功能被打开时，EasyRSS会在特定的网络环境下自动从Google Reader下载最新的阅读条目，并同步阅读状态。</string>
     <string name="TxtSettingImageFetching">图片加载</string>