This commit is contained in:
Thomas 2020-07-12 18:40:10 +02:00
parent 3b556e62eb
commit daf2a8a5e2
16 changed files with 29 additions and 17 deletions

View File

@ -41,6 +41,7 @@ android {
buildConfigField "boolean", "lite", "false"
}
lite {
minSdkVersion 21
applicationId "app.fedilab.lite"
buildConfigField "boolean", "DONATIONS", "true"
buildConfigField "boolean", "lite", "true"
@ -130,6 +131,7 @@ dependencies {
implementation "ch.acra:acra-notification:5.5.0"
implementation 'com.github.duanhong169:colorpicker:1.1.6'
implementation 'com.github.penfeizhou.android.animation:glide-plugin:2.2.0'
implementation 'com.github.stom79:Android-WYSIWYG-Editor:3.2.1'
implementation 'com.github.smarteist:autoimageslider:1.3.2'
debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.2'
@ -144,7 +146,7 @@ dependencies {
playstoreImplementation 'com.github.stom79:country-picker-android:1.2.0'
playstoreImplementation 'com.vanniktech:emoji-one:0.6.0'
playstoreImplementation 'ja.burhanrashid52:photoeditor:0.4.0'
playstoreImplementation 'com.github.stom79:Android-WYSIWYG-Editor:3.2.1'
//Fdroid
fdroidImplementation "org.conscrypt:conscrypt-android:2.4.0"
@ -152,5 +154,5 @@ dependencies {
fdroidImplementation 'com.github.stom79:country-picker-android:1.2.0'
fdroidImplementation 'com.vanniktech:emoji-one:0.6.0'
fdroidImplementation 'ja.burhanrashid52:photoeditor:0.4.0'
fdroidImplementation 'com.github.stom79:Android-WYSIWYG-Editor:3.2.1'
}

View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?><!--
Copyright 2017 Thomas Schneider
Copyright 2020 Thomas Schneider
This file is a part of Fedilab
@ -40,18 +40,19 @@
android:name="android.hardware.camera"
android:required="false" />
<application
android:name="app.fedilab.android.activities.MainApplication"
android:requestLegacyExternalStorage="true"
android:allowBackup="false"
android:hardwareAccelerated="true"
android:icon="@mipmap/ic_launcher_bubbles"
android:label="@string/app_name"
android:icon="@mipmap/ic_launcher_lite"
android:label="@string/app_name_lite"
android:largeHeap="true"
android:roundIcon="@mipmap/ic_launcher_bubbles_round"
android:supportsRtl="true"
android:theme="@style/AppThemeDark"
android:usesCleartextTraffic="true"
tools:replace="android:allowBackup">
tools:replace="android:allowBackup,android:icon, android:label">
<service
android:name="app.fedilab.android.services.LiveNotificationDelayedService"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -1,17 +1,23 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:viewportWidth="106.90303"
android:viewportHeight="106.90303">
<group android:translateX="26.993015"
android:translateY="26.993015">
android:viewportWidth="108"
android:viewportHeight="108">
<group android:scaleX="0.26898113"
android:scaleY="0.26898113">
<group
android:translateX="100.757576"
android:translateY="100.757576">
<path
android:pathData="m33.437,18.139c-1.0695,-0.0057 -2.2627,0.6482 -2.7732,1.561 0,0 -0.9691,1.7346 -2.9709,2.5492 -1.6369,0.6648 -2.8534,0.4563 -2.8534,0.4563 -1.1371,-0.1964 -2.5434,0.4591 -3.1257,1.4558l-1.9531,3.3447c-0.5899,1.0193 -0.9885,2.3565 0.6093,2.3565h1.3601c1.3149,0 2.9559,-0.9157 3.6454,-2.0363 0,0 1.2424,-2.017 3.6941,-2.0676 2.8528,-0.0589 5.2128,2.2062 5.2719,5.0577 0.0578,2.8528 -2.2066,5.2128 -5.0595,5.2709 -2.5247,0.0519 -3.8802,-2.0853 -3.8802,-2.0853 -0.7037,-1.1098 -2.3566,-2.0191 -3.6715,-2.0191l-3.3376,0.0212c-0.6326,0.0288 -1.2933,0.1737 -1.7446,0.8326l-1.2338,2.1129c-0.1508,0.2597 -0.3041,0.5202 -0.4561,0.7801 -0.5817,0.9955 -1.9845,1.632 -3.1173,1.4134 0,0 -1.8679,-0.3618 -3.8323,0.4368 -4.0726,1.6557 -6.0314,6.3003 -4.3763,10.372 1.6562,4.0734 6.3006,6.0322 10.373,4.3765 4.0729,-1.6557 6.0319,-6.3003 4.3757,-10.373 -0.4869,-1.1977 -0.7284,-1.4604 -0.7284,-1.4604 -0.7804,-0.8494 -0.9431,-2.36 -0.3608,-3.3555l0.178,-0.4567c5.5064,4.0579 12.927,5.2464 19.727,2.4807 8.1468,-3.3116 12.98,-11.308 12.66,-19.616l-2.0178,-0.185s-0.7392,0.1526 -1.1812,0.6083c-0.0768,0.1243 -0.157,0.2451 -0.2441,0.3624h-0.0011c-0.026,0.0655 -0.0684,0.1114 -0.1155,0.1492 -0.5328,0.6661 -1.2379,1.2094 -2.0854,1.5543 -1.2366,0.5033 -2.5547,0.4922 -3.7172,0.067 -0.0016,-0.0005 -0.003,-0.0011 -0.0044,-0.0016 0,-0 0,-0.0001 -0.0008,-0.0001 -0.014,-0.0051 -0.0276,-0.0112 -0.0416,-0.0164 -0.0634,-0.0239 -0.1267,-0.0481 -0.1891,-0.0744 -0.076,-0.032 -0.1511,-0.0658 -0.2255,-0.1015 0,-0.0001 0,-0.0002 -0.0008,-0.0003 -0.0744,-0.0356 -0.148,-0.073 -0.2206,-0.1122 0,-0.0001 0,-0.0002 -0.0008,-0.0003 -0.0726,-0.0392 -0.1443,-0.0802 -0.215,-0.1228 0,-0.0001 0,-0.0002 -0.0008,-0.0003 -0.0707,-0.0426 -0.1406,-0.0869 -0.2093,-0.133 -0.0001,-0 0,-0.0001 0,-0.0001 -0.0688,-0.0461 -0.1366,-0.094 -0.2032,-0.1435 0,-0.0001 0,-0.0002 -0.0008,-0.0003 -0.0666,-0.0494 -0.132,-0.1005 -0.1963,-0.1532 0,-0.0001 0,-0.0001 -0.0008,-0.0003 -0.0437,-0.0359 -0.086,-0.0736 -0.1286,-0.111 -0.0201,-0.0177 -0.041,-0.0344 -0.0609,-0.0524 -0.0618,-0.056 -0.1224,-0.1135 -0.1816,-0.1727 -0.0594,-0.0593 -0.1175,-0.12 -0.1742,-0.1824v-0.0003c-0.1132,-0.1246 -0.2207,-0.2556 -0.3221,-0.3923 -0.0508,-0.0685 -0.1,-0.1384 -0.1477,-0.2099v-0.0003c-0.1904,-0.2856 -0.3552,-0.5945 -0.4896,-0.9249l-0.0717,-0.1769c-0.0038,-0.0123 -0.0113,-0.025 -0.0221,-0.038 -0.0174,-0.0208 -0.0458,-0.0424 -0.0799,-0.0647 -0.0085,-0.0055 -0.0152,-0.0109 -0.0246,-0.0164 -0.0238,-0.0141 -0.0506,-0.0284 -0.0803,-0.0428 0,-0.0001 0,-0.0002 -0.0008,-0.0003 -0.0296,-0.0144 -0.0621,-0.0289 -0.0971,-0.0435 -0.141,-0.0587 -0.3247,-0.1191 -0.5392,-0.1774 -0.0001,-0 0,-0.0001 0,-0.0001 -0.0535,-0.0146 -0.109,-0.029 -0.1662,-0.0432v-0.0001c-0.0024,-0.0005 -0.0052,-0.0011 -0.0076,-0.0018 -0.1097,-0.0272 -0.2258,-0.0538 -0.3468,-0.0793 -0.0028,-0.0005 -0.0055,-0.0013 -0.0083,-0.0018 -0.2538,-0.0533 -0.5293,-0.1019 -0.8145,-0.1422l-1.4582,-0.2069c-0.1071,-0.0151 -0.2164,-0.0228 -0.327,-0.0234z"
android:strokeWidth=".26458"
android:fillColor="#546e7a"/>
android:fillAlpha="1"
android:fillColor="#546e7a"
android:pathData="m125.591,69.491c-3.922,-0.021 -8.297,2.377 -10.169,5.724 0,0 -3.554,6.361 -10.894,9.348 -6.002,2.438 -10.463,1.673 -10.463,1.673 -4.17,-0.72 -9.327,1.684 -11.462,5.338l-7.162,12.265c-2.163,3.738 -3.625,8.641 2.234,8.641h4.988c4.822,0 10.839,-3.358 13.368,-7.467 0,0 4.556,-7.396 13.546,-7.582 10.461,-0.216 19.115,8.09 19.331,18.546 0.212,10.461 -8.092,19.115 -18.553,19.328 -9.258,0.19 -14.229,-7.647 -14.229,-7.647 -2.581,-4.069 -8.642,-7.404 -13.463,-7.404l-12.239,0.078c-2.32,0.105 -4.742,0.637 -6.397,3.053l-4.524,7.748c-0.553,0.952 -1.115,1.907 -1.672,2.86 -2.133,3.65 -7.277,5.985 -11.431,5.183 0,0 -6.85,-1.327 -14.053,1.602 -14.934,6.071 -22.117,23.103 -16.048,38.035 6.073,14.937 23.104,22.119 38.039,16.048 14.935,-6.071 22.119,-23.103 16.046,-38.036 -1.785,-4.392 -2.671,-5.355 -2.671,-5.355 -2.862,-3.115 -3.458,-8.654 -1.323,-12.304l0.653,-1.675c20.191,14.881 47.402,19.238 72.339,9.097 29.874,-12.144 47.597,-41.465 46.422,-71.931l-7.399,-0.678c0,0 -2.711,0.56 -4.331,2.231 -0.282,0.456 -0.576,0.899 -0.895,1.329h-0.004c-0.095,0.24 -0.251,0.409 -0.423,0.547 -1.954,2.443 -4.539,4.435 -7.647,5.699 -4.535,1.846 -9.368,1.805 -13.631,0.246 -0.006,-0.002 -0.011,-0.004 -0.016,-0.005 0,-0 0,-0 -0.003,-0.001 -0.051,-0.019 -0.101,-0.041 -0.152,-0.06 -0.232,-0.088 -0.465,-0.176 -0.693,-0.273 -0.279,-0.118 -0.554,-0.241 -0.827,-0.372 0,-0 0,-0.001 -0.003,-0.001 -0.273,-0.131 -0.543,-0.268 -0.809,-0.411 0,-0 0,-0.001 -0.003,-0.001 -0.266,-0.144 -0.529,-0.294 -0.789,-0.45 0,-0 0,-0.001 -0.003,-0.001 -0.259,-0.156 -0.516,-0.319 -0.768,-0.488 -0,-0 0,-0 0,-0.001 -0.252,-0.169 -0.501,-0.345 -0.745,-0.526 0,-0 0,-0.001 -0.003,-0.001 -0.244,-0.181 -0.484,-0.369 -0.72,-0.562 0,-0 0,-0.001 -0.003,-0.001 -0.16,-0.132 -0.315,-0.27 -0.472,-0.407 -0.074,-0.065 -0.15,-0.126 -0.223,-0.192 -0.227,-0.205 -0.449,-0.416 -0.666,-0.633 -0.218,-0.217 -0.431,-0.44 -0.639,-0.669 0,-0 0,-0.001 0,-0.001 -0.415,-0.457 -0.809,-0.937 -1.181,-1.439 -0.186,-0.251 -0.367,-0.508 -0.541,-0.77 0,-0 0,-0.001 0,-0.001 -0.698,-1.047 -1.303,-2.18 -1.795,-3.391l-0.263,-0.649c-0.014,-0.045 -0.041,-0.092 -0.081,-0.139 -0.064,-0.076 -0.168,-0.156 -0.293,-0.237 -0.031,-0.02 -0.056,-0.04 -0.09,-0.06 -0.087,-0.052 -0.185,-0.104 -0.294,-0.157 0,-0 0,-0.001 -0.003,-0.001 -0.108,-0.053 -0.228,-0.106 -0.356,-0.159 -0.517,-0.215 -1.191,-0.437 -1.977,-0.651 -0,-0 0,-0.001 0,-0.001 -0.196,-0.053 -0.4,-0.106 -0.609,-0.158 0,-0 0,-0.001 0,-0.001 -0.009,-0.002 -0.019,-0.004 -0.028,-0.007 -0.402,-0.1 -0.828,-0.197 -1.272,-0.291 -0.01,-0.002 -0.02,-0.004 -0.03,-0.007 -0.931,-0.195 -1.941,-0.374 -2.987,-0.522l-5.347,-0.759c-0.393,-0.056 -0.793,-0.084 -1.199,-0.086z"
android:strokeWidth="0.26458332" />
<path
android:pathData="m19.12,19.438 l-0.3967,-0.9742c-1.4323,-3.5224 0.2622,-7.5393 3.7845,-8.971 3.5224,-1.4328 7.5388,0.2616 8.971,3.7845l0.25,0.6142c0.1202,0.6926 1.153,1.391 2.2963,1.5526l1.18,0.1667c1.1423,0.162 2.5192,-0.5399 3.0589,-1.5596 0,0 0.5045,-0.9536 2.0594,-1.5855 2.6431,-1.0744 5.656,0.1969 6.7312,2.8392 0.0671,0.1667 0.1249,0.3342 0.1744,0.5027 0.1757,0.3902 0.4951,0.59 0.8122,0.6914l1.4948,0.1367c-0.2475,-1.3308 -0.6331,-2.6565 -1.1623,-3.9591 -4.2285,-10.4 -16.087,-15.402 -26.486,-11.173 -10.399,4.2277 -15.402,16.086 -11.174,26.486 0.7207,1.7741 1.6692,3.3868 2.7897,4.8276l5.88,-10.068c0.5811,-0.9965 0.4638,-2.4865 -0.2629,-3.311z"
android:strokeWidth=".26458"
android:fillColor="#78909c"/>
android:fillAlpha="1"
android:fillColor="#78909c"
android:pathData="m73.084,74.257c0,0 0,0 -1.455,-3.572 -5.252,-12.916 0.962,-27.646 13.878,-32.896 12.916,-5.254 27.645,0.959 32.896,13.878 0.917,2.252 0.917,2.252 0.917,2.252 0.441,2.54 4.228,5.101 8.42,5.693l4.327,0.611c4.189,0.594 9.238,-1.98 11.217,-5.719 0,0 1.85,-3.497 7.552,-5.814 9.691,-3.94 20.74,0.722 24.683,10.411 0.246,0.611 0.458,1.225 0.64,1.843 0.644,1.431 1.815,2.163 2.978,2.536l5.481,0.501C183.71,59.102 182.296,54.241 180.356,49.464 164.85,11.328 121.364,-7.016 83.231,8.492 45.096,23.995 26.751,67.479 42.257,105.616c2.643,6.506 6.121,12.419 10.229,17.703l21.562,-36.92c2.131,-3.654 1.701,-9.118 -0.964,-12.142z"
android:strokeWidth="0.26458332" />
</group>
</group>
</vector>

View File

@ -94,7 +94,8 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:text="PayPal" />
android:text="PayPal"
tools:ignore="HardcodedText" />
<TextView
android:id="@+id/about_wiki"

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.8 KiB

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

After

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.3 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8.3 KiB

After

Width:  |  Height:  |  Size: 8.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.5 KiB

After

Width:  |  Height:  |  Size: 5.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -1,5 +1,6 @@
<resources>
<string name="app_name" translatable="false">Fedilab</string>
<string name="app_name_lite" translatable="false">Fedilab Lite</string>
<string name="navigation_drawer_open">Open the menu</string>
<string name="navigation_drawer_close">Close the menu</string>
@ -1234,4 +1235,5 @@
<string name="add_reaction">Add a reaction</string>
<string name="set_custom_tabs_indication">Use your favourite browser inside the app. Uncheck this feature to open links externally.</string>
<string name="set_video_cache">Video cache in MB, zero means no cache.</string>
</resources>