From cb1f51b8824789c888167ba028090fdc8f078029 Mon Sep 17 00:00:00 2001 From: ahmedre Date: Sun, 8 Mar 2015 18:20:44 -0700 Subject: [PATCH] Use minSdk 9. Update proguard. README for 2.6.0. This branch is specifically for Gingerbread and Honeycomb. Moving forward, it will insha'Allah only receive critical bugfixes. Future versions of Quran Android will be targeting 4.x+. --- README.md | 44 +++++++++++++++++++------------------------- TODO.md | 21 --------------------- app/build.gradle | 8 ++++---- app/proguard.cfg | 14 +------------- 4 files changed, 24 insertions(+), 63 deletions(-) delete mode 100644 TODO.md diff --git a/README.md b/README.md index 60479180d9..50df3558e0 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,10 @@ graphics by [Somaia Gabr](http://twitter.com/somaiagabr). Arabic support for non-Arabic phones by [Rehab Mohamed](http://twitter.com/hams_rrr), based on Arabic Reshaper project by [Ahmed Essam](http://twitter.com/Neo_4583). +sdk support +------------------------ +this version of the code supports Gingerbread and Honeycomb (2.3 - 3.2) devices. + Code Style ------------------------ - tab size: 2 @@ -62,36 +66,21 @@ App localization Terms of use ------------ -you are free to use parts of the Quran Android code in your application -with some conditions: +you are free to use parts of the Quran Android code in your application with some conditions: -* your app must be respectful of the book of Allah. adding advertisements -above and below each page of Quran is unacceptable, for example (yes, -someone actually did that). +* your app must be respectful of the book of Allah. adding advertisements above and below each page of Quran is unacceptable, for example (yes, someone actually did that). -* your app must provide some significant value over our app - otherwise, -why not just contribute a patch instead? +* your app must provide some significant value over our app - otherwise, why not just contribute a patch instead? * your app cannot make money from ads or from sales. there are many reasons for this: - we made this app for the benefit of people and not to make a profit - - the app costs us money (for serving the pages, translations, etc), not to -mention the time to develop it and to support it. - - not all of the data that we use is okay to be sold. the images, along with -some of the translations are on a license that allows their use and distribution -for free for non-profit uses, but does not allow users to make money from them. - -* if you write an application using any of the Quran data (the images, the -translations, etc), you must provide a link to the respective data source -page ([tanzil.net](http://tanzil.net) for the translations and the -[quran images project](http://github.com/quran/quran.com-images) for the images) -both within your application (in an about page) and in your application -description in the market or app store. - -* if you use part of (or all of) the quran android code or graphics, you -must provide a link back to the [quran android -project](http://github.com/ahmedre/quran_android) in your application -description and your application itself in an about section. + - the app costs us money (for serving the pages, translations, etc), not to mention the time to develop it and to support it. + - not all of the data that we use is okay to be sold. the images, along with some of the translations are on a license that allows their use and distribution for free for non-profit uses, but does not allow users to make money from them. + +* if you write an application using any of the Quran data (the images, the translations, etc), you must provide a link to the respective data source page ([tanzil.net](http://tanzil.net) for the translations and the [quran images project](http://github.com/quran/quran.com-images) for the images) both within your application (in an about page) and in your application description in the market or app store. + +* if you use part of (or all of) the quran android code or graphics, you must provide a link back to the [quran android project](http://github.com/ahmedre/quran_android) in your application description and your application itself in an about section. Open Source Projects Used ------------------------- @@ -101,7 +90,9 @@ Open Source Projects Used Changelog --------- -**development** +**version 2.6.0 (released 3/8/2015)** +- material design! +- switch translations from the panel. - compile targeting sdk 21 - replace ActionBarSherlock with support-appcompat-v7 - improve share and copy ayah texts @@ -109,6 +100,9 @@ Changelog - fix gapless repeat releated bugs #426 - fix translation highlighting color in night mode #423 - translation updates for Uzbek +- lots of bugfixes. + +*NOTE* - version 2.6 marks the end of line for 2.3/3.x devices. This branch will be used mainly for bugfixes on those devices. Moving forward, all new features will be 4.x+ to make development easier and the code cleaner. **version 2.5.8 (released 7/5/2014)** - fixing tablet bugs causing the page not to show up diff --git a/TODO.md b/TODO.md deleted file mode 100644 index 60004e9ff1..0000000000 --- a/TODO.md +++ /dev/null @@ -1,21 +0,0 @@ -**Notes and Things to Fix** - - * ProgressBars in Activity - appcompat broke these basically, so we have to - figure out what to do here (either "fix it" by providing a different layout - which contains the needed progress views, or find a different way to - represent progress) - it probably makes sense to change it, especially due - to both the way material design is moving. - * Search - the panel doesn't look new. Can we fix this? should see [this - article](https://chris.banes.me/2014/10/17/appcompat-v21/) - * cleanup about (remove abs, and ideally, cleanup the strings, code, etc) - * QuranActivity, TranslationManagerActivity, etc have config changes. they - shouldn't. This may break dialogs. - -QuranPageLayout is functionally equivalent to the previous layouts, with the -following exceptions: -1. portrait images were wrap/wrap, now they are match/match -2. translations were match/wrap, now they are match/match - -Should consider which of those values is more "correct," while noting that -changing portrait images to wrap/wrap would require an adjustment in terms -of where the overlay page text is drawn. diff --git a/app/build.gradle b/app/build.gradle index 91a093956d..f1daa306f1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -11,10 +11,10 @@ android { } defaultConfig { - minSdkVersion 7 + minSdkVersion 9 targetSdkVersion 21 - versionCode 259 - versionName "2.5.9" + versionCode 260 + versionName "2.6.0gb" } signingConfigs { @@ -33,7 +33,7 @@ android { release { minifyEnabled true - proguardFile 'proguard.cfg' + proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard.cfg' signingConfig signingConfigs.release } } diff --git a/app/proguard.cfg b/app/proguard.cfg index b32b0f3477..22e5ae6986 100644 --- a/app/proguard.cfg +++ b/app/proguard.cfg @@ -1,18 +1,7 @@ -ignorewarnings --dontoptimize --dontobfuscate --dontskipnonpubliclibraryclasses - --ignorewarnings - -renamesourcefileattribute SourceFile - -keepattributes SourceFile,LineNumberTable,*Annotation* - --printmapping map.txt --printseeds seed.txt - --keepclassmembers enum * { public static **[] values(); public static ** valueOf(java.lang.String); } +-repackageclasses 'android.support.v7' -keep public class * extends android.app.Activity -keep public class * extends android.app.Application @@ -26,5 +15,4 @@ public (android.content.Context, android.util.AttributeSet, int); public void set*(...); } --keepclassmembers class * extends android.app.Activity { public void *(android.view.View); } -keepclassmembers class android.support.v4.app.Fragment { *** getActivity(); public *** onCreate(); public *** onCreateOptionsMenu(...); }