Skip to content

Commit dde099a

Browse files
seventhmoonseventhmoon
committed
clean up
1 parent 25347b1 commit dde099a

File tree

9 files changed

+104
-112
lines changed

9 files changed

+104
-112
lines changed

‎app/app.iml

Lines changed: 47 additions & 82 deletions
Large diffs are not rendered by default.

‎app/build.gradle

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,16 +30,12 @@ dependencies {
3030
compile fileTree(include: ['*.jar'], dir: 'libs')
3131
testCompile 'junit:junit:4.12'
3232
compile project(':library')
33-
compile 'com.android.support:appcompat-v7:25.1.1'
34-
compile 'com.android.support:design:25.1.1'
35-
compile 'com.android.support:support-annotations:25.1.1'
33+
compile 'com.android.support:appcompat-v7:25.3.0'
34+
compile 'com.android.support:design:25.3.0'
35+
compile 'com.android.support:support-annotations:25.3.0'
3636
compile 'com.android.volley:volley:1.0.0'
37-
compile 'com.android.support:support-annotations:25.1.1'
38-
compile 'com.android.support:cardview-v7:25.1.1'
39-
compile 'com.android.support:gridlayout-v7:25.1.1'
40-
compile 'com.google.android.gms:play-services-maps:10.0.1'
41-
compile 'com.google.firebase:firebase-core:10.0.1'
42-
compile 'com.google.firebase:firebase-crash:10.0.1'
37+
compile 'com.android.support:cardview-v7:25.3.0'
38+
compile 'com.android.support:gridlayout-v7:25.3.0'
39+
4340
compile 'com.squareup.okhttp3:okhttp:3.4.2'
4441
}
45-
apply plugin: 'com.google.gms.google-services'

‎app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,8 @@
1010
android:supportsRtl="true"
1111
android:theme="@style/AppTheme"
1212
android:usesCleartextTraffic="true"
13-
tools:ignore="UnusedAttribute">
13+
tools:ignore="UnusedAttribute"
14+
android:fullBackupContent="@xml/backup_descriptor">
1415
<activity
1516
android:name=".MainActivity"
1617
android:label="@string/app_name"

‎app/src/main/java/com/androidfung/geoip/MainActivity.java

Lines changed: 28 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,16 @@
44
import android.os.Bundle;
55
import android.support.v7.app.AppCompatActivity;
66
import android.support.v7.widget.Toolbar;
7-
import android.util.Log;
87
import android.view.Menu;
98
import android.view.MenuItem;
109
import android.widget.Toast;
1110

12-
import com.android.volley.Response;
13-
import com.android.volley.VolleyError;
14-
import com.android.volley.toolbox.Volley;
15-
import com.androidfung.geoip.api.ApiManager;
1611
import com.androidfung.geoip.databinding.ActivityMainBinding;
1712
import com.androidfung.geoip.model.GeoIpResponseModel;
1813

14+
import retrofit2.Call;
15+
import retrofit2.Callback;
16+
1917

2018
public class MainActivity extends AppCompatActivity {
2119

@@ -31,23 +29,37 @@ protected void onCreate(Bundle savedInstanceState) {
3129

3230
// final TextView textViewInfo = (TextView) findViewById(R.id.textview_info);
3331

34-
ApiManager apiManager = new ApiManager(Volley.newRequestQueue(this));
35-
apiManager.getGeoIpInfo(new Response.Listener<GeoIpResponseModel>() {
32+
IpApiService ipApiService = ServicesManager.getGeoIpService();
33+
34+
ipApiService.getGeoIp().enqueue(new Callback<GeoIpResponseModel>() {
3635
@Override
37-
public void onResponse(GeoIpResponseModel response) {
38-
Log.d(TAG, String.valueOf(response==null));
39-
// textViewInfo.setText(response.toString());
40-
binding.setResponse(response);
41-
// binding.setVariable("response", response);
36+
public void onResponse(Call<GeoIpResponseModel> call, retrofit2.Response<GeoIpResponseModel> response) {
37+
binding.setResponse(response.body());
4238
}
43-
}, new Response.ErrorListener() {
39+
4440
@Override
45-
public void onErrorResponse(VolleyError error) {
46-
// textViewInfo.setText(error.toString());
47-
Toast.makeText(getApplicationContext(), error.toString(), Toast.LENGTH_SHORT).show();
41+
public void onFailure(Call<GeoIpResponseModel> call, Throwable t) {
42+
Toast.makeText(getApplicationContext(), t.toString(), Toast.LENGTH_SHORT).show();
4843
}
4944
});
5045

46+
// ApiManager apiManager = new ApiManager(Volley.newRequestQueue(this));
47+
// apiManager.getGeoIpInfo(new Response.Listener<GeoIpResponseModel>() {
48+
// @Override
49+
// public void onResponse(GeoIpResponseModel response) {
50+
// Log.d(TAG, String.valueOf(response==null));
51+
//// textViewInfo.setText(response.toString());
52+
// binding.setResponse(response);
53+
//// binding.setVariable("response", response);
54+
// }
55+
// }, new Response.ErrorListener() {
56+
// @Override
57+
// public void onErrorResponse(VolleyError error) {
58+
//// textViewInfo.setText(error.toString());
59+
// Toast.makeText(getApplicationContext(), error.toString(), Toast.LENGTH_SHORT).show();
60+
// }
61+
// });
62+
5163
}
5264

5365
@Override

‎app/src/main/res/layout/activity_main.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030

3131
</android.support.design.widget.AppBarLayout>
3232

33+
<!--suppress AndroidUnknownAttribute -->
3334
<include layout="@layout/content_main" bind:response="@{response}"/>
3435

3536
</android.support.design.widget.CoordinatorLayout>

‎app/src/main/res/xml/backup_descriptor.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<full-backup-content>
3+
<!-- Exclude specific shared preferences that contain GCM registration Id -->
4+
</full-backup-content>

‎library/library.iml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,13 +77,21 @@
7777
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
7878
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
7979
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
80+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8081
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
82+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8183
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
84+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
85+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
8286
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/lint" />
8387
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
88+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
8489
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
8590
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
91+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
92+
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
8693
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
94+
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
8795
</content>
8896
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
8997
<orderEntry type="sourceFolder" forTests="false" />

‎library/src/main/java/com/androidfung/geoip/ServicesManager.java

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.androidfung.geoip;
22

33
import retrofit2.Retrofit;
4+
import retrofit2.converter.gson.GsonConverterFactory;
45

56
/**
67
* Created by funglam on 3/16/17.
@@ -11,7 +12,11 @@ public class ServicesManager {
1112

1213
private static final String BASE_URL = "http://ip-api.com/";
1314

14-
public IpApiService getGeoIpService(){
15-
return new Retrofit.Builder().baseUrl(BASE_URL).build().create(IpApiService.class);
15+
public static IpApiService getGeoIpService(){
16+
return new Retrofit.Builder()
17+
.baseUrl(BASE_URL)
18+
.addConverterFactory(GsonConverterFactory.create())
19+
.build()
20+
.create(IpApiService.class);
1621
}
1722
}

‎library/src/main/java/com/androidfung/geoip/api/ApiManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ public void getGeoIpInfo(Response.Listener<GeoIpResponseModel> listener, Respons
4040

4141

4242
private static String toUrlParams(Map<String, String> params) {
43-
StringBuffer sb = new StringBuffer();
43+
StringBuilder sb = new StringBuilder();
4444
for (String key : params.keySet()) {
4545
try {
4646
sb.append("&").append(key).append("=").append(URLEncoder.encode(params.get(key), "utf-8"));

0 commit comments

Comments
 (0)