- @see #FloatingActionButton_color
+ @see #FloatingActionButton_colour
@see #FloatingActionButton_drawable
@see #FloatingActionButton_shadowColor
@see #FloatingActionButton_shadowDx
@@ -85,7 +85,7 @@ containing a value of this type.
0x7f010004, 0x7f010005
};
/**
-
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#color}
+
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#colour}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -96,9 +96,9 @@ containing a value of this type.
theme attribute (in the form
"?[package:][type:]name")
containing a value of this type.
- @attr name com.faizmalkani.floatingactionbutton:color
+ @attr name com.faizmalkani.floatingactionbutton:colour
*/
- public static final int FloatingActionButton_color = 1;
+ public static int FloatingActionButton_colour = 1;
/**
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#drawable}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -112,7 +112,7 @@ theme attribute (in the form
containing a value of this type.
@attr name com.faizmalkani.floatingactionbutton:drawable
*/
- public static final int FloatingActionButton_drawable = 0;
+ public static int FloatingActionButton_drawable = 0;
/**
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowColor}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -126,7 +126,7 @@ theme attribute (in the form
containing a value of this type.
@attr name com.faizmalkani.floatingactionbutton:shadowColor
*/
- public static final int FloatingActionButton_shadowColor = 5;
+ public static int FloatingActionButton_shadowColor = 5;
/**
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDx}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -140,7 +140,7 @@ theme attribute (in the form
containing a value of this type.
@attr name com.faizmalkani.floatingactionbutton:shadowDx
*/
- public static final int FloatingActionButton_shadowDx = 3;
+ public static int FloatingActionButton_shadowDx = 3;
/**
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDy}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -154,7 +154,7 @@ theme attribute (in the form
containing a value of this type.
@attr name com.faizmalkani.floatingactionbutton:shadowDy
*/
- public static final int FloatingActionButton_shadowDy = 4;
+ public static int FloatingActionButton_shadowDy = 4;
/**
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowRadius}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -168,6 +168,6 @@ theme attribute (in the form
containing a value of this type.
@attr name com.faizmalkani.floatingactionbutton:shadowRadius
*/
- public static final int FloatingActionButton_shadowRadius = 2;
+ public static int FloatingActionButton_shadowRadius = 2;
};
}
diff --git a/libraries/FloatingActionButton/build/generated/source/r/release/com/faizmalkani/floatingactionbutton/R.java b/libraries/FloatingActionButton/build/generated/source/r/release/com/faizmalkani/floatingactionbutton/R.java
index 99ce2ea..4d9193b 100644
--- a/libraries/FloatingActionButton/build/generated/source/r/release/com/faizmalkani/floatingactionbutton/R.java
+++ b/libraries/FloatingActionButton/build/generated/source/r/release/com/faizmalkani/floatingactionbutton/R.java
@@ -17,7 +17,7 @@ theme attribute (in the form
"?[package:][type:]name")
containing a value of this type.
*/
- public static int color=0x7f010001;
+ public static int colour=0x7f010001;
/**
Must be an integer value, such as "100".
This may also be a reference to a resource (in the form
"@[package:]type:name") or
@@ -66,14 +66,14 @@ containing a value of this type.
- @see #FloatingActionButton_color
+ @see #FloatingActionButton_colour
@see #FloatingActionButton_drawable
@see #FloatingActionButton_shadowColor
@see #FloatingActionButton_shadowDx
@@ -85,7 +85,7 @@ containing a value of this type.
0x7f010004, 0x7f010005
};
/**
-
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#color}
+
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#colour}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -96,9 +96,9 @@ containing a value of this type.
theme attribute (in the form
"?[package:][type:]name")
containing a value of this type.
- @attr name com.faizmalkani.floatingactionbutton:color
+ @attr name com.faizmalkani.floatingactionbutton:colour
*/
- public static final int FloatingActionButton_color = 1;
+ public static int FloatingActionButton_colour = 1;
/**
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#drawable}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -112,7 +112,7 @@ theme attribute (in the form
containing a value of this type.
@attr name com.faizmalkani.floatingactionbutton:drawable
*/
- public static final int FloatingActionButton_drawable = 0;
+ public static int FloatingActionButton_drawable = 0;
/**
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowColor}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -126,7 +126,7 @@ theme attribute (in the form
containing a value of this type.
@attr name com.faizmalkani.floatingactionbutton:shadowColor
*/
- public static final int FloatingActionButton_shadowColor = 5;
+ public static int FloatingActionButton_shadowColor = 5;
/**
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDx}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -140,7 +140,7 @@ theme attribute (in the form
containing a value of this type.
@attr name com.faizmalkani.floatingactionbutton:shadowDx
*/
- public static final int FloatingActionButton_shadowDx = 3;
+ public static int FloatingActionButton_shadowDx = 3;
/**
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowDy}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -154,7 +154,7 @@ theme attribute (in the form
containing a value of this type.
@attr name com.faizmalkani.floatingactionbutton:shadowDy
*/
- public static final int FloatingActionButton_shadowDy = 4;
+ public static int FloatingActionButton_shadowDy = 4;
/**
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.R.attr#shadowRadius}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -168,6 +168,6 @@ theme attribute (in the form
containing a value of this type.
@attr name com.faizmalkani.floatingactionbutton:shadowRadius
*/
- public static final int FloatingActionButton_shadowRadius = 2;
+ public static int FloatingActionButton_shadowRadius = 2;
};
}
diff --git a/libraries/FloatingActionButton/build/generated/source/r/test/debug/com/faizmalkani/floatingactionbutton/R.java b/libraries/FloatingActionButton/build/generated/source/r/test/debug/com/faizmalkani/floatingactionbutton/R.java
index 3dec0c8..c696a42 100644
--- a/libraries/FloatingActionButton/build/generated/source/r/test/debug/com/faizmalkani/floatingactionbutton/R.java
+++ b/libraries/FloatingActionButton/build/generated/source/r/test/debug/com/faizmalkani/floatingactionbutton/R.java
@@ -8,7 +8,7 @@ package com.faizmalkani.floatingactionbutton;
public final class R {
public static final class attr {
- public static final int color = 0x7f010001;
+ public static final int colour = 0x7f010001;
public static final int drawable = 0x7f010000;
public static final int shadowColor = 0x7f010005;
public static final int shadowDx = 0x7f010003;
@@ -17,7 +17,7 @@ public final class R {
}
public static final class styleable {
public static final int[] FloatingActionButton = { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005 };
- public static final int FloatingActionButton_color = 1;
+ public static final int FloatingActionButton_colour = 1;
public static final int FloatingActionButton_drawable = 0;
public static final int FloatingActionButton_shadowColor = 5;
public static final int FloatingActionButton_shadowDx = 3;
diff --git a/libraries/FloatingActionButton/build/generated/source/r/test/debug/com/faizmalkani/floatingactionbutton/test/R.java b/libraries/FloatingActionButton/build/generated/source/r/test/debug/com/faizmalkani/floatingactionbutton/test/R.java
index b092092..c2a3510 100644
--- a/libraries/FloatingActionButton/build/generated/source/r/test/debug/com/faizmalkani/floatingactionbutton/test/R.java
+++ b/libraries/FloatingActionButton/build/generated/source/r/test/debug/com/faizmalkani/floatingactionbutton/test/R.java
@@ -17,7 +17,7 @@ theme attribute (in the form
"?[package:][type:]name")
containing a value of this type.
*/
- public static final int color=0x7f010001;
+ public static final int colour=0x7f010001;
/**
Must be an integer value, such as "100".
This may also be a reference to a resource (in the form
"@[package:]type:name") or
@@ -66,14 +66,14 @@ containing a value of this type.
- @see #FloatingActionButton_color
+ @see #FloatingActionButton_colour
@see #FloatingActionButton_drawable
@see #FloatingActionButton_shadowColor
@see #FloatingActionButton_shadowDx
@@ -85,7 +85,7 @@ containing a value of this type.
0x7f010004, 0x7f010005
};
/**
-
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.test.R.attr#color}
+
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.test.R.attr#colour}
attribute's value can be found in the {@link #FloatingActionButton} array.
@@ -96,9 +96,9 @@ containing a value of this type.
theme attribute (in the form
"?[package:][type:]name")
containing a value of this type.
- @attr name com.faizmalkani.floatingactionbutton.test:color
+ @attr name com.faizmalkani.floatingactionbutton.test:colour
*/
- public static final int FloatingActionButton_color = 1;
+ public static final int FloatingActionButton_colour = 1;
/**
This symbol is the offset where the {@link com.faizmalkani.floatingactionbutton.test.R.attr#drawable}
attribute's value can be found in the {@link #FloatingActionButton} array.
diff --git a/libraries/FloatingActionButton/build/intermediates/bundles/debug/AndroidManifest.xml b/libraries/FloatingActionButton/build/intermediates/bundles/debug/AndroidManifest.xml
index abddf56..28dac35 100644
--- a/libraries/FloatingActionButton/build/intermediates/bundles/debug/AndroidManifest.xml
+++ b/libraries/FloatingActionButton/build/intermediates/bundles/debug/AndroidManifest.xml
@@ -6,7 +6,7 @@
+ android:targetSdkVersion="21" />
diff --git a/libraries/FloatingActionButton/build/intermediates/bundles/debug/R.txt b/libraries/FloatingActionButton/build/intermediates/bundles/debug/R.txt
index 5a3d2b2..a11b389 100644
--- a/libraries/FloatingActionButton/build/intermediates/bundles/debug/R.txt
+++ b/libraries/FloatingActionButton/build/intermediates/bundles/debug/R.txt
@@ -1,11 +1,11 @@
-int attr color 0x7f010001
+int attr colour 0x7f010001
int attr drawable 0x7f010000
int attr shadowColor 0x7f010005
int attr shadowDx 0x7f010003
int attr shadowDy 0x7f010004
int attr shadowRadius 0x7f010002
int[] styleable FloatingActionButton { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005 }
-int styleable FloatingActionButton_color 1
+int styleable FloatingActionButton_colour 1
int styleable FloatingActionButton_drawable 0
int styleable FloatingActionButton_shadowColor 5
int styleable FloatingActionButton_shadowDx 3
diff --git a/libraries/FloatingActionButton/build/intermediates/bundles/debug/classes.jar b/libraries/FloatingActionButton/build/intermediates/bundles/debug/classes.jar
index 4ce24f2..34fee55 100644
Binary files a/libraries/FloatingActionButton/build/intermediates/bundles/debug/classes.jar and b/libraries/FloatingActionButton/build/intermediates/bundles/debug/classes.jar differ
diff --git a/libraries/FloatingActionButton/build/intermediates/bundles/debug/res/values/values.xml b/libraries/FloatingActionButton/build/intermediates/bundles/debug/res/values/values.xml
index 7270419..8a1db4a 100644
--- a/libraries/FloatingActionButton/build/intermediates/bundles/debug/res/values/values.xml
+++ b/libraries/FloatingActionButton/build/intermediates/bundles/debug/res/values/values.xml
@@ -1,16 +1,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/libraries/FloatingActionButton/build/intermediates/bundles/release/AndroidManifest.xml b/libraries/FloatingActionButton/build/intermediates/bundles/release/AndroidManifest.xml
index abddf56..28dac35 100644
--- a/libraries/FloatingActionButton/build/intermediates/bundles/release/AndroidManifest.xml
+++ b/libraries/FloatingActionButton/build/intermediates/bundles/release/AndroidManifest.xml
@@ -6,7 +6,7 @@
+ android:targetSdkVersion="21" />
diff --git a/libraries/FloatingActionButton/build/intermediates/bundles/release/R.txt b/libraries/FloatingActionButton/build/intermediates/bundles/release/R.txt
index 5a3d2b2..a11b389 100644
--- a/libraries/FloatingActionButton/build/intermediates/bundles/release/R.txt
+++ b/libraries/FloatingActionButton/build/intermediates/bundles/release/R.txt
@@ -1,11 +1,11 @@
-int attr color 0x7f010001
+int attr colour 0x7f010001
int attr drawable 0x7f010000
int attr shadowColor 0x7f010005
int attr shadowDx 0x7f010003
int attr shadowDy 0x7f010004
int attr shadowRadius 0x7f010002
int[] styleable FloatingActionButton { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005 }
-int styleable FloatingActionButton_color 1
+int styleable FloatingActionButton_colour 1
int styleable FloatingActionButton_drawable 0
int styleable FloatingActionButton_shadowColor 5
int styleable FloatingActionButton_shadowDx 3
diff --git a/libraries/FloatingActionButton/build/intermediates/bundles/release/classes.jar b/libraries/FloatingActionButton/build/intermediates/bundles/release/classes.jar
index 8ba9b43..1056848 100644
Binary files a/libraries/FloatingActionButton/build/intermediates/bundles/release/classes.jar and b/libraries/FloatingActionButton/build/intermediates/bundles/release/classes.jar differ
diff --git a/libraries/FloatingActionButton/build/intermediates/bundles/release/res/values/values.xml b/libraries/FloatingActionButton/build/intermediates/bundles/release/res/values/values.xml
index 7270419..8a1db4a 100644
--- a/libraries/FloatingActionButton/build/intermediates/bundles/release/res/values/values.xml
+++ b/libraries/FloatingActionButton/build/intermediates/bundles/release/res/values/values.xml
@@ -1,16 +1,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/debug/merger.xml b/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/debug/merger.xml
index 195f33d..3acaa8d 100644
--- a/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/debug/merger.xml
+++ b/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/debug/merger.xml
@@ -1,11 +1,2 @@
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/release/merger.xml b/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/release/merger.xml
index 53b20d2..1767236 100644
--- a/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/release/merger.xml
+++ b/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/release/merger.xml
@@ -1,11 +1,2 @@
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/test/debug/merger.xml b/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/test/debug/merger.xml
index 44649a5..8806661 100644
--- a/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/test/debug/merger.xml
+++ b/libraries/FloatingActionButton/build/intermediates/incremental/mergeAssets/test/debug/merger.xml
@@ -1,11 +1,2 @@
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/libraries/FloatingActionButton/build/intermediates/incremental/mergeResources/test/debug/merger.xml b/libraries/FloatingActionButton/build/intermediates/incremental/mergeResources/test/debug/merger.xml
index bb03e60..07a6464 100644
--- a/libraries/FloatingActionButton/build/intermediates/incremental/mergeResources/test/debug/merger.xml
+++ b/libraries/FloatingActionButton/build/intermediates/incremental/mergeResources/test/debug/merger.xml
@@ -1,38 +1,2 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
\ No newline at end of file
diff --git a/libraries/FloatingActionButton/build/intermediates/incremental/packageResources/debug/merger.xml b/libraries/FloatingActionButton/build/intermediates/incremental/packageResources/debug/merger.xml
index ef374eb..b21b482 100644
--- a/libraries/FloatingActionButton/build/intermediates/incremental/packageResources/debug/merger.xml
+++ b/libraries/FloatingActionButton/build/intermediates/incremental/packageResources/debug/merger.xml
@@ -1,38 +1,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/libraries/FloatingActionButton/build/intermediates/incremental/packageResources/release/merger.xml b/libraries/FloatingActionButton/build/intermediates/incremental/packageResources/release/merger.xml
index f696a8f..f37989d 100644
--- a/libraries/FloatingActionButton/build/intermediates/incremental/packageResources/release/merger.xml
+++ b/libraries/FloatingActionButton/build/intermediates/incremental/packageResources/release/merger.xml
@@ -1,38 +1,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/libraries/FloatingActionButton/build/intermediates/manifests/test/debug/AndroidManifest.xml b/libraries/FloatingActionButton/build/intermediates/manifests/test/debug/AndroidManifest.xml
index 7e046b4..fb4c5e3 100644
--- a/libraries/FloatingActionButton/build/intermediates/manifests/test/debug/AndroidManifest.xml
+++ b/libraries/FloatingActionButton/build/intermediates/manifests/test/debug/AndroidManifest.xml
@@ -4,7 +4,7 @@
+ android:targetSdkVersion="21" />
+
+
+
+
+
+
+
+
+
+
diff --git a/libraries/FloatingActionButton/build/intermediates/res/test/debug/values/values.xml b/libraries/FloatingActionButton/build/intermediates/res/test/debug/values/values.xml
index b51ef97..8a1db4a 100644
--- a/libraries/FloatingActionButton/build/intermediates/res/test/debug/values/values.xml
+++ b/libraries/FloatingActionButton/build/intermediates/res/test/debug/values/values.xml
@@ -1,16 +1,4 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
\ No newline at end of file
diff --git a/libraries/FloatingActionButton/build/intermediates/symbols/test/debug/R.txt b/libraries/FloatingActionButton/build/intermediates/symbols/test/debug/R.txt
index 5a3d2b2..a11b389 100644
--- a/libraries/FloatingActionButton/build/intermediates/symbols/test/debug/R.txt
+++ b/libraries/FloatingActionButton/build/intermediates/symbols/test/debug/R.txt
@@ -1,11 +1,11 @@
-int attr color 0x7f010001
+int attr colour 0x7f010001
int attr drawable 0x7f010000
int attr shadowColor 0x7f010005
int attr shadowDx 0x7f010003
int attr shadowDy 0x7f010004
int attr shadowRadius 0x7f010002
int[] styleable FloatingActionButton { 0x7f010000, 0x7f010001, 0x7f010002, 0x7f010003, 0x7f010004, 0x7f010005 }
-int styleable FloatingActionButton_color 1
+int styleable FloatingActionButton_colour 1
int styleable FloatingActionButton_drawable 0
int styleable FloatingActionButton_shadowColor 5
int styleable FloatingActionButton_shadowDx 3
diff --git a/libraries/FloatingActionButton/build/outputs/aar/FloatingActionButton-debug.aar b/libraries/FloatingActionButton/build/outputs/aar/FloatingActionButton-debug.aar
new file mode 100644
index 0000000..b42693c
Binary files /dev/null and b/libraries/FloatingActionButton/build/outputs/aar/FloatingActionButton-debug.aar differ
diff --git a/libraries/FloatingActionButton/build/outputs/aar/FloatingActionButton-release.aar b/libraries/FloatingActionButton/build/outputs/aar/FloatingActionButton-release.aar
new file mode 100644
index 0000000..6c0433b
Binary files /dev/null and b/libraries/FloatingActionButton/build/outputs/aar/FloatingActionButton-release.aar differ
diff --git a/libraries/FloatingActionButton/build/outputs/aar/FloatingActionButton.aar b/libraries/FloatingActionButton/build/outputs/aar/FloatingActionButton.aar
deleted file mode 100644
index db4bac9..0000000
Binary files a/libraries/FloatingActionButton/build/outputs/aar/FloatingActionButton.aar and /dev/null differ
diff --git a/libraries/FloatingActionButton/res/values/attrs.xml b/libraries/FloatingActionButton/res/values/attrs.xml
index 85f5aa2..ba7267f 100644
--- a/libraries/FloatingActionButton/res/values/attrs.xml
+++ b/libraries/FloatingActionButton/res/values/attrs.xml
@@ -3,7 +3,7 @@
-
+
diff --git a/libraries/FloatingActionButton/src/com/faizmalkani/floatingactionbutton/FloatingActionButton.java b/libraries/FloatingActionButton/src/com/faizmalkani/floatingactionbutton/FloatingActionButton.java
index 57c8018..e6feb3a 100644
--- a/libraries/FloatingActionButton/src/com/faizmalkani/floatingactionbutton/FloatingActionButton.java
+++ b/libraries/FloatingActionButton/src/com/faizmalkani/floatingactionbutton/FloatingActionButton.java
@@ -52,7 +52,7 @@ public class FloatingActionButton extends View {
super(context, attrs, defStyleAttr);
TypedArray a = getContext().obtainStyledAttributes(attrs, R.styleable.FloatingActionButton);
- mColor = a.getColor(R.styleable.FloatingActionButton_color, Color.WHITE);
+ mColor = a.getColor(R.styleable.FloatingActionButton_colour, Color.WHITE);
mButtonPaint.setStyle(Paint.Style.FILL);
mButtonPaint.setColor(mColor);
float radius, dx, dy;
diff --git a/libraries/RootCommands/build.gradle b/libraries/RootCommands/build.gradle
index cc05ece..e13b766 100644
--- a/libraries/RootCommands/build.gradle
+++ b/libraries/RootCommands/build.gradle
@@ -15,12 +15,16 @@ dependencies {
}
android {
- compileSdkVersion 20
- buildToolsVersion '20.0.0'
+ compileSdkVersion 21
+ buildToolsVersion '21.0.2'
defaultConfig {
minSdkVersion 7
- targetSdkVersion 19
+ targetSdkVersion 21
+ }
+ compileOptions {
+ sourceCompatibility JavaVersion.VERSION_1_7
+ targetCompatibility JavaVersion.VERSION_1_7
}
}
diff --git a/libraries/sharedCode/build.gradle b/libraries/sharedCode/build.gradle
index 0834a87..362188e 100644
--- a/libraries/sharedCode/build.gradle
+++ b/libraries/sharedCode/build.gradle
@@ -24,13 +24,13 @@ android {
disable 'MissingTranslation', 'ExtraTranslation'
}
- compileSdkVersion 20
- buildToolsVersion '20.0.0'
+ compileSdkVersion 21
+ buildToolsVersion '21.0.2'
defaultConfig {
applicationId "sharedcode.turboeditor"
minSdkVersion 11
- targetSdkVersion 19
+ targetSdkVersion 21
versionCode 1
versionName "1.0"
}
@@ -66,7 +66,10 @@ dependencies {
// compile 'com.googlecode.juniversalchardet:juniversalchardet:1.0.3'
compile 'org.apache.commons:commons-lang3:3.1'
compile files('libs/juniversalchardet-1.0.3.jar')
- compile 'com.android.support:support-v4:19.0.+'
+ compile ("com.android.support:appcompat-v7:21.+") {
+ exclude group: 'com.android.support', module: 'support-v4'
+ }
+ compile 'com.android.support:support-v4:21.+'
compile 'com.github.gabrielemariotti.changeloglib:library:1.5.1'
compile 'commons-io:commons-io:2.4'
compile 'com.android.support:support-annotations:20.0.0'
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/BaseHomeActivity.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/BaseHomeActivity.java
index b710491..9c5ba5b 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/BaseHomeActivity.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/BaseHomeActivity.java
@@ -19,8 +19,6 @@
package sharedcode.turboeditor.activity;
-import android.app.ActionBar;
-import android.app.Activity;
import android.app.ProgressDialog;
import android.content.ActivityNotFoundException;
import android.content.Context;
@@ -36,12 +34,18 @@ import android.os.Bundle;
import android.os.Handler;
import android.os.IBinder;
import android.preference.PreferenceManager;
-import android.support.v4.app.ActionBarDrawerToggle;
+import android.support.annotation.Nullable;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.ActionBarDrawerToggle;
+import android.support.v7.widget.ShareActionProvider;
+import android.support.v7.widget.Toolbar;
import android.text.Editable;
import android.text.InputType;
import android.text.Selection;
import android.text.Spannable;
import android.text.TextPaint;
+import android.text.TextUtils;
import android.text.TextWatcher;
import android.text.method.KeyListener;
import android.text.style.ForegroundColorSpan;
@@ -54,13 +58,16 @@ import android.view.MenuItem;
import android.view.View;
import android.view.WindowManager;
import android.view.inputmethod.InputMethodManager;
+import android.widget.AdapterView;
import android.widget.EditText;
import android.widget.HorizontalScrollView;
+import android.widget.ListView;
import android.widget.Toast;
import com.faizmalkani.floatingactionbutton.FloatingActionButton;
import org.apache.commons.io.FilenameUtils;
+import org.apache.commons.lang3.ArrayUtils;
import org.sufficientlysecure.rootcommands.Shell;
import org.sufficientlysecure.rootcommands.Toolbox;
@@ -73,6 +80,7 @@ import java.util.regex.Pattern;
import de.greenrobot.event.EventBus;
import sharedcode.turboeditor.R;
+import sharedcode.turboeditor.adapter.AdapterDrawer;
import sharedcode.turboeditor.fragment.ChangelogDialog;
import sharedcode.turboeditor.fragment.FileInfoDialog;
import sharedcode.turboeditor.fragment.FindTextDialog;
@@ -108,11 +116,12 @@ import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChan
import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.THEME_CHANGE;
import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.WRAP_CONTENT;
-public abstract class BaseHomeActivity extends Activity implements FindTextDialog
+public abstract class BaseHomeActivity extends ActionBarActivity implements FindTextDialog
.SearchDialogInterface, GoodScrollView.ScrollInterface, PageSystem.PageSystemInterface,
- PageSystemButtons.PageButtonsInterface, SeekbarDialog.ISeekbarDialog, SaveFileDialog.ISaveDialog {
+ PageSystemButtons.PageButtonsInterface, SeekbarDialog.ISeekbarDialog, SaveFileDialog.ISaveDialog,
+ AdapterView.OnItemClickListener, AdapterDrawer.Callbacks{
- //region EDITOR VARIABLES
+ //region VARIABLES
static final int
ID_SELECT_ALL = android.R.id.selectAll;
static final int ID_CUT = android.R.id.cut;
@@ -160,9 +169,18 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
private PageSystem pageSystem;
private PageSystemButtons pageSystemButtons;
private String currentEncoding = "UTF-8";
+ private Toolbar toolbar;
+
+ /*
+ Navigation Drawer
+ */
+ private AdapterDrawer arrayAdapter;
+ private LinkedList files;
+ private ListView listView;
//endregion
//region Activity facts
+
@Override
protected void onCreate(Bundle savedInstanceState) {
// set the windows background
@@ -171,6 +189,8 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
super.onCreate(savedInstanceState);
// setup the layout
setContentView(R.layout.activity_home);
+ toolbar = (Toolbar) findViewById(R.id.my_awesome_toolbar);
+ setSupportActionBar(toolbar);
// setup the navigation drawer
setupNavigationDrawer();
// reset text editor
@@ -181,7 +201,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
// Open
mDrawerLayout.openDrawer(Gravity.START);
// Set the default title
- getActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
+ getSupportActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
}
// parse the intent
parseIntent(getIntent());
@@ -201,6 +221,8 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
super.onResume();
// Register the Event Bus for events
EventBus.getDefault().registerSticky(this);
+ // Refresh the list view
+ refreshList();
}
@Override
@@ -289,7 +311,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
hideTextEditor();
// Set the default title
- getActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
+ getSupportActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
EventBus.getDefault().post(new EventBusEvents.ClosedAFile());
@@ -311,13 +333,15 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
String path = "";
if (requestCode == SELECT_FILE_CODE) {
path = data.getStringExtra("path");
+ if(TextUtils.isEmpty(path))
+ path = AccessStorageApi.getPath(getBaseContext(), data.getData());
}
if (requestCode == KITKAT_OPEN_REQUEST_CODE) {
path = AccessStorageApi.getPath(getBaseContext(), data.getData());
}
- if (!path.isEmpty()) {
+ if (!TextUtils.isEmpty(path)) {
File file = new File(path);
if (file.isFile() && file.exists()) {
EventBus.getDefault().postSticky(new EventBusEvents.NewFileToOpen(new File
@@ -327,6 +351,15 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
}
}
+
+ @Override
+ public void onItemClick(AdapterView parent, View view, int position, long id) {
+ // Path of the file selected
+ String filePath = files.get(position).getAbsolutePath();
+ // Send the event that a file was selected
+ EventBus.getDefault().post(new EventBusEvents.NewFileToOpen(new File(filePath)));
+ }
+
//endregion
//region MENU
@@ -343,11 +376,6 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
- ActionBar ab = getActionBar();
- if (ab == null)
- return false;
-
-
if (fileOpened && searchingText) {
MenuItem imReplace = menu.findItem(R.id.im_replace);
MenuItem imPrev = menu.findItem(R.id.im_previous_item);
@@ -379,6 +407,16 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
imUndo.setVisible(false);
imRedo.setVisible(false);
}
+
+ MenuItem item = (MenuItem) menu.findItem(R.id.im_share);
+ ShareActionProvider shareAction = (ShareActionProvider) MenuItemCompat
+ .getActionProvider(item);
+ File f = new File(sFilePath);
+ Intent shareIntent = new Intent();
+ shareIntent.setAction(Intent.ACTION_SEND);
+ shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(f));
+ shareIntent.setType("text/plain");
+ shareAction.setShareIntent(shareIntent);
}
return true;
@@ -388,7 +426,8 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
public boolean onOptionsItemSelected(MenuItem item) {
int i = item.getItemId();
if (mDrawerToggle.onOptionsItemSelected(item)) {
- mDrawerLayout.closeDrawer(Gravity.RIGHT);
+ Toast.makeText(getBaseContext(), "drawer click", Toast.LENGTH_SHORT).show();
+ mDrawerLayout.closeDrawer(Gravity.END);
return true;
} else if (i == R.id.im_save) {
saveTheFile();
@@ -432,15 +471,6 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
//
}
- } else if (i == R.id.im_share) {
- File f = new File(sFilePath);
- Intent shareIntent = new Intent();
- shareIntent.setAction(Intent.ACTION_SEND);
- shareIntent.putExtra(Intent.EXTRA_STREAM, Uri.fromFile(f));
- shareIntent.setType("text/plain");
-
- startActivity(Intent.createChooser(shareIntent, getString(R.string.share)));
-
} else if (i == R.id.im_info) {
FileInfoDialog dialogFrag = FileInfoDialog.newInstance(sFilePath);
@@ -543,25 +573,22 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
*/
private void setupNavigationDrawer() {
mDrawerLayout = (CustomDrawerLayout) findViewById(R.id.drawer_layout);
- /* Action Bar */
- final ActionBar ab = getActionBar();
+ /* Action Bar
+ final ActionBar ab = toolbar;
ab.setDisplayHomeAsUpEnabled(true);
- ab.setHomeButtonEnabled(true);
+ ab.setHomeButtonEnabled(true);*/
/* Navigation drawer */
mDrawerToggle =
new ActionBarDrawerToggle(
this,
mDrawerLayout,
- R.drawable.ic_drawer,
+ toolbar,
R.string.nome_app_turbo_editor,
R.string.nome_app_turbo_editor) {
- /**
- * {@inheritDoc}
- */
@Override
public void onDrawerOpened(View drawerView) {
- invalidateOptionsMenu();
+ supportInvalidateOptionsMenu();
try {
closeKeyBoard();
} catch (NullPointerException e) {
@@ -569,17 +596,21 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
}
}
- /**
- * {@inheritDoc}
- */
@Override
public void onDrawerClosed(View view) {
- invalidateOptionsMenu();
+ supportInvalidateOptionsMenu();
}
};
/* link the mDrawerToggle to the Drawer Layout */
mDrawerLayout.setDrawerListener(mDrawerToggle);
//mDrawerLayout.setFocusableInTouchMode(false);
+
+ listView = (ListView) findViewById(android.R.id.list);
+ listView.setEmptyView(findViewById(android.R.id.empty));
+ files = new LinkedList<>();
+ arrayAdapter = new AdapterDrawer(this, files, this);
+ listView.setAdapter(arrayAdapter);
+ listView.setOnItemClickListener(this);
}
private void setupTextEditor() {
@@ -696,7 +727,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
}
public void updateTextSyntax() {
- if (!PreferenceHelper.getSyntaxHiglight(getBaseContext()) || mEditor.hasSelection() ||
+ if (!PreferenceHelper.getSyntaxHighlight(getBaseContext()) || mEditor.hasSelection() ||
updateHandler == null || colorRunnable_duringEditing == null)
return;
@@ -704,6 +735,48 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
updateHandler.removeCallbacks(colorRunnable_duringScroll);
updateHandler.postDelayed(colorRunnable_duringEditing, SYNTAX_DELAY_MILLIS_LONG);
}
+
+ private void refreshList(){
+ refreshList(null, false, false);
+ }
+
+ private void refreshList(@Nullable String path, boolean add, boolean delete) {
+ int max_recent_files = 15;
+ if(add)
+ max_recent_files--;
+
+ // File paths saved in preferences
+ String[] savedPaths = PreferenceHelper.getSavedPaths(this);
+ int first_index_of_array = savedPaths.length > max_recent_files ? savedPaths.length - max_recent_files : 0;
+ savedPaths = ArrayUtils.subarray(savedPaths, first_index_of_array, savedPaths.length);
+ // File names for the list
+ files.clear();
+ // StringBuilder that will contain the file paths
+ StringBuilder sb = new StringBuilder();
+ // for cycle to convert paths to names
+
+ for(int i = 0; i < savedPaths.length; i++){
+ String savedPath = savedPaths[i];
+ File file = new File(savedPath);
+ // Check that the file exist
+ if (file.exists()) {
+ if(path != null && path.equals(savedPath) && delete)
+ continue;
+ else {
+ files.addFirst(file);
+ sb.append(savedPath).append(",");
+ }
+ }
+ }
+ if(path != null && !path.isEmpty() && add && !ArrayUtils.contains(savedPaths, path)) {
+ sb.append(path).append(",");
+ files.addFirst(new File(path));
+ }
+ // save list without empty or non existed files
+ PreferenceHelper.setSavedPaths(this, sb);
+ // Set adapter
+ arrayAdapter.notifyDataSetChanged();
+ }
//endregion
//region EVENTBUS
@@ -718,8 +791,8 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
new AsyncTask() {
- File file;
- String message;
+ File file = event.getFile();
+ String message = "";
String fileText;
String encoding;
ProgressDialog progressDialog;
@@ -729,8 +802,6 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
super.onPreExecute();
// Close the drawer
mDrawerLayout.closeDrawer(Gravity.START);
- file = event.getFile();
- message = "";
progressDialog = new ProgressDialog(BaseHomeActivity.this);
progressDialog.setMessage(getString(R.string.please_wait));
progressDialog.show();
@@ -742,7 +813,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
try {
boolean isRoot = false;
- if (!file.exists()) {
+ if (!file.exists() || !file.isFile()) {
fileText = event.getFileText();
return null;
}
@@ -811,15 +882,20 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
String name = FilenameUtils.getName(sFilePath);
if (name.isEmpty())
- getActionBar().setTitle("*");
+ getSupportActionBar().setTitle(R.string.new_file);
else
- getActionBar().setTitle(name);
+ getSupportActionBar().setTitle(name);
+ if(!name.isEmpty()) {
+ refreshList(sFilePath, true, false);
+ }
}
}
}.execute();
+ EventBus.getDefault().removeStickyEvent(event);
+
}
public void onEvent(EventBusEvents.SavedAFile event) {
@@ -833,7 +909,8 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
} catch (NullPointerException e) {
e.printStackTrace();
}
- // Get intent, action and MIME type
+
+ /*// Get intent, action and MIME type
final Intent intent = getIntent();
final String action = intent.getAction();
final String type = intent.getType();
@@ -847,7 +924,10 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
setResult(Activity.RESULT_OK, returnIntent);
// finish the activity
finish();
- }
+ }*/
+
+ refreshList(event.getPath(), true, false);
+ arrayAdapter.selectView(event.getPath());
displayInterstitial();
}
@@ -862,7 +942,9 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
//
mDrawerLayout.openDrawer(Gravity.LEFT);
//
- getActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
+ getSupportActionBar().setTitle(getString(R.string.nome_app_turbo_editor));
+ //
+ supportInvalidateOptionsMenu();
// Replace fragment
hideTextEditor();
}
@@ -965,14 +1047,22 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
}
}
}
+
+ public void onEvent(EventBusEvents.AFileIsSelected event) {
+ arrayAdapter.selectView(event.getPath());
+
+ EventBus.getDefault().removeStickyEvent(event);
+ }
+
+ public void onEvent(EventBusEvents.ClosedAFile event) {
+ arrayAdapter.selectView("");
+ }
//endregion
//region Calls from the layout
public void OpenFile(View view) {
-
Intent subActivity = new Intent(BaseHomeActivity.this, SelectFileActivity.class);
subActivity.putExtra("action", SelectFileActivity.Actions.SelectFile);
-
AnimationUtils.startActivityWithScale(this, subActivity, true, SELECT_FILE_CODE, view);
}
@@ -1093,7 +1183,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
public void onScrollChanged(int l, int t, int oldl, int oldt) {
pageSystemButtons.updateVisibility(Math.abs(t) > 10);
- if (!PreferenceHelper.getSyntaxHiglight(getBaseContext()) || (mEditor.hasSelection() &&
+ if (!PreferenceHelper.getSyntaxHighlight(getBaseContext()) || (mEditor.hasSelection() &&
!searchingText) || updateHandler == null || colorRunnable_duringScroll == null)
return;
@@ -1139,8 +1229,16 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
mEditor.canSaveFile = false;
if(openNewFile)
onEvent(new EventBusEvents.NewFileToOpen(new File(pathOfNewFile)));
+ else
+ onEvent(new EventBusEvents.CannotOpenAFile());
}
+ @Override
+ public void CancelItem(int position, boolean andCloseOpenedFile) {
+ refreshList(files.get(position).getAbsolutePath(), false, true);
+ if (andCloseOpenedFile)
+ EventBus.getDefault().post(new EventBusEvents.CannotOpenAFile());
+ }
//endregion
public static class Editor extends EditText {
@@ -1645,7 +1743,7 @@ public abstract class BaseHomeActivity extends Activity implements FindTextDialo
disableTextChangedListener();
modified = false;
- if (PreferenceHelper.getSyntaxHiglight(getContext()))
+ if (PreferenceHelper.getSyntaxHighlight(getContext()))
setText(highlight(textToUpdate == null ? getEditableText() : Editable.Factory
.getInstance().newEditable(textToUpdate), textToUpdate != null));
else
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/LicensesActivity.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/LicensesActivity.java
index ebaf9a7..6685495 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/LicensesActivity.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/LicensesActivity.java
@@ -20,6 +20,7 @@
package sharedcode.turboeditor.activity;
import android.app.Activity;
+import android.app.FragmentManager;
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/SelectFileActivity.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/SelectFileActivity.java
index 63cbf94..adcbd62 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/SelectFileActivity.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/activity/SelectFileActivity.java
@@ -19,11 +19,13 @@
package sharedcode.turboeditor.activity;
-import android.app.Activity;
import android.content.Intent;
import android.os.AsyncTask;
import android.os.Bundle;
import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.SearchView;
+import android.support.v7.widget.Toolbar;
import android.text.TextUtils;
import android.view.Menu;
import android.view.MenuItem;
@@ -32,7 +34,6 @@ import android.widget.AdapterView;
import android.widget.Filter;
import android.widget.ListView;
import android.widget.PopupMenu;
-import android.widget.SearchView;
import android.widget.TextView;
import android.widget.Toast;
@@ -61,7 +62,7 @@ import sharedcode.turboeditor.util.AlphanumComparator;
import sharedcode.turboeditor.util.Build;
import sharedcode.turboeditor.util.ThemeUtils;
-public class SelectFileActivity extends Activity implements SearchView.OnQueryTextListener, AdapterView.OnItemClickListener, EditTextDialog.EditDialogListener {
+public class SelectFileActivity extends ActionBarActivity implements SearchView.OnQueryTextListener, AdapterView.OnItemClickListener, EditTextDialog.EditDialogListener {
private String currentFolder = PreferenceHelper.SD_CARD_ROOT;
private ListView listView;
private boolean wantAFile = true;
@@ -78,7 +79,10 @@ public class SelectFileActivity extends Activity implements SearchView.OnQueryTe
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_select_file);
- getActionBar().setDisplayHomeAsUpEnabled(true);
+ Toolbar toolbar = (Toolbar) findViewById(R.id.my_awesome_toolbar);
+ setSupportActionBar(toolbar);
+
+ getSupportActionBar().setDisplayHomeAsUpEnabled(true);
final Actions action = (Actions) getIntent().getExtras().getSerializable("action");
wantAFile = action == Actions.SelectFile;
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/adapter/AdapterDrawer.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/adapter/AdapterDrawer.java
index 44338bf..a076be7 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/adapter/AdapterDrawer.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/adapter/AdapterDrawer.java
@@ -30,7 +30,7 @@ import android.widget.ImageView;
import android.widget.TextView;
import java.io.File;
-import java.util.ArrayList;
+import java.util.List;
import sharedcode.turboeditor.R;
@@ -41,11 +41,11 @@ public class AdapterDrawer extends
// Layout Inflater
private final LayoutInflater inflater;
// List of file details
- private final ArrayList files;
+ private final List files;
private String selectedPath = "";
public AdapterDrawer(Context context,
- ArrayList files,
+ List files,
Callbacks callbacks) {
super(context, R.layout.item_file_list, files);
this.files = files;
@@ -80,13 +80,9 @@ public class AdapterDrawer extends
});
if (TextUtils.equals(selectedPath, files.get(position).getAbsolutePath())) {
- hold.nameLabel.setTypeface(hold.nameLabel.getTypeface(), Typeface.BOLD);
- convertView.setBackgroundColor((convertView.getResources()
- .getColor(R.color.item_selected)));
+ hold.nameLabel.setTypeface(null, Typeface.BOLD);
} else {
- hold.nameLabel.setTypeface(hold.nameLabel.getTypeface(), Typeface.NORMAL);
- convertView.setBackgroundColor((convertView.getResources()
- .getColor(android.R.color.transparent)));
+ hold.nameLabel.setTypeface(null, Typeface.NORMAL);
}
} else {
@@ -105,12 +101,8 @@ public class AdapterDrawer extends
if (TextUtils.equals(selectedPath, files.get(position).getAbsolutePath())) {
hold.nameLabel.setTypeface(null, Typeface.BOLD);
- convertView.setBackgroundColor((convertView.getResources()
- .getColor(R.color.item_selected)));
} else {
hold.nameLabel.setTypeface(null, Typeface.NORMAL);
- convertView.setBackgroundColor((convertView.getResources()
- .getColor(android.R.color.transparent)));
}
}
return convertView;
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/EditTextDialog.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/EditTextDialog.java
index f7e457d..fe337fe 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/EditTextDialog.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/EditTextDialog.java
@@ -32,6 +32,7 @@ import android.widget.EditText;
import android.widget.TextView;
import sharedcode.turboeditor.R;
+import sharedcode.turboeditor.views.DialogHelper;
// ...
public class EditTextDialog extends DialogFragment implements TextView.OnEditorActionListener {
@@ -55,22 +56,25 @@ public class EditTextDialog extends DialogFragment implements TextView.OnEditorA
public Dialog onCreateDialog(Bundle savedInstanceState) {
final Actions action = (Actions) getArguments().getSerializable("action");
- final String hint;
+ final String title;
switch (action) {
case NewFile:
- hint = getString(R.string.file);
+ title = getString(R.string.file);
break;
case NewFolder:
- hint = getString(R.string.folder);
+ title = getString(R.string.folder);
break;
default:
- hint = null;
+ title = null;
break;
}
- final View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_fragment_edittext, null);
+ View view = new DialogHelper.Builder(getActivity())
+ .setTitle(title)
+ .setView(R.layout.dialog_fragment_edittext)
+ .createSkeletonView();
this.mEditText = (EditText) view.findViewById(android.R.id.edit);
- this.mEditText.setHint(hint);
+ this.mEditText.setHint(R.string.name);
// Show soft keyboard automatically
this.mEditText.setText(getArguments().getString("hint"));
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/EncodingDialog.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/EncodingDialog.java
index a09bb91..3a0bb46 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/EncodingDialog.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/EncodingDialog.java
@@ -23,12 +23,12 @@ import android.app.AlertDialog;
import android.app.Dialog;
import android.app.DialogFragment;
import android.os.Bundle;
+import android.support.v7.widget.SwitchCompat;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.CompoundButton;
import android.widget.ListView;
-import android.widget.Switch;
import org.mozilla.universalchardet.Constants;
@@ -77,7 +77,7 @@ public class EncodingDialog extends DialogFragment implements AdapterView.OnItem
final View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_encoding_list, null);
list = (ListView) view.findViewById(android.R.id.list);
- Switch autoencoding = (Switch) view.findViewById(android.R.id.checkbox);
+ SwitchCompat autoencoding = (SwitchCompat) view.findViewById(android.R.id.checkbox);
autoencoding.setChecked(PreferenceHelper.getAutoEncoding(getActivity()));
autoencoding.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/FileInfoDialog.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/FileInfoDialog.java
index b6d2c08..abbf52c 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/FileInfoDialog.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/FileInfoDialog.java
@@ -34,6 +34,7 @@ import java.util.Date;
import sharedcode.turboeditor.R;
import sharedcode.turboeditor.adapter.AdapterTwoItem;
+import sharedcode.turboeditor.views.DialogHelper;
// ...
public class FileInfoDialog extends DialogFragment {
@@ -49,7 +50,12 @@ public class FileInfoDialog extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
- final View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_fragment_file_info, null);
+ View view = new DialogHelper.Builder(getActivity())
+ .setTitle(R.string.info)
+ .setView(R.layout.dialog_fragment_file_info)
+ .createSkeletonView();
+ //final View view = getActivity().getLayoutInflater().inflate(R.layout.dialog_fragment_file_info, null);
+
ListView list = (ListView) view.findViewById(android.R.id.list);
File file = new File(getArguments().getString("filePath"));
@@ -76,8 +82,8 @@ public class FileInfoDialog extends DialogFragment {
list.setAdapter(new AdapterTwoItem(getActivity(), lines1, lines2));
+
return new AlertDialog.Builder(getActivity())
- //.setTitle(title)
.setView(view)
.setPositiveButton(android.R.string.ok,
new DialogInterface.OnClickListener() {
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/NavigationDrawer.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/NavigationDrawer.java
deleted file mode 100644
index 1f77d16..0000000
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/fragment/NavigationDrawer.java
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
- * Copyright (C) 2014 Vlad Mihalachi
- *
- * This file is part of Turbo Editor.
- *
- * Turbo Editor is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Turbo Editor is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package sharedcode.turboeditor.fragment;
-
-import android.app.Fragment;
-import android.os.Bundle;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.AdapterView;
-import android.widget.ListView;
-
-import java.io.File;
-import java.util.ArrayList;
-
-import de.greenrobot.event.EventBus;
-import sharedcode.turboeditor.R;
-import sharedcode.turboeditor.adapter.AdapterDrawer;
-import sharedcode.turboeditor.preferences.PreferenceHelper;
-import sharedcode.turboeditor.util.EventBusEvents;
-
-
-public class NavigationDrawer extends Fragment implements AdapterView.OnItemClickListener, AdapterDrawer.Callbacks {
-
-
- private AdapterDrawer arrayAdapter;
- private ArrayList files;
- private ListView listView;
-
-
- @Override
- public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
- // Our custom layout
- View rootView = inflater.inflate(R.layout.fragment_navigation_drawer, container, false);
- listView = (ListView) rootView.findViewById(android.R.id.list);
- listView.setEmptyView(rootView.findViewById(android.R.id.empty));
- files = new ArrayList<>();
- arrayAdapter = new AdapterDrawer(getActivity(), files, this);
- listView.setAdapter(arrayAdapter);
- return rootView;
- }
-
-
- @Override
- public void onViewCreated(View view, Bundle savedInstanceState) {
- super.onViewCreated(view, savedInstanceState);
- listView.setOnItemClickListener(this);
- }
-
-
- @Override
- public void onResume() {
- super.onResume();
- // Register the Event Bus for events
- EventBus.getDefault().registerSticky(this);
- // Refresh the list view
- refreshList();
- }
-
-
- @Override
- public void onPause() {
- super.onPause();
- // Unregister the Event Bus
- EventBus.getDefault().unregister(this);
- }
-
- @Override
- public void onItemClick(AdapterView parent, View view, int position, long id) {
- // File paths saved in preferences
- String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
- // Path of the file selected
- String filePath = savedPaths[position];
- // Send the event that a file was selected
- EventBus.getDefault().post(new EventBusEvents.NewFileToOpen(new File(filePath)));
- }
-
- public void onEvent(EventBusEvents.AFileIsSelected event) {
- arrayAdapter.selectView(event.getPath());
-
- EventBus.getDefault().removeStickyEvent(event);
- }
-
- public void onEvent(EventBusEvents.NewFileToOpen event) {
-
- // File paths saved in preferences
- String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
- String selectedPath = event.getFile().getAbsolutePath();
- boolean pathAlreadyExist = false;
- for (String savedPath : savedPaths) {
- // We don't need to save the file path twice
- if (savedPath.equals(selectedPath)) {
- pathAlreadyExist = true;
- }
- }
- // Add the path if it wasn't added before
- if (!pathAlreadyExist)
- addPath(selectedPath);
-
- EventBus.getDefault().removeStickyEvent(event);
- }
-
- public void onEvent(EventBusEvents.SavedAFile event) {
- if (addPath(event.getPath())) {
- arrayAdapter.selectView(event.getPath());
- }
- }
-
- public void onEvent(EventBusEvents.ClosedAFile event) {
- arrayAdapter.selectView("");
- }
-
- private boolean addPath(String path) {
- // File paths saved in preferences
- String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
- // StringBuilder
- StringBuilder sb = new StringBuilder();
- boolean pathAlreadyExist = false;
- for (String savedPath : savedPaths) {
- // Append the file path and a comma
- sb.append(savedPath).append(",");
- if (savedPath.equals(path))
- pathAlreadyExist = true;
- }
- // Append new path
- if (!pathAlreadyExist)
- sb.append(path);
- // Put the string and commit
- PreferenceHelper.setSavedPaths(getActivity(), sb);
- // Update list
- refreshList();
-
- return pathAlreadyExist == false;
- }
-
- private void removePath(String path) {
- // File paths saved in preferences
- String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
- // StringBuilder
- StringBuilder sb = new StringBuilder();
- // for cycle
- for (String savedPath : savedPaths) {
- if (path.equals(savedPath)) continue;
- sb.append(savedPath).append(",");
- }
- // Put the string and commit
- PreferenceHelper.setSavedPaths(getActivity(), sb);
- // Update list
- refreshList();
- }
-
- private void refreshList() {
- // File paths saved in preferences
- String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
- // File names for the list
- files.clear();
- // StringBuilder that will contain the file paths
- StringBuilder sb = new StringBuilder();
- // for cycle to convert paths to names
- for (String path : savedPaths) {
- File file = new File(path);
- // Check that the file exist
- if (file.exists()) {
- files.add(file);
- sb.append(path).append(",");
- }
- }
- // save list without empty or non existed files
- PreferenceHelper.setSavedPaths(getActivity(), sb);
- // Set adapter
- arrayAdapter.notifyDataSetChanged();
- }
-
- @Override
- public void CancelItem(int position, boolean andCloseOpenedFile) {
- String[] savedPaths = PreferenceHelper.getSavedPaths(getActivity());
- removePath(savedPaths[position]);
- if (andCloseOpenedFile)
- EventBus.getDefault().post(new EventBusEvents.CannotOpenAFile());
- }
-}
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/ExtraSettingsActivity.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/ExtraSettingsActivity.java
deleted file mode 100644
index 19aab21..0000000
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/ExtraSettingsActivity.java
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
- * Copyright (C) 2014 Vlad Mihalachi
- *
- * This file is part of Turbo Editor.
- *
- * Turbo Editor is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Turbo Editor is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see .
- */
-
-package sharedcode.turboeditor.preferences;
-
-import android.content.Context;
-import android.content.res.Configuration;
-import android.os.Build;
-import android.os.Bundle;
-import android.preference.ListPreference;
-import android.preference.Preference;
-import android.preference.PreferenceActivity;
-import android.preference.PreferenceFragment;
-import android.preference.PreferenceManager;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import de.greenrobot.event.EventBus;
-import sharedcode.turboeditor.R;
-import sharedcode.turboeditor.util.EventBusEvents;
-import sharedcode.turboeditor.util.ThemeUtils;
-
-/**
- * A {@link PreferenceActivity} that presents a set of application settings. On
- * handset devices, settings are presented as a single list. On tablets,
- * settings are split by category, with category headers shown to the left of
- * the list of settings.
- *
- * See
- * Android Design: Settings for design guidelines and the Settings
- * API Guide for more information on developing a Settings UI.
- */
-public class ExtraSettingsActivity extends PreferenceActivity {
- /**
- * Determines whether to always show the simplified settings UI, where
- * settings are presented in a single list. When false, settings are shown
- * as a master/detail two-pane view on tablets. When true, a single pane is
- * shown on tablets.
- */
- private static final boolean ALWAYS_SIMPLE_PREFS = true;
- boolean encodingChanged = false,
- themeChanged = false,
- keyboardSuggestionsChanged = false;
- /**
- * A preference value change listener that updates the preference's summary
- * to reflect its new value.
- */
- private Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener() {
- @Override
- public boolean onPreferenceChange(Preference preference, Object value) {
- String stringValue = value.toString();
-
- if (preference instanceof ListPreference) {
- // For list preferences, look up the correct display value in
- // the preference's 'entries' list.
- ListPreference listPreference = (ListPreference) preference;
- int index = listPreference.findIndexOfValue(stringValue);
-
- // Set the summary to reflect the new value.
- preference.setSummary(
- index >= 0
- ? listPreference.getEntries()[index]
- : null);
-
- }
- switch (preference.getKey()) {
- case "light_theme":
- themeChanged = !themeChanged;
- break;
- case "suggestion_active":
- keyboardSuggestionsChanged = !keyboardSuggestionsChanged;
- break;
- case "editor_encoding":
- encodingChanged = true;
- break;
-
- }
- return true;
- }
- };
-
- /**
- * Helper method to determine if the device has an extra-large screen. For
- * example, 10" tablets are extra-large.
- */
- private static boolean isXLargeTablet(Context context) {
- return (context.getResources().getConfiguration().screenLayout
- & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE;
- }
-
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- ThemeUtils.setTheme(this);
- super.onCreate(savedInstanceState);
- }
-
- @Override
- protected void onPostCreate(Bundle savedInstanceState) {
- super.onPostCreate(savedInstanceState);
-
- setupSimplePreferencesScreen();
- }
-
- /**
- * Shows the simplified settings UI if the device configuration if the
- * device configuration dictates that a simplified, single-pane UI should be
- * shown.
- */
- private void setupSimplePreferencesScreen() {
- if (!isSimplePreferences(this)) {
- return;
- }
-
- // In the simplified UI, fragments are not used at all and we instead
- // use the older PreferenceActivity APIs.
-
- // Add 'general' preferences.
- addPreferencesFromResource(R.xml.extra_options);
-
- // Bind the summaries of EditText/List/Dialog/Ringtone preferences to
- // their values. When their values change, their summaries are updated
- // to reflect the new value, per the Android Design guidelines.
- bindPreferenceSummaryToValue(findPreference("editor_encoding"));
-
- String[] checkBoxPreferences = {"light_theme", "suggestion_active"};
- for (String key : checkBoxPreferences) {
- // Set the listener to watch for value changes.
- findPreference(key).setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
- }
- }
-
- /**
- * {@inheritDoc}
- */
- @Override
- public boolean onIsMultiPane() {
- return isXLargeTablet(this) && !isSimplePreferences(this);
- }
-
- /**
- * Determines whether the simplified settings UI should be shown. This is
- * true if this is forced via {@link #ALWAYS_SIMPLE_PREFS}, or the device
- * doesn't have newer APIs like {@link PreferenceFragment}, or the device
- * doesn't have an extra-large screen. In these cases, a single-pane
- * "simplified" settings UI should be shown.
- */
- private boolean isSimplePreferences(Context context) {
- return ALWAYS_SIMPLE_PREFS
- || Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB
- || !isXLargeTablet(context);
- }
-
- @Override
- protected void onDestroy() {
- List listOfChanges = new ArrayList<>();
- if (themeChanged) {
- listOfChanges.add(EventBusEvents.APreferenceValueWasChanged.Type.THEME_CHANGE);
- }
- if (keyboardSuggestionsChanged) {
- listOfChanges.add(EventBusEvents.APreferenceValueWasChanged.Type.TEXT_SUGGESTIONS);
- }
- if (encodingChanged) {
- listOfChanges.add(EventBusEvents.APreferenceValueWasChanged.Type.ENCODING);
- }
-
-
- if (listOfChanges.size() > 0) {
- EventBus.getDefault().postSticky(new EventBusEvents.APreferenceValueWasChanged(listOfChanges));
- }
- super.onDestroy();
- }
-
- /**
- * Binds a preference's summary to its value. More specifically, when the
- * preference's value is changed, its summary (line of text below the
- * preference title) is updated to reflect the value. The summary is also
- * immediately updated upon calling this method. The exact display format is
- * dependent on the type of preference.
- *
- * @see #sBindPreferenceSummaryToValueListener
- */
- private void bindPreferenceSummaryToValue(Preference preference) {
- // Set the listener to watch for value changes.
- preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener);
-
- // Trigger the listener immediately with the preference's
- // current value.
- sBindPreferenceSummaryToValueListener.onPreferenceChange(preference,
- PreferenceManager
- .getDefaultSharedPreferences(preference.getContext())
- .getString(preference.getKey(), ""));
- }
-}
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/PreferenceHelper.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/PreferenceHelper.java
index 96502b1..084f3be 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/PreferenceHelper.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/PreferenceHelper.java
@@ -49,7 +49,7 @@ public final class PreferenceHelper {
return getPrefs(context).getBoolean("editor_line_numbers", true);
}
- public static boolean getSyntaxHiglight(Context context) {
+ public static boolean getSyntaxHighlight(Context context) {
return getPrefs(context).getBoolean("editor_syntax_highlight", false);
}
@@ -105,7 +105,7 @@ public final class PreferenceHelper {
return getPrefs(context).getBoolean("ignore_back_button", false);
}
- public static boolean getPageSystemEnabled(Context context) {
+ public static boolean getSplitText(Context context) {
return getPrefs(context).getBoolean("page_system_active", true);
}
@@ -122,7 +122,7 @@ public final class PreferenceHelper {
getEditor(context).putBoolean("editor_line_numbers", value).commit();
}
- public static void setSyntaxHiglight(Context context, boolean value) {
+ public static void setSyntaxHighlight(Context context, boolean value) {
getEditor(context).putBoolean("editor_syntax_highlight", value).commit();
}
@@ -158,4 +158,31 @@ public final class PreferenceHelper {
getEditor(context).putBoolean("has_donated", value);
}
+ public static void setLightTheme(Context context, boolean value) {
+ getEditor(context).putBoolean("light_theme", value).commit();
+ }
+
+ public static void setSuggestionsActive(Context context, boolean value) {
+ getEditor(context).putBoolean("suggestion_active", value).commit();
+ }
+
+ public static void setAutoSave(Context context, boolean value) {
+ getEditor(context).putBoolean("auto_save", value).commit();
+ }
+
+ public static void setIgnoreBackButton(Context context, boolean value) {
+ getEditor(context).putBoolean("ignore_back_button", value).commit();
+ }
+
+ public static void setSplitText(Context context, boolean value) {
+ getEditor(context).putBoolean("page_system_active", value).commit();
+ }
+
+ public static void setSendErrorReport(Context context, boolean value) {
+ getEditor(context).putBoolean("ignore_back_button", value).commit();
+ }
+
+ public static void setEncoding(Context context, String value) {
+ getEditor(context).putString("editor_encoding", value).commit();
+ }
}
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/SettingsFragment.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/SettingsFragment.java
index cedfde2..3bb26f4 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/SettingsFragment.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/preferences/SettingsFragment.java
@@ -20,32 +20,34 @@
package sharedcode.turboeditor.preferences;
import android.app.Fragment;
-import android.content.Intent;
import android.os.Bundle;
+import android.support.v7.widget.SwitchCompat;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
-import android.widget.CheckBox;
import android.widget.CompoundButton;
import android.widget.TextView;
import de.greenrobot.event.EventBus;
import sharedcode.turboeditor.R;
+import sharedcode.turboeditor.fragment.EncodingDialog;
import sharedcode.turboeditor.fragment.SeekbarDialog;
-import sharedcode.turboeditor.util.AnimationUtils;
import sharedcode.turboeditor.util.ProCheckUtils;
import sharedcode.turboeditor.util.ViewUtils;
import sharedcode.turboeditor.views.DialogHelper;
import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged;
+import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.ENCODING;
import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.FONT_SIZE;
import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.LINE_NUMERS;
import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.MONOSPACE;
import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.READ_ONLY;
import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.SYNTAX;
+import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.TEXT_SUGGESTIONS;
+import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.THEME_CHANGE;
import static sharedcode.turboeditor.util.EventBusEvents.APreferenceValueWasChanged.Type.WRAP_CONTENT;
-public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbarDialog {
+public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbarDialog, EncodingDialog.DialogListener {
// Editor Variables
private boolean sLineNumbers;
@@ -54,71 +56,100 @@ public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbar
private boolean sUseMonospace;
private boolean sReadOnly;
+ private boolean sLightTheme;
+ private boolean sSuggestions;
+ private boolean sAutoSave;
+ private boolean sIgnoreBackButton;
+ private boolean sSplitText;
+ private boolean sErrorReports;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
sUseMonospace = PreferenceHelper.getUseMonospace(getActivity());
- sColorSyntax = PreferenceHelper.getSyntaxHiglight(getActivity());
+ sColorSyntax = PreferenceHelper.getSyntaxHighlight(getActivity());
sWrapContent = PreferenceHelper.getWrapContent(getActivity());
sLineNumbers = PreferenceHelper.getLineNumbers(getActivity());
sReadOnly = PreferenceHelper.getReadOnly(getActivity());
+
+ sLightTheme = PreferenceHelper.getLightTheme(getActivity());
+ sSuggestions = PreferenceHelper.getSuggestionActive(getActivity());
+ sAutoSave = PreferenceHelper.getAutoSave(getActivity());
+ sIgnoreBackButton = PreferenceHelper.getIgnoreBackButton(getActivity());
+ sSplitText = PreferenceHelper.getSplitText(getActivity());
+ sErrorReports = PreferenceHelper.getSendErrorReports(getActivity());
}
@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Our custom layout
- View rootView = inflater.inflate(R.layout.fragment_settings, container, false);
- final CheckBox switchLineNumbers, switchSyntax, switchWrapContent, switchMonospace, switchReadOnly;
- switchLineNumbers = (CheckBox) rootView.findViewById(R.id.switch_line_numbers);
- switchSyntax = (CheckBox) rootView.findViewById(R.id.switch_syntax);
- switchWrapContent = (CheckBox) rootView.findViewById(R.id.switch_wrap_content);
- switchMonospace = (CheckBox) rootView.findViewById(R.id.switch_monospace);
- switchReadOnly = (CheckBox) rootView.findViewById(R.id.switch_read_only);
+ final View rootView = inflater.inflate(R.layout.fragment_settings, container, false);
+ final SwitchCompat swLineNumbers, swSyntax, swWrapContent, swMonospace, swReadOnly;
+ final SwitchCompat swLightTheme, swSuggestions, swAutoSave, swIgnoreBackButton, swSplitText, swErrorReports;
+
+ swLineNumbers = (SwitchCompat) rootView.findViewById(R.id.switch_line_numbers);
+ swSyntax = (SwitchCompat) rootView.findViewById(R.id.switch_syntax);
+ swWrapContent = (SwitchCompat) rootView.findViewById(R.id.switch_wrap_content);
+ swMonospace = (SwitchCompat) rootView.findViewById(R.id.switch_monospace);
+ swReadOnly = (SwitchCompat) rootView.findViewById(R.id.switch_read_only);
- switchLineNumbers.setChecked(sLineNumbers);
- switchSyntax.setChecked(sColorSyntax);
- switchWrapContent.setChecked(sWrapContent);
- switchMonospace.setChecked(sUseMonospace);
- switchReadOnly.setChecked(sReadOnly);
+ swLightTheme = (SwitchCompat) rootView.findViewById(R.id.switch_light_theme);
+ swSuggestions = (SwitchCompat) rootView.findViewById(R.id.switch_suggestions_active);
+ swAutoSave = (SwitchCompat) rootView.findViewById(R.id.switch_auto_save);
+ swIgnoreBackButton = (SwitchCompat) rootView.findViewById(R.id.switch_ignore_backbutton);
+ swSplitText = (SwitchCompat) rootView.findViewById(R.id.switch_page_system);
+ swErrorReports = (SwitchCompat) rootView.findViewById(R.id.switch_send_error_reports);
- TextView fontSizeView, donateView, extraOptionsView;
+ swLineNumbers.setChecked(sLineNumbers);
+ swSyntax.setChecked(sColorSyntax);
+ swWrapContent.setChecked(sWrapContent);
+ swMonospace.setChecked(sUseMonospace);
+ swReadOnly.setChecked(sReadOnly);
+
+ swLightTheme.setChecked(sLightTheme);
+ swSuggestions.setChecked(sSuggestions);
+ swAutoSave.setChecked(sAutoSave);
+ swIgnoreBackButton.setChecked(sIgnoreBackButton);
+ swSplitText.setChecked(sSplitText);
+ swErrorReports.setChecked(sErrorReports);
+
+ TextView fontSizeView, encodingView, donateView, extraOptionsView;
fontSizeView = (TextView) rootView.findViewById(R.id.drawer_button_font_size);
+ encodingView = (TextView) rootView.findViewById(R.id.drawer_button_encoding);
extraOptionsView = (TextView) rootView.findViewById(R.id.drawer_button_extra_options);
donateView = (TextView) rootView.findViewById(R.id.drawer_button_go_pro);
if(ProCheckUtils.isPro(getActivity(), false))
ViewUtils.setVisible(donateView, false);
- switchLineNumbers.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ swLineNumbers.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- sLineNumbers = isChecked;
PreferenceHelper.setLineNumbers(getActivity(), isChecked);
EventBus.getDefault().post(new APreferenceValueWasChanged(LINE_NUMERS));
}
});
- switchSyntax.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ swSyntax.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
sColorSyntax = isChecked;
- PreferenceHelper.setSyntaxHiglight(getActivity(), isChecked);
+ PreferenceHelper.setSyntaxHighlight(getActivity(), isChecked);
EventBus.getDefault().post(new APreferenceValueWasChanged(SYNTAX));
}
});
- switchWrapContent.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ swWrapContent.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- sWrapContent = isChecked;
PreferenceHelper.setWrapContent(getActivity(), isChecked);
EventBus.getDefault().post(new APreferenceValueWasChanged(WRAP_CONTENT));
}
});
- switchMonospace.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ swMonospace.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
sUseMonospace = isChecked;
@@ -128,10 +159,9 @@ public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbar
}
});
- switchReadOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ swReadOnly.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
- sReadOnly = isChecked;
PreferenceHelper.setReadOnly(getActivity(), isChecked);
EventBus.getDefault().post(new APreferenceValueWasChanged(READ_ONLY));
}
@@ -151,11 +181,21 @@ public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbar
}
});
+ encodingView.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ EncodingDialog dialogFrag = EncodingDialog.newInstance();
+ dialogFrag.setTargetFragment(SettingsFragment.this, 0);
+ dialogFrag.show(getFragmentManager().beginTransaction(), "dialog");
+ }
+ });
+
extraOptionsView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- AnimationUtils.startActivityWithScale(getActivity(), new Intent(getActivity(),
- ExtraSettingsActivity.class), false, 0, v);
+ View otherOptions = rootView.findViewById(R.id.other_options);
+ boolean isVisible = otherOptions.getVisibility() == View.VISIBLE;
+ ViewUtils.setVisible(otherOptions, !isVisible);
}
});
@@ -166,6 +206,22 @@ public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbar
}
});
+ swLightTheme.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ PreferenceHelper.setLightTheme(getActivity(), isChecked);
+ EventBus.getDefault().post(new APreferenceValueWasChanged(THEME_CHANGE));
+ }
+ });
+
+ swSuggestions.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+ @Override
+ public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+ PreferenceHelper.setSuggestionsActive(getActivity(), isChecked);
+ EventBus.getDefault().post(new APreferenceValueWasChanged(TEXT_SUGGESTIONS));
+ }
+ });
+
return rootView;
}
@@ -175,4 +231,10 @@ public class SettingsFragment extends Fragment implements SeekbarDialog.ISeekbar
EventBus.getDefault().post(new APreferenceValueWasChanged(FONT_SIZE));
}
+
+ @Override
+ public void onEncodingSelected(String result) {
+ PreferenceHelper.setEncoding(getActivity(), result);
+ EventBus.getDefault().post(new APreferenceValueWasChanged(ENCODING));
+ }
}
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/texteditor/PageSystem.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/texteditor/PageSystem.java
index d860604..22a3f32 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/texteditor/PageSystem.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/texteditor/PageSystem.java
@@ -43,7 +43,7 @@ public class PageSystem {
int to;
int indexOfReturn;
int textLenght = text.length();
- boolean pageSystemEnabled = PreferenceHelper.getPageSystemEnabled(context);
+ boolean pageSystemEnabled = PreferenceHelper.getSplitText(context);
if (pageSystemEnabled && textLenght > maxLenghtInOnePage) {
while (i < textLenght && pageSystemEnabled) {
to = i + charForPage;
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/EventBusEvents.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/EventBusEvents.java
index 9fe0669..916ea51 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/EventBusEvents.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/EventBusEvents.java
@@ -87,7 +87,7 @@ public class EventBusEvents {
}
public enum Type {
- FONT_SIZE, ENCODING, SYNTAX, WRAP_CONTENT, MONOSPACE, LINE_NUMERS, THEME_CHANGE, TEXT_SUGGESTIONS, READ_ONLY
+ FONT_SIZE, ENCODING, SYNTAX, WRAP_CONTENT, MONOSPACE, LINE_NUMERS, THEME_CHANGE, TEXT_SUGGESTIONS, READ_ONLY,
}
}
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/ThemeUtils.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/ThemeUtils.java
index ac76d63..acbeb5d 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/ThemeUtils.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/util/ThemeUtils.java
@@ -35,6 +35,15 @@ public class ThemeUtils {
}
}
+ public static void setPreferenceTheme(Activity activity){
+ boolean light = PreferenceHelper.getLightTheme(activity);
+ if (light) {
+ activity.setTheme(R.style.PreferenceLight);
+ } else {
+ activity.setTheme(R.style.PreferenceDark);
+ }
+ }
+
public static void setWindowsBackground(Activity activity) {
boolean whiteTheme = PreferenceHelper.getLightTheme(activity);
if (whiteTheme) {
diff --git a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/views/CustomDrawerLayout.java b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/views/CustomDrawerLayout.java
index 5f6aa56..8308909 100644
--- a/libraries/sharedCode/src/main/java/sharedcode/turboeditor/views/CustomDrawerLayout.java
+++ b/libraries/sharedCode/src/main/java/sharedcode/turboeditor/views/CustomDrawerLayout.java
@@ -24,7 +24,7 @@ import android.support.v4.widget.DrawerLayout;
import android.util.AttributeSet;
import android.view.KeyEvent;
-public class CustomDrawerLayout extends DrawerLayout {
+public class CustomDrawerLayout extends DrawerLayout{
public CustomDrawerLayout(Context context) {
super(context);
}
diff --git a/libraries/sharedCode/src/main/res/drawable-hdpi-v21/ic_drawer.png b/libraries/sharedCode/src/main/res/drawable-hdpi-v21/ic_drawer.png
deleted file mode 100644
index 5c2c7f1..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-hdpi-v21/ic_drawer.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-hdpi/ic_ab_overflow_compat.png b/libraries/sharedCode/src/main/res/drawable-hdpi/ic_ab_overflow_compat.png
deleted file mode 100644
index e9ed46d..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-hdpi/ic_ab_overflow_compat.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-hdpi/ic_ab_up_compat.png b/libraries/sharedCode/src/main/res/drawable-hdpi/ic_ab_up_compat.png
deleted file mode 100644
index 0f5bd0c..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-hdpi/ic_ab_up_compat.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-hdpi/ic_drawer.png b/libraries/sharedCode/src/main/res/drawable-hdpi/ic_drawer.png
deleted file mode 100644
index 50c6581..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-hdpi/ic_drawer.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-mdpi-v21/ic_drawer.png b/libraries/sharedCode/src/main/res/drawable-mdpi-v21/ic_drawer.png
deleted file mode 100644
index c912125..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-mdpi-v21/ic_drawer.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-mdpi/ic_ab_overflow_compat.png b/libraries/sharedCode/src/main/res/drawable-mdpi/ic_ab_overflow_compat.png
deleted file mode 100644
index 1f03dbf..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-mdpi/ic_ab_overflow_compat.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-mdpi/ic_ab_up_compat.png b/libraries/sharedCode/src/main/res/drawable-mdpi/ic_ab_up_compat.png
deleted file mode 100644
index 6979254..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-mdpi/ic_ab_up_compat.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-mdpi/ic_drawer.png b/libraries/sharedCode/src/main/res/drawable-mdpi/ic_drawer.png
deleted file mode 100644
index 7bfb298..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-mdpi/ic_drawer.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xhdpi-v21/ic_drawer.png b/libraries/sharedCode/src/main/res/drawable-xhdpi-v21/ic_drawer.png
deleted file mode 100644
index 56f01f3..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xhdpi-v21/ic_drawer.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_ab_overflow_compat.png b/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_ab_overflow_compat.png
deleted file mode 100644
index 0bef610..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_ab_overflow_compat.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_ab_up_compat.png b/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_ab_up_compat.png
deleted file mode 100644
index 4f463dc..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_ab_up_compat.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_github.png b/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_github.png
deleted file mode 100644
index 8326848..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_github.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_google_play.png b/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_google_play.png
deleted file mode 100644
index 6659ece..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_google_play.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_gplus.png b/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_gplus.png
deleted file mode 100644
index c3a9d01..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_gplus.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_mail.png b/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_mail.png
deleted file mode 100644
index 89ebe62..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_action_mail.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_drawer.png b/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_drawer.png
deleted file mode 100644
index 7b4a0d0..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xhdpi/ic_drawer.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xxhdpi-v21/ic_drawer.png b/libraries/sharedCode/src/main/res/drawable-xxhdpi-v21/ic_drawer.png
deleted file mode 100644
index 1fc1d9c..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xxhdpi-v21/ic_drawer.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xxhdpi/ic_ab_overflow_compat.png b/libraries/sharedCode/src/main/res/drawable-xxhdpi/ic_ab_overflow_compat.png
deleted file mode 100644
index 4258a3e..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xxhdpi/ic_ab_overflow_compat.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xxhdpi/ic_ab_up_compat.png b/libraries/sharedCode/src/main/res/drawable-xxhdpi/ic_ab_up_compat.png
deleted file mode 100644
index 2e2cb0a..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xxhdpi/ic_ab_up_compat.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable-xxhdpi/ic_drawer.png b/libraries/sharedCode/src/main/res/drawable-xxhdpi/ic_drawer.png
deleted file mode 100644
index 29f346b..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable-xxhdpi/ic_drawer.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable/actionbar_icon_placeholder_compat.xml b/libraries/sharedCode/src/main/res/drawable/actionbar_icon_placeholder_compat.xml
deleted file mode 100644
index f01519b..0000000
--- a/libraries/sharedCode/src/main/res/drawable/actionbar_icon_placeholder_compat.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/libraries/sharedCode/src/main/res/drawable/actionbar_shadow.xml b/libraries/sharedCode/src/main/res/drawable/actionbar_shadow.xml
deleted file mode 100644
index f6a4ef6..0000000
--- a/libraries/sharedCode/src/main/res/drawable/actionbar_shadow.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/libraries/sharedCode/src/main/res/drawable/drawer_shadow.9.png b/libraries/sharedCode/src/main/res/drawable/drawer_shadow.9.png
deleted file mode 100644
index fabe9d9..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable/drawer_shadow.9.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable/ic_add_dark.png b/libraries/sharedCode/src/main/res/drawable/ic_add_dark.png
deleted file mode 100644
index e13ea6b..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable/ic_add_dark.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable/ic_file_dark.png b/libraries/sharedCode/src/main/res/drawable/ic_file_dark.png
deleted file mode 100644
index 3383e67..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable/ic_file_dark.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable/ic_info_dark.png b/libraries/sharedCode/src/main/res/drawable/ic_info_dark.png
deleted file mode 100644
index f8625b2..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable/ic_info_dark.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable/ic_settings_dark.png b/libraries/sharedCode/src/main/res/drawable/ic_settings_dark.png
deleted file mode 100644
index 58cb2c8..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable/ic_settings_dark.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable/item_background_holo_dark.xml b/libraries/sharedCode/src/main/res/drawable/item_background_holo_dark.xml
deleted file mode 100644
index b548cc6..0000000
--- a/libraries/sharedCode/src/main/res/drawable/item_background_holo_dark.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libraries/sharedCode/src/main/res/drawable/item_background_holo_light.xml b/libraries/sharedCode/src/main/res/drawable/item_background_holo_light.xml
deleted file mode 100644
index d236759..0000000
--- a/libraries/sharedCode/src/main/res/drawable/item_background_holo_light.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/libraries/sharedCode/src/main/res/drawable/list_focused_holo.9.png b/libraries/sharedCode/src/main/res/drawable/list_focused_holo.9.png
deleted file mode 100644
index b545f8e..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable/list_focused_holo.9.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable/list_longpressed_holo_dark.9.png b/libraries/sharedCode/src/main/res/drawable/list_longpressed_holo_dark.9.png
deleted file mode 100644
index 1080244..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable/list_longpressed_holo_dark.9.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable/list_pressed_holo_dark.9.png b/libraries/sharedCode/src/main/res/drawable/list_pressed_holo_dark.9.png
deleted file mode 100644
index 29037a0..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable/list_pressed_holo_dark.9.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable/list_selector_disabled_holo_dark.9.png b/libraries/sharedCode/src/main/res/drawable/list_selector_disabled_holo_dark.9.png
deleted file mode 100644
index 88726b6..0000000
Binary files a/libraries/sharedCode/src/main/res/drawable/list_selector_disabled_holo_dark.9.png and /dev/null differ
diff --git a/libraries/sharedCode/src/main/res/drawable/navigation_drawer_shadow.xml b/libraries/sharedCode/src/main/res/drawable/navigation_drawer_shadow.xml
deleted file mode 100644
index 3928c4f..0000000
--- a/libraries/sharedCode/src/main/res/drawable/navigation_drawer_shadow.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
\ No newline at end of file
diff --git a/libraries/sharedCode/src/main/res/layout/activity_home.xml b/libraries/sharedCode/src/main/res/layout/activity_home.xml
index e24b75a..6e9211c 100644
--- a/libraries/sharedCode/src/main/res/layout/activity_home.xml
+++ b/libraries/sharedCode/src/main/res/layout/activity_home.xml
@@ -17,17 +17,23 @@
~ You should have received a copy of the GNU General Public License
~ along with this program. If not, see .
-->
+
+
+
-
-
-
-
-
+ android:layout_height="match_parent"
+ android:id="@id/text_editor"
+ android:visibility="gone">
-
-
-
+ android:scrollbars="vertical"
+ android:fillViewport="true"
+ android:id="@id/vertical_scroll"
+ android:background="@null">
-
+
-
+
+
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ android:layout_gravity="end"/>
+
+
diff --git a/libraries/sharedCode/src/main/res/layout/activity_select_file.xml b/libraries/sharedCode/src/main/res/layout/activity_select_file.xml
index 1fb7326..284894d 100644
--- a/libraries/sharedCode/src/main/res/layout/activity_select_file.xml
+++ b/libraries/sharedCode/src/main/res/layout/activity_select_file.xml
@@ -18,27 +18,43 @@
~ along with this program. If not, see .
-->
-
-
-
+ android:layout_width="match_parent"
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="vertical">
-
+
+
+
+
+
+
+
+
+
diff --git a/libraries/sharedCode/src/main/res/layout/dialog_encoding_list.xml b/libraries/sharedCode/src/main/res/layout/dialog_encoding_list.xml
index 5f086eb..bc6c6b6 100644
--- a/libraries/sharedCode/src/main/res/layout/dialog_encoding_list.xml
+++ b/libraries/sharedCode/src/main/res/layout/dialog_encoding_list.xml
@@ -24,7 +24,7 @@
android:layout_gravity="center"
android:orientation="vertical">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/libraries/sharedCode/src/main/res/layout/fragment_settings.xml b/libraries/sharedCode/src/main/res/layout/fragment_settings.xml
index 1102951..cc5920c 100644
--- a/libraries/sharedCode/src/main/res/layout/fragment_settings.xml
+++ b/libraries/sharedCode/src/main/res/layout/fragment_settings.xml
@@ -23,7 +23,8 @@
android:layout_height="match_parent"
android:layout_width="match_parent"
xmlns:android="http://schemas.android.com/apk/res/android"
- android:background="@color/navigation_drawer_background_inverted">
+ android:background="@color/navigation_drawer_background_inverted"
+ android:paddingTop="10dp">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ android:background="?selectableItemBackground"
+ android:textColor="@color/navigation_drawer_button_text_color_inverted"
+ android:drawableRight="@drawable/abc_spinner_mtrl_am_alpha"/>
-
+ android:layout_height="match_parent"
+ android:id="@+id/other_options"
+ android:visibility="gone"
+ android:orientation="vertical">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/libraries/sharedCode/src/main/res/layout/item_drawer_list.xml b/libraries/sharedCode/src/main/res/layout/item_drawer_list.xml
index 96ad2cb..9e5924a 100644
--- a/libraries/sharedCode/src/main/res/layout/item_drawer_list.xml
+++ b/libraries/sharedCode/src/main/res/layout/item_drawer_list.xml
@@ -18,7 +18,7 @@
~ along with this program. If not, see .
-->
+ android:textColor="@color/navigation_drawer_button_text_color_inverted"/>
+ android:src="@drawable/ic_close_dark"
+ android:padding="15dp"/>
diff --git a/libraries/sharedCode/src/main/res/drawable/list_selector_background_transition_holo_dark.xml b/libraries/sharedCode/src/main/res/layout/toolbar.xml
similarity index 61%
rename from libraries/sharedCode/src/main/res/drawable/list_selector_background_transition_holo_dark.xml
rename to libraries/sharedCode/src/main/res/layout/toolbar.xml
index fb8fa05..07267f5 100644
--- a/libraries/sharedCode/src/main/res/drawable/list_selector_background_transition_holo_dark.xml
+++ b/libraries/sharedCode/src/main/res/layout/toolbar.xml
@@ -18,7 +18,14 @@
~ along with this program. If not, see .
-->
-
-
-
-
+
+
\ No newline at end of file
diff --git a/libraries/sharedCode/src/main/res/menu/activity_select_file.xml b/libraries/sharedCode/src/main/res/menu/activity_select_file.xml
index 25f67e6..5f947bd 100644
--- a/libraries/sharedCode/src/main/res/menu/activity_select_file.xml
+++ b/libraries/sharedCode/src/main/res/menu/activity_select_file.xml
@@ -22,25 +22,25 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
diff --git a/libraries/sharedCode/src/main/res/menu/fragment_editor.xml b/libraries/sharedCode/src/main/res/menu/fragment_editor.xml
index 0381c79..1500043 100644
--- a/libraries/sharedCode/src/main/res/menu/fragment_editor.xml
+++ b/libraries/sharedCode/src/main/res/menu/fragment_editor.xml
@@ -22,44 +22,45 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
diff --git a/libraries/sharedCode/src/main/res/menu/fragment_editor_search.xml b/libraries/sharedCode/src/main/res/menu/fragment_editor_search.xml
index 299e222..2d1059a 100644
--- a/libraries/sharedCode/src/main/res/menu/fragment_editor_search.xml
+++ b/libraries/sharedCode/src/main/res/menu/fragment_editor_search.xml
@@ -30,29 +30,29 @@
-->
diff --git a/libraries/sharedCode/src/main/res/menu/popup_new_file.xml b/libraries/sharedCode/src/main/res/menu/popup_new_file.xml
index 939befe..4a1f10b 100644
--- a/libraries/sharedCode/src/main/res/menu/popup_new_file.xml
+++ b/libraries/sharedCode/src/main/res/menu/popup_new_file.xml
@@ -24,10 +24,10 @@
+ app:showAsAction="ifRoom"/>
+ app:showAsAction="ifRoom"/>
\ No newline at end of file
diff --git a/libraries/sharedCode/src/main/res/raw/changelog.xml b/libraries/sharedCode/src/main/res/raw/changelog.xml
index 82e1233..acfef20 100644
--- a/libraries/sharedCode/src/main/res/raw/changelog.xml
+++ b/libraries/sharedCode/src/main/res/raw/changelog.xml
@@ -20,11 +20,12 @@
-
+ Turbo Editor is a free and open source app. Now you can show your appreciation and support development by donating :)
- New visual changes
+ New visual changes to make the app more "Material"New save dialog when you are about to close a fileMany enchantments and fixes
+ Have feedback? Please use xda or the email. Thanks!
diff --git a/libraries/sharedCode/src/main/res/values-af-rZA/strings.xml b/libraries/sharedCode/src/main/res/values-af-rZA/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-af-rZA/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-af-rZA/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-ar-rSA/strings.xml b/libraries/sharedCode/src/main/res/values-ar-rSA/strings.xml
index 44c0c8a..99f2529 100644
--- a/libraries/sharedCode/src/main/res/values-ar-rSA/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-ar-rSA/strings.xml
@@ -71,4 +71,6 @@
فتحتم حفظ الملف % 1$ s مع النجاح!فتح ملف
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-az-rAZ/strings.xml b/libraries/sharedCode/src/main/res/values-az-rAZ/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-az-rAZ/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-az-rAZ/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-be-rBY/strings.xml b/libraries/sharedCode/src/main/res/values-be-rBY/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-be-rBY/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-be-rBY/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-bg-rBG/strings.xml b/libraries/sharedCode/src/main/res/values-bg-rBG/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-bg-rBG/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-bg-rBG/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-ca-rES/strings.xml b/libraries/sharedCode/src/main/res/values-ca-rES/strings.xml
index c917bf9..63bd647 100644
--- a/libraries/sharedCode/src/main/res/values-ca-rES/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-ca-rES/strings.xml
@@ -71,4 +71,6 @@
ObreL\'arxiu %1$s s\'ha desat amb èxit!Obre un arxiu
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-cs-rCZ/strings.xml b/libraries/sharedCode/src/main/res/values-cs-rCZ/strings.xml
index 39f9cb4..75dc356 100644
--- a/libraries/sharedCode/src/main/res/values-cs-rCZ/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-cs-rCZ/strings.xml
@@ -71,4 +71,6 @@
OtevřítSoubor %1$s byl úspěšně uložen!Otevřít soubor
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-da-rDK/strings.xml b/libraries/sharedCode/src/main/res/values-da-rDK/strings.xml
index bc09d22..a321c57 100644
--- a/libraries/sharedCode/src/main/res/values-da-rDK/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-da-rDK/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-de-rDE/strings.xml b/libraries/sharedCode/src/main/res/values-de-rDE/strings.xml
index e4b3f6f..5e325f7 100644
--- a/libraries/sharedCode/src/main/res/values-de-rDE/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-de-rDE/strings.xml
@@ -71,4 +71,6 @@
ÖffnenDie Datei %1$s wurde erfolgreich gespeichert!Datei öffnen
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-el-rGR/strings.xml b/libraries/sharedCode/src/main/res/values-el-rGR/strings.xml
index 3e5bc17..eb5e330 100644
--- a/libraries/sharedCode/src/main/res/values-el-rGR/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-el-rGR/strings.xml
@@ -71,4 +71,6 @@
ΆνοιγμαΤο αρχείο %1$s αποθηκεύτηκε με επιτυχία!Άνοιγμα αρχείου
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-es-rES/strings.xml b/libraries/sharedCode/src/main/res/values-es-rES/strings.xml
index 01571c7..643c0bb 100644
--- a/libraries/sharedCode/src/main/res/values-es-rES/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-es-rES/strings.xml
@@ -71,4 +71,6 @@
Abrir¡El archivo %1$s fue guardado exitosamente!Abrir archivo
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-fi-rFI/strings.xml b/libraries/sharedCode/src/main/res/values-fi-rFI/strings.xml
index 4b4f597..fbb5d27 100644
--- a/libraries/sharedCode/src/main/res/values-fi-rFI/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-fi-rFI/strings.xml
@@ -71,4 +71,6 @@
AvaaTiedosto \'%1$s\' on tallennettu onnistuneesti!Avaa tiedosto
+ Ei
+ Uusi tiedosto
diff --git a/libraries/sharedCode/src/main/res/values-fil-rPH/strings.xml b/libraries/sharedCode/src/main/res/values-fil-rPH/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-fil-rPH/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-fil-rPH/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-fr-rFR/strings.xml b/libraries/sharedCode/src/main/res/values-fr-rFR/strings.xml
index c0d270c..50cf2d7 100644
--- a/libraries/sharedCode/src/main/res/values-fr-rFR/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-fr-rFR/strings.xml
@@ -31,7 +31,7 @@
Dossier Thème clairAller à la ligne
- Go to Page…
+ Aller à la Page…RechercherRemplacerPartager
@@ -71,4 +71,6 @@
OuvrirLe fichier %1$s a été enregistré avec succès !Ouvrir un fichier
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-gl-rES/strings.xml b/libraries/sharedCode/src/main/res/values-gl-rES/strings.xml
index 09c1c9a..c4512fb 100644
--- a/libraries/sharedCode/src/main/res/values-gl-rES/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-gl-rES/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-hi-rIN/strings.xml b/libraries/sharedCode/src/main/res/values-hi-rIN/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-hi-rIN/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-hi-rIN/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-hr-rHR/strings.xml b/libraries/sharedCode/src/main/res/values-hr-rHR/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-hr-rHR/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-hr-rHR/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-hu-rHU/strings.xml b/libraries/sharedCode/src/main/res/values-hu-rHU/strings.xml
index 24b156d..1d5ce96 100644
--- a/libraries/sharedCode/src/main/res/values-hu-rHU/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-hu-rHU/strings.xml
@@ -71,4 +71,6 @@
MegnyitA(z) %1$s fájl sikeresen mentve!Fájl megnyitása
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-hy-rAM/strings.xml b/libraries/sharedCode/src/main/res/values-hy-rAM/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-hy-rAM/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-hy-rAM/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-in-rID/strings.xml b/libraries/sharedCode/src/main/res/values-in-rID/strings.xml
index 2cf482a..d4f7cbb 100644
--- a/libraries/sharedCode/src/main/res/values-in-rID/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-in-rID/strings.xml
@@ -71,4 +71,6 @@
BukaFile %1$s berhasil disimpan!Buka file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-it-rIT/strings.xml b/libraries/sharedCode/src/main/res/values-it-rIT/strings.xml
index 63f6d86..6cfda83 100644
--- a/libraries/sharedCode/src/main/res/values-it-rIT/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-it-rIT/strings.xml
@@ -71,4 +71,6 @@
ApriIl file %1$s è stato salvato con successo!Apri un file
+ No
+ Nuovo file
diff --git a/libraries/sharedCode/src/main/res/values-it-rIT/strings_dialogs.xml b/libraries/sharedCode/src/main/res/values-it-rIT/strings_dialogs.xml
index 36176c5..7ab3748 100644
--- a/libraries/sharedCode/src/main/res/values-it-rIT/strings_dialogs.xml
+++ b/libraries/sharedCode/src/main/res/values-it-rIT/strings_dialogs.xml
@@ -21,11 +21,11 @@
ChiudiInformazioni
- open source.
+ open source.
Copyright 2013-2014 Vlad Mihalachi. Tutti i diritti riservati.
-Se vuoi inviare consigli qui c'e il link al XDA Thread]]>
+Se vuoi inviare consigli qui c\'e il link al XDA Thread]]>
diff --git a/libraries/sharedCode/src/main/res/values-it-rIT/strings_donation.xml b/libraries/sharedCode/src/main/res/values-it-rIT/strings_donation.xml
index cb013de..9ed36e1 100644
--- a/libraries/sharedCode/src/main/res/values-it-rIT/strings_donation.xml
+++ b/libraries/sharedCode/src/main/res/values-it-rIT/strings_donation.xml
@@ -21,7 +21,7 @@
DonaFai una donazione allo sviluppatore
- open source.
+ open source.
Puoi mostrare il tuo apprezzamento e aiutare nello sviluppo donando:]]>Hai già effettuato la donazione di questo elemento.Un gelato
diff --git a/libraries/sharedCode/src/main/res/values-iw-rIL/strings.xml b/libraries/sharedCode/src/main/res/values-iw-rIL/strings.xml
index 11ffee0..88be70b 100644
--- a/libraries/sharedCode/src/main/res/values-iw-rIL/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-iw-rIL/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-ja-rJP/strings.xml b/libraries/sharedCode/src/main/res/values-ja-rJP/strings.xml
index d14eb4c..aca60de 100644
--- a/libraries/sharedCode/src/main/res/values-ja-rJP/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-ja-rJP/strings.xml
@@ -31,7 +31,7 @@
フォルダーライトテーマ行へ移動
- Go to Page…
+ ページを移動…検索置換共有
@@ -71,4 +71,6 @@
開くファイル %1$s は保存されました！ファイルを開く
+ いいえ
+ 新しいファイル
diff --git a/libraries/sharedCode/src/main/res/values-ja-rJP/strings_dialogs.xml b/libraries/sharedCode/src/main/res/values-ja-rJP/strings_dialogs.xml
index af29a59..8a5366f 100644
--- a/libraries/sharedCode/src/main/res/values-ja-rJP/strings_dialogs.xml
+++ b/libraries/sharedCode/src/main/res/values-ja-rJP/strings_dialogs.xml
@@ -19,16 +19,15 @@
~ along with this program. If not, see .
-->
- Close
- About
+ 閉じる
+ アプリについてopen source app.
+ Turbo Editor はフリーで オープン ソース のアプリです.
Copyright 2013-2014 Vlad Mihalachi. All Rights Reserved.
- If you want to send feedback here is the XDA thread
+ フィードバックを送りたい方は、こちら XDA スレッド へ
]]>
diff --git a/libraries/sharedCode/src/main/res/values-ja-rJP/strings_donation.xml b/libraries/sharedCode/src/main/res/values-ja-rJP/strings_donation.xml
index 5c19453..ef59c68 100644
--- a/libraries/sharedCode/src/main/res/values-ja-rJP/strings_donation.xml
+++ b/libraries/sharedCode/src/main/res/values-ja-rJP/strings_donation.xml
@@ -20,18 +20,18 @@
-->
寄付
- Donate to developer
+ 開発者に寄付open source app.
- You can show your appreciation and support development by donating:
+ Turbo Editor はフリーで オープン ソース のアプリです.
+ あなたの寄付によって感謝の気持ちを表したり、開発をサポートすることができます:
]]>
- You\'ve donated for this item already.
- An ice cream
- Cup of coffee
- Electricity bills
- The right pillow
- Solid-state drive
- Sound system
- Failed to setup in-app-billing service!
- Notice that Google is not responsible for that payments method.
+ 既にこのアイテムに寄付しています。
+ アイスクリーム
+ コーヒー1杯
+ 電気代
+ ちょうど良い枕
+ SSD
+ サウンドシステム
+ アプリ内課金サービスのセットアップに失敗しました。
+ この決済についてはGoogleが責任を負わないことに注意してください。
diff --git a/libraries/sharedCode/src/main/res/values-ko-rKR/strings.xml b/libraries/sharedCode/src/main/res/values-ko-rKR/strings.xml
index a1587ab..76c7f13 100644
--- a/libraries/sharedCode/src/main/res/values-ko-rKR/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-ko-rKR/strings.xml
@@ -71,4 +71,6 @@
열기파일 %1$s 저장 완료!파일 열기
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-lb-rLU/strings.xml b/libraries/sharedCode/src/main/res/values-lb-rLU/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-lb-rLU/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-lb-rLU/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-mk-rMK/strings.xml b/libraries/sharedCode/src/main/res/values-mk-rMK/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-mk-rMK/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-mk-rMK/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-mn-rMN/strings.xml b/libraries/sharedCode/src/main/res/values-mn-rMN/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-mn-rMN/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-mn-rMN/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-mt-rMT/strings.xml b/libraries/sharedCode/src/main/res/values-mt-rMT/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-mt-rMT/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-mt-rMT/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-nl-rNL/strings.xml b/libraries/sharedCode/src/main/res/values-nl-rNL/strings.xml
index ac762f2..096cc3e 100644
--- a/libraries/sharedCode/src/main/res/values-nl-rNL/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-nl-rNL/strings.xml
@@ -71,4 +71,6 @@
OpenenHet bestand %1$s is met succes opgeslagen!Open een bestand
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-no-rNO/strings.xml b/libraries/sharedCode/src/main/res/values-no-rNO/strings.xml
index eba255e..1cc84ac 100644
--- a/libraries/sharedCode/src/main/res/values-no-rNO/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-no-rNO/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-pl-rPL/strings.xml b/libraries/sharedCode/src/main/res/values-pl-rPL/strings.xml
index d2cff34..f9be2d0 100644
--- a/libraries/sharedCode/src/main/res/values-pl-rPL/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-pl-rPL/strings.xml
@@ -71,4 +71,6 @@
OtwórzPlik %1$s został pomyślnie zapisany!Otwórz plik
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-pt-rBR/strings.xml b/libraries/sharedCode/src/main/res/values-pt-rBR/strings.xml
index 04189df..0e19838 100644
--- a/libraries/sharedCode/src/main/res/values-pt-rBR/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-pt-rBR/strings.xml
@@ -71,4 +71,6 @@
AbrirO arquivo %1$s foi salvo com sucesso!Abrir um arquivo
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-pt-rPT/strings.xml b/libraries/sharedCode/src/main/res/values-pt-rPT/strings.xml
index 8621662..c9303ab 100644
--- a/libraries/sharedCode/src/main/res/values-pt-rPT/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-pt-rPT/strings.xml
@@ -31,7 +31,7 @@
PastaTema claroIr para a linha
- Go to Page…
+ Ir para a página…LocalizarSubstituirPartilhar
@@ -71,4 +71,6 @@
AbrirO ficheiro %1$s foi gravado com sucesso!Abrir um ficheiro
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-pt-rPT/strings_dialogs.xml b/libraries/sharedCode/src/main/res/values-pt-rPT/strings_dialogs.xml
index af29a59..c1df8e5 100644
--- a/libraries/sharedCode/src/main/res/values-pt-rPT/strings_dialogs.xml
+++ b/libraries/sharedCode/src/main/res/values-pt-rPT/strings_dialogs.xml
@@ -19,16 +19,16 @@
~ along with this program. If not, see .
-->
- Close
- About
+ Fechar
+ Sobreopen source app.
- Copyright 2013-2014 Vlad Mihalachi. All Rights Reserved.
+ O Turbo Editor é uma aplicação livre.
+ Copyright 2013-2014 Vlad Mihalachi. Todos os direitos reservados.
- If you want to send feedback here is the XDA thread
+ Se quiser fazer algum comentário aceda ao fórum XDA.
]]>
diff --git a/libraries/sharedCode/src/main/res/values-pt-rPT/strings_donation.xml b/libraries/sharedCode/src/main/res/values-pt-rPT/strings_donation.xml
index 2769a80..225a648 100644
--- a/libraries/sharedCode/src/main/res/values-pt-rPT/strings_donation.xml
+++ b/libraries/sharedCode/src/main/res/values-pt-rPT/strings_donation.xml
@@ -20,18 +20,17 @@
-->
Donativos
- Donate to developer
+ Efetuar donativoopen source app.
- You can show your appreciation and support development by donating:
- ]]>
- You\'ve donated for this item already.
- An ice cream
- Cup of coffee
- Electricity bills
- The right pillow
- Solid-state drive
- Sound system
- Failed to setup in-app-billing service!
- Notice that Google is not responsible for that payments method.
+ O Turbo Editor é uma aplicação livre.
+ Pode demonstrar o seu apreço e ajudar no desenvolvimento efetuando um donativo para:]]>
+ Já efetuou um donativo para este item.
+ Um gelado
+ Um café
+ A conta de eletricidade
+ Uma almofada
+ Um disco SSD
+ Um sistema de som
+ Erro ao configurar o serviço de pagamento!
+ Tenha em atenção que a Google não é responsável por este método de pagamento.
diff --git a/libraries/sharedCode/src/main/res/values-ro-rRO/strings.xml b/libraries/sharedCode/src/main/res/values-ro-rRO/strings.xml
index 36568e7..18bb8ac 100644
--- a/libraries/sharedCode/src/main/res/values-ro-rRO/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-ro-rRO/strings.xml
@@ -31,10 +31,10 @@
DirectorTema deschisă la culoareDu-te la linia
- Go to Page…
+ Du-te la pagina…CautăÎnlocuiește
- Share
+ DistribuițiKeyboard suggestions and SwipeAuto-codificareaSetați ca folderul de lucru
@@ -54,13 +54,13 @@
Faceţi clic pe lung pentru mai multe opţiuniAuto salvareDoar citire
- Send error reports
- Extra options
- Split the text if too long
- Ignore back button
- Donate
+ Trimite raportul de eroare
+ Opţiuni suplimentare
+ Împarte textul dacă e prea lung
+ Ignoră butonul \"back\"
+ DoneazăCodificare
- Share
+ DistribuițiInformațiiTurbo EditorPreferințe
@@ -71,4 +71,6 @@
DeschideFişierul %1$s a fost salvat cu succes!Deschideţi un fişier
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-ro-rRO/strings_dialogs.xml b/libraries/sharedCode/src/main/res/values-ro-rRO/strings_dialogs.xml
index af29a59..487b796 100644
--- a/libraries/sharedCode/src/main/res/values-ro-rRO/strings_dialogs.xml
+++ b/libraries/sharedCode/src/main/res/values-ro-rRO/strings_dialogs.xml
@@ -19,8 +19,8 @@
~ along with this program. If not, see .
-->
- Close
- About
+ Închide
+ Despreopen source app.
Copyright 2013-2014 Vlad Mihalachi. All Rights Reserved.
diff --git a/libraries/sharedCode/src/main/res/values-ro-rRO/strings_donation.xml b/libraries/sharedCode/src/main/res/values-ro-rRO/strings_donation.xml
index 9b2bcc8..ba3c96e 100644
--- a/libraries/sharedCode/src/main/res/values-ro-rRO/strings_donation.xml
+++ b/libraries/sharedCode/src/main/res/values-ro-rRO/strings_donation.xml
@@ -19,7 +19,7 @@
~ along with this program. If not, see .
-->
- Donate
+ DoneazăDonate to developeropen source app.
diff --git a/libraries/sharedCode/src/main/res/values-ru-rRU/strings.xml b/libraries/sharedCode/src/main/res/values-ru-rRU/strings.xml
index 2a5f389..a37465b 100644
--- a/libraries/sharedCode/src/main/res/values-ru-rRU/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-ru-rRU/strings.xml
@@ -71,4 +71,6 @@
открытьФайл %1$s успешно сохранен!Открыть файл
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-ru-rRU/strings_dialogs.xml b/libraries/sharedCode/src/main/res/values-ru-rRU/strings_dialogs.xml
index af29a59..751f735 100644
--- a/libraries/sharedCode/src/main/res/values-ru-rRU/strings_dialogs.xml
+++ b/libraries/sharedCode/src/main/res/values-ru-rRU/strings_dialogs.xml
@@ -19,16 +19,16 @@
~ along with this program. If not, see .
-->
- Close
- About
+ Закрыть
+ О программеopen source app.
+ Турбо редактор бесплатен и приложение с откр. исходным кодом .
Copyright 2013-2014 Vlad Mihalachi. All Rights Reserved.
- If you want to send feedback here is the XDA thread
+ Обратная связь XDA thread
]]>
diff --git a/libraries/sharedCode/src/main/res/values-sl-rSI/strings.xml b/libraries/sharedCode/src/main/res/values-sl-rSI/strings.xml
index b4ac5d4..26da45c 100644
--- a/libraries/sharedCode/src/main/res/values-sl-rSI/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-sl-rSI/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-sq-rAL/strings.xml b/libraries/sharedCode/src/main/res/values-sq-rAL/strings.xml
index ff2c114..ed26d53 100644
--- a/libraries/sharedCode/src/main/res/values-sq-rAL/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-sq-rAL/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-sr-rSP/strings.xml b/libraries/sharedCode/src/main/res/values-sr-rSP/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-sr-rSP/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-sr-rSP/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-sv-rSE/strings.xml b/libraries/sharedCode/src/main/res/values-sv-rSE/strings.xml
index 33c12d3..bfcb5d9 100644
--- a/libraries/sharedCode/src/main/res/values-sv-rSE/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-sv-rSE/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-tr-rTR/strings.xml b/libraries/sharedCode/src/main/res/values-tr-rTR/strings.xml
index 37f9f7c..6d32407 100644
--- a/libraries/sharedCode/src/main/res/values-tr-rTR/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-tr-rTR/strings.xml
@@ -31,7 +31,7 @@
KlasörAydınlık TemaSatıra git
- Go to Page…
+ Sayfaya git…BulDeğiştirPaylaş
@@ -71,4 +71,6 @@
Aç%1$s dosyası başarıyla kaydedildi!Dosya aç
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-tr-rTR/strings_dialogs.xml b/libraries/sharedCode/src/main/res/values-tr-rTR/strings_dialogs.xml
index af29a59..a90ae36 100644
--- a/libraries/sharedCode/src/main/res/values-tr-rTR/strings_dialogs.xml
+++ b/libraries/sharedCode/src/main/res/values-tr-rTR/strings_dialogs.xml
@@ -19,16 +19,15 @@
~ along with this program. If not, see .
-->
- Close
- About
+ Kapat
+ Hakkındaopen source app.
- Copyright 2013-2014 Vlad Mihalachi. All Rights Reserved.
+ Turbo Editör ücretsiz ve açık kaynak bir uygulamadır.
+ Telif hakkı 2013-2014 Vlad Mihalachi. Tüm Hakları Saklıdır.
- If you want to send feedback here is the XDA thread
- ]]>
+ Geri bildirim göndermek istiyorsanız XDA konusunu kullanabilirsiniz
+ ]]>
diff --git a/libraries/sharedCode/src/main/res/values-tr-rTR/strings_donation.xml b/libraries/sharedCode/src/main/res/values-tr-rTR/strings_donation.xml
index e468560..d6e4c1f 100644
--- a/libraries/sharedCode/src/main/res/values-tr-rTR/strings_donation.xml
+++ b/libraries/sharedCode/src/main/res/values-tr-rTR/strings_donation.xml
@@ -20,18 +20,18 @@
-->
Bağış yap
- Donate to developer
+ Geliştiriciye bağış yapopen source app.
- You can show your appreciation and support development by donating:
+ Turbo Editör ücretsiz ve açık kaynak bir uygulamadır.
+ Bağış yaparak gelişimini destekleyebilir ve beğeninizi gösterebilirsiniz:
]]>
- You\'ve donated for this item already.
- An ice cream
- Cup of coffee
- Electricity bills
- The right pillow
- Solid-state drive
- Sound system
- Failed to setup in-app-billing service!
- Notice that Google is not responsible for that payments method.
+ Zaten bu öğe için bağış yaptınız.
+ Bir dondurma
+ Bir fincan kahve
+ Elektrik faturaları
+ Ortopedik yastık
+ Solid-state sürücü
+ Ses sistemi
+ Uygulama içi ödeme hizmetinin kurulumu başarısız oldu!
+ Google\'ın bu ödeme yönteminden sorumlu olmadığına dikkat edin.
diff --git a/libraries/sharedCode/src/main/res/values-uk-rUA/strings.xml b/libraries/sharedCode/src/main/res/values-uk-rUA/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-uk-rUA/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-uk-rUA/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-vi-rVN/strings.xml b/libraries/sharedCode/src/main/res/values-vi-rVN/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-vi-rVN/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-vi-rVN/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-vls-rBE/strings.xml b/libraries/sharedCode/src/main/res/values-vls-rBE/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-vls-rBE/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-vls-rBE/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-w820dp/dimens.xml b/libraries/sharedCode/src/main/res/values-w820dp/dimens.xml
index d1b4929..c91149f 100644
--- a/libraries/sharedCode/src/main/res/values-w820dp/dimens.xml
+++ b/libraries/sharedCode/src/main/res/values-w820dp/dimens.xml
@@ -20,6 +20,7 @@
64dp
+ 64dp
diff --git a/libraries/sharedCode/src/main/res/values-zh-rCN/strings.xml b/libraries/sharedCode/src/main/res/values-zh-rCN/strings.xml
index 1bbb40e..4afee70 100644
--- a/libraries/sharedCode/src/main/res/values-zh-rCN/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-zh-rCN/strings.xml
@@ -71,4 +71,6 @@
打开文件 %1$s 保存成功 ！打开文件
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values-zh-rTW/strings.xml b/libraries/sharedCode/src/main/res/values-zh-rTW/strings.xml
index 74b320d..ba3c203 100644
--- a/libraries/sharedCode/src/main/res/values-zh-rTW/strings.xml
+++ b/libraries/sharedCode/src/main/res/values-zh-rTW/strings.xml
@@ -71,4 +71,6 @@
OpenThe file %1$s was saved with success!Open a file
+ No
+ New file
diff --git a/libraries/sharedCode/src/main/res/values/colors.xml b/libraries/sharedCode/src/main/res/values/colors.xml
index e54a7c7..49140d4 100644
--- a/libraries/sharedCode/src/main/res/values/colors.xml
+++ b/libraries/sharedCode/src/main/res/values/colors.xml
@@ -37,7 +37,7 @@
#212121#666666#ffffffff
- #607d8b
+
#ffffff#f7f7f7
@@ -64,4 +64,6 @@
#b6cc45#DFED47
+
+ #607d8b
\ No newline at end of file
diff --git a/libraries/sharedCode/src/main/res/values/dimens.xml b/libraries/sharedCode/src/main/res/values/dimens.xml
index 09562e1..2c2d8e9 100644
--- a/libraries/sharedCode/src/main/res/values/dimens.xml
+++ b/libraries/sharedCode/src/main/res/values/dimens.xml
@@ -21,6 +21,7 @@
16dp16dp
+ 0dp
diff --git a/libraries/sharedCode/src/main/res/values/ids.xml b/libraries/sharedCode/src/main/res/values/ids.xml
index 008c7a1..ad55774 100644
--- a/libraries/sharedCode/src/main/res/values/ids.xml
+++ b/libraries/sharedCode/src/main/res/values/ids.xml
@@ -76,6 +76,9 @@
+
+
+
diff --git a/libraries/sharedCode/src/main/res/values/strings.xml b/libraries/sharedCode/src/main/res/values/strings.xml
index 0cb3be0..1f88208 100644
--- a/libraries/sharedCode/src/main/res/values/strings.xml
+++ b/libraries/sharedCode/src/main/res/values/strings.xml
@@ -72,5 +72,5 @@
The file %1$s was saved with success!Open a fileNo
-
+ New file
diff --git a/libraries/sharedCode/src/main/res/values/styles.xml b/libraries/sharedCode/src/main/res/values/styles.xml
index b62e93b..097f9f0 100644
--- a/libraries/sharedCode/src/main/res/values/styles.xml
+++ b/libraries/sharedCode/src/main/res/values/styles.xml
@@ -19,7 +19,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-