i/YandView
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

text normalization

Browse Source
This commit is contained in:
anrannn
2022-09-30 21:07:29 +08:00
parent 830b5978ae
commit 9f664b1511
9 changed files with 50 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/src/main/java/com/lsp/view/activity/main/MainActivity.kt
+2 -2
View File
@@ -332,7 +332,7 @@ class MainActivity : BaseActivity() {
super.handleMessage(msg)
when (msg.what){
CallBackStatus.DATAISNULL.ordinal ->{
Snackbar.make(swipeRefreshLayout,"未找到内容",Snackbar.LENGTH_SHORT).show()
Snackbar.make(swipeRefreshLayout,R.string.toast_load_empty,Snackbar.LENGTH_SHORT).show()
search.setText("")
}
CallBackStatus.OK.ordinal -> {
@@ -345,7 +345,7 @@ class MainActivity : BaseActivity() {
}
CallBackStatus.NETWORKERROR.ordinal -> {
Snackbar.make(swipeRefreshLayout,"网络连接失败",Snackbar.LENGTH_SHORT).show()
Snackbar.make(swipeRefreshLayout,R.string.toast_load_network_fail,Snackbar.LENGTH_SHORT).show()
}
}
app/src/main/java/com/lsp/view/activity/pic/PicActivity.kt
+2 -2
View File
@@ -204,13 +204,13 @@ class PicActivity : BaseActivity() {
Log.e("Pic", e.stackTraceToString())
}
val pb = findViewById<ProgressBar>(R.id.pb)
Snackbar.make(pb, "加载错误", Snackbar.LENGTH_LONG).setAction("查看Log") {
Snackbar.make(pb, R.string.toast_load_fail, Snackbar.LENGTH_LONG).setAction(R.string.button_check) {
AlertDialog.Builder(this@PicActivity).apply {
setTitle("Log")
if (e != null) {
setMessage(e.stackTraceToString())
}
setNegativeButton("确定", null)
setNegativeButton(R.string.button_ok, null)
create()
show()
}
app/src/main/res/layout/activity_fav_tag.xml
+1 -1
View File
@@ -16,7 +16,7 @@
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:id="@+id/toolbar"
app:title="FavouriteTag"
app:title="@string/title_activity_favouriteTag"
/>
</com.google.android.material.appbar.AppBarLayout>
app/src/main/res/layout/activity_login.xml
+3 -3
View File
@@ -13,16 +13,16 @@
android:layout_height="wrap_content"
android:textSize="44sp"
android:id="@+id/title"
android:text="Login"/>
android:text="@string/activity_login_login"/>
<EditText
android:hint="账号..."
android:hint="@string/activity_login_account"
android:layout_marginTop="20dp"
android:layout_gravity="center"
android:layout_width="240dp"
android:layout_height="wrap_content"
android:id="@+id/username"/>
<EditText
android:hint="密码..."
android:hint="@string/activity_login_password"
android:inputType="textPassword"
android:layout_gravity="center"
android:layout_width="240dp"
app/src/main/res/layout/img_item_layout.xml
+2 -2
View File
@@ -32,7 +32,7 @@
android:background="@drawable/ic_twotone_arrow_downward_24"
android:id="@+id/quick_download"
android:layout_margin="15dp"
android:contentDescription="Download" />
android:contentDescription="@string/description_download" />
<ImageView
android:layout_width="35dp"
@@ -40,7 +40,7 @@
android:background="@drawable/ic_twotone_share_24"
android:id="@+id/quick_share"
android:layout_margin="15dp"
android:contentDescription="Share" />
android:contentDescription="@string/description_share" />
</LinearLayout>
</FrameLayout>
app/src/main/res/menu/nav_menu.xml
+3 -3
View File
@@ -4,14 +4,14 @@
<item
android:id="@+id/photo"
android:icon="@drawable/ic_baseline_insert_photo_24"
android:title="画廊"/>
android:title="@string/item_gallery"/>
<item
android:id="@+id/taglist"
android:icon="@drawable/ic_baseline_label_24"
android:title="收藏标签"/>
android:title="@string/item_collect"/>
<item
android:id="@+id/setting"
android:icon="@drawable/setting_icon"
android:title="设置"/>
android:title="@string/item_settings"/>
</group>
</menu>
app/src/main/res/menu/toolbar_menu.xml
+1 -1
View File
@@ -5,6 +5,6 @@
android:id="@+id/search_nav"
android:icon="@drawable/ic_baseline_search_24"
app:showAsAction="always"
android:title="搜索" />
android:title="@string/item_search" />
</menu>
app/src/main/res/values-zh/strings.xml
+19
View File
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="title_activity_settings">设置</string>
<string name="title_activity_favouriteTag">收藏标签</string>
<string name="item_gallery">画廊</string>
<string name="item_collect">收藏</string>
<string name="item_settings">设置</string>
<string name="item_search">搜索</string>
<string name="description_download">下载</string>
<string name="description_share">分享</string>
<string name="activity_login_login">登录</string>
<string name="activity_login_account">账户</string>
<string name="activity_login_password">密码</string>
<string name="toast_load_fail">加载失败</string>
<string name="button_check">查看</string>
<string name="button_ok">好的</string>
<string name="toast_load_empty">没有更多内容</string>
<string name="toast_load_network_fail">连接失败，请检查网络</string>
</resources>
app/src/main/res/values/strings.xml
+17 -2
View File
@@ -1,5 +1,20 @@
<resources>
<string name="app_name">YandView</string>
<string name="app_name" translatable="false">YandView</string>
<string name="title_activity_settings">SettingsActivity</string>
<string name="title_activity_settings_backup">SettingsActivity_backup</string>
<string name="title_activity_settings_backup" translatable="false">SettingsActivity_backup</string>
<string name="title_activity_favouriteTag">FavouriteTag</string>
<string name="item_gallery">Gallery</string>
<string name="item_collect">Collect</string>
<string name="item_settings">Settings</string>
<string name="item_search">Search</string>
<string name="description_download">Download</string>
<string name="description_share">Share</string>
<string name="activity_login_login">Login</string>
<string name="activity_login_account">Account</string>
<string name="activity_login_password">Password</string>
<string name="toast_load_fail">Loading fail</string>
<string name="button_check">Check</string>
<string name="button_ok">OK</string>
<string name="toast_load_empty">Empty</string>
<string name="toast_load_network_fail">Connection fail</string>
</resources>