diff --git a/LimeStudio/app/app-release.apk b/LimeStudio/app/app-release.apk index a250e0c3..a1cbdb9c 100644 Binary files a/LimeStudio/app/app-release.apk and b/LimeStudio/app/app-release.apk differ diff --git a/LimeStudio/app/build.gradle b/LimeStudio/app/build.gradle index 3dd934a3..d53c7fc9 100644 --- a/LimeStudio/app/build.gradle +++ b/LimeStudio/app/build.gradle @@ -33,8 +33,8 @@ android { applicationId "net.toload.main.hd" minSdkVersion 16 targetSdkVersion 22 - versionCode 511 - versionName '5.0.3' + versionCode 512 + versionName '5.0.4' } buildTypes { release { diff --git a/LimeStudio/app/src/main/java/net/toload/main/hd/limedb/LimeDB.java b/LimeStudio/app/src/main/java/net/toload/main/hd/limedb/LimeDB.java index 36bf5969..088cd441 100644 --- a/LimeStudio/app/src/main/java/net/toload/main/hd/limedb/LimeDB.java +++ b/LimeStudio/app/src/main/java/net/toload/main/hd/limedb/LimeDB.java @@ -284,16 +284,8 @@ public class LimeDB extends LimeSQLiteOpenHelper { // Cache for Related Score private HashMap relatedscore = new HashMap<>(); - - private LimeHanConverter hanConverter; - - - - - - public void setFinish(boolean value) { this.finish = value; } diff --git a/LimeStudio/app/src/main/java/net/toload/main/hd/ui/ManageRelatedFragment.java b/LimeStudio/app/src/main/java/net/toload/main/hd/ui/ManageRelatedFragment.java index 17b2a910..eb46f6cd 100644 --- a/LimeStudio/app/src/main/java/net/toload/main/hd/ui/ManageRelatedFragment.java +++ b/LimeStudio/app/src/main/java/net/toload/main/hd/ui/ManageRelatedFragment.java @@ -437,8 +437,6 @@ public void addRelated(String pword, String cword, int score) { public void updateRelated(int id, String pword, String cword, int score) { - if(datasource.hasRelated(pword, cword) == 0){ - // remove from temp list for(int i = 0 ; i < total ; i++){ if(id== this.relatedlist.get(i).getId()){ @@ -463,10 +461,6 @@ public void updateRelated(int id, String pword, String cword, int score) { searchrelated(); - }else{ - Toast.makeText(activity, R.string.manage_related_duplicated, Toast.LENGTH_SHORT).show(); - } - } } \ No newline at end of file diff --git a/LimeStudio/app/src/main/java/net/toload/main/hd/ui/SetupImFragment.java b/LimeStudio/app/src/main/java/net/toload/main/hd/ui/SetupImFragment.java index 8af33e5d..f2fbf44e 100644 --- a/LimeStudio/app/src/main/java/net/toload/main/hd/ui/SetupImFragment.java +++ b/LimeStudio/app/src/main/java/net/toload/main/hd/ui/SetupImFragment.java @@ -30,6 +30,8 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; +import android.content.pm.PackageInfo; +import android.content.pm.PackageManager; import android.graphics.Typeface; import android.net.ConnectivityManager; import android.os.Bundle; @@ -41,6 +43,7 @@ import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import android.widget.TextView; import android.widget.Toast; import com.dropbox.client2.DropboxAPI; @@ -142,6 +145,8 @@ public class SetupImFragment extends Fragment { List imlist; + TextView txtVersion; + // Vpon //private RelativeLayout adBannerLayout; // private VpadnBanner vpadnBanner = null; @@ -382,6 +387,16 @@ public void onClick(View v) { } + PackageInfo pInfo = null; + try { + pInfo = getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0); + String versionstr = "v"+ pInfo.versionName + " - " + pInfo.versionCode; + txtVersion = (TextView) rootView.findViewById(R.id.txtVersion); + txtVersion.setText(versionstr); + } catch (PackageManager.NameNotFoundException e) { + e.printStackTrace(); + } + return rootView; } diff --git a/LimeStudio/app/src/main/res/layout/fragment_setup_im.xml b/LimeStudio/app/src/main/res/layout/fragment_setup_im.xml index cb3c0405..9f6eea19 100644 --- a/LimeStudio/app/src/main/res/layout/fragment_setup_im.xml +++ b/LimeStudio/app/src/main/res/layout/fragment_setup_im.xml @@ -41,13 +41,25 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/SetupImFragment" - android:padding="10dp"> + android:padding="5dp"> + + + + android:padding="5dp">