Commit ca7f3421 authored by fallenstardust's avatar fallenstardust

取消最大创建分类限制

更改卡组选择默认string
parent 1ef6ba5c
...@@ -43,6 +43,12 @@ ...@@ -43,6 +43,12 @@
优化: 优化:
1.重置资源支持重置人机文件; 1.重置资源支持重置人机文件;
2.优化APP加载速度; 2.优化APP加载速度;
3.禁止创建不允许符号为名称的分类;
修复:
1.删除被清空的卡组闪退的问题;
2.无法上下滚动分类列表的问题;
3.未分类下无卡组时选择卡组闪退的问题;
4.提取录像卡组无法保存卡组的问题;
</pre> </pre>
</body> </body>
</html> </html>
\ No newline at end of file
...@@ -375,7 +375,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie ...@@ -375,7 +375,7 @@ public abstract class HomeActivity extends BaseActivity implements NavigationVie
startActivity(new Intent(this, DeckManagerActivity.getDeckManager())); startActivity(new Intent(this, DeckManagerActivity.getDeckManager()));
break; break;
case R.id.action_join_qq_group: case R.id.action_join_qq_group:
String key = "4IyCWlDy1rdR14_eg0q1Xi488nG53_Lm"; String key = "anEjPCDdhLgxtfLre-nT52G1Coye3LkK";
joinQQGroup(key); joinQQGroup(key);
break; break;
case R.id.action_help: { case R.id.action_help: {
......
...@@ -174,9 +174,9 @@ public class YGODialogUtil { ...@@ -174,9 +174,9 @@ public class YGODialogUtil {
du.dis(); du.dis();
switch (position) { switch (position) {
case 0: case 0:
if (deckList.size()>=8){ //if (deckList.size()>=8){
YGOUtil.show("最多只能有5个自定义分类"); // YGOUtil.show("最多只能有5个自定义分类");
} //}
DialogPlus builder = new DialogPlus(context); DialogPlus builder = new DialogPlus(context);
builder.setTitle(R.string.please_input_category_name); builder.setTitle(R.string.please_input_category_name);
EditText editText = new EditText(context); EditText editText = new EditText(context);
......
...@@ -57,7 +57,7 @@ ...@@ -57,7 +57,7 @@
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:textColor="@color/white" android:textColor="@color/white"
android:textStyle="bold" android:textStyle="bold"
android:text="假装这是一个卡组.ydk" android:text="@string/select_deck"
android:textSize="18sp" android:textSize="18sp"
android:id="@+id/tv_deck" android:id="@+id/tv_deck"
android:layout_width="match_parent" android:layout_width="match_parent"
......
...@@ -157,6 +157,7 @@ ...@@ -157,6 +157,7 @@
<string name="all">모두보기</string> <string name="all">모두보기</string>
<string name="donation">기부</string> <string name="donation">기부</string>
<string name="refresh">새로고침</string> <string name="refresh">새로고침</string>
<string name="select_deck">카드 그룹 선택</string>
<string name="quit_deck_tip">덱관리자를 나가겠습니까?</string> <string name="quit_deck_tip">덱관리자를 나가겠습니까?</string>
<string name="deck_delete_text">삭제하려면 여기로 드래그하십시오.</string> <string name="deck_delete_text">삭제하려면 여기로 드래그하십시오.</string>
<string name="question_keep_cur_deck">현재 카드를 유지하겠습니까?</string> <string name="question_keep_cur_deck">현재 카드를 유지하겠습니까?</string>
...@@ -264,7 +265,7 @@ ...@@ -264,7 +265,7 @@
<string name="delete_confirm">카테고리 전부 삭제</string> <string name="delete_confirm">카테고리 전부 삭제</string>
<string name="no_deck_is_selected">덱이 선택되지 않았습니다.</string> <string name="no_deck_is_selected">덱이 선택되지 않았습니다.</string>
<string name="done">완료!</string> <string name="done">완료!</string>
<string name="screenshoot">스크린 샷</string> <string name="screenshoot">사진공유</string>
<string name="code_share">코드 공유</string> <string name="code_share">코드 공유</string>
<string name="donot_editor_bot_Deck">AI 덱을 편집 / 제거하지 마십시오. AI 모드는 제대로 작동하지 않습니다.</string> <string name="donot_editor_bot_Deck">덱을 변경하지 말아 주세요. 그러면 프로그램이 제대로 작동하지 않을 수 있습니다.</string>
</resources> </resources>
...@@ -159,6 +159,7 @@ ...@@ -159,6 +159,7 @@
<string name="all">全卡表</string> <string name="all">全卡表</string>
<string name="donation">支持我们</string> <string name="donation">支持我们</string>
<string name="refresh">刷新</string> <string name="refresh">刷新</string>
<string name="select_deck">点击选择卡组</string>
<string name="quit_deck_tip">退出卡组编辑?</string> <string name="quit_deck_tip">退出卡组编辑?</string>
<string name="deck_delete_text">拖到这里删除</string> <string name="deck_delete_text">拖到这里删除</string>
<string name="question_keep_cur_deck">保留当前卡牌?</string> <string name="question_keep_cur_deck">保留当前卡牌?</string>
...@@ -221,7 +222,7 @@ ...@@ -221,7 +222,7 @@
<string name="OpenTIP">快捷加房使用方法</string> <string name="OpenTIP">快捷加房使用方法</string>
<string name="Open_Alert_Window">去打开悬浮窗</string> <string name="Open_Alert_Window">去打开悬浮窗</string>
<string name="Function_Menu">功能菜单</string> <string name="Function_Menu">功能菜单</string>
<string name="Join_QQ">水友</string> <string name="Join_QQ">机型调试</string>
<string name="donatefor">您的捐赠将用于维持自动更新费用,收集更新资料、修图后期以及购买适配机型等</string> <string name="donatefor">您的捐赠将用于维持自动更新费用,收集更新资料、修图后期以及购买适配机型等</string>
<string name="coverSelect">点击相应卡背选择文件</string> <string name="coverSelect">点击相应卡背选择文件</string>
<string name="bgSelect">点击相应背景选择文件</string> <string name="bgSelect">点击相应背景选择文件</string>
......
...@@ -159,6 +159,7 @@ ...@@ -159,6 +159,7 @@
<string name="label_pendulum">Pendulum scale</string> <string name="label_pendulum">Pendulum scale</string>
<string name="all">All</string> <string name="all">All</string>
<string name="refresh">Refresh</string> <string name="refresh">Refresh</string>
<string name="select_deck">Click here to select Deck</string>
<string name="quit_deck_tip">Quit deck editor?</string> <string name="quit_deck_tip">Quit deck editor?</string>
<string name="deck_delete_text">Drag here to delete</string> <string name="deck_delete_text">Drag here to delete</string>
<string name="question_keep_cur_deck">keep current cards?</string> <string name="question_keep_cur_deck">keep current cards?</string>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment