diff --git a/app/build.gradle b/app/build.gradle index 285cb83..4097191 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "top.fumiama.simpledict" minSdkVersion 26 targetSdkVersion 34 - versionCode 21 - versionName '5.0.1' + versionCode 22 + versionName '5.0.2' resConfigs "zh", "zh-rCN" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" diff --git a/app/src/main/java/top/fumiama/simpledict/MainActivity.kt b/app/src/main/java/top/fumiama/simpledict/MainActivity.kt index 9a47ac5..cd78cd2 100644 --- a/app/src/main/java/top/fumiama/simpledict/MainActivity.kt +++ b/app/src/main/java/top/fumiama/simpledict/MainActivity.kt @@ -44,6 +44,7 @@ class MainActivity : AppCompatActivity() { private var spwd: String? = null private var dict: SimpleDict? = null private var cm: ClipboardManager? = null + private var noShowNisi = false private var mViewPagerPosition = 0 private val mControlBarStates = arrayOf(ControlBarState(visibleThreshold+8), ControlBarState(visibleThreshold+8)) private val mVPAdapter get() = fmvp.adapter as MainFragment.PagerAdapter @@ -58,7 +59,9 @@ class MainActivity : AppCompatActivity() { if(contains("port")) getInt("port", port).apply { port = this } if(contains("pwd")) getString("pwd", pwd)?.apply { pwd = this } if(contains("spwd")) getString("spwd", spwd)?.apply { spwd = this } + if(contains("noNisi")) getBoolean("noNisi", noShowNisi).apply { noShowNisi = this } } + Log.d("MyMain", "noNisi: $noShowNisi") dict = SimpleDict(Client(host, port), pwd, externalCacheDir, spwd) cm = getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager @@ -164,6 +167,7 @@ class MainActivity : AppCompatActivity() { } } putString("pwd", w) + putBoolean("noNisi", t.dis.isChecked) apply() Toast.makeText(this@MainActivity, R.string.toast_take_effect_next_time, Toast.LENGTH_SHORT).show() return@setPositiveButton @@ -422,8 +426,10 @@ class MainActivity : AppCompatActivity() { //Log.d("MyMain", "Like status of $key is $like") holder.itemView.apply { runOnUiThread { - ta.visibility = View.VISIBLE - tn.text = key + if (!noShowNisi) { + tn.visibility = View.VISIBLE + tn.text = key + } ta.text = key tb.text = data vl.setBackgroundResource(if(like) R.drawable.ic_like_filled else R.drawable.ic_like) diff --git a/app/src/main/res/layout/dialog_input.xml b/app/src/main/res/layout/dialog_input.xml index 9f825c4..9c1dda7 100644 --- a/app/src/main/res/layout/dialog_input.xml +++ b/app/src/main/res/layout/dialog_input.xml @@ -42,6 +42,14 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> + + + android:orientation="vertical" + android:paddingStart="16dp" + android:paddingTop="10dp" + android:paddingEnd="16dp" + android:paddingBottom="10dp"> + android:textStyle="bold" + android:visibility="gone" + tools:visibility="visible" /> @@ -38,10 +39,7 @@ + android:layout_height="wrap_content" /> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b690874..c11ba20 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,6 +18,7 @@ 重设 添加 删除 + 不显示Nisi zenbi eujuno