update the structure of the project

teebbo · Jan 25, 2019 · 3813aa8 · 3813aa8
1 parent 097b031
commit 3813aa8
Show file tree

Hide file tree

Showing 96 changed files with 1,418 additions and 483 deletions.
diff --git a/Iconvert/app/src/main/java/com/kimboo/iconvert/activity/AbstractAppCompatActivity.java b/Iconvert/app/src/main/java/com/kimboo/iconvert/activity/AbstractAppCompatActivity.java
diff --git a/Iconvert/app/src/main/java/com/kimboo/iconvert/adapter/ConvertViewPagerAdapter.java b/Iconvert/app/src/main/java/com/kimboo/iconvert/adapter/ConvertViewPagerAdapter.java
diff --git a/Iconvert/app/src/main/java/com/kimboo/iconvert/dao/devise/DeviseDao.java b/Iconvert/app/src/main/java/com/kimboo/iconvert/dao/devise/DeviseDao.java
diff --git a/Iconvert/app/src/main/java/com/kimboo/iconvert/dao/tauxchange/TauxChangeDao.java b/Iconvert/app/src/main/java/com/kimboo/iconvert/dao/tauxchange/TauxChangeDao.java
diff --git a/Iconvert/app/src/main/res/layout/activity_main.xml b/Iconvert/app/src/main/res/layout/activity_main.xml
diff --git a/Iconvert/.gitignore → iconvert-android/Iconvert/.gitignore b/Iconvert/.gitignore → iconvert-android/Iconvert/.gitignore
diff --git a/...ert/.idea/caches/build_file_checksums.ser → ...ert/.idea/caches/build_file_checksums.ser b/...ert/.idea/caches/build_file_checksums.ser → ...ert/.idea/caches/build_file_checksums.ser
diff --git a/Iconvert/.idea/codeStyles/Project.xml → ...oid/Iconvert/.idea/codeStyles/Project.xml b/Iconvert/.idea/codeStyles/Project.xml → ...oid/Iconvert/.idea/codeStyles/Project.xml
diff --git a/Iconvert/.idea/gradle.xml → iconvert-android/Iconvert/.idea/gradle.xml b/Iconvert/.idea/gradle.xml → iconvert-android/Iconvert/.idea/gradle.xml
diff --git a/Iconvert/.idea/misc.xml → iconvert-android/Iconvert/.idea/misc.xml b/Iconvert/.idea/misc.xml → iconvert-android/Iconvert/.idea/misc.xml
diff --git a/Iconvert/.idea/modules.xml → iconvert-android/Iconvert/.idea/modules.xml b/Iconvert/.idea/modules.xml → iconvert-android/Iconvert/.idea/modules.xml
diff --git a/Iconvert/.idea/runConfigurations.xml → ...roid/Iconvert/.idea/runConfigurations.xml b/Iconvert/.idea/runConfigurations.xml → ...roid/Iconvert/.idea/runConfigurations.xml
diff --git a/Iconvert/Iconvert.iml → iconvert-android/Iconvert/Iconvert.iml b/Iconvert/Iconvert.iml → iconvert-android/Iconvert/Iconvert.iml
diff --git a/Iconvert/app/.gitignore → iconvert-android/Iconvert/app/.gitignore b/Iconvert/app/.gitignore → iconvert-android/Iconvert/app/.gitignore
diff --git a/Iconvert/app/app.iml → iconvert-android/Iconvert/app/app.iml b/Iconvert/app/app.iml → iconvert-android/Iconvert/app/app.iml
@@ -23,19 +23,19 @@
     </facet>
   </component>
   <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7">
-    <output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
-    <output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
+    <output url="file://$MODULE_DIR$/build/intermediates/javac/debug/compileDebugJavaWithJavac/classes" />
+    <output-test url="file://$MODULE_DIR$/build/intermediates/javac/debugUnitTest/compileDebugUnitTestJavaWithJavac/classes" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debug/processDebugResources/r" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/generated/not_namespaced_r_class_sources/debugAndroidTest/processDebugAndroidTestResources/r" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
       <sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
