update project

guardianproject · Jan 21, 2019 · a19c8c1 · a19c8c1
1 parent fb994b0
commit a19c8c1
Show file tree

Hide file tree

Showing 39 changed files with 78 additions and 48 deletions.
diff --git a/.idea/libraries/Gradle__android_arch_core_runtime_1_1_0.xml b/.idea/libraries/Gradle__android_arch_core_runtime_1_1_0.xml
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_0.xml b/.idea/libraries/Gradle__android_arch_lifecycle_livedata_core_1_1_0.xml
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_0.xml b/.idea/libraries/Gradle__android_arch_lifecycle_runtime_1_1_0.xml
diff --git a/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_0.xml b/.idea/libraries/Gradle__android_arch_lifecycle_viewmodel_1_1_0.xml
diff --git a/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_animated_vector_drawable_27_1_1.xml
diff --git a/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_appcompat_v7_27_1_1.xml
diff --git a/.idea/libraries/Gradle__com_android_support_design_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_design_27_1_1.xml
diff --git a/.idea/libraries/Gradle__com_android_support_recyclerview_v7_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_recyclerview_v7_27_1_1.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_compat_27_1_1.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_ui_27_1_1.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_core_utils_27_1_1.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_fragment_27_1_1.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_media_compat_27_1_1.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_v4_27_1_1.xml
diff --git a/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_support_vector_drawable_27_1_1.xml
diff --git a/.idea/libraries/Gradle__com_android_support_transition_27_1_1.xml b/.idea/libraries/Gradle__com_android_support_transition_27_1_1.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -14,13 +14,13 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 27
+    compileSdkVersion 28
     buildToolsVersion= '28.0.3'
 
     defaultConfig {
         applicationId "com.circleof6.open"
         minSdkVersion 14
-        targetSdkVersion 27
+        targetSdkVersion 28
         versionCode 3020
         versionName "3.0.0-OPEN-BETA-2"
     }
@@ -32,6 +32,11 @@ android {
             dimension "free"
             applicationId "com.circleof6.open"
         }
