Skip to content

Commit

Permalink
Updated build scripts and resources.
Browse files Browse the repository at this point in the history
  • Loading branch information
yfwz100 committed Jun 17, 2015
1 parent 9358e53 commit c346cab
Show file tree
Hide file tree
Showing 13 changed files with 10 additions and 23 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ apply plugin: 'com.android.application'

android {
compileSdkVersion 21
buildToolsVersion "21.1.1"
buildToolsVersion "21.1.2"

defaultConfig {
applicationId "maxon.guessnumber"
Expand All @@ -21,5 +21,5 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:appcompat-v7:21.0.2'
compile 'com.android.support:appcompat-v7:22.2.0'
}
Binary file modified app/src/main/ic_launcher-web.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions app/src/main/java/maxon/guessnumber/GuessNumberActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import android.app.AlertDialog;
import android.content.DialogInterface;
import android.os.Bundle;
import android.support.v7.app.ActionBarActivity;
import android.support.v7.app.AppCompatActivity;
import android.view.KeyEvent;
import android.view.LayoutInflater;
import android.view.Menu;
Expand All @@ -19,7 +19,7 @@
*
* @author yfwz100
*/
public class GuessNumberActivity extends ActionBarActivity {
public class GuessNumberActivity extends AppCompatActivity {

// UI components.
private TextView[] numberTextViews;
Expand Down
12 changes: 0 additions & 12 deletions app/src/main/res/anim/number_translation.xml

This file was deleted.

Binary file modified app/src/main/res/drawable-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 1 addition & 2 deletions app/src/main/res/layout/dialog_about.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,11 @@

<ImageView
android:id="@+id/logo"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentLeft="false"
android:layout_alignParentStart="false"
android:layout_alignParentTop="false"
android:layout_centerInParent="true"
android:layout_gravity="center"
android:layout_margin="@dimen/activity_horizontal_margin"
android:adjustViewBounds="false"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/menu/menu_guess_number.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
tools:context=".GuessNumberActivity">
<item
android:id="@+id/action_show_formula"
android:icon="@android:drawable/ic_lock_lock"
android:icon="@android:drawable/ic_menu_info_details"
android:orderInCategory="100"
android:title="@string/action_show_formula"
app:showAsAction="ifRoom" />
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/values-zh/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<string name="action_show_formula">显示公式</string>
<string name="show_formula_title">公式…</string>
<string name="logo_description">图标</string>
<string name="about_copyright">Copyright © 2014</string>
<string name="about_copyright">Copyright © 2014 重庆旭恒天辰信息技术有限公司</string>
<string name="guess_number_hint">下一个数字…</string>

</resources>
4 changes: 2 additions & 2 deletions app/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

<string name="app_name">Guess Number</string>
<string name="action_settings">Settings</string>
<string name="guess_number_title">Guess the next number...</string>
<string name="guess_number_title">Guess the next number</string>
<string name="action_next_numbers">Next numbers</string>
<string name="action_about">About</string>
<string name="about_title">About</string>
Expand All @@ -19,6 +19,6 @@
<string name="action_show_formula">Show formula</string>
<string name="show_formula_title">The formula…</string>
<string name="logo_description">The logo</string>
<string name="about_copyright">Copyright © 2014</string>
<string name="about_copyright">Copyright © 2014 www.cqxhtc.com</string>
<string name="guess_number_hint">The next number…</string>
</resources>
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:1.0.0'
classpath 'com.android.tools.build:gradle:1.2.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
Expand Down

0 comments on commit c346cab

Please sign in to comment.