Skip to content
This repository was archived by the owner on Nov 28, 2024. It is now read-only.

Commit 1a36625

Browse files
authored
Lint (#52)
* Lint #Fix #51 * One more duplicated ID
1 parent 9249f87 commit 1a36625

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

app/src/main/res/layout/settings.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@
342342
android:paddingTop="12dip" >
343343

344344
<TextView
345-
android:id="@+id/TitleName"
345+
android:id="@+id/TitleName2"
346346
android:layout_width="wrap_content"
347347
android:layout_height="0dip"
348348
android:layout_weight="1"
@@ -469,7 +469,7 @@
469469
android:paddingTop="12dip" >
470470

471471
<TextView
472-
android:id="@+id/TitleName"
472+
android:id="@+id/TitleName3"
473473
android:layout_width="wrap_content"
474474
android:layout_height="0dip"
475475
android:layout_weight="1"
@@ -524,7 +524,7 @@
524524
</LinearLayout>
525525

526526
<ImageView
527-
android:id="@+id/SettingSyncStatus"
527+
android:id="@+id/SettingSyncStatus2"
528528
android:layout_width="80dip"
529529
android:layout_height="wrap_content"
530530
android:src="@drawable/setting_browser_choice" >
@@ -789,7 +789,7 @@
789789
android:paddingTop="12dip" >
790790

791791
<TextView
792-
android:id="@+id/TitleName"
792+
android:id="@+id/TitleName4"
793793
android:layout_width="wrap_content"
794794
android:layout_height="0dip"
795795
android:layout_weight="1"

app/src/main/res/layout/single_item_view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@
158158
android:layout_height="fill_parent" />
159159

160160
<TextView
161-
android:id="@+id/BtnText"
161+
android:id="@+id/BtnText2"
162162
android:layout_width="wrap_content"
163163
android:layout_height="wrap_content"
164164
android:layout_marginLeft="5dip"

app/src/main/res/values-zh-rCN/strings.xml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
<string name="TxtSendItemContentTo">发送条目内容至…</string>
4242
<string name="TxtHelp">帮助</string>
4343
<string name="TxtLogout">登出</string>
44-
<string name="TxtShareWithNote">分享并添加笔记</string>
4544
<string name="TxtSettingAutoSync">自动同步</string>
4645
<string name="TxtSettingAutoSyncIntro">在此项功能被打开时,EasyRSS会在特定的网络环境下自动从Google Reader下载最新的阅读条目,并同步阅读状态。</string>
4746
<string name="TxtSettingImageFetching">图片加载</string>

0 commit comments

Comments
 (0)