Skip to content

Commit ccaaddc

Browse files
feat. working icons based on paid/free flavour + fixed ad_id on free version
1 parent a737813 commit ccaaddc

33 files changed

+152
-318
lines changed

android/app/build.gradle

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,21 +8,25 @@ android {
88
applicationId "com.foxdebug.acode"
99

1010

11-
//sdk versions and other stuff should be changed from versions.build.gradle
11+
//sdk versions and other stuff should be changed from variables.build.gradle
1212
minSdkVersion rootProject.ext.minSdkVersion
1313
targetSdkVersion rootProject.ext.targetSdkVersion
14-
versionCode 1
15-
versionName "1.0"
14+
15+
//fdroid expect this as literals so no fancy logic
16+
versionCode 957
17+
versionName "1.11.1"
1618

1719
flavorDimensions += "default"
1820
productFlavors{
1921
free{
2022
applicationId = "com.foxdebug.acodefree"
23+
dimension = "default"
2124
buildConfigField("boolean", "PAID", "false")
2225
}
2326

2427
paid{
2528
applicationId = "com.foxdebug.acode"
29+
dimension = "default"
2630
buildConfigField("boolean", "PAID", "true")
2731
}
2832
}

android/app/src/androidTest/java/com/getcapacitor/myapp/ExampleInstrumentedTest.java

Lines changed: 0 additions & 26 deletions
This file was deleted.
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
4+
5+
<application>
6+
7+
<meta-data
8+
android:name="com.google.android.gms.ads.APPLICATION_ID"
9+
tools:replace="android:value"
10+
android:value="ca-app-pub-5911839694379275~4255791238"/>
11+
12+
</application>
13+
14+
15+
</manifest>
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<color name="ic_launcher_background">@android:color/white</color>
4+
<color name="ic_splash_background">@android:color/white</color>
5+
</resources>

android/app/src/main/AndroidManifest.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<manifest xmlns:android="http://schemas.android.com/apk/res/android">
2+
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3+
xmlns:tools="http://schemas.android.com/tools">
34

45
<application
56
android:allowBackup="true"
67
android:icon="@mipmap/ic_launcher"
78
android:label="@string/app_name"
8-
android:roundIcon="@mipmap/ic_launcher_round"
9+
android:roundIcon="@mipmap/ic_launcher"
910
android:supportsRtl="true"
1011
android:theme="@style/AppTheme">
1112

@@ -31,7 +32,7 @@
3132
android:grantUriPermissions="true">
3233
<meta-data
3334
android:name="android.support.FILE_PROVIDER_PATHS"
34-
android:resource="@xml/file_paths"></meta-data>
35+
android:resource="@xml/file_paths"/>
3536
</provider>
3637
</application>
3738

android/app/src/main/res/drawable-v24/ic_launcher_foreground.xml

Lines changed: 0 additions & 34 deletions
This file was deleted.

android/app/src/main/res/drawable/ic_launcher_background.xml

Lines changed: 0 additions & 170 deletions
This file was deleted.
Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="108dp"
3+
android:height="108dp"
4+
android:viewportWidth="544.37"
5+
android:viewportHeight="452.63">
6+
<group android:scaleX="0.55"
7+
android:scaleY="0.4573112"
8+
android:translateX="122.48325"
9+
android:translateY="122.81861">
10+
<path
11+
android:pathData="m216.9,55.7c1.54,-9.11 9.61,-17.98 16.49,-17.98 10.54,0 32.1,0 42.28,0 9.31,0 17.81,11.45 15,25.95 -16.32,84.09 -48.75,253.82 -63.92,334.21 -2.15,11.4 -10.51,17.02 -16.04,17.02 -8.59,0 -25.2,0 -36.49,0 -7.06,0 -17.09,-9.66 -15.71,-17.67 18.15,-105.18 43.83,-255.62 58.39,-341.53z"
12+
android:fillColor="#3499FE"/>
13+
<path
14+
android:pathData="m327.13,55.71c-1.54,-9.11 -9.61,-17.98 -16.49,-17.98 -10.54,0 -32.1,0 -42.28,0 -9.31,0 -17.81,11.45 -15,25.95 16.32,84.09 48.75,253.82 63.92,334.21 2.15,11.4 10.51,17.02 16.04,17.02 8.59,0 25.2,0 36.49,0 7.06,0 17.09,-9.66 15.71,-17.67 -18.15,-105.18 -43.83,-255.62 -58.39,-341.53z"
15+
android:fillColor="#3499FE"/>
16+
<path
17+
android:pathData="m438.86,233.19c-4.64,-4.84 -53.34,-55.72 -70.25,-72.53 -6.23,-6.19 -6.23,-16.45 -3.45,-23.32 2.17,-5.36 8.75,-11.32 15.15,-11.29 11.27,0.05 35.05,0 46.31,0 4.16,0 7.87,2.18 11.59,5.95 20.31,20.55 59,60.43 80.61,83.36v0c1.44,1.52 2.93,2.88 4.1,4.12 3.54,3.75 4.64,8.13 4.84,11.56 0.09,0.93 0.13,1.8 0.15,2.58 0.09,3.59 -0.81,8.86 -4.99,13.27 -1.17,1.24 -2.66,2.6 -4.1,4.12v0c-21.61,22.93 -60.3,62.81 -80.61,83.36 -3.72,3.77 -7.43,5.95 -11.59,5.95 -11.26,0 -35.04,-0.05 -46.31,0 -6.4,0.03 -12.98,-5.93 -15.15,-11.29 -2.78,-6.87 -2.78,-17.13 3.45,-23.32 16.92,-16.79 65.62,-67.67 70.25,-72.52z"
18+
android:fillColor="#3499FE"/>
19+
<path
20+
android:pathData="m105.51,233.77c4.64,-4.84 53.34,-55.72 70.25,-72.53 6.23,-6.19 6.23,-16.45 3.45,-23.32 -2.17,-5.36 -8.75,-11.32 -15.15,-11.29 -11.27,0.05 -35.05,0 -46.31,0 -4.16,0 -7.87,2.18 -11.59,5.95 -20.31,20.55 -59,60.43 -80.61,83.36v0c-1.44,1.52 -2.93,2.88 -4.1,4.12 -3.54,3.75 -4.64,8.13 -4.84,11.56 -0.09,0.93 -0.13,1.8 -0.15,2.58 -0.09,3.59 0.81,8.86 4.99,13.27 1.17,1.24 2.66,2.6 4.1,4.12v0c21.61,22.93 60.3,62.81 80.61,83.36 3.72,3.77 7.43,5.95 11.59,5.95 11.26,0 35.04,-0.05 46.31,0 6.4,0.03 12.98,-5.93 15.15,-11.29 2.78,-6.87 2.78,-17.13 -3.45,-23.32 -16.91,-16.8 -65.61,-67.68 -70.25,-72.52z"
21+
android:fillColor="#3499FE"/>
22+
</group>
23+
</vector>
Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
33
<background android:drawable="@color/ic_launcher_background"/>
4-
<foreground android:drawable="@mipmap/ic_launcher_foreground"/>
4+
<foreground android:drawable="@drawable/ic_launcher_foreground"/>
5+
<monochrome android:drawable="@drawable/ic_launcher_foreground"/>
56
</adaptive-icon>

android/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml

Lines changed: 0 additions & 5 deletions
This file was deleted.

0 commit comments

Comments
 (0)