diff --git a/build.gradle b/build.gradle index fe3b9737b..d6f79eed6 100644 --- a/build.gradle +++ b/build.gradle @@ -47,7 +47,7 @@ subprojects { MariotakuCommons : '0.9.20', RestFu : '0.9.60', ObjectCursor : '0.9.21', - PlayServices : '11.4.0', + PlayServices : '11.4.2', MapsUtils : '0.5', DropboxCoreSdk : '3.0.3', GoogleDriveApi : 'v3-rev81-1.22.0', diff --git a/settings.gradle b/settings.gradle index 1386d66f4..f7b732053 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,4 +1,3 @@ include ':twidere' include ':twidere.component.common' -include ':twidere.component.nyan' -include ':twidere.wear' +include ':twidere.component.nyan' \ No newline at end of file diff --git a/twidere.wear/.gitignore b/twidere.wear/.gitignore deleted file mode 100644 index 796b96d1c..000000000 --- a/twidere.wear/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/build diff --git a/twidere.wear/build.gradle b/twidere.wear/build.gradle deleted file mode 100644 index 22ad906d1..000000000 --- a/twidere.wear/build.gradle +++ /dev/null @@ -1,47 +0,0 @@ -/* - * Twidere - Twitter client for Android - * - * Copyright (C) 2012-2015 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 { - - compileSdkVersion globalCompileSdkVersion - buildToolsVersion globalBuildToolsVersion - - defaultConfig { - applicationId "org.mariotaku.twidere" - minSdkVersion 20 - targetSdkVersion 26 - versionCode 1 - versionName "1.0" - multiDexEnabled true - } - - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_7 - targetCompatibility JavaVersion.VERSION_1_7 - } - -} - -dependencies { - compileOnly 'com.google.android.wearable:wearable:2.0.5' - implementation 'com.google.android.support:wearable:2.0.5' - implementation "com.google.android.gms:play-services-wearable:${libVersions['PlayServices']}" -} diff --git a/twidere.wear/proguard-rules.pro b/twidere.wear/proguard-rules.pro deleted file mode 100644 index bb65c6fe8..000000000 --- a/twidere.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 /Applications/Android Studio.app/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.wear/src/main/AndroidManifest.xml b/twidere.wear/src/main/AndroidManifest.xml deleted file mode 100644 index 8577ea6ff..000000000 --- a/twidere.wear/src/main/AndroidManifest.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/twidere.wear/src/main/java/org/mariotaku/twidere/extension/wear/MainActivity.java b/twidere.wear/src/main/java/org/mariotaku/twidere/extension/wear/MainActivity.java deleted file mode 100644 index a0266fc9a..000000000 --- a/twidere.wear/src/main/java/org/mariotaku/twidere/extension/wear/MainActivity.java +++ /dev/null @@ -1,24 +0,0 @@ -package org.mariotaku.twidere.extension.wear; - -import android.app.Activity; -import android.os.Bundle; -import android.support.wearable.view.WatchViewStub; -import android.widget.TextView; - -public class MainActivity extends Activity { - - private TextView mTextView; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - final WatchViewStub stub = findViewById(R.id.watch_view_stub); - stub.setOnLayoutInflatedListener(new WatchViewStub.OnLayoutInflatedListener() { - @Override - public void onLayoutInflated(WatchViewStub stub) { - mTextView = stub.findViewById(R.id.text); - } - }); - } -} diff --git a/twidere.wear/src/main/res/drawable-hdpi/ic_launcher.png b/twidere.wear/src/main/res/drawable-hdpi/ic_launcher.png deleted file mode 100644 index 55621cc10..000000000 Binary files a/twidere.wear/src/main/res/drawable-hdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.wear/src/main/res/drawable-mdpi/ic_launcher.png b/twidere.wear/src/main/res/drawable-mdpi/ic_launcher.png deleted file mode 100644 index 11ec2068b..000000000 Binary files a/twidere.wear/src/main/res/drawable-mdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.wear/src/main/res/drawable-xhdpi/ic_launcher.png b/twidere.wear/src/main/res/drawable-xhdpi/ic_launcher.png deleted file mode 100644 index 7c02b784a..000000000 Binary files a/twidere.wear/src/main/res/drawable-xhdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.wear/src/main/res/drawable-xxhdpi/ic_launcher.png b/twidere.wear/src/main/res/drawable-xxhdpi/ic_launcher.png deleted file mode 100644 index 915d91441..000000000 Binary files a/twidere.wear/src/main/res/drawable-xxhdpi/ic_launcher.png and /dev/null differ diff --git a/twidere.wear/src/main/res/layout/activity_main.xml b/twidere.wear/src/main/res/layout/activity_main.xml deleted file mode 100644 index 0d83a6897..000000000 --- a/twidere.wear/src/main/res/layout/activity_main.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - diff --git a/twidere.wear/src/main/res/layout/rect_activity_main.xml b/twidere.wear/src/main/res/layout/rect_activity_main.xml deleted file mode 100644 index 9cea89757..000000000 --- a/twidere.wear/src/main/res/layout/rect_activity_main.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - diff --git a/twidere.wear/src/main/res/layout/round_activity_main.xml b/twidere.wear/src/main/res/layout/round_activity_main.xml deleted file mode 100644 index b2eed694d..000000000 --- a/twidere.wear/src/main/res/layout/round_activity_main.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - diff --git a/twidere.wear/src/main/res/values/strings.xml b/twidere.wear/src/main/res/values/strings.xml deleted file mode 100644 index aefd24a73..000000000 --- a/twidere.wear/src/main/res/values/strings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - Twidere Wear Extension - MainActivity - Hello Round World! - Hello Square World! - -