diff --git a/Android.mk b/Android.mk index e1983b53b..0255c3ffd 100644 --- a/Android.mk +++ b/Android.mk @@ -8,9 +8,14 @@ LOCAL_PACKAGE_NAME := F-Droid fdroid_root := $(LOCAL_PATH) fdroid_dir := F-Droid +fdroid_out := $(OUT_DIR)/target/common/obj/APPS/$(LOCAL_MODULE)_intermediates +fdroid_build := $(fdroid_root)/$(fdroid_dir)/build fdroid_apk := build/outputs/apk/F-Droid-release-unsigned.apk $(fdroid_root)/$(fdroid_dir)/$(fdroid_apk): + rm -Rf $(fdroid_build) + mkdir -p $(fdroid_out) + ln -s $(fdroid_out) $(fdroid_build) cd $(fdroid_root)/$(fdroid_dir) && gradle assembleRelease LOCAL_CERTIFICATE := platform diff --git a/CHANGELOG.md b/CHANGELOG.md index dac43f20e..a71f271dd 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,34 @@ +### Upcoming release + +* Adapt UI to use Material Design + +* Redesign the App Details view with larger icons, expandable description and + links with icons + +* Add ability to make F-Droid install itself as a privileged app on /system + via root, allowing the use of the system installer + +* Remove the root installer, since the system installer is safer, more stable + and now easy to set up with root privileges + +* Can now manually add swap repo via "Repositories" screen + +* Using NFC during swap now initiates a proper swap, rather than redirecting to + the "Repositories" screen + +### 0.92 (2015-06-08) + +* Make swap only in portrait mode to prevent crashes and issues where UI elements are obscured + +* Update Universal-Image-Loader to 1.9.4 + +* Make Apk downloads progress be measured in kilobytes instead of bytes + +* Add missing Sardinian language to the preferences + +* Fix minimum SDK to be 8 (2.2) instead of 7 (2.1) since support for version 7 + was dropped long ago + ### 0.91 (2015-05-18) * Don't request the "Write to external storage" permission on 4.4 and later diff --git a/F-Droid/.classpath b/F-Droid/.classpath deleted file mode 100644 index 2415c67fd..000000000 --- a/F-Droid/.classpath +++ /dev/null @@ -1,17 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/F-Droid/.project b/F-Droid/.project deleted file mode 100644 index 7045783ad..000000000 --- a/F-Droid/.project +++ /dev/null @@ -1,33 +0,0 @@ - - - fdroid - - - - - - com.android.ide.eclipse.adt.ResourceManagerBuilder - - - - - com.android.ide.eclipse.adt.PreCompilerBuilder - - - - - org.eclipse.jdt.core.javabuilder - - - - - com.android.ide.eclipse.adt.ApkBuilder - - - - - - com.android.ide.eclipse.adt.AndroidNature - org.eclipse.jdt.core.javanature - - diff --git a/F-Droid/AndroidManifest.xml b/F-Droid/AndroidManifest.xml index 447d5d813..b75b27df5 100644 --- a/F-Droid/AndroidManifest.xml +++ b/F-Droid/AndroidManifest.xml @@ -3,8 +3,8 @@ xmlns:tools="http://schemas.android.com/tools" package="org.fdroid.fdroid" android:installLocation="auto" - android:versionCode="910" - android:versionName="0.91" + android:versionCode="940" + android:versionName="0.94-test" > - - - + + + + + + + + + + /dev/null; then - if [ -z $ANDROID_HOME ]; then - if [ -e ~/.android/bashrc ]; then - . ~/.android/bashrc - else - echo "'android' not found, ANDROID_HOME must be set!" - exit - fi - else - export PATH="${ANDROID_HOME}/tools:$PATH" - fi -fi - -# set up test signing keys for any `ant release` runs -if [ -e ~/.android/ant.properties ]; then - cp ~/.android/ant.properties ./ -else - echo "skipping release ant.properties" -fi - - -EXTERN=../extern - -place_support_v4() { - mkdir -p $1/libs - cp libs/android-support-v4.jar $1/libs/ -} - -android update lib-project --path $EXTERN/UniversalImageLoader/library - -android update lib-project --path $EXTERN/AndroidPinning - -android update lib-project --path $EXTERN/libsuperuser/libsuperuser - -android update lib-project --path $EXTERN/zxing-core - -android update lib-project --path $EXTERN/support-v4-preferencefragment -place_support_v4 $EXTERN/support-v4-preferencefragment - -android update lib-project --path $EXTERN/Support/v7/appcompat --target android-19 -place_support_v4 $EXTERN/Support/v7/appcompat - -android update project --path . --name F-Droid - -{ echo -e "\nSuccessfully updated the main project.\n"; } 2>/dev/null - -# technically optional, needed for the tests -cd test -android update test-project --path . --main .. - -{ echo -e "\nSuccessfully updated the test project.\n"; } 2>/dev/null diff --git a/F-Droid/build.gradle b/F-Droid/build.gradle index 71d3f764a..1d994dc85 100644 --- a/F-Droid/build.gradle +++ b/F-Droid/build.gradle @@ -21,7 +21,7 @@ if ( !hasProperty( 'sourceDeps' ) ) { 'com.android.support:support-annotations:22.1.0', 'org.thoughtcrime.ssl.pinning:AndroidPinning:1.0.0', - 'com.nostra13.universalimageloader:universal-image-loader:1.9.3', + 'com.nostra13.universalimageloader:universal-image-loader:1.9.4', 'com.google.zxing:core:3.2.0', 'eu.chainfire:libsuperuser:1.0.0.201504231659', @@ -156,6 +156,11 @@ android { release { minifyEnabled false } + buildTypes { + debug { + debuggable true + } + } } compileOptions { diff --git a/F-Droid/project.properties b/F-Droid/project.properties deleted file mode 100644 index cab683d5d..000000000 --- a/F-Droid/project.properties +++ /dev/null @@ -1,18 +0,0 @@ -target=android-21 - -android.library.reference.1=../extern/UniversalImageLoader/library -android.library.reference.2=../extern/AndroidPinning -android.library.reference.3=../extern/libsuperuser/libsuperuser -android.library.reference.4=../extern/zxing-core -android.library.reference.5=../extern/support-v4-preferencefragment -android.library.reference.6=../extern/Support/v7/appcompat - -# For java libraries, place symlinks in ../extern/symlinks-for-ant-and-eclipse/ -source.dir=src;../extern/symlinks-for-ant-and-eclipse - -# With a target SDK of android-21 (5.0/Lollipop) and a Java 1.7 compiler, you -# can use Java 1.7 features like the <> diamond operator, multi-catch, strings -# in switches, etc. zxing uses the <> operator, so Java 1.7 is required. -java.encoding=UTF-8 -java.source=1.7 -java.target=1.7 diff --git a/F-Droid/res/drawable-hdpi/ic_bitcoin.png b/F-Droid/res/drawable-hdpi/ic_bitcoin.png new file mode 100644 index 000000000..169cf36bd Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_bitcoin.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_bullet_key_permission.png b/F-Droid/res/drawable-hdpi/ic_bullet_key_permission.png new file mode 100644 index 000000000..4cf50ade1 Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_bullet_key_permission.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_changelog.png b/F-Droid/res/drawable-hdpi/ic_changelog.png new file mode 100644 index 000000000..3e3f16da5 Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_changelog.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_coins_s.png b/F-Droid/res/drawable-hdpi/ic_coins_s.png new file mode 100644 index 000000000..0ada1d008 Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_coins_s.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_dogecoin.png b/F-Droid/res/drawable-hdpi/ic_dogecoin.png new file mode 100644 index 000000000..344d0ab8f Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_dogecoin.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_donate.png b/F-Droid/res/drawable-hdpi/ic_donate.png new file mode 100644 index 000000000..735e62d62 Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_donate.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_expand_less_grey600.png b/F-Droid/res/drawable-hdpi/ic_expand_less_grey600.png new file mode 100644 index 000000000..96758c875 Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_expand_less_grey600.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_expand_more_grey600.png b/F-Droid/res/drawable-hdpi/ic_expand_more_grey600.png new file mode 100644 index 000000000..00b9f645c Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_expand_more_grey600.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_flattr.png b/F-Droid/res/drawable-hdpi/ic_flattr.png new file mode 100644 index 000000000..6ee1e3d0e Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_flattr.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_issues.png b/F-Droid/res/drawable-hdpi/ic_issues.png new file mode 100644 index 000000000..b08cafcef Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_issues.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_launcher.png b/F-Droid/res/drawable-hdpi/ic_launcher.png index 08d5d89b5..88138a47a 100644 Binary files a/F-Droid/res/drawable-hdpi/ic_launcher.png and b/F-Droid/res/drawable-hdpi/ic_launcher.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_litecoin.png b/F-Droid/res/drawable-hdpi/ic_litecoin.png new file mode 100644 index 000000000..1829f211c Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_litecoin.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_repo_app_default.png b/F-Droid/res/drawable-hdpi/ic_repo_app_default.png index 798531939..3eebd9667 100644 Binary files a/F-Droid/res/drawable-hdpi/ic_repo_app_default.png and b/F-Droid/res/drawable-hdpi/ic_repo_app_default.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_source_code.png b/F-Droid/res/drawable-hdpi/ic_source_code.png new file mode 100644 index 000000000..0315f418d Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_source_code.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_stat_notify.png b/F-Droid/res/drawable-hdpi/ic_stat_notify.png new file mode 100644 index 000000000..a6bacbb33 Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_stat_notify.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_stat_notify_updates.png b/F-Droid/res/drawable-hdpi/ic_stat_notify_updates.png index 838b523af..f39e443f6 100644 Binary files a/F-Droid/res/drawable-hdpi/ic_stat_notify_updates.png and b/F-Droid/res/drawable-hdpi/ic_stat_notify_updates.png differ diff --git a/F-Droid/res/drawable-hdpi/ic_website.png b/F-Droid/res/drawable-hdpi/ic_website.png new file mode 100644 index 000000000..3a051cfe0 Binary files /dev/null and b/F-Droid/res/drawable-hdpi/ic_website.png differ diff --git a/F-Droid/res/drawable-hdpi/tab_unselected_holo.9.png b/F-Droid/res/drawable-hdpi/tab_unselected_holo.9.png new file mode 100644 index 000000000..19532ab10 Binary files /dev/null and b/F-Droid/res/drawable-hdpi/tab_unselected_holo.9.png differ diff --git a/F-Droid/res/drawable-ldpi/ic_bullet_key_permission.png b/F-Droid/res/drawable-ldpi/ic_bullet_key_permission.png new file mode 100644 index 000000000..4aff20ce9 Binary files /dev/null and b/F-Droid/res/drawable-ldpi/ic_bullet_key_permission.png differ diff --git a/F-Droid/res/drawable-ldpi/ic_launcher.png b/F-Droid/res/drawable-ldpi/ic_launcher.png index 2b5489661..f1e8bc847 100644 Binary files a/F-Droid/res/drawable-ldpi/ic_launcher.png and b/F-Droid/res/drawable-ldpi/ic_launcher.png differ diff --git a/F-Droid/res/drawable-ldpi/ic_repo_app_default.png b/F-Droid/res/drawable-ldpi/ic_repo_app_default.png index 47f30b576..0cd50bf41 100644 Binary files a/F-Droid/res/drawable-ldpi/ic_repo_app_default.png and b/F-Droid/res/drawable-ldpi/ic_repo_app_default.png differ diff --git a/F-Droid/res/drawable-ldpi/ic_stat_notify.png b/F-Droid/res/drawable-ldpi/ic_stat_notify.png new file mode 100644 index 000000000..62ddd6ed6 Binary files /dev/null and b/F-Droid/res/drawable-ldpi/ic_stat_notify.png differ diff --git a/F-Droid/res/drawable-ldpi/ic_stat_notify_updates.png b/F-Droid/res/drawable-ldpi/ic_stat_notify_updates.png index 6f15a958d..c0f2718bd 100644 Binary files a/F-Droid/res/drawable-ldpi/ic_stat_notify_updates.png and b/F-Droid/res/drawable-ldpi/ic_stat_notify_updates.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_bitcoin.png b/F-Droid/res/drawable-mdpi/ic_bitcoin.png new file mode 100644 index 000000000..816d45249 Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_bitcoin.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_bullet_key_permission.png b/F-Droid/res/drawable-mdpi/ic_bullet_key_permission.png new file mode 100644 index 000000000..7fee56024 Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_bullet_key_permission.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_changelog.png b/F-Droid/res/drawable-mdpi/ic_changelog.png new file mode 100644 index 000000000..42ceeaacf Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_changelog.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_coins_s.png b/F-Droid/res/drawable-mdpi/ic_coins_s.png new file mode 100644 index 000000000..3b8fd8abd Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_coins_s.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_dogecoin.png b/F-Droid/res/drawable-mdpi/ic_dogecoin.png new file mode 100644 index 000000000..19114580f Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_dogecoin.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_donate.png b/F-Droid/res/drawable-mdpi/ic_donate.png new file mode 100644 index 000000000..e5581f265 Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_donate.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_expand_less_grey600.png b/F-Droid/res/drawable-mdpi/ic_expand_less_grey600.png new file mode 100644 index 000000000..d83b2e103 Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_expand_less_grey600.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_expand_more_grey600.png b/F-Droid/res/drawable-mdpi/ic_expand_more_grey600.png new file mode 100644 index 000000000..b2c6b766c Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_expand_more_grey600.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_flattr.png b/F-Droid/res/drawable-mdpi/ic_flattr.png new file mode 100644 index 000000000..db8f6f312 Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_flattr.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_issues.png b/F-Droid/res/drawable-mdpi/ic_issues.png new file mode 100644 index 000000000..293522c27 Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_issues.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_launcher.png b/F-Droid/res/drawable-mdpi/ic_launcher.png index 0c0d41738..18ef68deb 100644 Binary files a/F-Droid/res/drawable-mdpi/ic_launcher.png and b/F-Droid/res/drawable-mdpi/ic_launcher.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_litecoin.png b/F-Droid/res/drawable-mdpi/ic_litecoin.png new file mode 100644 index 000000000..f882a02a8 Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_litecoin.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_repo_app_default.png b/F-Droid/res/drawable-mdpi/ic_repo_app_default.png index 8c9d250ab..49742b32f 100644 Binary files a/F-Droid/res/drawable-mdpi/ic_repo_app_default.png and b/F-Droid/res/drawable-mdpi/ic_repo_app_default.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_source_code.png b/F-Droid/res/drawable-mdpi/ic_source_code.png new file mode 100644 index 000000000..6db7bf836 Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_source_code.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_stat_notify.png b/F-Droid/res/drawable-mdpi/ic_stat_notify.png new file mode 100644 index 000000000..0a4bed95d Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_stat_notify.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_stat_notify_updates.png b/F-Droid/res/drawable-mdpi/ic_stat_notify_updates.png index 28bec3e03..def295299 100644 Binary files a/F-Droid/res/drawable-mdpi/ic_stat_notify_updates.png and b/F-Droid/res/drawable-mdpi/ic_stat_notify_updates.png differ diff --git a/F-Droid/res/drawable-mdpi/ic_website.png b/F-Droid/res/drawable-mdpi/ic_website.png new file mode 100644 index 000000000..ede2cdc4f Binary files /dev/null and b/F-Droid/res/drawable-mdpi/ic_website.png differ diff --git a/F-Droid/res/drawable-mdpi/tab_unselected_holo.9.png b/F-Droid/res/drawable-mdpi/tab_unselected_holo.9.png new file mode 100644 index 000000000..a2dbf42b7 Binary files /dev/null and b/F-Droid/res/drawable-mdpi/tab_unselected_holo.9.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_bitcoin.png b/F-Droid/res/drawable-xhdpi/ic_bitcoin.png new file mode 100644 index 000000000..7e4854b7a Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_bitcoin.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_bullet_key_permission.png b/F-Droid/res/drawable-xhdpi/ic_bullet_key_permission.png new file mode 100644 index 000000000..6a0bdfcb1 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_bullet_key_permission.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_changelog.png b/F-Droid/res/drawable-xhdpi/ic_changelog.png new file mode 100644 index 000000000..258f81848 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_changelog.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_coins_s.png b/F-Droid/res/drawable-xhdpi/ic_coins_s.png new file mode 100644 index 000000000..13d134e6b Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_coins_s.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_dogecoin.png b/F-Droid/res/drawable-xhdpi/ic_dogecoin.png new file mode 100644 index 000000000..3d1fe88bb Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_dogecoin.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_donate.png b/F-Droid/res/drawable-xhdpi/ic_donate.png new file mode 100644 index 000000000..a319c5070 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_donate.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_expand_less_grey600.png b/F-Droid/res/drawable-xhdpi/ic_expand_less_grey600.png new file mode 100644 index 000000000..f117dc673 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_expand_less_grey600.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_expand_more_grey600.png b/F-Droid/res/drawable-xhdpi/ic_expand_more_grey600.png new file mode 100644 index 000000000..8702c9a26 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_expand_more_grey600.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_flattr.png b/F-Droid/res/drawable-xhdpi/ic_flattr.png new file mode 100644 index 000000000..1d0768495 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_flattr.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_issues.png b/F-Droid/res/drawable-xhdpi/ic_issues.png new file mode 100644 index 000000000..9b1d101d8 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_issues.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_launcher.png b/F-Droid/res/drawable-xhdpi/ic_launcher.png index cd508306b..98cb52a3e 100644 Binary files a/F-Droid/res/drawable-xhdpi/ic_launcher.png and b/F-Droid/res/drawable-xhdpi/ic_launcher.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_litecoin.png b/F-Droid/res/drawable-xhdpi/ic_litecoin.png new file mode 100644 index 000000000..7c205e177 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_litecoin.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_repo_app_default.png b/F-Droid/res/drawable-xhdpi/ic_repo_app_default.png index b224d0a2e..7c2baabf0 100644 Binary files a/F-Droid/res/drawable-xhdpi/ic_repo_app_default.png and b/F-Droid/res/drawable-xhdpi/ic_repo_app_default.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_source_code.png b/F-Droid/res/drawable-xhdpi/ic_source_code.png new file mode 100644 index 000000000..265f17f60 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_source_code.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_stat_notify.png b/F-Droid/res/drawable-xhdpi/ic_stat_notify.png new file mode 100644 index 000000000..e115f6db5 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_stat_notify.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_stat_notify_updates.png b/F-Droid/res/drawable-xhdpi/ic_stat_notify_updates.png index 276f47c97..1dcf07911 100644 Binary files a/F-Droid/res/drawable-xhdpi/ic_stat_notify_updates.png and b/F-Droid/res/drawable-xhdpi/ic_stat_notify_updates.png differ diff --git a/F-Droid/res/drawable-xhdpi/ic_website.png b/F-Droid/res/drawable-xhdpi/ic_website.png new file mode 100644 index 000000000..54d4e28b9 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/ic_website.png differ diff --git a/F-Droid/res/drawable-xhdpi/tab_unselected_holo.9.png b/F-Droid/res/drawable-xhdpi/tab_unselected_holo.9.png new file mode 100644 index 000000000..946517378 Binary files /dev/null and b/F-Droid/res/drawable-xhdpi/tab_unselected_holo.9.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_bitcoin.png b/F-Droid/res/drawable-xxhdpi/ic_bitcoin.png new file mode 100644 index 000000000..1cc7291ac Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_bitcoin.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_bullet_key_permission.png b/F-Droid/res/drawable-xxhdpi/ic_bullet_key_permission.png new file mode 100644 index 000000000..a74c2862b Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_bullet_key_permission.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_changelog.png b/F-Droid/res/drawable-xxhdpi/ic_changelog.png new file mode 100644 index 000000000..33f8ac25e Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_changelog.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_dogecoin.png b/F-Droid/res/drawable-xxhdpi/ic_dogecoin.png new file mode 100644 index 000000000..0e025144d Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_dogecoin.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_donate.png b/F-Droid/res/drawable-xxhdpi/ic_donate.png new file mode 100644 index 000000000..20f8cc32c Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_donate.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_expand_less_grey600.png b/F-Droid/res/drawable-xxhdpi/ic_expand_less_grey600.png new file mode 100644 index 000000000..63b7299c4 Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_expand_less_grey600.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_expand_more_grey600.png b/F-Droid/res/drawable-xxhdpi/ic_expand_more_grey600.png new file mode 100644 index 000000000..921249fb2 Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_expand_more_grey600.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_flattr.png b/F-Droid/res/drawable-xxhdpi/ic_flattr.png new file mode 100644 index 000000000..30099090e Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_flattr.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_issues.png b/F-Droid/res/drawable-xxhdpi/ic_issues.png new file mode 100644 index 000000000..eb1293aae Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_issues.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_launcher.png b/F-Droid/res/drawable-xxhdpi/ic_launcher.png index a5fe271ac..9d29cc939 100644 Binary files a/F-Droid/res/drawable-xxhdpi/ic_launcher.png and b/F-Droid/res/drawable-xxhdpi/ic_launcher.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_litecoin.png b/F-Droid/res/drawable-xxhdpi/ic_litecoin.png new file mode 100644 index 000000000..74fcd0b22 Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_litecoin.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_repo_app_default.png b/F-Droid/res/drawable-xxhdpi/ic_repo_app_default.png index 6f72988d0..a51203e06 100644 Binary files a/F-Droid/res/drawable-xxhdpi/ic_repo_app_default.png and b/F-Droid/res/drawable-xxhdpi/ic_repo_app_default.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_source_code.png b/F-Droid/res/drawable-xxhdpi/ic_source_code.png new file mode 100644 index 000000000..778f8953f Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_source_code.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_stat_notify.png b/F-Droid/res/drawable-xxhdpi/ic_stat_notify.png new file mode 100644 index 000000000..7a739a43f Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_stat_notify.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_stat_notify_updates.png b/F-Droid/res/drawable-xxhdpi/ic_stat_notify_updates.png index 08efc3d68..509d3d0bb 100644 Binary files a/F-Droid/res/drawable-xxhdpi/ic_stat_notify_updates.png and b/F-Droid/res/drawable-xxhdpi/ic_stat_notify_updates.png differ diff --git a/F-Droid/res/drawable-xxhdpi/ic_website.png b/F-Droid/res/drawable-xxhdpi/ic_website.png new file mode 100644 index 000000000..937e30575 Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/ic_website.png differ diff --git a/F-Droid/res/drawable-xxhdpi/tab_unselected_holo.9.png b/F-Droid/res/drawable-xxhdpi/tab_unselected_holo.9.png new file mode 100644 index 000000000..8fcecf76c Binary files /dev/null and b/F-Droid/res/drawable-xxhdpi/tab_unselected_holo.9.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_bitcoin.png b/F-Droid/res/drawable-xxxhdpi/ic_bitcoin.png new file mode 100644 index 000000000..d3f5ecd7a Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_bitcoin.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_changelog.png b/F-Droid/res/drawable-xxxhdpi/ic_changelog.png new file mode 100644 index 000000000..99e6cf4a9 Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_changelog.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_dogecoin.png b/F-Droid/res/drawable-xxxhdpi/ic_dogecoin.png new file mode 100644 index 000000000..677adb961 Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_dogecoin.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_donate.png b/F-Droid/res/drawable-xxxhdpi/ic_donate.png new file mode 100644 index 000000000..70e133609 Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_donate.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_expand_less_grey600.png b/F-Droid/res/drawable-xxxhdpi/ic_expand_less_grey600.png new file mode 100644 index 000000000..ed72b071c Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_expand_less_grey600.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_expand_more_grey600.png b/F-Droid/res/drawable-xxxhdpi/ic_expand_more_grey600.png new file mode 100644 index 000000000..55f8396f2 Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_expand_more_grey600.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_flattr.png b/F-Droid/res/drawable-xxxhdpi/ic_flattr.png new file mode 100644 index 000000000..19dd2978f Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_flattr.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_issues.png b/F-Droid/res/drawable-xxxhdpi/ic_issues.png new file mode 100644 index 000000000..cc1ba6afe Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_issues.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_launcher.png b/F-Droid/res/drawable-xxxhdpi/ic_launcher.png new file mode 100644 index 000000000..c012986f5 Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_launcher.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_litecoin.png b/F-Droid/res/drawable-xxxhdpi/ic_litecoin.png new file mode 100644 index 000000000..120119e20 Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_litecoin.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_repo_app_default.png b/F-Droid/res/drawable-xxxhdpi/ic_repo_app_default.png new file mode 100644 index 000000000..323399dd0 Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_repo_app_default.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_source_code.png b/F-Droid/res/drawable-xxxhdpi/ic_source_code.png new file mode 100644 index 000000000..ff72e6aba Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_source_code.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_stat_notify.png b/F-Droid/res/drawable-xxxhdpi/ic_stat_notify.png new file mode 100644 index 000000000..378d77776 Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_stat_notify.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_stat_notify_updates.png b/F-Droid/res/drawable-xxxhdpi/ic_stat_notify_updates.png new file mode 100644 index 000000000..1ddb65c3a Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_stat_notify_updates.png differ diff --git a/F-Droid/res/drawable-xxxhdpi/ic_website.png b/F-Droid/res/drawable-xxxhdpi/ic_website.png new file mode 100644 index 000000000..e81ebc245 Binary files /dev/null and b/F-Droid/res/drawable-xxxhdpi/ic_website.png differ diff --git a/F-Droid/res/drawable/ic_text_dot.xml b/F-Droid/res/drawable/ic_text_dot.xml new file mode 100644 index 000000000..f8f396453 --- /dev/null +++ b/F-Droid/res/drawable/ic_text_dot.xml @@ -0,0 +1,22 @@ + + + + + + + + diff --git a/F-Droid/res/layout/app_details_header.xml b/F-Droid/res/layout/app_details_header.xml index 7b693a739..e36319c54 100644 --- a/F-Droid/res/layout/app_details_header.xml +++ b/F-Droid/res/layout/app_details_header.xml @@ -1,97 +1,115 @@ - - + + + + android:id="@+id/icon" + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_gravity="center_vertical" + android:contentDescription="@string/app_icon" + android:scaleType="fitCenter" + tools:src="@drawable/ic_launcher" /> - + + + + + android:orientation="horizontal"> - + android:layout_gravity="center_vertical" + android:layout_marginBottom="3dp" + android:layout_weight="1" + android:baselineAligned="false" + android:orientation="vertical"> - + + + + + +