Permalink
Browse files

new release

  • Loading branch information...
1 parent c494d33 commit 73b92c48505f2b1427cca7e628f765dc4e79485d @herrlado committed Jan 13, 2012
Showing with 350 additions and 214 deletions.
  1. +1 −1 .classpath
  2. +1 −0 .gitignore
  3. +13 −11 AndroidManifest.xml
  4. +39 −38 build.xml
  5. +8 −2 proguard.cfg
  6. +1 −1 res/layout/georgian_installed.xml
  7. +7 −3 res/values/strings.xml
  8. +280 −158 src/org/herrlado/geofonts/Installer.java
View
@@ -3,5 +3,5 @@
<classpathentry kind="src" path="src"/>
<classpathentry kind="src" path="gen"/>
<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
- <classpathentry kind="output" path="bin"/>
+ <classpathentry kind="output" path="bin/classes"/>
</classpath>
View
@@ -2,3 +2,4 @@ bin/
gen/
georgianfonts
/build.properties
+/local.properties
View
@@ -1,18 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.herrlado.geofonts"
- android:versionCode="25" android:versionName="2.5">
+ package="org.herrlado.geofonts" android:versionCode="40"
+ android:versionName="4.0">
- <application android:icon="@drawable/icon" android:label="@string/app_name" android:debuggable="false">
- <activity android:name=".Installer"
- android:label="@string/app_name" >
- <intent-filter>
- <action android:name="android.intent.action.MAIN" />
- <category android:name="android.intent.category.LAUNCHER" />
- </intent-filter>
- </activity>
+ <application android:icon="@drawable/icon" android:label="@string/app_name"
+ android:debuggable="false">
+ <activity android:name=".Installer"
+ android:label="@string/app_name"
+ android:configChanges="orientation">
+ <intent-filter>
+ <action android:name="android.intent.action.MAIN" />
+ <category android:name="android.intent.category.LAUNCHER" />
+ </intent-filter>
+ </activity>
- </application>
+ </application>
<uses-sdk android:minSdkVersion="3" android:targetSdkVersion="8"></uses-sdk>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
</manifest>
View
@@ -1,49 +1,50 @@
<?xml version="1.0" encoding="UTF-8"?>
-<project name="GeorgianFonts">
+<project name="Installer" default="help">
-<!-- The local.properties file is created and updated by the 'android'
- tool.
- It contains the path to the SDK. It should *NOT* be checked into
- Version Control Systems. -->
- <property file="local.properties" />
+ <!-- The local.properties file is created and updated by the 'android' tool.
+ It contains the path to the SDK. It should *NOT* be checked into
+ Version Control Systems. -->
+ <loadproperties srcFile="local.properties" />
- <!-- The build.properties file can be created by you and is never touched
- by the 'android' tool. This is the place to change some of the
- default property values used by the Ant rules.
+ <!-- The ant.properties file can be created by you. It is only edited by the
+ 'android' tool to add properties to it.
+ This is the place to change some Ant specific build properties.
Here are some properties you may want to change/update:
source.dir
The name of the source directory. Default is 'src'.
out.dir
The name of the output directory. Default is 'bin'.
+ For other overridable properties, look at the beginning of the rules
+ files in the SDK, at tools/ant/build.xml
+
Properties related to the SDK location or the project target should
be updated using the 'android' tool with the 'update' action.
This file is an integral part of the build system for your
application and should be checked into Version Control Systems.
-->
- <property file="build.properties" />
+ <property file="ant.properties" />
- <!-- The default.properties file is created and updated by the 'android'
+ <!-- The project.properties file is created and updated by the 'android'
tool, as well as ADT.
+
+ This contains project specific properties such as project target, and library
+ dependencies. Lower level build properties are stored in ant.properties
+ (or in .classpath for Eclipse projects).
+
This file is an integral part of the build system for your
application and should be checked into Version Control Systems. -->
- <property file="default.properties" />
+ <loadproperties srcFile="project.properties" />
- <!-- Custom Android task to deal with the project target, and import the
- proper rules.
- This requires ant 1.6.0 or above. -->
- <path id="android.antlibs">
- <pathelement path="${sdk.dir}/tools/lib/anttasks.jar" />
- <pathelement path="${sdk.dir}/tools/lib/sdklib.jar" />
- <pathelement path="${sdk.dir}/tools/lib/androidprefs.jar" />
- </path>
+ <!-- quick check on sdk.dir -->
+ <fail
+ message="sdk.dir is missing. Make sure to generate local.properties using 'android update project'"
+ unless="sdk.dir"
+ />
- <taskdef name="setup"
- classname="com.android.ant.SetupTask"
- classpathref="android.antlibs" />
<!-- extension targets. Uncomment the ones where you want to do custom work
in between standard targets -->
@@ -53,32 +54,32 @@
<target name="-pre-compile">
</target>
- [This is typically used for code obfuscation.
- Compiled code location: ${out.classes.absolute.dir}
- If this is not done in place, override ${out.dex.input.absolute.dir}]
+ /* This is typically used for code obfuscation.
+ Compiled code location: ${out.classes.absolute.dir}
+ If this is not done in place, override ${out.dex.input.absolute.dir} */
<target name="-post-compile">
</target>
-->
-
- <!-- Execute the Android Setup task that will setup some properties
- specific to the target, and import the build rules files.
-
- The rules file is imported from
- <SDK>/platforms/<target_platform>/ant/ant_rules_r#.xml
+ <!-- Import the actual build file.
To customize existing targets, there are two options:
- Customize only one target:
- copy/paste the target into this file, *before* the
- <setup> task.
+ <import> task.
- customize it to your needs.
- - Customize the whole script.
+ - Customize the whole content of build.xml
- copy/paste the content of the rules files (minus the top node)
- into this file, *after* the <setup> task
- - disable the import of the rules by changing the setup task
- below to <setup import="false" />.
+ into this file, replacing the <import> task.
- customize to your needs.
+
+ ***********************
+ ****** IMPORTANT ******
+ ***********************
+ In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
+ in order to avoid having your file be overridden by tools such as "android update project"
-->
- <setup />
+ <!-- version-tag: 1 -->
+ <import file="${sdk.dir}/tools/ant/build.xml" />
</project>
View
@@ -10,20 +10,26 @@
-keep public class * extends android.app.Service
-keep public class * extends android.content.BroadcastReceiver
-keep public class * extends android.content.ContentProvider
+-keep public class * extends android.app.backup.BackupAgentHelper
+-keep public class * extends android.preference.Preference
-keep public class com.android.vending.licensing.ILicensingService
-keepclasseswithmembernames class * {
native <methods>;
}
--keepclasseswithmembernames class * {
+-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet);
}
--keepclasseswithmembernames class * {
+-keepclasseswithmembers class * {
public <init>(android.content.Context, android.util.AttributeSet, int);
}
+-keepclassmembers class * extends android.app.Activity {
+ public void *(android.view.View);
+}
+
-keepclassmembers enum * {
public static **[] values();
public static ** valueOf(java.lang.String);
@@ -15,9 +15,9 @@
android:text="@string/georgian_text"
/>
-
<Button android:text="@string/install_button" android:id="@+id/install_fonts" android:layout_height="wrap_content" android:visibility="visible" android:enabled="false" android:layout_width="match_parent"></Button>
<Button android:text="@string/uninstall_this_app" android:id="@+id/uninstall_this_app" android:layout_height="wrap_content" android:visibility="visible" android:enabled="true" android:layout_width="match_parent"></Button>
+<Button android:text="@string/restore_fonts" android:id="@+id/restore_fonts" android:layout_height="wrap_content" android:visibility="visible" android:enabled="false" android:layout_width="match_parent"></Button>
<ProgressBar android:id="@+id/installing" android:visibility="invisible" android:layout_gravity="center_vertical|center_horizontal"
android:layout_width="wrap_content" android:layout_height="wrap_content"></ProgressBar>
View
@@ -5,14 +5,18 @@
<string name="app_name">Georgian Fonts Installer</string>
<string name="install_button">Install Georgian Fonts</string>
<string name="uninstall_this_app">Uninstall this app (not needed after the successful install)</string>
-
-
+ <string name="restore_fonts">Restore Original Fonts</string>
+
<string name="send_logs">Send logs</string>
<string name="send_logs_hint">Send your device\'s logs to the developer.\nDo this only if you were asked to do so.</string>
<string name="sendlog_run">Run SendLog</string>
<string name="sendlog_run_hint">SendLog will collect the device log and send it to the developer.\nYou will have an opportunity to review and modify the data being sent.</string>
<string name="sendlog_install">Install SendLog</string>
<string name="sendlog_install_hint">Install the free SendLog application to collect the device log and send it to the developer.</string>
<string name="debug">Debug</string>
-
+ <string name="alert_info">INFO</string>
+ <string name="alert_warn">WARNING</string>
+ <string name="alert_ok">ok</string>
+ <string name="alert_cancel">cancel</string>
+ <string name="alert_help">help</string>
</resources>
Oops, something went wrong.

0 comments on commit 73b92c4

Please sign in to comment.