+        circulo {
+            dimension "free"
+            applicationId "org.article19.circulo"
+
+        }
     }
 
     signingConfigs {

diff --git a/app/src/circulo/ic_launcher-web.png b/app/src/circulo/ic_launcher-web.png
diff --git a/app/src/circulo/res/drawable/ic_launcher_foreground.xml b/app/src/circulo/res/drawable/ic_launcher_foreground.xml
@@ -0,0 +1,21 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="108dp"
+        android:height="108dp"
+        android:viewportWidth="624.39026"
+        android:viewportHeight="624.39026">
+    <group android:translateX="56.19512"
+            android:translateY="56.19512">
+      <path
+          android:pathData="M256,256m-230.3,0a230.3,230.3 0,1 1,460.6 0a230.3,230.3 0,1 1,-460.6 0"
+          android:fillColor="#F7E613"/>
+      <path
+          android:pathData="M272.3,86.8c7.8,1.6 15.7,2.9 23.4,4.7c69.7,16.2 122.5,74.8 131.3,145.6c0.9,7 1.1,14 1.7,21.5c-10.3,0 -19.8,0 -28.9,0c-1.9,-11.6 -2.9,-23.1 -5.7,-34.3c-16.5,-66.1 -77.8,-111.1 -145.8,-107.4c-79.6,4.4 -140.5,73.9 -134.3,153.3c5.6,71.6 64.1,127.8 136.5,131c4.8,0.2 6,1.6 5.9,6.1c-0.3,7.8 -0.1,15.7 -0.1,23.9c-15.7,0.3 -30.3,-1.9 -44.8,-5.7C143.7,407.7 92.6,348.5 84.8,279c-0.4,-3.5 -1,-6.9 -1.5,-10.3c0,-6.3 0,-12.6 0,-18.9c0.8,-5 1.6,-10 2.3,-14.9c10,-70.2 62,-127.2 130.7,-143.2c7.9,-1.9 16,-3.2 24,-4.8C251,86.8 261.6,86.8 272.3,86.8z"
+          android:fillColor="#A42274"/>
+      <path
+          android:pathData="M134.6,259.3c9.8,0 19.2,0 29.2,0c1.5,33.7 15.8,60.4 44.6,78.4c19.1,11.9 40,15.7 62.2,12.4c43.5,-6.5 76.6,-45.4 77.6,-89.4c0.9,-43.9 -33.5,-92 -91.9,-94.1c0,-9.3 0,-18.7 0,-28c26.5,-7.9 78.2,19 100.8,52.3c29.7,43.9 27.7,102.7 -5,143.7c-33.9,42.6 -90.2,57.9 -140.7,38.1C160.8,352.7 133.4,303.2 134.6,259.3z"
+          android:fillColor="#A42274"/>
+      <path
+          android:pathData="M298.5,259.3c9.8,0 19.2,0 28.5,0c3.6,21.5 -13.6,50.8 -36.9,63.1c-28,14.8 -61.6,10 -84,-11.8c-22.2,-21.7 -27.9,-55 -14.7,-82.5c12.1,-25.2 39.8,-41.8 64.9,-40.1c0,8.7 0.2,17.5 -0.2,26.3c-0.1,1.2 -3.1,3 -4.9,3.2c-18.1,2.4 -32.4,15.6 -36.1,34c-3.5,17.1 5,35.2 20.5,44c25.3,14.4 57.3,-1.1 61.8,-29.9C297.7,263.7 298.1,261.8 298.5,259.3z"
+          android:fillColor="#A42274"/>
+    </group>
+</vector>
diff --git a/app/src/circulo/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/circulo/res/mipmap-anydpi-v26/ic_launcher.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/app/src/circulo/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/circulo/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+    <background android:drawable="@color/ic_launcher_background"/>
+    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
+</adaptive-icon>
diff --git a/app/src/circulo/res/mipmap-hdpi/ic_launcher.png b/app/src/circulo/res/mipmap-hdpi/ic_launcher.png
diff --git a/app/src/circulo/res/mipmap-hdpi/ic_launcher_round.png b/app/src/circulo/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app/src/circulo/res/mipmap-mdpi/ic_launcher.png b/app/src/circulo/res/mipmap-mdpi/ic_launcher.png
diff --git a/app/src/circulo/res/mipmap-mdpi/ic_launcher_round.png b/app/src/circulo/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app/src/circulo/res/mipmap-xhdpi/ic_launcher.png b/app/src/circulo/res/mipmap-xhdpi/ic_launcher.png
diff --git a/app/src/circulo/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/circulo/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app/src/circulo/res/mipmap-xxhdpi/ic_launcher.png b/app/src/circulo/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/app/src/circulo/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/circulo/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app/src/circulo/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/circulo/res/mipmap-xxxhdpi/ic_launcher.png
diff --git a/app/src/circulo/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/circulo/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app/src/circulo/res/values/ic_launcher_background.xml b/app/src/circulo/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#FFFFFF</color>
+</resources>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -74,7 +74,7 @@
         </activity>
         <provider
             android:name="com.circleof6.data.CustomContentProvider"
-            android:authorities="com.circleof6.data.CustomContentProvider"
+            android:authorities="${applicationId}.data.CustomContentProvider"
             android:exported="false"
             android:multiprocess="true">
         </provider>

diff --git a/app/src/main/res/layout/activity_paged_tutorial.xml b/app/src/main/res/layout/activity_paged_tutorial.xml
@@ -18,7 +18,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:id="@+id/co6_u_logo"
-        android:src="@drawable/tutorial_co6_u_logo"
+        android:src="@drawable/ic_launcher"
         android:layout_margin="10dp"
         android:layout_alignParentTop="true"
         android:layout_alignParentLeft="true"

diff --git a/app/src/main/res/layout/activity_sharing_app.xml b/app/src/main/res/layout/activity_sharing_app.xml
@@ -11,7 +11,6 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:drawableLeft="@drawable/co6_u_logo"
         android:drawablePadding="12dp"
         android:text="@string/help_using_app"
         android:textColor="@color/primary_text_white"

diff --git a/app/src/main/res/layout/activity_tutorial_select_language.xml b/app/src/main/res/layout/activity_tutorial_select_language.xml
@@ -63,14 +63,5 @@
         android:layout_height="1dp"
         android:background="@color/cyan"/>
 
-    <ImageView
-        android:id="@+id/imageView"
-        android:layout_width="wrap_content"
-        android:layout_gravity="center"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/padding_small"
-        android:layout_marginTop="@dimen/padding_small"
-        android:scaleType="centerInside"
-        android:src="@drawable/tutorial_co6_u_logo" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/include_logo.xml b/app/src/main/res/layout/include_logo.xml
@@ -6,4 +6,4 @@
     android:layout_height="wrap_content"
     android:layout_gravity="left|top"
     android:layout_margin="12dp"
-    android:src="@drawable/co6_u_logo"/>
+    android:src="@drawable/ic_launcher"/>
diff --git a/app/universal/release/app-universal-release.apk b/app/universal/release/app-universal-release.apk
diff --git a/app/universal/release/output.json b/app/universal/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3010,"versionName":"3.0.0-OPEN-BETA-1","enabled":true,"outputFile":"app-universal-release.apk","fullName":"universalRelease","baseName":"universal-release"},"path":"app-universal-release.apk","properties":{}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":3020,"versionName":"3.0.0-OPEN-BETA-2","enabled":true,"outputFile":"app-universal-release.apk","fullName":"universalRelease","baseName":"universal-release"},"path":"app-universal-release.apk","properties":{}}]