Skip to content
This repository was archived by the owner on Jun 8, 2024. It is now read-only.

Commit

Permalink
Update dependecies
Browse files Browse the repository at this point in the history
Signed-off-by: Fung <[email protected]>
  • Loading branch information
fython committed Jun 13, 2017
1 parent c3b5f03 commit ea45e73
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 13 deletions.
9 changes: 5 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 25
buildToolsVersion "25.0.3"
compileSdkVersion 26
buildToolsVersion "26.0.0"

defaultConfig {
applicationId "info.papdt.blackblub"
minSdkVersion 21
targetSdkVersion 25
targetSdkVersion 26
versionCode 9
versionName "1.2.1"
}
Expand All @@ -28,7 +28,8 @@ android {

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
compile 'com.android.support:cardview-v7:25.3.1'
compile 'com.android.support:cardview-v7:26.0.0-beta2'
compile 'org.adw.library:discrete-seekbar:1.0.0'
compile 'org.cyanogenmod:platform.sdk:2.0'
compile 'moe.feng:AlipayZeroSdk:1.1'
}
6 changes: 3 additions & 3 deletions app/src/main/java/info/papdt/blackblub/ui/LaunchActivity.java
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ protected void onCreate(Bundle savedInstanceState) {

}

mSwitch = (MaterialAnimatedSwitch) findViewById(R.id.toggle);
mSwitch = findViewById(R.id.toggle);
mSwitch.setOnCheckedChangeListener(new MaterialAnimatedSwitch.OnCheckedChangeListener() {
@Override
public void onCheckedChanged(boolean b) {
Expand Down Expand Up @@ -167,7 +167,7 @@ public void onStopTrackingTouch(DiscreteSeekBar seekBar) {
}
});

mModeText = (TextView) findViewById(R.id.mode_view);
mModeText = findViewById(R.id.mode_view);
int mode = mNightScreenSettings.getInt(NightScreenSettings.KEY_MODE, C.MODE_NO_PERMISSION);
mModeText.setText(getResources().getStringArray(R.array.mode_text)[mode]
+ ((mode == C.MODE_NO_PERMISSION && Build.VERSION.SDK_INT >= Build.VERSION_CODES.N)
Expand Down Expand Up @@ -229,7 +229,7 @@ public void onClick(DialogInterface dialogInterface, int i) {
}
});

ImageButton menuBtn = (ImageButton) findViewById(R.id.btn_menu);
ImageButton menuBtn = findViewById(R.id.btn_menu);
popupMenu = new PopupMenu(this, menuBtn);
popupMenu.getMenuInflater().inflate(R.menu.menu_settings, popupMenu.getMenu());
popupMenu.getMenu()
Expand Down
10 changes: 4 additions & 6 deletions build.gradle
Original file line number Diff line number Diff line change
@@ -1,20 +1,18 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.

buildscript {
repositories {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.1.3'

// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
classpath 'com.android.tools.build:gradle:2.2.3'
}
}

allprojects {
repositories {
jcenter()
mavenCentral()
maven { url "https://jitpack.io" }
maven { url "https://maven.google.com" }
}
}

Expand Down

0 comments on commit ea45e73

Please sign in to comment.