Skip to content

Commit 7c996e5

Browse files
committed
change build-tool
1 parent 7de8477 commit 7c996e5

File tree

7 files changed

+14
-19
lines changed

7 files changed

+14
-19
lines changed

MaterialSearch/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22

33
android {
44
compileSdkVersion 21
5-
buildToolsVersion "21.1.2"
5+
buildToolsVersion "23.0.2"
66

77
defaultConfig {
88
minSdkVersion 11

app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.application'
22

33
android {
44
compileSdkVersion 23
5-
buildToolsVersion "23.0.0 rc2"
5+
buildToolsVersion "23.0.2"
66

77
defaultConfig {
88
applicationId "com.quinn.githubknife"
@@ -33,7 +33,7 @@ dependencies {
3333

3434
compile 'de.hdodenhof:circleimageview:1.3.0'
3535
compile 'com.nostra13.universalimageloader:universal-image-loader:1.9.3'
36-
compile 'com.afollestad:material-dialogs:0.7.8.1'
36+
compile 'com.afollestad.material-dialogs:core:0.9.0.2'
3737
compile 'com.jaeger.statusbaruitl:library:1.0.0'
3838

3939
compile 'com.squareup.retrofit:retrofit:2.0.0-beta2'

app/src/main/java/com/quinn/githubknife/ui/activity/TrendingActivity.java

+7-12
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,9 @@
22

33
import android.content.Context;
44
import android.content.Intent;
5-
import android.content.res.Configuration;
6-
import android.support.design.widget.TabLayout;
7-
import android.support.v4.app.Fragment;
5+
import android.os.Bundle;
86
import android.support.v4.app.FragmentManager;
97
import android.support.v4.app.FragmentTransaction;
10-
import android.support.v4.util.ArrayMap;
11-
import android.support.v4.view.ViewPager;
12-
import android.os.Bundle;
138
import android.support.v7.app.AlertDialog;
149
import android.support.v7.widget.Toolbar;
1510
import android.util.Log;
@@ -23,7 +18,6 @@
2318
import com.quinn.githubknife.ui.BaseActivity;
2419
import com.quinn.githubknife.ui.adapter.FragmentPagerAdapter;
2520
import com.quinn.githubknife.ui.fragments.TrendingReposFragment;
26-
import com.quinn.githubknife.ui.fragments.TrendingUsersFragment;
2721
import com.quinn.githubknife.utils.Constants;
2822

2923
import java.io.File;
@@ -44,11 +38,10 @@ public class TrendingActivity extends BaseActivity {
4438
private String trendingRepoUrl = Constants.TRENDING_BASE_URL;
4539
private String trendingUserUrl = "";
4640
private TrendingReposFragment fragment;
47-
private final String[] languages = getResources().getStringArray(R.array.language);
48-
private final String[] urlParams = getResources().getStringArray(R.array.language_param);
49-
private static final HashMap<String, String> languageUrlMap = new HashMap<>();
50-
5141

42+
private static final HashMap<String, String> languageUrlMap = new HashMap<>();
43+
private String[] languages;
44+
private String[] urlParams;
5245

5346
@Override
5447
protected void onCreate(Bundle savedInstanceState) {
@@ -61,7 +54,8 @@ protected void onCreate(Bundle savedInstanceState) {
6154
setSupportActionBar(toolbar);
6255
getSupportActionBar().setHomeButtonEnabled(true); //设置返回键可用
6356
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
64-
57+
languages = getResources().getStringArray(R.array.language);
58+
urlParams = getResources().getStringArray(R.array.language_param);
6559
initialLanguages();
6660

6761
FragmentManager fragmentManager = getSupportFragmentManager();
@@ -72,6 +66,7 @@ protected void onCreate(Bundle savedInstanceState) {
7266
}
7367

7468
private void initialLanguages() {
69+
7570
if(languages == null || urlParams == null || languages.length != urlParams.length || languages.length == 0) {
7671
throw new IllegalStateException("You have not define languages");
7772
}

breadcrumbs/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22

33
android {
44
compileSdkVersion 22
5-
buildToolsVersion "22.0.1"
5+
buildToolsVersion "23.0.2"
66

77
defaultConfig {
88
minSdkVersion 15

httpknife/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22

33
android {
44
compileSdkVersion 22
5-
buildToolsVersion "23.0.0 rc2"
5+
buildToolsVersion "23.0.2"
66

77
defaultConfig {
88
minSdkVersion 15

iconlibrary/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apply plugin: 'com.android.library'
22

33
android {
44
compileSdkVersion 22
5-
buildToolsVersion "23.0.0 rc2"
5+
buildToolsVersion "23.0.2"
66

77
defaultConfig {
88
minSdkVersion 15

settings.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
include ':app', ':httpknife', ':iconlibrary', ':breadcrumbs', 'MaterialSearch'
1+
include ':app', ':httpknife', ':iconlibrary', ':breadcrumbs', 'MaterialSearch', ':MaterialSearch'

0 commit comments

Comments
 (0)