Merge branch 'support_Android_O'

app/build.gradle

@@ -1,18 +1,18 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 25
-    buildToolsVersion '25.0.1'
+    compileSdkVersion 26
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "com.kiminonawa.mydiary"
         minSdkVersion 17
-        targetSdkVersion 25
+        targetSdkVersion 26
 
         // versionName rule
         // version.yyMMDD_BuildCount_OPTION ,
         // BuildCount_OPTION: D = demo , A = alpha,  H = hotfix
-        versionCode 35
-        versionName "0.3.0.170424_1_A"
+        versionCode 36
+        versionName "0.3.0.170509_1_AH"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -31,13 +31,13 @@ dependencies {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
     //Android lib
-    compile 'com.android.support:appcompat-v7:25.3.0'
-    compile 'com.android.support:design:25.3.0'
-    compile 'com.android.support:support-v4:25.3.0'
-    compile 'com.android.support:support-v13:25.3.0'
-    compile 'com.android.support:recyclerview-v7:25.3.0'
-    compile 'com.android.support:gridlayout-v7:25.3.0'
-    compile 'com.android.support:cardview-v7:25.3.0'
+    compile 'com.android.support:appcompat-v7:26.1.0'
+    compile 'com.android.support:design:26.1.0'
+    compile 'com.android.support:support-v4:26.1.0'
+    compile 'com.android.support:support-v13:26.1.0'
+    compile 'com.android.support:recyclerview-v7:26.1.0'
+    compile 'com.android.support:gridlayout-v7:26.1.0'
+    compile 'com.android.support:cardview-v7:26.1.0'
 
 
     testCompile 'junit:junit:4.12'
@@ -48,11 +48,11 @@ dependencies {
     compile 'commons-io:commons-io:2.5'
     compile 'de.hdodenhof:circleimageview:2.1.0'
     compile 'com.marshalchen.ultimaterecyclerview:library:0.7.0'
-    compile ('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.10.4@aar'){
+    compile ('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar'){
         transitive=true
     }
     //Fresco photo
-    compile 'com.facebook.fresco:fresco:1.2.0'
+    compile 'com.facebook.fresco:fresco:1.8.0'
 
     //Year class to check the old devices
     compile 'com.facebook.device.yearclass:yearclass:2.0.0'

app/src/main/AndroidManifest.xml

@@ -19,6 +19,8 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:resizeableActivity="false"
+        android:supportsPictureInPicture="false"
         android:supportsRtl="false"
         android:theme="@style/AppTheme">
 
@@ -52,10 +54,10 @@
         <activity
             android:name=".entries.photo.PhotoOverviewActivity"
             android:screenOrientation="portrait"
-            android:theme="@style/Theme_NoActionBar_FullScreen"/>
+            android:theme="@style/Theme_NoActionBar_FullScreen" />
         <activity
             android:name=".entries.photo.PhotoDetailViewerActivity"
-            android:screenOrientation="portrait"/>
+            android:screenOrientation="portrait" />
         <activity
             android:name=".memo.MemoActivity"
             android:screenOrientation="portrait"

app/src/main/java/com/kiminonawa/mydiary/backup/BackupActivity.java

@@ -1,6 +1,7 @@
 package com.kiminonawa.mydiary.backup;
 
 import android.app.Activity;
+import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ -14,6 +15,8 @@
 
 import com.kiminonawa.mydiary.R;
 import com.kiminonawa.mydiary.main.MainActivity;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.gui.MyDiaryButton;
 import com.nononsenseapps.filepicker.FilePickerActivity;
 
@@ -88,6 +91,11 @@ protected void onActivityResult(int requestCode, int resultCode, Intent intent)
         }
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
 
     @Override
     public void onClick(View v) {

app/src/main/java/com/kiminonawa/mydiary/backup/DirectoryPickerActivity.java

@@ -1,7 +1,10 @@
 package com.kiminonawa.mydiary.backup;
 
+import android.content.Context;
 import android.os.Environment;
 
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.nononsenseapps.filepicker.AbstractFilePickerFragment;
 import com.nononsenseapps.filepicker.FilePickerActivity;
 
@@ -38,6 +41,12 @@ protected AbstractFilePickerFragment<File> getFragment(
         return currentFragment;
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
+
     /**
      * Override the back-button.
      */

app/src/main/java/com/kiminonawa/mydiary/contacts/ContactsActivity.java

@@ -1,5 +1,6 @@
 package com.kiminonawa.mydiary.contacts;
 
+import android.content.Context;
 import android.database.Cursor;
 import android.graphics.PorterDuff;
 import android.os.Bundle;
@@ -14,6 +15,8 @@
 
 import com.kiminonawa.mydiary.R;
 import com.kiminonawa.mydiary.db.DBManager;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.SPFManager;
 import com.kiminonawa.mydiary.shared.ThemeManager;
 import com.kiminonawa.mydiary.shared.gui.LetterComparator;
@@ -127,6 +130,11 @@ protected void onCreate(Bundle savedInstanceState) {
         initTopicAdapter();
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
     private void initLanguageStr() {
         EN = Locale.ENGLISH.getLanguage();
         JA = Locale.JAPANESE.getLanguage();

app/src/main/java/com/kiminonawa/mydiary/entries/DiaryActivity.java

@@ -1,5 +1,6 @@
 package com.kiminonawa.mydiary.entries;
 
+import android.content.Context;
 import android.database.Cursor;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
@@ -26,6 +27,8 @@
 import com.kiminonawa.mydiary.entries.diary.item.IDairyRow;
 import com.kiminonawa.mydiary.entries.entries.EntriesEntity;
 import com.kiminonawa.mydiary.entries.entries.EntriesFragment;
+import com.kiminonawa.mydiary.shared.language.LanguagerHelper;
+import com.kiminonawa.mydiary.shared.language.MyContextWrapper;
 import com.kiminonawa.mydiary.shared.ThemeManager;
 import com.kiminonawa.mydiary.shared.statusbar.ChinaPhoneHelper;
 
@@ -121,6 +124,11 @@ protected void onStop() {
         mGoogleApiClient.disconnect();
     }
 
+    @Override
+    protected void attachBaseContext(Context newBase) {
+        super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
+    }
+
 
     /**
      *

app/src/main/java/com/kiminonawa/mydiary/entries/diary/CopyPhotoTask.java

@@ -8,9 +8,10 @@
 import android.util.Log;
 
 import com.kiminonawa.mydiary.R;
+import com.kiminonawa.mydiary.entries.diary.item.DiaryTextTag;
+import com.kiminonawa.mydiary.shared.FileManager;
 import com.kiminonawa.mydiary.shared.photo.BitmapHelper;
 import com.kiminonawa.mydiary.shared.photo.ExifUtil;
-import com.kiminonawa.mydiary.shared.FileManager;
 
 import java.io.FileOutputStream;
 import java.io.IOException;
@@ -23,7 +24,7 @@
 public class CopyPhotoTask extends AsyncTask<Void, Void, String> {
 
     public interface CopyPhotoCallBack {
-        void onCopyCompiled(String fileName);
+        void onCopyCompiled(String fileName, DiaryTextTag tag);
     }
 
     private Uri uri;
@@ -34,16 +35,17 @@ public interface CopyPhotoCallBack {
     private int reqWidth, reqHeight;
     private FileManager fileManager;
     private boolean isAddPicture = false;
-
+    private DiaryTextTag tag;
 
     /**
      * From select image
      */
     public CopyPhotoTask(Context context, Uri uri,
                          int reqWidth, int reqHeight,
-                         FileManager fileManager, CopyPhotoCallBack callBack) {
+                         FileManager fileManager, CopyPhotoCallBack callBack, DiaryTextTag tag) {
         this.uri = uri;
-        isAddPicture = false;
+        this.isAddPicture = false;
+        this.tag = tag;
         initTask(context, reqWidth, reqHeight, fileManager, callBack);
 
     }
@@ -54,8 +56,9 @@ public CopyPhotoTask(Context context, Uri uri,
      */
     public CopyPhotoTask(Context context, String srcFileName,
                          int reqWidth, int reqHeight,
-                         FileManager fileManager, CopyPhotoCallBack callBack) {
+                         FileManager fileManager, CopyPhotoCallBack callBack, DiaryTextTag tag) {
         this.srcFileName = fileManager.getDirAbsolutePath() + "/" + srcFileName;
+        this.tag = tag;
         isAddPicture = true;
         initTask(context, reqWidth, reqHeight, fileManager, callBack);
     }
@@ -103,7 +106,7 @@ protected String doInBackground(Void... params) {
     protected void onPostExecute(String fileName) {
         super.onPostExecute(fileName);
         progressDialog.dismiss();
-        callBack.onCopyCompiled(fileName);
+        callBack.onCopyCompiled(fileName,tag);
     }
 
 

app/src/main/java/com/kiminonawa/mydiary/entries/diary/DiaryFragment.java

@@ -312,16 +312,16 @@ public void onRequestPermissionsResult(int requestCode,
     }
 
 
-    private void loadFileFromTemp(String fileName) {
+    private void loadFileFromTemp(String fileName,DiaryTextTag tag) {
         try {
             String tempFileSrc = FileManager.FILE_HEADER + diaryTempFileManager.getDirAbsolutePath() + "/" + fileName;
-//            Bitmap resizeBmp = BitmapFactory.decodeFile(tempFileSrc);
-//            if (resizeBmp != null) {
             DiaryPhoto diaryPhoto = new DiaryPhoto(getActivity());
             diaryPhoto.setPhoto(Uri.parse(tempFileSrc), fileName);
-            DiaryTextTag tag = checkoutOldDiaryContent();
             //Check edittext is focused
             if (tag != null) {
+                //Delete duplicate text
+                EditText currentEditText = (EditText) diaryItemHelper.get(tag.getPositionTag()).getView();
+                currentEditText.getText().delete(tag.getEdittextIndex(), currentEditText.getText().toString().length());
                 //Add new edittext
                 DiaryText diaryText = new DiaryText(getActivity());
                 diaryText.setPosition(tag.getPositionTag());
@@ -343,9 +343,6 @@ private void loadFileFromTemp(String fileName) {
                 diaryItemHelper.createItem(diaryText);
                 diaryText.getView().requestFocus();
             }
-//            } else {
-//                throw new FileNotFoundException(tempFileSrc + "not found or bitmap is null");
-//            }
         } catch (Exception e) {
             Log.e(TAG, e.toString());
             Toast.makeText(getActivity(), getString(R.string.toast_photo_path_error), Toast.LENGTH_LONG).show();
@@ -589,7 +586,7 @@ public void onProviderDisabled(String provider) {
     };
 
     private void openPhotoBottomSheet() {
-        DiaryPhotoBottomSheet diaryPhotoBottomSheet = DiaryPhotoBottomSheet.newInstance(false);
+        DiaryPhotoBottomSheet diaryPhotoBottomSheet = DiaryPhotoBottomSheet.newInstance(false,checkoutOldDiaryContent());
         diaryPhotoBottomSheet.setTargetFragment(this, 0);
         diaryPhotoBottomSheet.show(getFragmentManager(), "diaryPhotoBottomSheet");
     }
@@ -605,7 +602,8 @@ private DiaryTextTag checkoutOldDiaryContent() {
                 int index = currentEditText.getSelectionStart();
                 String nextEditTextStr = currentEditText.getText().toString()
                         .substring(index, currentEditText.getText().toString().length());
-                currentEditText.getText().delete(index, currentEditText.getText().toString().length());
+                //Set index & text string
+                tag.setEdittextIndex(index);
                 tag.setNextEditTextStr(nextEditTextStr);
             }
         }
@@ -614,31 +612,31 @@ private DiaryTextTag checkoutOldDiaryContent() {
 
 
     @Override
-    public void selectPhoto(Uri uri) {
+    public void selectPhoto(Uri uri,DiaryTextTag tag) {
         if (FileManager.isImage(
                 FileManager.getFileNameByUri(getActivity(), uri))) {
             //1.Copy bitmap to temp for rotating & resize
             //2.Then Load bitmap call back ;
             new CopyPhotoTask(getActivity(), uri,
                     DiaryItemHelper.getVisibleWidth(getActivity()), DiaryItemHelper.getVisibleHeight(getActivity()),
-                    diaryTempFileManager, this).execute();
+                    diaryTempFileManager, this,tag).execute();
         } else {
             Toast.makeText(getActivity(), getString(R.string.toast_not_image), Toast.LENGTH_LONG).show();
         }
     }
 
     @Override
-    public void addPhoto(String fileName) {
+    public void addPhoto(String fileName,DiaryTextTag tag) {
         //1.get saved file for rotating & resize from temp
         //2.Then , Load bitmap in call back ;
         new CopyPhotoTask(getActivity(), fileName,
                 DiaryItemHelper.getVisibleWidth(getActivity()), DiaryItemHelper.getVisibleHeight(getActivity()),
-                diaryTempFileManager, this).execute();
+                diaryTempFileManager, this,tag).execute();
     }
 
     @Override
-    public void onCopyCompiled(String fileName) {
-        loadFileFromTemp(fileName);
+    public void onCopyCompiled(String fileName,DiaryTextTag tag) {
+        loadFileFromTemp(fileName,tag);
     }
 
 

app/src/main/java/com/kiminonawa/mydiary/entries/diary/DiaryPhotoBottomSheet.java

@@ -18,6 +18,7 @@
 
 import com.kiminonawa.mydiary.R;
 import com.kiminonawa.mydiary.entries.DiaryActivity;
+import com.kiminonawa.mydiary.entries.diary.item.DiaryTextTag;
 import com.kiminonawa.mydiary.shared.FileManager;
 import com.kiminonawa.mydiary.shared.ThemeManager;
 
@@ -32,9 +33,9 @@
 public class DiaryPhotoBottomSheet extends BottomSheetDialogFragment implements View.OnClickListener {
 
     public interface PhotoCallBack {
-        void addPhoto(String fileName);
+        void addPhoto(String fileName, DiaryTextTag tag);
 
-        void selectPhoto(Uri uri);
+        void selectPhoto(Uri uri, DiaryTextTag tag);
     }
 
     private RelativeLayout RL_diary_photo_dialog;
@@ -55,10 +56,11 @@ public interface PhotoCallBack {
     private PhotoCallBack callBack;
 
 
-    public static DiaryPhotoBottomSheet newInstance(boolean isEditMode) {
+    public static DiaryPhotoBottomSheet newInstance(boolean isEditMode, DiaryTextTag tag) {
         Bundle args = new Bundle();
         DiaryPhotoBottomSheet fragment = new DiaryPhotoBottomSheet();
         args.putBoolean("isEditMode", isEditMode);
+        args.putParcelable("diaryTextTag", tag);
         fragment.setArguments(args);
         return fragment;
     }
@@ -101,16 +103,22 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
+
+        DiaryTextTag tag = null;
+        if (getArguments().getParcelable("diaryTextTag") instanceof DiaryTextTag) {
+            tag = getArguments().getParcelable("diaryTextTag");
+        }
+
         if (requestCode == REQUEST_START_CAMERA_CODE) {
             if (resultCode == RESULT_OK) {
-                callBack.addPhoto(tempFileName);
+                callBack.addPhoto(tempFileName, tag);
             }
             dismiss();
         } else if (requestCode == REQUEST_SELECT_IMAGE_CODE) {
             if (resultCode == RESULT_OK) {
                 //fix the ZenPhone C & HTC 626 crash issues
                 if (data != null && data.getData() != null && callBack != null) {
-                    callBack.selectPhoto(data.getData());
+                    callBack.selectPhoto(data.getData(), tag);
                 } else {
                     Toast.makeText(getActivity(), getString(R.string.toast_photo_intent_error), Toast.LENGTH_LONG).show();
                 }