diff --git a/settings.gradle b/settings.gradle index 5a0cacc22..b14cc8409 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,5 @@ include ':twidere' include ':twidere.component.common' +include ':twidere.component.nyan' include ':twidere.library.extension' include ':twidere.wear' -include ':twidere.donate.nyanwp' -include ':twidere.donate.nyanwp.wear' -include ':twidere.component.nyan' \ No newline at end of file diff --git a/twidere.donate.nyanwp.wear/.gitignore b/twidere.donate.nyanwp.wear/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/twidere.donate.nyanwp.wear/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/twidere.donate.nyanwp.wear/build.gradle b/twidere.donate.nyanwp.wear/build.gradle deleted file mode 100644 index 8cefe0197..000000000 --- a/twidere.donate.nyanwp.wear/build.gradle +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2014 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -apply plugin: 'com.android.application' - -android { - defaultConfig { - applicationId "org.mariotaku.twidere.donate.nyanwp" - minSdkVersion 20 - targetSdkVersion 25 - versionCode 1 - versionName "1.0" - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} - -dependencies { - compile 'com.google.android.support:wearable:1.4.0' - compile project(':twidere.component.nyan') - compile fileTree(dir: 'libs', include: ['*.jar']) -} diff --git a/twidere.donate.nyanwp.wear/proguard-rules.pro b/twidere.donate.nyanwp.wear/proguard-rules.pro deleted file mode 100644 index ee5b46f04..000000000 --- a/twidere.donate.nyanwp.wear/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/mariotaku/Tools/android-sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/twidere.donate.nyanwp.wear/src/main/AndroidManifest.xml b/twidere.donate.nyanwp.wear/src/main/AndroidManifest.xml deleted file mode 100644 index 663bc09f4..000000000 --- a/twidere.donate.nyanwp.wear/src/main/AndroidManifest.xml +++ /dev/null @@ -1,46 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/twidere.donate.nyanwp.wear/src/main/java/org/mariotaku/twidere/donate/nyanwp/NyanActivity.java b/twidere.donate.nyanwp.wear/src/main/java/org/mariotaku/twidere/donate/nyanwp/NyanActivity.java deleted file mode 100644 index 55d39318f..000000000 --- a/twidere.donate.nyanwp.wear/src/main/java/org/mariotaku/twidere/donate/nyanwp/NyanActivity.java +++ /dev/null @@ -1,44 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2014 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.donate.nyanwp; - -import android.app.Activity; -import android.os.Bundle; -import android.support.wearable.view.WatchViewStub; -import android.support.wearable.view.WatchViewStub.OnLayoutInflatedListener; - -import org.mariotaku.twidere.nyan.NyanDaydreamView; - -public class NyanActivity extends Activity implements OnLayoutInflatedListener { - - @Override - public void onLayoutInflated(WatchViewStub watchViewStub) { - final NyanDaydreamView nyanView = (NyanDaydreamView) watchViewStub.findViewById(R.id.nyan_view); - nyanView.setScale(getResources().getInteger(R.integer.default_live_wallpaper_scale)); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_nyan); - final WatchViewStub stub = (WatchViewStub) findViewById(R.id.watch_view_stub); - stub.setOnLayoutInflatedListener(this); - } -} diff --git a/twidere.donate.nyanwp.wear/src/main/res/drawable-hdpi/ic_launcher.png b/twidere.donate.nyanwp.wear/src/main/res/drawable-hdpi/ic_launcher.png deleted file mode 100755 index 09b2de4b2..000000000 Binary files a/twidere.donate.nyanwp.wear/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.donate.nyanwp.wear/src/main/res/drawable-mdpi/ic_launcher.png b/twidere.donate.nyanwp.wear/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100755 index 29d52d1b8..000000000 Binary files a/twidere.donate.nyanwp.wear/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.donate.nyanwp.wear/src/main/res/drawable-xhdpi/ic_launcher.png b/twidere.donate.nyanwp.wear/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100755 index 2cd6045e3..000000000 Binary files a/twidere.donate.nyanwp.wear/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.donate.nyanwp.wear/src/main/res/drawable-xxhdpi/ic_launcher.png b/twidere.donate.nyanwp.wear/src/main/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100755 index 7079aa91d..000000000 Binary files a/twidere.donate.nyanwp.wear/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.donate.nyanwp.wear/src/main/res/drawable-xxxhdpi/ic_launcher.png b/twidere.donate.nyanwp.wear/src/main/res/drawable-xxxhdpi/ic_launcher.png deleted file mode 100755 index b4d69c78a..000000000 Binary files a/twidere.donate.nyanwp.wear/src/main/res/drawable-xxxhdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.donate.nyanwp.wear/src/main/res/layout/activity_nyan.xml b/twidere.donate.nyanwp.wear/src/main/res/layout/activity_nyan.xml deleted file mode 100644 index 1c23a9281..000000000 --- a/twidere.donate.nyanwp.wear/src/main/res/layout/activity_nyan.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - diff --git a/twidere.donate.nyanwp.wear/src/main/res/layout/rect_activity_nyan.xml b/twidere.donate.nyanwp.wear/src/main/res/layout/rect_activity_nyan.xml deleted file mode 100644 index 571a5cccf..000000000 --- a/twidere.donate.nyanwp.wear/src/main/res/layout/rect_activity_nyan.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - \ No newline at end of file diff --git a/twidere.donate.nyanwp.wear/src/main/res/layout/round_activity_nyan.xml b/twidere.donate.nyanwp.wear/src/main/res/layout/round_activity_nyan.xml deleted file mode 100644 index 78cc70d0e..000000000 --- a/twidere.donate.nyanwp.wear/src/main/res/layout/round_activity_nyan.xml +++ /dev/null @@ -1,28 +0,0 @@ - - - - \ No newline at end of file diff --git a/twidere.donate.nyanwp.wear/src/main/res/values/strings.xml b/twidere.donate.nyanwp.wear/src/main/res/values/strings.xml deleted file mode 100644 index 90708bd82..000000000 --- a/twidere.donate.nyanwp.wear/src/main/res/values/strings.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - twidere.donate.nyanwp.wear - Hello Round World! - Hello Square World! - - diff --git a/twidere.donate.nyanwp.wear/web_hi_res_512.png b/twidere.donate.nyanwp.wear/web_hi_res_512.png deleted file mode 100755 index ccc62926c..000000000 Binary files a/twidere.donate.nyanwp.wear/web_hi_res_512.png and /dev/null differ diff --git a/twidere.donate.nyanwp/.gitignore b/twidere.donate.nyanwp/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/twidere.donate.nyanwp/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/twidere.donate.nyanwp/build.gradle b/twidere.donate.nyanwp/build.gradle deleted file mode 100644 index 511cf80db..000000000 --- a/twidere.donate.nyanwp/build.gradle +++ /dev/null @@ -1,40 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2014 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -apply plugin: 'com.android.application' - -android { - defaultConfig { - applicationId "org.mariotaku.twidere.donate.nyanwp" - minSdkVersion 14 - targetSdkVersion 25 - versionCode 3 - versionName "1.2" - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } -} - -dependencies { - wearApp project(':twidere.donate.nyanwp.wear') - compile project(':twidere.component.nyan') - compile fileTree(dir: 'libs', include: ['*.jar']) -} diff --git a/twidere.donate.nyanwp/ic_launcher-web.png b/twidere.donate.nyanwp/ic_launcher-web.png deleted file mode 100644 index a9b0a840f..000000000 Binary files a/twidere.donate.nyanwp/ic_launcher-web.png and /dev/null differ diff --git a/twidere.donate.nyanwp/proguard-rules.pro b/twidere.donate.nyanwp/proguard-rules.pro deleted file mode 100644 index ee5b46f04..000000000 --- a/twidere.donate.nyanwp/proguard-rules.pro +++ /dev/null @@ -1,17 +0,0 @@ -# Add project specific ProGuard rules here. -# By default, the flags in this file are appended to flags specified -# in /Users/mariotaku/Tools/android-sdk/tools/proguard/proguard-android.txt -# You can edit the include path and order by changing the proguardFiles -# directive in build.gradle. -# -# For more details, see -# http://developer.android.com/guide/developing/tools/proguard.html - -# Add any project specific keep options here: - -# If your project uses WebView with JS, uncomment the following -# and specify the fully qualified class name to the JavaScript interface -# class: -#-keepclassmembers class fqcn.of.javascript.interface.for.webview { -# public *; -#} diff --git a/twidere.donate.nyanwp/src/androidTest/java/org/mariotaku/twidere/donate/nyanwp/ApplicationTest.java b/twidere.donate.nyanwp/src/androidTest/java/org/mariotaku/twidere/donate/nyanwp/ApplicationTest.java deleted file mode 100644 index b56626471..000000000 --- a/twidere.donate.nyanwp/src/androidTest/java/org/mariotaku/twidere/donate/nyanwp/ApplicationTest.java +++ /dev/null @@ -1,32 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2014 Mariotaku Lee - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -package org.mariotaku.twidere.donate.nyanwp; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/twidere.donate.nyanwp/src/main/AndroidManifest.xml b/twidere.donate.nyanwp/src/main/AndroidManifest.xml deleted file mode 100644 index 1bf72807f..000000000 --- a/twidere.donate.nyanwp/src/main/AndroidManifest.xml +++ /dev/null @@ -1,38 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/twidere.donate.nyanwp/src/main/res/drawable-hdpi/ic_launcher.png b/twidere.donate.nyanwp/src/main/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 96a442e5b..000000000 Binary files a/twidere.donate.nyanwp/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.donate.nyanwp/src/main/res/drawable-mdpi/ic_launcher.png b/twidere.donate.nyanwp/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 359047dfa..000000000 Binary files a/twidere.donate.nyanwp/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.donate.nyanwp/src/main/res/drawable-nodpi/nyan_sakamoto_thumbnail_bitmap.png b/twidere.donate.nyanwp/src/main/res/drawable-nodpi/nyan_sakamoto_thumbnail_bitmap.png deleted file mode 100644 index 37dae3fe4..000000000 Binary files a/twidere.donate.nyanwp/src/main/res/drawable-nodpi/nyan_sakamoto_thumbnail_bitmap.png and /dev/null differ diff --git a/twidere.donate.nyanwp/src/main/res/drawable-xhdpi/ic_launcher.png b/twidere.donate.nyanwp/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 71c6d760f..000000000 Binary files a/twidere.donate.nyanwp/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.donate.nyanwp/src/main/res/drawable-xxhdpi/ic_launcher.png b/twidere.donate.nyanwp/src/main/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 4df189464..000000000 Binary files a/twidere.donate.nyanwp/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.donate.nyanwp/src/main/res/drawable/nyan_sakamoto_thumbnail.xml b/twidere.donate.nyanwp/src/main/res/drawable/nyan_sakamoto_thumbnail.xml deleted file mode 100644 index 0b89d80a6..000000000 --- a/twidere.donate.nyanwp/src/main/res/drawable/nyan_sakamoto_thumbnail.xml +++ /dev/null @@ -1,6 +0,0 @@ - - diff --git a/twidere.donate.nyanwp/src/main/res/values-land/integers.xml b/twidere.donate.nyanwp/src/main/res/values-land/integers.xml deleted file mode 100644 index 36fa42641..000000000 --- a/twidere.donate.nyanwp/src/main/res/values-land/integers.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 5 - 17 - - \ No newline at end of file diff --git a/twidere.donate.nyanwp/src/main/res/values-large-land/integers.xml b/twidere.donate.nyanwp/src/main/res/values-large-land/integers.xml deleted file mode 100644 index ae7d093b6..000000000 --- a/twidere.donate.nyanwp/src/main/res/values-large-land/integers.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 8 - 23 - - \ No newline at end of file diff --git a/twidere.donate.nyanwp/src/main/res/values-large/integers.xml b/twidere.donate.nyanwp/src/main/res/values-large/integers.xml deleted file mode 100644 index 2f9e84b85..000000000 --- a/twidere.donate.nyanwp/src/main/res/values-large/integers.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - 10 - 13 - 2 - - \ No newline at end of file diff --git a/twidere.donate.nyanwp/src/main/res/values-xlarge-land/integers.xml b/twidere.donate.nyanwp/src/main/res/values-xlarge-land/integers.xml deleted file mode 100644 index 3dd392f11..000000000 --- a/twidere.donate.nyanwp/src/main/res/values-xlarge-land/integers.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - 13 - 31 - - \ No newline at end of file diff --git a/twidere.donate.nyanwp/src/main/res/values-xlarge/integers.xml b/twidere.donate.nyanwp/src/main/res/values-xlarge/integers.xml deleted file mode 100644 index f30cdcfdc..000000000 --- a/twidere.donate.nyanwp/src/main/res/values-xlarge/integers.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - 15 - 19 - 3 - - \ No newline at end of file diff --git a/twidere.donate.nyanwp/src/main/res/values/colors.xml b/twidere.donate.nyanwp/src/main/res/values/colors.xml deleted file mode 100644 index ce34fda39..000000000 --- a/twidere.donate.nyanwp/src/main/res/values/colors.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - #003366 - - \ No newline at end of file diff --git a/twidere.donate.nyanwp/src/main/res/values/integers.xml b/twidere.donate.nyanwp/src/main/res/values/integers.xml deleted file mode 100644 index 2d89b6636..000000000 --- a/twidere.donate.nyanwp/src/main/res/values/integers.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - 8 - 11 - 1 - - \ No newline at end of file diff --git a/twidere.donate.nyanwp/src/main/res/values/strings.xml b/twidere.donate.nyanwp/src/main/res/values/strings.xml deleted file mode 100644 index 2075de25b..000000000 --- a/twidere.donate.nyanwp/src/main/res/values/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - Twidere Donate Live Wallpaper - Twidere Donate Wallpaper - Twidere Donate Daydream - - diff --git a/twidere.donate.nyanwp/src/main/res/values/styles.xml b/twidere.donate.nyanwp/src/main/res/values/styles.xml deleted file mode 100644 index d98a53a8a..000000000 --- a/twidere.donate.nyanwp/src/main/res/values/styles.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - diff --git a/twidere.donate.nyanwp/src/main/res/xml/nyan_wallpaper.xml b/twidere.donate.nyanwp/src/main/res/xml/nyan_wallpaper.xml deleted file mode 100644 index 58df3aab3..000000000 --- a/twidere.donate.nyanwp/src/main/res/xml/nyan_wallpaper.xml +++ /dev/null @@ -1,3 +0,0 @@ - - diff --git a/twidere/build.gradle b/twidere/build.gradle index 3bd92b031..44b5e6658 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -34,8 +34,8 @@ android { applicationId "org.mariotaku.twidere" minSdkVersion 14 targetSdkVersion 25 - versionCode 275 - versionName '3.4.13' + versionCode 276 + versionName '3.4.14' multiDexEnabled true buildConfigField 'boolean', 'LEAK_CANARY_ENABLED', 'Boolean.parseBoolean("true")'