diff --git a/.idea/misc.xml b/.idea/misc.xml
index 4d8d8ef..8f75457 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
-
+
\ No newline at end of file
diff --git a/app/build.gradle b/app/build.gradle
index e58cb96..0b3ec89 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -39,7 +39,7 @@ dependencies {
compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
compile 'org.jsoup:jsoup:1.9.2'
compile 'com.nononsenseapps:filepicker:2.5.2'
- compile 'com.github.medyo:android-about-page:1.0.7'
+ compile 'com.github.medyo:android-about-page:1.1.1'
}
def ksFile = rootProject.file('local.properties')
diff --git a/app/src/main/java/com/sh1r0/noveldroid/SettingsFragment.java b/app/src/main/java/com/sh1r0/noveldroid/SettingsFragment.java
index 02fe4eb..b17ba5f 100644
--- a/app/src/main/java/com/sh1r0/noveldroid/SettingsFragment.java
+++ b/app/src/main/java/com/sh1r0/noveldroid/SettingsFragment.java
@@ -22,7 +22,6 @@
import android.support.v7.preference.Preference;
import android.support.v7.preference.Preference.OnPreferenceClickListener;
import android.support.v7.preference.PreferenceFragmentCompat;
-import android.support.v7.view.ContextThemeWrapper;
import android.text.Editable;
import android.text.TextWatcher;
import android.view.LayoutInflater;
@@ -50,8 +49,6 @@
import java.net.URL;
import java.text.SimpleDateFormat;
import java.util.Date;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
public class SettingsFragment extends PreferenceFragmentCompat implements
SharedPreferences.OnSharedPreferenceChangeListener {
@@ -70,7 +67,6 @@ public class SettingsFragment extends PreferenceFragmentCompat implements
private Preference about;
private SharedPreferences prefs;
private String versionName;
- private String aboutMessage;
private DownloadManager manager;
private BroadcastReceiver receiver;
@@ -89,7 +85,6 @@ public void onCreate(Bundle paramBundle) {
} catch (NameNotFoundException e) {
e.printStackTrace();
}
- aboutMessage = getString(R.string.version_tag) + versionName + "\n" + getString(R.string.author_tag) + getString(R.string.author_name);
encoding = findPreference(KEY_ENCODING);
namingRule = findPreference(KEY_NAMING_RULE);
@@ -100,7 +95,7 @@ public boolean onPreferenceClick(Preference preference) {
final View dialog_view = factory.inflate(R.layout.naming_rule_dialog,null);
final EditText editText;
final TextView previewTextView;
- previewTextView = (TextView) dialog_view.findViewById(R.id.tv_preivew_string);
+ previewTextView = (TextView) dialog_view.findViewById(R.id.tv_preview_string);
editText = (EditText) dialog_view.findViewById(R.id.et_naming_rule);
editText.addTextChangedListener(new TextWatcher() {
@Override
@@ -359,7 +354,7 @@ protected void onPostExecute(final Pair versionPair) {
AlertDialog.Builder dialog = new AlertDialog.Builder(getActivity());
dialog.setCancelable(false);
- if (NovelUtils.versionCompare(currentVersion, versionPair.first) == 0) {
+ if (NovelUtils.versionCompare(currentVersion, versionPair.first) >= 0) {
dialog.setMessage(R.string.current_is_latest);
dialog.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
@Override
diff --git a/app/src/main/res/layout/naming_rule_dialog.xml b/app/src/main/res/layout/naming_rule_dialog.xml
index 1a145cb..7d67494 100644
--- a/app/src/main/res/layout/naming_rule_dialog.xml
+++ b/app/src/main/res/layout/naming_rule_dialog.xml
@@ -1,25 +1,41 @@
+ android:orientation="vertical"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:paddingBottom="16dp"
+ android:paddingLeft="16dp"
+ android:paddingRight="16dp"
+ android:paddingTop="16dp">
-
-
+ android:id="@+id/tv_preview_string"
+ android:textSize="20sp"
+ android:layout_gravity="center_horizontal"
+ android:textColor="@color/primary_text"
+ android:textStyle="normal|italic"
+ android:paddingTop="10sp"
+ android:paddingBottom="10sp"
+ android:textAllCaps="false"
+ />
+ android:id="@+id/et_naming_rule"
+ />
+
+
-
\ No newline at end of file
+
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 62aa220..4529b45 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -42,7 +42,7 @@
編碼
選擇編碼
命名規則
- /n=書名, /a=作者, /t=年-月-日, /y=年, /m=月, /d=日
+ /n=書名,/a=作者,/t=年-月-日,\n/y=年,/m=月,/d=日
下載資料夾
新資料夾
新資料夾名稱
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index aa8f81f..d4ce4c3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,7 +49,7 @@
Select Encoding
Filename Rule
Select Naming Rule
- /n=bookname, /a=author /t=yyyy-MM-dd, /y=year, /m=month and /d=day
+ /n=bookname, /a=author /t=yyyy-MM-dd,\n/y=year, /m=month and /d=day
Download Folder
New Folder
New Folder Name