@@ -49,20 +49,20 @@
       <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/res" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/resources" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/assets" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/aidl" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/androidTestDebug/shaders" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
@@ -84,29 +84,39 @@
       <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotation_processor_list" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/apk_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/build-info" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-libraries" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/check-manifest" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/checkDebugClasspath" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/compatible_screen_manifest" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javaPrecompile" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_merged_manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant_run_split_apk_resources" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/javac" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint_jar" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifest-checker" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_assets" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/merged_manifests" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/prebuild" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/processed_res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/resources" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shader_assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
-      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/splits-support" />
+      <excludeFolder url="file://$MODULE_DIR$/build/intermediates/split_list" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
       <excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
       <excludeFolder url="file://$MODULE_DIR$/build/outputs" />

diff --git a/Iconvert/app/build.gradle → iconvert-android/Iconvert/app/build.gradle b/Iconvert/app/build.gradle → iconvert-android/Iconvert/app/build.gradle
@@ -3,7 +3,7 @@ apply plugin: 'com.android.application'
 android {
     compileSdkVersion 26
     defaultConfig {
-        applicationId "com.kimboo.iconvert"
+        applicationId "com.kimboofactory.iconvert"
         minSdkVersion 24
         targetSdkVersion 26
         versionCode 1

diff --git a/Iconvert/app/proguard-rules.pro → ...t-android/Iconvert/app/proguard-rules.pro b/Iconvert/app/proguard-rules.pro → ...t-android/Iconvert/app/proguard-rules.pro
diff --git a/Iconvert/app/src/main/AndroidManifest.xml → ...Iconvert/app/src/main/AndroidManifest.xml b/Iconvert/app/src/main/AndroidManifest.xml → ...Iconvert/app/src/main/AndroidManifest.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.kimboo.iconvert">
+    xmlns:tools="http://schemas.android.com/tools"
+    package="com.kimboofactory.iconvert">
 
     <!-- Permission to access Internet -->
     <uses-permission android:name="android.permission.INTERNET" />
@@ -10,7 +11,8 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:theme="@style/AppTheme" >
+        android:theme="@style/AppTheme"
+        tools:ignore="GoogleAppIndexingWarning">
         <activity
             android:name=".activity.MainActivity"
             android:screenOrientation="portrait"
@@ -21,7 +23,7 @@
             </intent-filter>
             <meta-data
                 android:name="android.app.searchable"
-                android:resource="@xml/searchable"/>
+                android:value="@xml/searchable"/>
         </activity>
     </application>
 

diff --git a/...kimboo/iconvert/RetrieveCurrencyTask.java → ...actory/iconvert/RetrieveCurrencyTask.java b/...kimboo/iconvert/RetrieveCurrencyTask.java → ...actory/iconvert/RetrieveCurrencyTask.java
@@ -1,37 +1,19 @@
-package com.kimboo.iconvert;
+package com.kimboofactory.iconvert;
 
 import android.content.Context;
 import android.os.AsyncTask;
 import android.util.Log;
-import android.widget.TextView;
 import android.widget.Toast;
 
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.UnsupportedEncodingException;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Map;
-
-import com.kimboo.iconvert.dao.NetworkDao;
-import com.kimboo.iconvert.dao.devise.DeviseDaoImpl;
-import com.kimboo.iconvert.dao.devise.DeviseDao;
-import com.kimboo.iconvert.dao.tauxchange.TauxChangeDao;
-import com.kimboo.iconvert.dao.tauxchange.TauxChangeDaoImpl;
-import com.kimboo.iconvert.model.Devise;
-import com.kimboo.iconvert.model.TauxChange;
+import com.kimboofactory.iconvert.dao.NetworkDao;
+import com.kimboofactory.iconvert.dao.devise.DeviseDaoImpl;
+import com.kimboofactory.iconvert.dao.devise.DeviseDao;
+import com.kimboofactory.iconvert.dao.tauxchange.TauxChangeDao;
+import com.kimboofactory.iconvert.dao.tauxchange.TauxChangeDaoImpl;
 
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import javax.net.ssl.HttpsURLConnection;
-
 /**
  * Created by khranyt on 01/11/2015.
  */