Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add Chinese language support in general setting. #34

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Add Chinese language support in general setting. #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
ca033aa
Upgrade gradle and 3rd party repositories to up-to-date.
Jul 25, 2017
0305bcc
Add Chinese language support in general setting.
Jul 25, 2017
01222b7
Modify configuration to pass travis-ci check.
Jul 26, 2017
03dff31
Fix swipe refresh layout doesn't display in some case.
Jul 26, 2017
d8b016a
Upgrade gradle and 3rd party repositories to up-to-date.
Dec 6, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android:
- tools
- tools
- platfom-tools
- build-tools-25.0.2
- build-tools-26.0.1
- android-25
- extra-android-m2repository
licenses:
Expand Down
35 changes: 13 additions & 22 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion '25.0.2'
compileSdkVersion 26
defaultConfig {
applicationId "org.asdtm.goodweather"
minSdkVersion 14
targetSdkVersion 25
targetSdkVersion 26
versionCode 13
versionName "4.4"
vectorDrawables.useSupportLibrary = true
Expand All @@ -15,22 +14,14 @@ android {
release {
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
applicationVariants.all { variant ->
variant.outputs.each { output ->
output.outputFile = new File(
output.outputFile.parent,
output.outputFile.name.replace("app-release.apk", "GoodWeather-release-${variant.versionName}.apk"))
}
}
}
debug {
minifyEnabled false
applicationVariants.all { variant ->
variant.outputs.each { output ->
output.outputFile = new File(
output.outputFile.parent,
output.outputFile.name.replace("app-debug.apk", "GoodWeather-debug-${variant.versionName}.apk"))
}
}

applicationVariants.all { variant ->
variant.outputs.all { output ->
outputFileName = "GoodWeather-${variant.buildType.name}-${variant.versionName}" + ".apk"
}
}
}
Expand All @@ -42,12 +33,12 @@ android {

dependencies {
compile fileTree(include: ['*.jar'], dir: 'libs')
compile 'com.android.support:appcompat-v7:25.3.1'
compile 'com.android.support:design:25.3.1'
compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.android.support:support-v4:25.3.1'
compile 'com.android.support:appcompat-v7:26.1.0'
compile 'com.android.support:design:26.1.0'
compile 'com.android.support:cardview-v7:26.1.0'
compile 'com.android.support:support-v4:26.1.0'
testCompile 'junit:junit:4.12'
compile 'com.google.code.gson:gson:2.6.2'
compile 'com.github.PhilJay:MPAndroidChart:v3.0.0-beta1'
compile 'com.google.code.gson:gson:2.8.0'
compile 'com.github.PhilJay:MPAndroidChart:v3.0.2'
compile 'com.android.support.constraint:constraint-layout:1.0.2'
}
12 changes: 6 additions & 6 deletions app/src/main/java/org/asdtm/goodweather/GraphsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@
import org.asdtm.goodweather.utils.CustomValueFormatter;
import org.asdtm.goodweather.utils.LanguageUtil;
import org.asdtm.goodweather.utils.PreferenceUtil;
import org.asdtm.goodweather.utils.XAxisValueFormatter;
import org.asdtm.goodweather.utils.Utils;
import org.asdtm.goodweather.utils.XAxisValueFormatter;
import org.asdtm.goodweather.utils.YAxisValueFormatter;
import org.json.JSONArray;
import org.json.JSONException;
Expand All @@ -50,8 +50,8 @@

public class GraphsActivity extends BaseActivity {

private ConnectionDetector mConnectionDetector;
public List<WeatherForecast> mForecastList;
private ConnectionDetector mConnectionDetector;
private LineChart mTemperatureChart;
private LineChart mWindChart;
private LineChart mRainChart;
Expand Down Expand Up @@ -116,7 +116,7 @@ public void handleMessage(android.os.Message msg) {
}

private void setTemperatureChart() {
mTemperatureChart.setDescription("");
//mTemperatureChart.setDescription("");
mTemperatureChart.setDrawGridBackground(false);
mTemperatureChart.setTouchEnabled(true);
mTemperatureChart.setDragEnabled(true);
Expand Down Expand Up @@ -185,7 +185,7 @@ private void setTemperatureChart() {
}

private void setWindChart() {
mWindChart.setDescription("");
//mWindChart.setDescription("");
mWindChart.setDrawGridBackground(false);
mWindChart.setTouchEnabled(true);
mWindChart.setDragEnabled(true);
Expand Down Expand Up @@ -254,7 +254,7 @@ private void setWindChart() {
}

private void setRainChart() {
mRainChart.setDescription("");
//mRainChart.setDescription("");
mRainChart.setDrawGridBackground(false);
mRainChart.setTouchEnabled(true);
mRainChart.setDragEnabled(true);
Expand Down Expand Up @@ -323,7 +323,7 @@ private void setRainChart() {
}

private void setSnowChart() {
mSnowChart.setDescription("");
//mSnowChart.setDescription("");
mSnowChart.setDrawGridBackground(false);
mSnowChart.setTouchEnabled(true);
mSnowChart.setDragEnabled(true);
Expand Down
Loading