Skip to content

Commit

Permalink
adding peach-toolbox library
Browse files Browse the repository at this point in the history
  • Loading branch information
@teebbo
teebbo committed Feb 18, 2019
1 parent 5f7fb72 commit 0869630
Show file tree
Hide file tree
Showing 15 changed files with 77 additions and 39 deletions.
Binary file modified iconvert-android/.idea/caches/build_file_checksums.ser
View file
Binary file not shown.
6 changes: 6 additions & 0 deletions iconvert-android/.idea/encodings.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions iconvert-android/.idea/gradle.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions iconvert-android/.idea/modules.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 10 additions & 29 deletions iconvert-android/app/app.iml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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/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/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/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" />
Expand All @@ -84,42 +84,21 @@
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<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/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/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/manifest-checker" />
<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/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" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 28 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
Expand All @@ -145,6 +124,7 @@
<orderEntry type="library" name="Gradle: androidx.sqlite:sqlite-framework-2.0.0" level="project" />
<orderEntry type="library" name="Gradle: androidx.vectordrawable:vectordrawable-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: androidx.legacy:legacy-support-v4-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: __local_aars__:D.\Projets\iconvert-project\iconvert\iconvert-android\app\libs\peach-toolbox-commons.jar:unspecified@jar" level="project" />
<orderEntry type="library" name="Gradle: androidx.asynclayoutinflater:asynclayoutinflater-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okhttp3:okhttp:3.12.0@jar" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: net.sf.kxml:kxml2:2.3.0@jar" level="project" />
Expand Down Expand Up @@ -184,9 +164,10 @@
<orderEntry type="library" name="Gradle: androidx.lifecycle:lifecycle-process-2.0.0" level="project" />
<orderEntry type="library" name="Gradle: androidx.cursoradapter:cursoradapter-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: com.squareup.okio:okio:1.15.0@jar" level="project" />
<orderEntry type="library" name="Gradle: artifacts:peach-toolbox-android" level="project" />
<orderEntry type="library" scope="TEST" name="Gradle: androidx.test:monitor-1.1.1" level="project" />
<orderEntry type="library" name="Gradle: androidx.print:print-1.0.0" level="project" />
<orderEntry type="library" name="Gradle: androidx.collection:collection:1.0.0@jar" level="project" />
<orderEntry type="library" name="Gradle: android-android-28" level="project" />
<orderEntry type="module" module-name="peach-toolbox-commons-0.1.0-alpha01" />
</component>
</module>
6 changes: 6 additions & 0 deletions iconvert-android/app/build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,12 @@ android {

dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')

// peach-toolbox-commons
implementation project(':peach-toolbox-commons-0.1.0-alpha01')
// peach-toolbox-android
implementation project(':peach-toolbox-android')

// android support
implementation deps.support.app_compat
implementation deps.constraint_layout
Expand Down
Binary file added iconvert-android/app/libs/peach-toolbox-commons.jar
View file
Binary file not shown.
40 changes: 36 additions & 4 deletions ...roid/app/src/main/java/com/kimboofactory/iconvert/persistence/api/OpenXchangeRateAPI.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
package com.kimboofactory.iconvert.persistence.api;

import com.aleengo.peach.toolbox.commons.net.OkHttpSingleton;
import com.aleengo.peach.toolbox.commons.net.PeachRequest;
import com.kimboofactory.iconvert.net.KFYRequest;
import com.kimboofactory.iconvert.util.SingletonUtil;

import okhttp3.Callback;
import okhttp3.Dispatcher;
import okhttp3.OkHttpClient;

/**
* Created by CK_ALEENGO on 13/02/2019.
Expand All @@ -16,19 +20,47 @@ public class OpenXchangeRateAPI {
public static final String CURRENCIES_END_POINT = "currencies.json";

private static OpenXchangeRateAPI instance;
private static OkHttpClient client;

private OpenXchangeRateAPI() {
client = configureClient();
}

private static class LazyHolder {
private static final OpenXchangeRateAPI INSTANCE = new OpenXchangeRateAPI();
}

public static OpenXchangeRateAPI getInstance() {
instance = SingletonUtil.getInstance(OpenXchangeRateAPI.class, instance);
return instance;
return LazyHolder.INSTANCE;
}


public void getCurrencies(Callback callback) {
final KFYRequest request = KFYRequest.builder()
/*final KFYRequest request = KFYRequest.builder()
.baseUrl(BASE_URL)
.endpoint(CURRENCIES_END_POINT)
.build();*/

final PeachRequest request = new PeachRequest.Builder()
.client(client)
.baseUrl(BASE_URL)
.build();

request.execute(callback);
//request.execute(callback);
request.get(CURRENCIES_END_POINT, callback);
request.get(RATE_END_POINT, callback);


}

private OkHttpClient configureClient() {
final Dispatcher dispatcher = new Dispatcher();
dispatcher.setMaxRequests(5);

return OkHttpSingleton.getInstance()
.getClient()
.newBuilder()
.dispatcher(dispatcher)
.build();
}
}
9 changes: 7 additions & 2 deletions ...droid/app/src/main/java/com/kimboofactory/iconvert/persistence/local/LocalDataSource.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,14 @@ public class LocalDataSource implements DataSource {
private LocalDataSource() {
}

private static class LazyHolder {
private static final LocalDataSource INSTANCE = new LocalDataSource();
}

public static LocalDataSource getInstance() {
instance = SingletonUtil.getInstance(LocalDataSource.class, instance);
return instance;
/*instance = SingletonUtil.getInstance(LocalDataSource.class, instance);
return instance;*/
return LazyHolder.INSTANCE;
}

@Override
Expand Down
6 changes: 3 additions & 3 deletions ...p/src/main/java/com/kimboofactory/iconvert/persistence/repository/CurrencyRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,7 @@ public CurrencyRepository(LocalDataSource localDataSource, RemoteDataSource remo

@Override
public void find(final String query, SearchCallback callback) {
if (!localDataSource.isEmpty()) {
localDataSource.getCurrencies(null);
} else {
if (localDataSource.isEmpty()) {
remoteDataSource.getCurrencies((error, currencies) -> {
final Result<String> result =
new Result<>(Optional.ofNullable(error), Optional.ofNullable(currencies));
Expand All @@ -37,6 +35,8 @@ public void find(final String query, SearchCallback callback) {
localDataSource.saveAll(new ArrayList<>());
}
});
} else {
localDataSource.getCurrencies(null);
}
}
}
2 changes: 2 additions & 0 deletions iconvert-android/peach-toolbox-android/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
configurations.maybeCreate("default")
artifacts.add("default", file('peach-toolbox-android-0.1.0-alpha01.aar'))
Binary file added iconvert-android/peach-toolbox-android/peach-toolbox-android-0.1.0-alpha01.aar
View file
Binary file not shown.
2 changes: 2 additions & 0 deletions iconvert-android/peach-toolbox-commons-0.1.0-alpha01/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
configurations.maybeCreate("default")
artifacts.add("default", file('peach-toolbox-commons-0.1.0-alpha01.jar'))
Binary file added iconvert-android/peach-toolbox-commons-0.1.0-alpha01/peach-toolbox-commons-0.1.0-alpha01.jar
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion iconvert-android/settings.gradle
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
include ':app'
include ':app', ':peach-toolbox-android', ':peach-toolbox-commons-0.1.0-alpha01'

0 comments on commit 0869630

Please sign in to comment.