Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

/app/src/main/res/values-it #68

Open
wants to merge 10 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 14 additions & 14 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -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 {
Expand All @@ -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'
Expand All @@ -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'
Expand Down
6 changes: 4 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -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">

Expand Down Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -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) {
Expand Down
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -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.
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@
import com.kiminonawa.mydiary.backup.obj.BUMemoEntries;
import com.kiminonawa.mydiary.db.DBManager;
import com.kiminonawa.mydiary.main.topic.ITopic;
import com.kiminonawa.mydiary.shared.FileManager;
import com.kiminonawa.mydiary.shared.file.DirFactory;
import com.kiminonawa.mydiary.shared.file.IDir;
import com.kiminonawa.mydiary.shared.file.LocalDir;

import java.io.FileWriter;
import java.io.IOException;
Expand Down Expand Up @@ -70,8 +72,8 @@ public ExportAsyncTask(Context context, ExportCallBack callBack, String backupZi
this.backupManager.initBackupManagerExportInfo();

this.dbManager = new DBManager(context);
FileManager backupFM = new FileManager(context, FileManager.BACKUP_DIR);
this.backupJsonFilePath = backupFM.getDirAbsolutePath() + "/"
IDir backupDir = DirFactory.CreateDirByType(context, LocalDir.BACKUP_DIR);
this.backupJsonFilePath = backupDir.getDirAbsolutePath() + "/"
+ BackupManager.BACKUP_JSON_FILE_NAME;
this.backupZipRootPath = backupZipRootPath;
this.backupZipFileName = BACKUP_ZIP_FILE_HEADER + sdf.format(new Date()) + BACKUP_ZIP_FILE_SUB_FILE_NAME;
Expand Down Expand Up @@ -121,7 +123,7 @@ protected void onPostExecute(Boolean exportSuccessful) {


private void deleteBackupJsonFile() {
new FileManager(mContext, FileManager.BACKUP_DIR).clearDir();
DirFactory.CreateDirByType(mContext, LocalDir.BACKUP_DIR).clearDir();
}

private void outputBackupJson() throws IOException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@
import com.kiminonawa.mydiary.backup.obj.BUMemoEntries;
import com.kiminonawa.mydiary.db.DBManager;
import com.kiminonawa.mydiary.main.topic.ITopic;
import com.kiminonawa.mydiary.shared.FileManager;
import com.kiminonawa.mydiary.shared.file.DirFactory;
import com.kiminonawa.mydiary.shared.file.IDir;
import com.kiminonawa.mydiary.shared.file.LocalDir;

import org.apache.commons.io.FileUtils;

Expand All @@ -41,7 +43,7 @@ public interface ImportCallBack {
* Backup
*/
private BackupManager backupManager;
private FileManager backupFileManager, diartFileManager;
private IDir backupLocalDir, diaryLocalDir;
private String backupJsonFilePath;
private String backupZieFilePath;
/*
Expand All @@ -60,13 +62,13 @@ public interface ImportCallBack {
public ImportAsyncTask(Context context, ImportCallBack callBack, String backupZieFilePath) {
this.mContext = context;
this.dbManager = new DBManager(context);
FileManager backFM = new FileManager(context, FileManager.BACKUP_DIR);
this.backupJsonFilePath = backFM.getDirAbsolutePath() + "/"
IDir backDir = DirFactory.CreateDirByType(context, LocalDir.BACKUP_DIR);
this.backupJsonFilePath = backDir.getDirAbsolutePath() + "/"
+ BackupManager.BACKUP_JSON_FILE_NAME;
this.backupZieFilePath = backupZieFilePath;

this.backupFileManager = new FileManager(mContext, FileManager.BACKUP_DIR);
this.diartFileManager = new FileManager(mContext, FileManager.DIARY_ROOT_DIR);
this.backupLocalDir = DirFactory.CreateDirByType(mContext, LocalDir.BACKUP_DIR);
this.diaryLocalDir = DirFactory.CreateDirByType(mContext, LocalDir.DIARY_ROOT_DIR);

this.callBack = callBack;
this.progressDialog = new ProgressDialog(context);
Expand All @@ -84,7 +86,7 @@ protected Boolean doInBackground(Void... params) {
try {
ZipManager zipManager = new ZipManager(mContext);

FileManager zipBackupFM = new FileManager(mContext, FileManager.BACKUP_DIR);
IDir zipBackupFM = DirFactory.CreateDirByType(mContext, LocalDir.BACKUP_DIR);
zipManager.unzip(backupZieFilePath,
zipBackupFM.getDirAbsolutePath() + "/");
loadBackupJsonFileIntoManager();
Expand All @@ -93,7 +95,7 @@ protected Boolean doInBackground(Void... params) {
Log.e(TAG, "import flow fail", e);
importSuccessful = false;
} finally {
backupFileManager.clearDir();
backupLocalDir.clearDir();
}
return importSuccessful;
}
Expand Down Expand Up @@ -207,10 +209,10 @@ private void saveTopicIntoDB(BackupManager.BackupTopicListBean backupTopic) thro

private void copyDiaryPhoto(long oldTopicId, long newTopicId,
long oldDiaryId, long newDiaryId) throws IOException {
File backupDiaryDir = new File(backupFileManager.getDirAbsolutePath() + "/diary/" +
File backupDiaryDir = new File(backupLocalDir.getDirAbsolutePath() + "/diary/" +
oldTopicId + "/" + oldDiaryId + "/");
if (backupDiaryDir.exists() || backupDiaryDir.isDirectory()) {
File newDiaryDir = new File(diartFileManager.getDirAbsolutePath() + "/" +
File newDiaryDir = new File(diaryLocalDir.getDirAbsolutePath() + "/" +
newTopicId + "/" + newDiaryId + "/");
FileUtils.moveDirectory(backupDiaryDir, newDiaryDir);
}
Expand Down
10 changes: 6 additions & 4 deletions app/src/main/java/com/kiminonawa/mydiary/backup/ZipManager.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,9 @@
import android.content.Context;
import android.util.Log;

import com.kiminonawa.mydiary.shared.FileManager;
import com.kiminonawa.mydiary.shared.file.DirFactory;
import com.kiminonawa.mydiary.shared.file.IDir;
import com.kiminonawa.mydiary.shared.file.LocalDir;

import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
Expand All @@ -23,18 +25,18 @@

public class ZipManager {

private FileManager diaryFileManager;
private IDir diaryLocalDir;
private final int BUFFER_SIZE = 2048;


public ZipManager(Context context) {
//Copy data form diary
diaryFileManager = new FileManager(context, FileManager.DIARY_ROOT_DIR);
diaryLocalDir = DirFactory.CreateDirByType(context, LocalDir.DIARY_ROOT_DIR);
}

public boolean zipFileAtPath(String backupJsonFilePath, String toLocation) {

File sourceFile = diaryFileManager.getDir();
File sourceFile = diaryLocalDir.getDir();
try {
BufferedInputStream origin = null;
FileOutputStream dest = new FileOutputStream(toLocation);
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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();
Expand Down
Original file line number Diff line number Diff line change
@@ -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;
Expand All @@ -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;

Expand Down Expand Up @@ -121,6 +124,11 @@ protected void onStop() {
mGoogleApiClient.disconnect();
}

@Override
protected void attachBaseContext(Context newBase) {
super.attachBaseContext(MyContextWrapper.wrap(newBase, LanguagerHelper.getLocaleLanguage(newBase)));
}


/**
*
Expand Down
Loading