From b6d2900f30b30bda0e9a5b20bb23ea27aba531a5 Mon Sep 17 00:00:00 2001 From: lmovse Date: Sat, 6 Oct 2018 15:37:43 +0800 Subject: [PATCH] Fix recycler view direction problem --- .gitignore | 1 + README.md | 3 +- app/build.gradle | 23 +++-- .../jooff/shuyi/ExampleInstrumentedTest.java | 2 +- .../jooff/shuyi/collect/CollectFragment.java | 13 +-- .../jooff/shuyi/data/AppDbRepository.java | 1 + .../shuyi/data/local/LocalDbOpenHelper.java | 4 +- .../jooff/shuyi/history/HistoryFragment.java | 21 ++-- .../jooff/shuyi/history/HistoryPresenter.java | 6 +- .../jooff/shuyi/main/MainActivity.java | 2 +- .../shuyi/util/DividerItemDecoration.java | 93 ------------------ .../com/example/jooff/shuyi/util/TkUtil.java | 82 --------------- .../ic_beach_access_white_24dp.png | Bin 1468 -> 0 bytes .../ic_delete_all_history_black_24dp.png | Bin 490 -> 0 bytes app/src/main/res/values/arrays-google.xml | 2 - app/src/main/res/values/strings.xml | 6 +- app/src/main/res/values/styles.xml | 7 -- .../example/jooff/shuyi/ExampleUnitTest.java | 2 +- 18 files changed, 41 insertions(+), 227 deletions(-) delete mode 100644 app/src/main/java/com/example/jooff/shuyi/util/DividerItemDecoration.java delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_beach_access_white_24dp.png delete mode 100644 app/src/main/res/drawable-xxxhdpi/ic_delete_all_history_black_24dp.png diff --git a/.gitignore b/.gitignore index 271b6e0..9a39a96 100644 --- a/.gitignore +++ b/.gitignore @@ -35,6 +35,7 @@ captures/ # Intellij *.iml .idea/ +app/release/ # Keystore files *.jks diff --git a/README.md b/README.md index 8b4b5ee..cd55300 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ - 复制翻译：无需打开 APP，无需输入单词，长按文本，点击复制，你想要的便出现在你面前 - 快速翻译：一触即达，方便你的生活 - 夜间模式：在最深的夜里给还在奋斗的你最温暖的翻译体验 -- 多源翻译：有道，金山，百度，扇贝，译云，给你最多种的选择 +- 多源翻译：谷歌，有道，金山，百度，扇贝，译云，给你最多种的选择 点击下载，安装，惊喜为你而来。 @@ -20,4 +20,5 @@ - [新增] 一键删除历史记录 - [修复] 切换到任务栏时的主题着色不一致 - [修复] 切换到译云源时查询原文会改变 +- [修复] 分割线显示问题 - [优化] 扇贝源只支持英文单词译中的提示 diff --git a/app/build.gradle b/app/build.gradle index 7040900..eb45728 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -43,21 +43,20 @@ android { } } dependencies { - compile fileTree(include: ['*.jar'], dir: 'libs') - androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + implementation fileTree(include: ['*.jar'], dir: 'libs') + androidTestImplementation('com.android.support.test.espresso:espresso-core:2.2.2', { exclude group: 'com.android.support', module: 'support-annotations' }) - compile files('libs/library-1.0.19.jar') - compile 'com.getbase:floatingactionbutton:1.10.1' - compile 'com.android.support.constraint:constraint-layout:2.0.0-alpha2' - compile 'com.android.support:appcompat-v7:28.0.0' - compile 'com.android.support:cardview-v7:28.0.0' - compile 'com.android.support:design:28.0.0' - compile 'com.android.support:support-v4:28.0.0' - compile 'com.android.support:support-vector-drawable:28.0.0' - testCompile 'junit:junit:4.12' + implementation files('libs/library-1.0.19.jar') + implementation 'com.getbase:floatingactionbutton:1.10.1' + implementation 'com.android.support.constraint:constraint-layout:2.0.0-alpha2' + implementation 'com.android.support:appcompat-v7:28.0.0' + implementation 'com.android.support:cardview-v7:28.0.0' + implementation 'com.android.support:design:28.0.0' + implementation 'com.android.support:support-v4:28.0.0' + implementation 'com.android.support:support-vector-drawable:28.0.0' + testImplementation 'junit:junit:4.12' implementation 'com.jakewharton:butterknife:8.8.1' - implementation 'io.apisense:rhino-android:1.0' implementation 'com.google.code.gson:gson:2.8.5' annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1' } diff --git a/app/src/androidTest/java/com/example/jooff/shuyi/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/example/jooff/shuyi/ExampleInstrumentedTest.java index 54047ae..3ecf788 100644 --- a/app/src/androidTest/java/com/example/jooff/shuyi/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/com/example/jooff/shuyi/ExampleInstrumentedTest.java @@ -17,7 +17,7 @@ @RunWith(AndroidJUnit4.class) public class ExampleInstrumentedTest { @Test - public void useAppContext() throws Exception { + public void useAppContext() { // Context of the app under test. Context appContext = InstrumentationRegistry.getTargetContext(); diff --git a/app/src/main/java/com/example/jooff/shuyi/collect/CollectFragment.java b/app/src/main/java/com/example/jooff/shuyi/collect/CollectFragment.java index dbdd3ab..12775ff 100644 --- a/app/src/main/java/com/example/jooff/shuyi/collect/CollectFragment.java +++ b/app/src/main/java/com/example/jooff/shuyi/collect/CollectFragment.java @@ -12,6 +12,7 @@ import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; import android.support.v7.widget.CardView; +import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; @@ -25,7 +26,6 @@ import com.example.jooff.shuyi.data.AppDbRepository; import com.example.jooff.shuyi.data.entity.Collect; import com.example.jooff.shuyi.translate.main.MainTransView; -import com.example.jooff.shuyi.util.DividerItemDecoration; import java.util.ArrayList; @@ -70,7 +70,7 @@ public void initView() { recCollect.setAdapter(mAdapter); recCollect.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false)); recCollect.setNestedScrollingEnabled(false); - recCollect.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL_LIST)); + recCollect.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL)); ItemTouchHelper mItemTouchHelper = new ItemTouchHelper(new HistoryRvCallback()); mItemTouchHelper.attachToRecyclerView(recCollect); mPresenter.initTheme(); @@ -196,12 +196,9 @@ public void onBindViewHolder(final CollectRvAdapter.collectViewHolder holder, in holder.textOriginal.setText(item.getOriginal()); holder.textResult.setText(item.getResult()); if (onItemClickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - int pos = holder.getLayoutPosition(); - onItemClickListener.onItemClick(holder.itemView, pos); - } + holder.itemView.setOnClickListener(view -> { + int pos = holder.getLayoutPosition(); + onItemClickListener.onItemClick(holder.itemView, pos); }); } } diff --git a/app/src/main/java/com/example/jooff/shuyi/data/AppDbRepository.java b/app/src/main/java/com/example/jooff/shuyi/data/AppDbRepository.java index dec0fee..1df9db6 100644 --- a/app/src/main/java/com/example/jooff/shuyi/data/AppDbRepository.java +++ b/app/src/main/java/com/example/jooff/shuyi/data/AppDbRepository.java @@ -59,6 +59,7 @@ public void getTrans(int tranFrom, String transUrl, AppDbSource.TranslateCallbac break; case R.id.source_youdao: RemoteJsonSource.getInstance().getTrans(TransSource.FROM_YOUDAO, transUrl, callback); + break; case R.id.source_google: RemoteJsonSource.getInstance().getTrans(TransSource.FROM_GOOGLE, transUrl, callback); break; diff --git a/app/src/main/java/com/example/jooff/shuyi/data/local/LocalDbOpenHelper.java b/app/src/main/java/com/example/jooff/shuyi/data/local/LocalDbOpenHelper.java index 3a276df..92789fb 100644 --- a/app/src/main/java/com/example/jooff/shuyi/data/local/LocalDbOpenHelper.java +++ b/app/src/main/java/com/example/jooff/shuyi/data/local/LocalDbOpenHelper.java @@ -24,7 +24,7 @@ public class LocalDbOpenHelper extends SQLiteOpenHelper { + AppDbSchema.HistoryTable._ID + " integer" + " primary key autoincrement," + AppDbSchema.HistoryTable.ORIGINAL + " text," + AppDbSchema.HistoryTable.RESULT + " text, " - + AppDbSchema.HistoryTable.COLLECTED + "tinyint unsigned default 0" + ")"; + + AppDbSchema.HistoryTable.COLLECTED + " tinyint unsigned default 0" + ")"; private static final String CREATE_COLLECT = "CREATE TABLE " + AppDbSchema.CollectTable.TABLE_NAME + " (" @@ -48,7 +48,7 @@ public void onUpgrade(SQLiteDatabase sqLiteDatabase, int oldVersion, int newVers if (oldVersion == 1) { sqLiteDatabase.execSQL("ALTER TABLE " + AppDbSchema.HistoryTable.TABLE_NAME + " ADD " - + AppDbSchema.HistoryTable.COLLECTED + "tinyint unsigned default 0 "); + + AppDbSchema.HistoryTable.COLLECTED + " tinyint unsigned default 0 "); sqLiteDatabase.execSQL("CREATE TABLE " + AppDbSchema.CollectTable.TABLE_NAME + "(" + AppDbSchema.CollectTable._ID + " integer" + " primary key autoincrement" + ", " diff --git a/app/src/main/java/com/example/jooff/shuyi/history/HistoryFragment.java b/app/src/main/java/com/example/jooff/shuyi/history/HistoryFragment.java index 78e337e..dc4e0cd 100644 --- a/app/src/main/java/com/example/jooff/shuyi/history/HistoryFragment.java +++ b/app/src/main/java/com/example/jooff/shuyi/history/HistoryFragment.java @@ -12,6 +12,7 @@ import android.support.v4.app.Fragment; import android.support.v4.content.ContextCompat; import android.support.v7.widget.CardView; +import android.support.v7.widget.DividerItemDecoration; import android.support.v7.widget.LinearLayoutManager; import android.support.v7.widget.RecyclerView; import android.support.v7.widget.helper.ItemTouchHelper; @@ -26,7 +27,6 @@ import com.example.jooff.shuyi.data.AppDbRepository; import com.example.jooff.shuyi.data.entity.History; import com.example.jooff.shuyi.translate.main.MainTransView; -import com.example.jooff.shuyi.util.DividerItemDecoration; import java.util.ArrayList; @@ -68,11 +68,11 @@ public void onStart() { @Override public void initView() { - mAdapter = new HistoryRvAdapter(new ArrayList(0), mListener); + mAdapter = new HistoryRvAdapter(new ArrayList<>(0), mListener); recHistory.setAdapter(mAdapter); recHistory.setLayoutManager(new LinearLayoutManager(getContext(), LinearLayoutManager.VERTICAL, false)); recHistory.setNestedScrollingEnabled(false); - recHistory.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL_LIST)); + recHistory.addItemDecoration(new DividerItemDecoration(getContext(), DividerItemDecoration.VERTICAL)); ItemTouchHelper mItemTouchHelper = new ItemTouchHelper(new HistoryRvCallback()); mItemTouchHelper.attachToRecyclerView(recHistory); mPresenter.initTheme(); @@ -169,7 +169,7 @@ public void onChildDraw(Canvas c, RecyclerView recyclerView, RecyclerView.ViewHo super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive); } } else { - // 拖动时有系统自己完成 + // 拖动时由系统自己完成 super.onChildDraw(c, recyclerView, viewHolder, dX, dY, actionState, isCurrentlyActive); } } @@ -205,12 +205,9 @@ public void onBindViewHolder(final HistoryRvAdapter.historyViewHolder holder, in holder.collect.setTag(true); } if (onItemClickListener != null) { - holder.itemView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - int pos = holder.getLayoutPosition(); - onItemClickListener.onItemClick(holder.itemView, pos); - } + holder.itemView.setOnClickListener(view -> { + int pos = holder.getLayoutPosition(); + onItemClickListener.onItemClick(holder.itemView, pos); }); } } @@ -232,10 +229,13 @@ public void refreshItems(ArrayList items) { } class historyViewHolder extends RecyclerView.ViewHolder { + @BindView(R.id.item_original) TextView textOriginal; + @BindView(R.id.item_result) TextView textResult; + @BindView(R.id.collcect) ImageView collect; @@ -259,7 +259,6 @@ public void show(ImageView collect) { ButterKnife.bind(this, itemView); } } - } public interface OnItemClickListener { diff --git a/app/src/main/java/com/example/jooff/shuyi/history/HistoryPresenter.java b/app/src/main/java/com/example/jooff/shuyi/history/HistoryPresenter.java index 46e2e4e..a9122cd 100644 --- a/app/src/main/java/com/example/jooff/shuyi/history/HistoryPresenter.java +++ b/app/src/main/java/com/example/jooff/shuyi/history/HistoryPresenter.java @@ -23,9 +23,9 @@ public HistoryPresenter(AppDbSource.HistoryDbSource historyDbSource, HistoryCont @Override public void loadData() { - ArrayList historys = mHistoryDbSource.getHistories(); - if (!historys.isEmpty()) { - mHistoryView.showHistory(historys); + ArrayList histories = mHistoryDbSource.getHistories(); + if (!histories.isEmpty()) { + mHistoryView.showHistory(histories); } } diff --git a/app/src/main/java/com/example/jooff/shuyi/main/MainActivity.java b/app/src/main/java/com/example/jooff/shuyi/main/MainActivity.java index 7154f52..3ddc2af 100644 --- a/app/src/main/java/com/example/jooff/shuyi/main/MainActivity.java +++ b/app/src/main/java/com/example/jooff/shuyi/main/MainActivity.java @@ -378,7 +378,7 @@ public void showConfirmFinish() { @Override public void onSuccess(int transFrom, String original) { - if (transFrom == TransSource.FROM_HISTORY) { + if (transFrom == TransSource.FROM_HISTORY || transFrom == TransSource.FROM_COLLECT) { mEditText.setText(original); } mProgressBar.setVisibility(View.GONE); diff --git a/app/src/main/java/com/example/jooff/shuyi/util/DividerItemDecoration.java b/app/src/main/java/com/example/jooff/shuyi/util/DividerItemDecoration.java deleted file mode 100644 index 75ce89a..0000000 --- a/app/src/main/java/com/example/jooff/shuyi/util/DividerItemDecoration.java +++ /dev/null @@ -1,93 +0,0 @@ -package com.example.jooff.shuyi.util; - - -import android.content.Context; -import android.content.res.TypedArray; -import android.graphics.Canvas; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.support.v7.widget.LinearLayoutManager; -import android.support.v7.widget.RecyclerView; -import android.view.View; - -public class DividerItemDecoration extends RecyclerView.ItemDecoration { - private static final int[] ATTRS = new int[]{ - android.R.attr.listDivider - }; - - public static final int HORIZONTAL_LIST = LinearLayoutManager.HORIZONTAL; - - public static final int VERTICAL_LIST = LinearLayoutManager.VERTICAL; - - private Drawable mDivider; - - private int mOrientation; - - public DividerItemDecoration(Context context, int orientation) { - final TypedArray a = context.obtainStyledAttributes(ATTRS); - mDivider = a.getDrawable(0); - a.recycle(); - setOrientation(orientation); - } - - public void setOrientation(int orientation) { - if (orientation != HORIZONTAL_LIST && orientation != VERTICAL_LIST) { - throw new IllegalArgumentException("invalid orientation"); - } - mOrientation = orientation; - } - - @Override - public void onDraw(Canvas c, RecyclerView parent) { - - if (mOrientation == VERTICAL_LIST) { - drawVertical(c, parent); - } else { - drawHorizontal(c, parent); - } - - } - - - public void drawVertical(Canvas c, RecyclerView parent) { - final int left = parent.getPaddingLeft(); - final int right = parent.getWidth() - parent.getPaddingRight(); - - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View child = parent.getChildAt(i); - android.support.v7.widget.RecyclerView v = new android.support.v7.widget.RecyclerView(parent.getContext()); - final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child - .getLayoutParams(); - final int top = child.getBottom() + params.bottomMargin; - final int bottom = top + mDivider.getIntrinsicHeight(); - mDivider.setBounds(left, top, right, bottom); - mDivider.draw(c); - } - } - - public void drawHorizontal(Canvas c, RecyclerView parent) { - final int top = parent.getPaddingTop(); - final int bottom = parent.getHeight() - parent.getPaddingBottom(); - - final int childCount = parent.getChildCount(); - for (int i = 0; i < childCount; i++) { - final View child = parent.getChildAt(i); - final RecyclerView.LayoutParams params = (RecyclerView.LayoutParams) child - .getLayoutParams(); - final int left = child.getRight() + params.rightMargin; - final int right = left + mDivider.getIntrinsicHeight(); - mDivider.setBounds(left, top, right, bottom); - mDivider.draw(c); - } - } - - @Override - public void getItemOffsets(Rect outRect, int itemPosition, RecyclerView parent) { - int last = parent.getAdapter().getItemCount(); - if (itemPosition < last - 1) { - outRect.set(0, 0, 0, mDivider.getIntrinsicHeight()); - } - } - -} \ No newline at end of file diff --git a/app/src/main/java/com/example/jooff/shuyi/util/TkUtil.java b/app/src/main/java/com/example/jooff/shuyi/util/TkUtil.java index 6af1b42..f3f1879 100644 --- a/app/src/main/java/com/example/jooff/shuyi/util/TkUtil.java +++ b/app/src/main/java/com/example/jooff/shuyi/util/TkUtil.java @@ -1,34 +1,14 @@ package com.example.jooff.shuyi.util; -import android.os.AsyncTask; -import android.util.Log; - -import com.example.jooff.shuyi.api.GoogleTransApi; - -import java.io.BufferedReader; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.net.HttpURLConnection; -import java.net.URL; import java.util.ArrayList; import java.util.List; import java.util.Random; -import java.util.concurrent.ExecutionException; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -import javax.script.ScriptEngine; -import javax.script.ScriptEngineManager; -import javax.script.ScriptException; public class TkUtil { private static String tkk = null; // 谷歌翻译页面中的验证值 - private static Pattern TKK_PATTERN = Pattern.compile("TKK=(.*);VERSION_LABEL"); - private static Random generator = new Random(); /** @@ -130,73 +110,11 @@ private static long tkUtil(long a, String b) { /** * 获取翻译页面，并且提取界面中的 tkk - * 本脚本中，只在第一次使用的时候刷新。在不同的场景中，请设置自己的刷新频率，避免被发现 */ private static void setTKK() { long a = Math.abs(generator.nextInt()); long b = generator.nextInt(); long c = System.currentTimeMillis() / (60 * 60 * 1000); tkk = c + "." + (a + b); - if (tkk == null) { - String translatePage = sendGet(GoogleTransApi.BASE_URL); - Matcher matcher = TKK_PATTERN.matcher(translatePage); - while (matcher.find()) { - tkk = matcher.group(1); - } - ScriptEngineManager manager = new ScriptEngineManager(); - ScriptEngine se = manager.getEngineByName("js"); - try { - tkk = (String) se.eval(tkk); - } catch (ScriptException e) { - Log.e("TKUtil", "setTKK: failed!", e); - } - } - } - - public static String sendGet(String httpUrl) { - String result = ""; - AsyncTask asyncTask = new AsyncTask() { - @Override - protected String doInBackground(String... strings) { - String result = ""; - BufferedReader reader = null; - StringBuilder sbf = new StringBuilder(); - try { - URL url = new URL(httpUrl); - HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection(); - urlConnection.setRequestMethod("GET"); - urlConnection.setRequestProperty("User-Agent", GoogleTransApi.DEFAULT_USER_AGENT); - urlConnection.connect(); - InputStream is = urlConnection.getInputStream(); - reader = new BufferedReader(new InputStreamReader(is, "UTF-8")); - String strRead; - while ((strRead = reader.readLine()) != null) { - sbf.append(strRead); - sbf.append("\r\n"); - } - reader.close(); - result = sbf.toString(); - } catch (IOException e) { - e.printStackTrace(); - } finally { - if (reader != null) { - try { - reader.close(); - } catch (IOException e) { - e.printStackTrace(); - } - } - } - return result; - } - }; - try { - asyncTask.execute(); - result = asyncTask.get(); - } catch (ExecutionException | InterruptedException e) { - e.printStackTrace(); - } - return result; } - } diff --git a/app/src/main/res/drawable-xxxhdpi/ic_beach_access_white_24dp.png b/app/src/main/res/drawable-xxxhdpi/ic_beach_access_white_24dp.png deleted file mode 100644 index ec9c5ba2888120989b26cd70733d2a1454fc8612..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1468 zcmV;t1w;CYP)U2mpxyq^dh;JZJ%E6KD_UJm`1OKcM^Uzw!X| zH|Q$p7f=i63s6019H^22h-(yR73dJ?4l`43gARgLf<_X6r!@@J0J_ZFluHQtrMv@} z3~B{EW_}9)-hH4+c>_=jI>Ev!$3Zi)4qzzgXBKw(5%gl#0Q3N@ORQQ#FYTbua1|Ck z0RDhI&EhPlOpgZF=D!QN#o{jig66~s;LDVNu7NIq4&#PtC#V_4e{RFg)V07sY={K_ zpEth&b)u15L3N-ppcf?DssfG1`b{{MJ@g1+yY8;qw)wq5TR^)(pI{219*1xZs2cRF z=67(2@1PmiJwW(L2ZHUDPLn_Yk1%Jm7gGaMK|M7_+bqy`pbkd>8bTZa-Ec1dRxzl% zp#7kQpaF_~7zkRANx2}+w+Ub~&do~=1o;qQ%vM~7^J(x?(2dZ{w*}xm?BF@je8WNi z30kc}k z1oczs@B8?y@n*hh02_-s%h&nS9IZt7gLa9+a`0u)8DHj`1TYMb0h6T)19VyV@#I*A zk-Ni(`6dChmPjuYf_vl`LMKj3y(D8;nzF05X1*x^wJCpzh2LNClqTTEj3XptnN^e` zw`#sA04GZX-#) zrUbk*@tG-sq>nE$54Rp{0^sMlX}1@ei;{A80)fC62NSXaprK5l&4MGvM`_0mV)OvY zU7Bhs`s{+hPO~~OO%g4DkzEAXR`mJ)o=>hy6+V4_5G#O{0z1-*fTy8CSraROg8~n` z;yP~!X8zh(r=Uu~RZUfi1p1cMwcxpK;#`Kkcw1p}=sQMW%HrjYp>06rHC zwkf6l7BXKCzz>1}pJwT|723&sbpYoCgXZi0zA0@qlKJWYu1W--c8RqgvwL4B3iDL~ z$QZZ1Ogl^RZoVo2nfd!VOTSE2i96=pny(5#_652(%d|BX6Jxf`e;zb3k0XGW@4INP z(SiBL@OW}&768az0q`+LkYBx^9(_!@(^a`^`lN)@#GSMZUcJ_jRI~) zjbjMYLx7;$zyyQ2e16+*P~ISzXylk70Lwk41H3{o(MV0i<|iSvOF(!dBmlZ^Li#q} zD+E)WAI#KlyMzbbO`lT)fQ2&Vrz--*c0cMidH$NA>$X5{8Og!|Uk`RvSm`?!oARN#&p8!Pu-%>~ffB=vP00AHo00KZF00e+U00;m{QcnQ; WV(D~{?rrh_0000VBF~G;uunK>+P+BnTHJ|+7e@{ z^h%oN>`n>u(2rAN{xOAdlV^|ON5@v7O9GK*6PG@3{hy(@Pdxfkek;%n5ZE*QZ^-r5 zZ2fEBTm79FA5IQ%_~GlZBP@!x*Jk^ zOrloiv5Q01kNA&2&(9S4^&_Vvc`k>IaQKGMr~QD#ZS+ z7Mj;;AMPZ~)V3pH-=TV;IL`mmV-LMsG1FW@^*}YJ<$0kAl22wmG~dbX#anXr!)#mj zB_0vRf0p?l^7cHzx&LQez`B+@A4;8#RdfXH7>!kRMC}+^ey~Kg=pNd(kS~cZDN1lw z;jF^fTo?N47BkqVa8)q>nWU4z`yqH=L+pfXP1ZTgF=w(@##mmaeaofHCH_e~k7Ko$7AfEm{b+c#(D|YK<2lZ` zLVT_Dea9@0zdE!(UU=7z!y1X*Rh`8zvwl5e28Z?no4g(Kcgg*zQ|孟加拉语 波斯尼亚语 克罗地亚语 - 捷克语 @@ -70,7 +69,6 @@ bn bs hr - cs \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index c1109f7..b966c81 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,14 +6,14 @@ 译文 发生了一些不可描述的错误 复制成功 - 见或不见 - "\n"你见，或者不见我， + 评或不评 + "\n"你评，或者不评我， "\n"我就在那里， "\n"不悲不喜。 "\n"你赞，或者不赞我， "\n"赞就在那里， "\n"不增不减。 - "\n"来我怀里， + "\n"来酷安给我好评， "\n"或者， "\n"让我住进你的心里。 见 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index d31ed5e..d3a1156 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -13,17 +13,10 @@ true - - -