Merge branch 'release/4.4.0'

yukuku · Mar 21, 2017 · c5b6c69 · c5b6c69
2 parents 61db4d3 + 75622be
commit c5b6c69
Show file tree

Hide file tree

Showing 211 changed files with 6,333 additions and 7,506 deletions.
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
diff --git a/.idea/kotlinc.xml b/.idea/kotlinc.xml
diff --git a/.travis.yml b/.travis.yml
@@ -1,16 +1,24 @@
 language: android
 
+install:
+  - echo y | android update sdk -u -a -t tools
+  - echo y | android update sdk -u -a -t platform-tools
+  - echo y | android update sdk -u -a -t build-tools-25.0.1
+  - echo y | android update sdk -u -a -t android-25
+  - echo y | android update sdk -u -a -t extra-google-m2repository
+  - echo y | android update sdk -u -a -t extra-android-m2repository
+
 android:
   components:
     # see https://github.com/travis-ci/travis-ci/issues/6040#issuecomment-219367943
     - tools
     - tools
 
     # The BuildTools version used by your project
-    - build-tools-24.0.1
+    - build-tools-25.0.1
 
     # The SDK version used to compile your project
-    - android-24
+    - android-25
 
     # Additional components
     - extra-google-m2repository

diff --git a/ATree/src/main/java/yuku/atree/BaseMutableTreeNode.java b/ATree/src/main/java/yuku/atree/BaseMutableTreeNode.java
@@ -72,7 +72,7 @@ public List<TreeNode> children() {
 	}
 
 	@Override public void remove(final MutableTreeNode child) {
-		int index = -1;
+		int index;
 		if (child == null || children == null || (index = children.indexOf(child)) == -1) {
 			throw new IllegalArgumentException("child null or not found");
 		}
@@ -110,7 +110,7 @@ public boolean isNodeAncestor(final TreeNode anotherNode) {
 	}
 
 	public boolean isNodeDescendant(final BaseMutableTreeNode anotherNode) {
-		return anotherNode != null ? anotherNode.isNodeAncestor(this) : false;
+		return anotherNode != null && anotherNode.isNodeAncestor(this);
 	}
 
 	public TreeNode getSharedAncestor(final BaseMutableTreeNode anotherNode) {
@@ -135,8 +135,7 @@ public boolean isNodeRelated(final BaseMutableTreeNode node) {
 			return 0;
 		}
 		int childrenDepth = 0;
-		for (Iterator<TreeNode> it = children.iterator(); it.hasNext();) {
-			TreeNode child = it.next();
+		for (TreeNode child : children) {
 			int childDepth = child.getDepth();
 			if (childDepth > childrenDepth) {
 				childrenDepth = childDepth;
@@ -184,7 +183,7 @@ public boolean isRoot() {
 	}
 
 	public boolean isNodeChild(final TreeNode child) {
-		return child != null && children != null ? children.contains(child) : false;
+		return child != null && children != null && children.contains(child);
 	}
 
 	@Override public boolean isLeaf() {
@@ -207,7 +206,7 @@ protected TreeNode[] getPathToRoot(final TreeNode node, final int depth) {
 
 	private List<TreeNode> getChildren() {
 		if (children == null) {
-			children = new ArrayList<TreeNode>();
+			children = new ArrayList<>();
 		}
 
 		return children;

diff --git a/ATree/src/main/java/yuku/atree/nodes/BaseFileTreeNode.java b/ATree/src/main/java/yuku/atree/nodes/BaseFileTreeNode.java
@@ -49,7 +49,7 @@ public BaseFileTreeNode(VirtualChild[] virtualChildren) {
 			if (files == null) {
 				this.removeAllChildren();
 			} else {
-				HashMap<String, BaseFileTreeNode> existing = new HashMap<String, BaseFileTreeNode>();
+				HashMap<String, BaseFileTreeNode> existing = new HashMap<>();
 				for (int i = 0; i < this.getChildCount(); i++) {
 					BaseFileTreeNode child = this.getChildAt(i);
 					existing.put(child.file.getName(), child);

diff --git a/Afw/src/main/java/yuku/afw/storage/InternalDbHelper.java b/Afw/src/main/java/yuku/afw/storage/InternalDbHelper.java
@@ -23,7 +23,7 @@ public InternalDbHelper(String name) {
 
 	@Override public void onOpen(SQLiteDatabase db) {
 		//
-	};
+	}
 
 	@Override public void onCreate(SQLiteDatabase db) {
 		Log.d(TAG, "onCreate called");

diff --git a/Afw/src/main/java/yuku/afw/storage/Preferences.java b/Afw/src/main/java/yuku/afw/storage/Preferences.java
@@ -152,7 +152,13 @@ public static void setString(String key, String val) {
 		commitIfNotHeld();
 		if (BuildConfig.DEBUG) Log.d(TAG, key + " = (string) " + val);
 	}
-
+
+	public static void setString(@StringRes final int keyStringResId, String val) {
+		final Resources r = App.context.getResources();
+		final String key = r.getString(keyStringResId);
+		setString(key, val);
+	}
+
 	public static void setBoolean(Enum<?> key, boolean val) {
 		setBoolean(key.toString(), val);
 	}

diff --git a/Alkitab/build.gradle b/Alkitab/build.gradle
@@ -17,11 +17,11 @@ android {
         applicationId 'yuku.alkitab.debug'
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 14000268
-        versionName '4.4.0-beta8'
+        versionCode 14000300
+        versionName '4.4.0'
         multiDexEnabled true
-        // Keep this synced with build.gradle resConfigs!
-        resConfigs 'af', 'bg', 'cs', 'da', 'de', 'es', 'fr', 'in', 'ja', 'lv', 'ms', 'nl', 'pl', 'pt', 'ro', 'ru', 'th', 'uk', 'zh-rCN', 'zh-rTW'
+        // Keep this synced with integrate_translations.sh!
+        resConfigs 'af', 'bg', 'cs', 'da', 'de', 'es', 'fr', 'in', 'ja', 'lv', 'ms', 'nl', 'pl', 'pt', 'ro', 'ru', 'th', 'uk', 'vi', 'zh-rCN', 'zh-rTW'
         buildConfigField 'String', 'SERVER_HOST', "\"$SERVER_HOST\""
     }
     buildTypes {
@@ -104,5 +104,5 @@ dependencies {
     compile 'com.android.support:multidex:1.0.1'
     compile "com.android.support:design:$supportLibVersion"
     compile "com.android.support:percent:$supportLibVersion"
-    compile "com.takisoft.fix:preference-v7:$supportLibVersion.0"
+    compile "com.takisoft.fix:preference-v7:24.2.0.0"
 }
diff --git a/Alkitab/src/main/AndroidManifest.xml b/Alkitab/src/main/AndroidManifest.xml
@@ -43,7 +43,7 @@
 		android:theme="@style/Theme.Alkitab">
 		<activity
 			android:name="yuku.alkitab.base.IsiActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection">
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale">
 			<intent-filter>
 				<action android:name="android.intent.action.MAIN" />
 
@@ -65,27 +65,27 @@
 		</activity>
 		<activity
 			android:name="yuku.alkitab.base.ac.GotoActivity"
-			android:configChanges="locale|layoutDirection"
+			android:configChanges="locale|layoutDirection|fontScale"
 			android:theme="@style/Theme.Alkitab.DialogWhenLarge"
 			android:windowSoftInputMode="adjustNothing" />
 		<activity
 			android:name="yuku.alkitab.base.ac.SettingsActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/pengaturan_alkitab" />
 		<activity
 			android:name="yuku.alkitab.base.ac.ColorSettingsActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection" />
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale" />
 		<activity
 			android:name="yuku.alkitab.base.ac.MarkersActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/activity_title_markers" />
 		<activity
 			android:name="yuku.alkitab.base.ac.MarkerListActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:windowSoftInputMode="adjustResize|stateHidden" />
 		<activity
 			android:name="yuku.alkitab.base.ac.VersionsActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/kelola_versi"
 			android:parentActivityName="yuku.alkitab.base.IsiActivity">
 			<meta-data
@@ -258,86 +258,86 @@
 		</activity>
 		<activity
 			android:name="yuku.alkitab.base.ac.SearchActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/search"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="yuku.alkitab.base.ac.DevotionActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/menuDevotion">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="yuku.alkitab.base.IsiActivity" />
 		</activity>
 		<activity
 			android:name="yuku.alkitab.base.ac.HelpActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection">
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="yuku.alkitab.base.ac.AboutActivity" />
 		</activity>
 		<activity
 			android:name="yuku.alkitab.base.ac.AboutActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/menuBantuan">
 			<meta-data
 				android:name="android.support.PARENT_ACTIVITY"
 				android:value="yuku.alkitab.base.IsiActivity" />
 		</activity>
 		<activity
 			android:name="yuku.alkitab.base.ac.ShareActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection" />
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale" />
 		<activity
 			android:name="yuku.alkitab.base.ac.FontManagerActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/fm_activity_title" />
 		<activity
 			android:name="yuku.alkitab.base.ac.SongListActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/sn_songs_activity_title"
 			android:theme="@style/Theme.Alkitab.DialogWhenLarge"
 			android:windowSoftInputMode="adjustResize|stateHidden" />
 		<activity
 			android:name="yuku.alkitab.base.ac.SongViewActivity"
-			android:label="@string/sn_songs_activity_title"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection" />
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
+			android:label="@string/sn_songs_activity_title" />
 		<activity
 			android:name="yuku.alkitab.base.ac.SecretSettingsActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="Secret settings" />
 		<activity
 			android:name="yuku.alkitab.base.ac.SecretSyncDebugActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="Secret sync debug" />
 		<activity
 			android:name="yuku.alkitab.base.ac.ReadingPlanActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection" />
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale" />
 		<activity
 			android:name="yuku.alkitab.base.ac.PatchTextActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="yuku.alkitab.base.sync.SyncSettingsActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/sync_status_activity_title" />
 		<activity
 			android:name="yuku.alkitab.base.sync.SyncLogActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
-			android:label="@string/sync_log_activity_title"/>
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
+			android:label="@string/sync_log_activity_title" />
 		<activity
 			android:name="yuku.alkitab.base.sync.SyncLoginActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/sync_login_activity_title" />
 		<activity
 			android:name="yuku.filechooser.FileChooserActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection" />
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale" />
 		<activity
 			android:name="com.example.android.wizardpager.MainActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:theme="@style/AlkitabFeedback.Theme" />
 		<activity
 			android:name="yuku.alkitab.base.ac.VersesDialogActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:theme="@style/Theme.Alkitab.Transparent">
 			<intent-filter>
 				<action android:name="yuku.alkitab.action.SHOW_VERSES_DIALOG" />
@@ -347,25 +347,25 @@
 		</activity>
 		<activity
 			android:name="yuku.alkitab.base.ac.DailyVerseAppWidgetConfigurationActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/dv_activity_title">
 			<intent-filter>
 				<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
 			</intent-filter>
 		</activity>
 		<activity
 			android:name="yuku.alkitab.base.ac.SearchBookFilterActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/select_books_to_search"
 			android:theme="@style/Theme.Alkitab.DialogWhenLarge" />
 		<activity
 			android:name="yuku.alkitab.base.ac.NoteActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:icon="@drawable/ic_attr_note"
 			android:windowSoftInputMode="adjustResize" />
 		<activity
 			android:name="yuku.alkitab.base.ac.AlertDialogActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:excludeFromRecents="true"
 			android:theme="@style/Theme.PopupActivity" />
 
@@ -495,7 +495,7 @@
 		<!-- from a separate app: devotion reminder -->
 		<activity
 			android:name="yuku.alkitab.reminder.ac.DevotionReminderActivity"
-			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection"
+			android:configChanges="keyboardHidden|orientation|screenSize|locale|layoutDirection|fontScale"
 			android:label="@string/dr_app_name" />
 
 		<receiver android:name="yuku.alkitab.reminder.br.DevotionReminderReceiver" />

diff --git a/Alkitab/src/main/assets/help/material_sources.html b/Alkitab/src/main/assets/help/material_sources.html
@@ -43,7 +43,6 @@
         <li><b>Pray</b> -- that this project/app can be continuously developed.</li>
         <li><b>Support</b> -- the parties that provided the data and resources.</li>
     </ul>
-    </p>
 
     <p>Let us be involved together, pressing onwards towards this goal -- "Bible Everywhere" !!</p>