diff options
| author | laco0416 <laco0416@gmail.com> | 2014-03-20 21:27:42 +0900 |
|---|---|---|
| committer | laco0416 <laco0416@gmail.com> | 2014-03-20 21:48:51 +0900 |
| commit | 6322c5c060bf3d64cebe6bc0ac76488f3f5ca63d (patch) | |
| tree | dbc2bb81522a277f3c1d5f630d758442df0ba213 | |
| parent | 30479ec62d3952264d6eb046fe6985315d88d9d5 (diff) | |
| download | SmileEssence-6322c5c060bf3d64cebe6bc0ac76488f3f5ca63d.tar.gz | |
Initialize commits
303 files changed, 1299 insertions, 14330 deletions
diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..9e4b1f6b --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +.idea +bin +gen +out +/Test Results - SmileEssenceTest.html +/local.properties +/proguard-project.txt +/SmileEssenceTest/local.properties +/SmileEssenceTest/proguard-project.txt diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6b40e351..ad6e3623 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,94 +1,29 @@ -<?xml version="1.0" encoding="utf-8" standalone="no"?> +<?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="net.miz_hi.smileessence" - android:versionCode="44" - android:versionName="@string/app_version"> - - <uses-sdk - android:minSdkVersion="14" - android:targetSdkVersion="14"/> - - <uses-permission android:name="android.permission.INTERNET"/> - <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/> - <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> + package="net.lacolaco.smileessence" + android:versionCode="1" + android:versionName="1.0"> + <uses-sdk android:minSdkVersion="14"/> + <uses-permission android:name="android.permission.INTERNET"></uses-permission> <application - android:name="net.miz_hi.smileessence.ClientApplication" - android:allowBackup="true" - android:debuggable="true" - android:icon="@drawable/app_icon" - android:label="@string/app_name" - android:theme="@style/AppTheme"> + android:label="@string/app_name" + android:name=".Application" + android:icon="@drawable/ic_launcher"> + <meta-data + android:name="AA_DB_NAME" + android:value="app.db"></meta-data> + <meta-data + android:name="AA_DB_VERSION" + android:value="1"></meta-data> + <activity - android:name="net.miz_hi.smileessence.view.activity.MainActivity" - android:configChanges="keyboardHidden|orientation|screenSize" - android:label="@string/app_name" - android:launchMode="singleTask" - android:windowSoftInputMode="stateHidden|adjustNothing"> + android:name=".activity.MainActivity" + android:label="@string/app_name"> <intent-filter> <action android:name="android.intent.action.MAIN"/> - <category android:name="android.intent.category.LAUNCHER"/> </intent-filter> - <intent-filter - android:label="つぶやく"> - <action android:name="android.intent.action.VIEW"/> - - <category android:name="android.intent.category.DEFAULT"/> - <category android:name="android.intent.category.BROWSABLE"/> - - <data - android:host="twitter.com" - android:path="/share" - android:scheme="https"/> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.VIEW"/> - - <category android:name="android.intent.category.DEFAULT"/> - <category android:name="android.intent.category.BROWSABLE"/> - - <data - android:host="twitter.com" - android:scheme="http"/> - </intent-filter> - <intent-filter> - <action android:name="android.intent.action.VIEW"/> - - <category android:name="android.intent.category.DEFAULT"/> - <category android:name="android.intent.category.BROWSABLE"/> - - <data - android:host="twitter.com" - android:scheme="https"/> - </intent-filter> - <intent-filter - android:label="つぶやく"> - <action android:name="android.intent.action.SEND"/> - - <data android:mimeType="text/plain"/> - - <category android:name="android.intent.category.DEFAULT"/> - </intent-filter> </activity> - <activity - android:name="net.miz_hi.smileessence.view.activity.WebViewActivity" - android:configChanges="keyboardHidden|orientation" - android:launchMode="standard"/> - <activity - android:name="net.miz_hi.smileessence.view.activity.SettingActivity" - android:configChanges="keyboardHidden|orientation" - android:launchMode="standard"> - </activity> - <activity - android:name="net.miz_hi.smileessence.view.activity.TemplateActivity" - android:configChanges="orientation"> - </activity> - <activity - android:name="net.miz_hi.smileessence.view.activity.ExtraWordActivity" - android:configChanges="orientation"> - </activity> - <activity android:name=".view.activity.LicenseActivity"/> </application> - -</manifest>
\ No newline at end of file +</manifest> diff --git a/LISENCE b/LISENCE new file mode 100644 index 00000000..4947287f --- /dev/null +++ b/LISENCE @@ -0,0 +1,177 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS
\ No newline at end of file @@ -0,0 +1,13 @@ +SmileEssence Lite +Copyright 2014 laco0416 + +Licensed under the Apache License, Version 2.0 (the "License"); +you may not use this file except in compliance with the License. +You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an "AS IS" BASIS, +WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +See the License for the specific language governing permissions and limitations under the License
\ No newline at end of file diff --git a/README.md b/README.md deleted file mode 100644 index dac1e046..00000000 --- a/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# SmileEssence Lite - -# Advanced. - - -Beautiful, cool, and funny. -You'll have a better twitter life. - -[http://smileessence.miz-hi.net](http://smileessence.miz-hi.net)
\ No newline at end of file diff --git a/SmileEssence.iml b/SmileEssence.iml new file mode 100644 index 00000000..b2350db0 --- /dev/null +++ b/SmileEssence.iml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="FacetManager"> + <facet type="android" name="Android"> + <configuration> + <option name="UPDATE_PROPERTY_FILES" value="true" /> + </configuration> + </facet> + </component> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="library" exported="" name="twitter4j-core-3.0.5" level="application" /> + <orderEntry type="library" exported="" name="android-support-v13" level="application" /> + <orderEntry type="library" exported="" name="ActiveAndroid" level="application" /> + <orderEntry type="module" module-name="Crouton" exported="" /> + <orderEntry type="module" module-name="ViewPagerIndicator" exported="" /> + </component> +</module> + diff --git a/SmileEssenceLite.iml b/SmileEssenceLite.iml deleted file mode 100644 index 98b10070..00000000 --- a/SmileEssenceLite.iml +++ /dev/null @@ -1,87 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<module type="JAVA_MODULE" version="4"> - <component name="EclipseModuleManager" forced_jdk="true"> - <conelement value="com.android.ide.eclipse.adt.DEPENDENCIES" /> - <src_description expected_position="1"> - <src_folder value="file://$MODULE_DIR$/src" expected_position="0" /> - <src_folder value="file://$MODULE_DIR$/gen" expected_position="1" /> - <src_folder value="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK" expected_position="2" /> - <src_folder value="com.android.ide.eclipse.adt.LIBRARIES" expected_position="3" /> - </src_description> - </component> - <component name="FacetManager"> - <facet type="android" name="Android"> - <configuration> - <option name="UPDATE_PROPERTY_FILES" value="true" /> - </configuration> - </facet> - </component> - <component name="NewModuleRootManager" inherit-compiler-output="false"> - <output url="file://$MODULE_DIR$/bin/classes" /> - <exclude-output /> - <content url="file://$MODULE_DIR$"> - <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> - <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" /> - </content> - <orderEntry type="jdk" jdkName="Android 4.0 Platform" jdkType="Android SDK" /> - <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="ViewPagerIndicator" /> - <orderEntry type="module" module-name="Crouton" /> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/libs/ormlite-android-4.33.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/libs/ormlite-core-4.33.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/libs/twitter-text-1.6.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/libs/twitter4j-core-3.0.3-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/libs/twitter4j-media-support-3.0.3-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library> - <CLASSES> - <root url="jar://$MODULE_DIR$/libs/twitter4j-stream-3.0.3-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="library" name="android-support-v13" level="project" /> - </component> -</module> - diff --git a/SmileEssenceTest/AndroidManifest.xml b/SmileEssenceTest/AndroidManifest.xml new file mode 100644 index 00000000..8f444c7c --- /dev/null +++ b/SmileEssenceTest/AndroidManifest.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- package name must be unique so suffix with "tests" so package loader doesn't ignore us --> +<manifest xmlns:android="http://schemas.android.com/apk/res/android" + package="net.lacolaco.smileessence.tests" + android:versionCode="1" + android:versionName="1.0"> + <!-- We add an application tag here just so that we can indicate that + this package needs to link against the android.test library, + which is needed when building test cases. --> + <application> + <uses-library android:name="android.test.runner"/> + </application> + <!-- + This declares that this application uses the instrumentation test runner targeting + the package of net.lacolaco.smileessence. To run the tests use the command: + "adb shell am instrument -w net.lacolaco.smileessence.tests/android.test.InstrumentationTestRunner" + --> + <instrumentation + android:name="android.test.InstrumentationTestRunner" + android:targetPackage="net.lacolaco.smileessence" + android:label="Tests for net.lacolaco.smileessence"/> +</manifest> diff --git a/SmileEssenceTest/SmileEssenceTest.iml b/SmileEssenceTest/SmileEssenceTest.iml new file mode 100644 index 00000000..df364c74 --- /dev/null +++ b/SmileEssenceTest/SmileEssenceTest.iml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4"> + <component name="FacetManager"> + <facet type="android" name="Android"> + <configuration> + <option name="PACK_TEST_CODE" value="true" /> + <option name="UPDATE_PROPERTY_FILES" value="true" /> + </configuration> + </facet> + </component> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="module" module-name="SmileEssence" scope="PROVIDED" /> + <orderEntry type="sourceFolder" forTests="false" /> + </component> +</module> + diff --git a/SmileEssenceTest/ant.properties b/SmileEssenceTest/ant.properties new file mode 100644 index 00000000..4c160604 --- /dev/null +++ b/SmileEssenceTest/ant.properties @@ -0,0 +1,18 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked into Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + +tested.project.dir=D:\\User\\Projects\\SmileEssence diff --git a/SmileEssenceTest/build.xml b/SmileEssenceTest/build.xml new file mode 100644 index 00000000..2f87aa2b --- /dev/null +++ b/SmileEssenceTest/build.xml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="SmileEssenceTest" default="help"> + + <!-- The local.properties file is created and updated by the 'android' tool. + It contains the path to the SDK. It should *NOT* be checked into + Version Control Systems. --> + <property file="local.properties"/> + + <!-- The ant.properties file can be created by you. It is only edited by the + 'android' tool to add properties to it. + This is the place to change some Ant specific build properties. + Here are some properties you may want to change/update: + + source.dir + The name of the source directory. Default is 'src'. + out.dir + The name of the output directory. Default is 'bin'. + + For other overridable properties, look at the beginning of the rules + files in the SDK, at tools/ant/build.xml + + Properties related to the SDK location or the project target should + be updated using the 'android' tool with the 'update' action. + + This file is an integral part of the build system for your + application and should be checked into Version Control Systems. + + --> + <property file="ant.properties"/> + + <!-- if sdk.dir was not set from one of the property file, then + get it from the ANDROID_HOME env var. + This must be done before we load project.properties since + the proguard config can use sdk.dir --> + <property environment="env"/> + <condition property="sdk.dir" value="${env.ANDROID_HOME}"> + <isset property="env.ANDROID_HOME"/> + </condition> + + <!-- The project.properties file is created and updated by the 'android' + tool, as well as ADT. + + This contains project specific properties such as project target, and library + dependencies. Lower level build properties are stored in ant.properties + (or in .classpath for Eclipse projects). + + This file is an integral part of the build system for your + application and should be checked into Version Control Systems. --> + <loadproperties srcFile="project.properties"/> + + <!-- quick check on sdk.dir --> + <fail + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable." + unless="sdk.dir" + /> + + <!-- + Import per project custom build rules if present at the root of the project. + This is the place to put custom intermediary targets such as: + -pre-build + -pre-compile + -post-compile (This is typically used for code obfuscation. + Compiled code location: ${out.classes.absolute.dir} + If this is not done in place, override ${out.dex.input.absolute.dir}) + -post-package + -post-build + -pre-clean + --> + <import file="custom_rules.xml" optional="true"/> + + <!-- Import the actual build file. + + To customize existing targets, there are two options: + - Customize only one target: + - copy/paste the target into this file, *before* the + <import> task. + - customize it to your needs. + - Customize the whole content of build.xml + - copy/paste the content of the rules files (minus the top node) + into this file, replacing the <import> task. + - customize to your needs. + + *********************** + ****** IMPORTANT ****** + *********************** + In all cases you must update the value of version-tag below to read 'custom' instead of an integer, + in order to avoid having your file be overridden by tools such as "android update project" + --> + <!-- version-tag: 1 --> + <import file="${sdk.dir}/tools/ant/build.xml"/> + +</project> diff --git a/SmileEssenceTest/project.properties b/SmileEssenceTest/project.properties new file mode 100644 index 00000000..4ab12569 --- /dev/null +++ b/SmileEssenceTest/project.properties @@ -0,0 +1,14 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-19 diff --git a/SmileEssenceTest/src/net/lacolaco/smileessence/activity/MainActivityTest.java b/SmileEssenceTest/src/net/lacolaco/smileessence/activity/MainActivityTest.java new file mode 100644 index 00000000..522a1378 --- /dev/null +++ b/SmileEssenceTest/src/net/lacolaco/smileessence/activity/MainActivityTest.java @@ -0,0 +1,48 @@ +package net.lacolaco.smileessence.activity; + +import android.test.ActivityInstrumentationTestCase2; +import net.lacolaco.smileessence.notification.Notificator; + +/** + * This is a simple framework for a test of an Application. See + * {@link android.test.ApplicationTestCase ApplicationTestCase} for more information on + * how to write and extend Application tests. + * <p/> + * To run this test, you can type: + * adb shell am instrument -w \ + * -e class net.lacolaco.smileessence.activity.MainActivityTest \ + * net.lacolaco.smileessence.tests/android.test.InstrumentationTestRunner + */ +public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActivity> +{ + + public MainActivityTest() + { + super(MainActivity.class); + } + + public void testTitle() throws Exception + { + assertEquals("SmileEssence", getActivity().getTitle()); + } + + public void testNotification() throws Exception + { + + final Notificator notificator = new Notificator(getActivity(), "Test Notice"); + assertNotNull(notificator.makeCrouton()); + assertNotNull(notificator.makeToast()); + getActivity().runOnUiThread(new Runnable() + { + @Override + public void run() + { + Notificator.startNotification(); + notificator.publish(); + Notificator.stopNotification(); + notificator.publish(); + } + }); + + } +} diff --git a/SmileEssenceTest/src/net/lacolaco/smileessence/preference/PreferenceHelperTest.java b/SmileEssenceTest/src/net/lacolaco/smileessence/preference/PreferenceHelperTest.java new file mode 100644 index 00000000..d9c071b3 --- /dev/null +++ b/SmileEssenceTest/src/net/lacolaco/smileessence/preference/PreferenceHelperTest.java @@ -0,0 +1,34 @@ + + +package net.lacolaco.smileessence.preference; + +import android.test.AndroidTestCase; +import net.lacolaco.smileessence.R; + +public class PreferenceHelperTest extends AndroidTestCase +{ + + private Pref pref; + + @Override + public void setUp() throws Exception + { + pref = new Pref(getContext()); + } + + public void testNotFound() throws Exception + { + assertEquals("", pref.getValue(0, "")); + } + + public void testUseDefault() throws Exception + { + assertNotSame(0, pref.getValue(R.string.key_text_size, 10)); + } + + public void testPutAndGet() throws Exception + { + assertEquals(true, pref.putValue(R.string.key_test_preference, 10)); + assertEquals(10, pref.getValue(R.string.key_test_preference, 0)); + } +} diff --git a/SmileEssenceTest/src/net/lacolaco/smileessence/resource/ResourceHelperTest.java b/SmileEssenceTest/src/net/lacolaco/smileessence/resource/ResourceHelperTest.java new file mode 100644 index 00000000..d259bd91 --- /dev/null +++ b/SmileEssenceTest/src/net/lacolaco/smileessence/resource/ResourceHelperTest.java @@ -0,0 +1,14 @@ +package net.lacolaco.smileessence.resource; + +import android.test.AndroidTestCase; +import net.lacolaco.smileessence.R; + +public class ResourceHelperTest extends AndroidTestCase +{ + + public void testReadResource() throws Exception + { + ResourceHelper pref = new ResourceHelper(getContext()); + assertNotNull(pref.getString(R.string.app_name)); + } +} diff --git a/SmileEssenceTest/src/net/lacolaco/smileessence/twitter/TwitterApiTest.java b/SmileEssenceTest/src/net/lacolaco/smileessence/twitter/TwitterApiTest.java new file mode 100644 index 00000000..8e7bcb74 --- /dev/null +++ b/SmileEssenceTest/src/net/lacolaco/smileessence/twitter/TwitterApiTest.java @@ -0,0 +1,37 @@ +package net.lacolaco.smileessence.twitter; + +import junit.framework.TestCase; + +public class TwitterApiTest extends TestCase +{ + + private static final String CONSUMER_KEY = "SIt6h4O6qmBB2URSKsF1Q"; + private static final String CONSUMER_SECRET = "Uil1dyrqiodLLqXIB6B0rVwVxFfFCxTf8ggAcszWc"; + private static final String TOKEN = "498602690-IF2Ht1Q4yn2FfDitTQsuP0LMUKN5rzPCWpHBy72t"; + private static final String TOKEN_SECRET = "xSukt39B6f8DZXVyagCgZsaaml8NObyIQIdtYiFqsI"; + private static final String SCREEN_NAME = "laco0416"; + private static final long USER_ID = 498602690; + private TwitterApi api; + + @Override + public void setUp() throws Exception + { + api = new TwitterApi(TOKEN, TOKEN_SECRET); + } + + public void testReadProperties() throws Exception + { + assertEquals(CONSUMER_KEY, api.getTwitter().getConfiguration().getOAuthConsumerKey()); + assertEquals(CONSUMER_SECRET, api.getTwitter().getConfiguration().getOAuthConsumerSecret()); + } + + public void testAuthenticate() throws Exception + { + assertEquals(SCREEN_NAME, api.getTwitter().getScreenName()); + } + + public void testAccessApi() throws Exception + { + assertNotNull(api.getTwitter().users().showUser(USER_ID)); + } +} diff --git a/ant.properties b/ant.properties new file mode 100644 index 00000000..b0971e89 --- /dev/null +++ b/ant.properties @@ -0,0 +1,17 @@ +# This file is used to override default values used by the Ant build system. +# +# This file must be checked into Version Control Systems, as it is +# integral to the build system of your project. + +# This file is only used by the Ant script. + +# You can use this to override default values such as +# 'source.dir' for the location of your java source folder and +# 'out.dir' for the location of your output folder. + +# You can also use it define how the release builds are signed by declaring +# the following properties: +# 'key.store' for the location of your keystore and +# 'key.alias' for the name of the key to use. +# The password will be asked during the build when you use the 'release' target. + diff --git a/build.xml b/build.xml new file mode 100644 index 00000000..cf7de91b --- /dev/null +++ b/build.xml @@ -0,0 +1,92 @@ +<?xml version="1.0" encoding="UTF-8"?> +<project name="SmileEssence" default="help"> + + <!-- The local.properties file is created and updated by the 'android' tool. + It contains the path to the SDK. It should *NOT* be checked into + Version Control Systems. --> + <property file="local.properties"/> + + <!-- The ant.properties file can be created by you. It is only edited by the + 'android' tool to add properties to it. + This is the place to change some Ant specific build properties. + Here are some properties you may want to change/update: + + source.dir + The name of the source directory. Default is 'src'. + out.dir + The name of the output directory. Default is 'bin'. + + For other overridable properties, look at the beginning of the rules + files in the SDK, at tools/ant/build.xml + + Properties related to the SDK location or the project target should + be updated using the 'android' tool with the 'update' action. + + This file is an integral part of the build system for your + application and should be checked into Version Control Systems. + + --> + <property file="ant.properties"/> + + <!-- if sdk.dir was not set from one of the property file, then + get it from the ANDROID_HOME env var. + This must be done before we load project.properties since + the proguard config can use sdk.dir --> + <property environment="env"/> + <condition property="sdk.dir" value="${env.ANDROID_HOME}"> + <isset property="env.ANDROID_HOME"/> + </condition> + + <!-- The project.properties file is created and updated by the 'android' + tool, as well as ADT. + + This contains project specific properties such as project target, and library + dependencies. Lower level build properties are stored in ant.properties + (or in .classpath for Eclipse projects). + + This file is an integral part of the build system for your + application and should be checked into Version Control Systems. --> + <loadproperties srcFile="project.properties"/> + + <!-- quick check on sdk.dir --> + <fail + message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through the ANDROID_HOME environment variable." + unless="sdk.dir" + /> + + <!-- + Import per project custom build rules if present at the root of the project. + This is the place to put custom intermediary targets such as: + -pre-build + -pre-compile + -post-compile (This is typically used for code obfuscation. + Compiled code location: ${out.classes.absolute.dir} + If this is not done in place, override ${out.dex.input.absolute.dir}) + -post-package + -post-build + -pre-clean + --> + <import file="custom_rules.xml" optional="true"/> + + <!-- Import the actual build file. + + To customize existing targets, there are two options: + - Customize only one target: + - copy/paste the target into this file, *before* the + <import> task. + - customize it to your needs. + - Customize the whole content of build.xml + - copy/paste the content of the rules files (minus the top node) + into this file, replacing the <import> task. + - customize to your needs. + + *********************** + ****** IMPORTANT ****** + *********************** + In all cases you must update the value of version-tag below to read 'custom' instead of an integer, + in order to avoid having your file be overridden by tools such as "android update project" + --> + <!-- version-tag: 1 --> + <import file="${sdk.dir}/tools/ant/build.xml"/> + +</project> diff --git a/libs/android-support-v13.jar b/libs/android-support-v13.jar Binary files differdeleted file mode 100644 index df7f9fc2..00000000 --- a/libs/android-support-v13.jar +++ /dev/null diff --git a/libs/ormlite-android-4.33.jar b/libs/ormlite-android-4.33.jar Binary files differdeleted file mode 100644 index 76001fa7..00000000 --- a/libs/ormlite-android-4.33.jar +++ /dev/null diff --git a/libs/ormlite-core-4.33.jar b/libs/ormlite-core-4.33.jar Binary files differdeleted file mode 100644 index 6d1e0595..00000000 --- a/libs/ormlite-core-4.33.jar +++ /dev/null diff --git a/libs/twitter-text-1.6.1.jar b/libs/twitter-text-1.6.1.jar Binary files differdeleted file mode 100644 index 072a5e3f..00000000 --- a/libs/twitter-text-1.6.1.jar +++ /dev/null diff --git a/libs/twitter4j-core-3.0.3-SNAPSHOT.jar b/libs/twitter4j-core-3.0.3-SNAPSHOT.jar Binary files differdeleted file mode 100644 index aa158413..00000000 --- a/libs/twitter4j-core-3.0.3-SNAPSHOT.jar +++ /dev/null diff --git a/libs/twitter4j-media-support-3.0.3-SNAPSHOT.jar b/libs/twitter4j-media-support-3.0.3-SNAPSHOT.jar Binary files differdeleted file mode 100644 index 33008087..00000000 --- a/libs/twitter4j-media-support-3.0.3-SNAPSHOT.jar +++ /dev/null diff --git a/libs/twitter4j-stream-3.0.3-SNAPSHOT.jar b/libs/twitter4j-stream-3.0.3-SNAPSHOT.jar Binary files differdeleted file mode 100644 index 6d579938..00000000 --- a/libs/twitter4j-stream-3.0.3-SNAPSHOT.jar +++ /dev/null diff --git a/project.properties b/project.properties new file mode 100644 index 00000000..1b9802ba --- /dev/null +++ b/project.properties @@ -0,0 +1,16 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-19 +android.library.reference.1=../Android-Libs/Crouton/library/src/main +android.library.reference.2=../Android-Libs/Android-ViewPagerIndicator/library diff --git a/res/color/list_footer_layout.xml b/res/color/list_footer_layout.xml deleted file mode 100644 index b0055a75..00000000 --- a/res/color/list_footer_layout.xml +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:binding="http://www.gueei.com/android-binding/" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - binding:onClick="onClick" - > - - <TextView - android:id="@+id/textView1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical|center_horizontal" - binding:text="text" - android:textAppearance="?android:attr/textAppearanceLarge" /> - -</LinearLayout>
\ No newline at end of file diff --git a/res/drawable-hdpi/app_icon.png b/res/drawable-hdpi/app_icon.png Binary files differdeleted file mode 100644 index 4d800081..00000000 --- a/res/drawable-hdpi/app_icon.png +++ /dev/null diff --git a/res/drawable-hdpi/expand_close.png b/res/drawable-hdpi/expand_close.png Binary files differdeleted file mode 100644 index 68ce841c..00000000 --- a/res/drawable-hdpi/expand_close.png +++ /dev/null diff --git a/res/drawable-hdpi/expand_open.png b/res/drawable-hdpi/expand_open.png Binary files differdeleted file mode 100644 index 8a8f19f7..00000000 --- a/res/drawable-hdpi/expand_open.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_launcher.png b/res/drawable-hdpi/ic_launcher.png Binary files differnew file mode 100644 index 00000000..8074c4c5 --- /dev/null +++ b/res/drawable-hdpi/ic_launcher.png diff --git a/res/drawable-hdpi/icon_add_b.png b/res/drawable-hdpi/icon_add_b.png Binary files differdeleted file mode 100644 index 638219c0..00000000 --- a/res/drawable-hdpi/icon_add_b.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_camera.png b/res/drawable-hdpi/icon_camera.png Binary files differdeleted file mode 100644 index be411fae..00000000 --- a/res/drawable-hdpi/icon_camera.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_clean.png b/res/drawable-hdpi/icon_clean.png Binary files differdeleted file mode 100644 index c7befb0c..00000000 --- a/res/drawable-hdpi/icon_clean.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_delete.png b/res/drawable-hdpi/icon_delete.png Binary files differdeleted file mode 100644 index 329dc28c..00000000 --- a/res/drawable-hdpi/icon_delete.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_edit.png b/res/drawable-hdpi/icon_edit.png Binary files differdeleted file mode 100644 index 436a3e53..00000000 --- a/res/drawable-hdpi/icon_edit.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_favorite.png b/res/drawable-hdpi/icon_favorite.png Binary files differdeleted file mode 100644 index 250da351..00000000 --- a/res/drawable-hdpi/icon_favorite.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_menu.png b/res/drawable-hdpi/icon_menu.png Binary files differdeleted file mode 100644 index 8b3ba4ed..00000000 --- a/res/drawable-hdpi/icon_menu.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_pict.png b/res/drawable-hdpi/icon_pict.png Binary files differdeleted file mode 100644 index cbd82341..00000000 --- a/res/drawable-hdpi/icon_pict.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_reflesh.png b/res/drawable-hdpi/icon_reflesh.png Binary files differdeleted file mode 100644 index 49eb6126..00000000 --- a/res/drawable-hdpi/icon_reflesh.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_reply.png b/res/drawable-hdpi/icon_reply.png Binary files differdeleted file mode 100644 index 67bbb22d..00000000 --- a/res/drawable-hdpi/icon_reply.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_retweet.png b/res/drawable-hdpi/icon_retweet.png Binary files differdeleted file mode 100644 index 5a0adabe..00000000 --- a/res/drawable-hdpi/icon_retweet.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_right.png b/res/drawable-hdpi/icon_right.png Binary files differdeleted file mode 100644 index 13837f96..00000000 --- a/res/drawable-hdpi/icon_right.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_row.png b/res/drawable-hdpi/icon_row.png Binary files differdeleted file mode 100644 index 4097d0e0..00000000 --- a/res/drawable-hdpi/icon_row.png +++ /dev/null diff --git a/res/drawable-hdpi/icon_twitter.png b/res/drawable-hdpi/icon_twitter.png Binary files differdeleted file mode 100644 index f7abc2b9..00000000 --- a/res/drawable-hdpi/icon_twitter.png +++ /dev/null diff --git a/res/drawable-hdpi/se_logo.png b/res/drawable-hdpi/se_logo.png Binary files differdeleted file mode 100644 index 76deb19b..00000000 --- a/res/drawable-hdpi/se_logo.png +++ /dev/null diff --git a/res/drawable-ldpi/ic_launcher.png b/res/drawable-ldpi/ic_launcher.png Binary files differnew file mode 100644 index 00000000..1095584e --- /dev/null +++ b/res/drawable-ldpi/ic_launcher.png diff --git a/res/drawable-mdpi/ic_launcher.png b/res/drawable-mdpi/ic_launcher.png Binary files differnew file mode 100644 index 00000000..a07c69fa --- /dev/null +++ b/res/drawable-mdpi/ic_launcher.png diff --git a/res/drawable/shadow.xml b/res/drawable/shadow.xml deleted file mode 100644 index 67bb1c57..00000000 --- a/res/drawable/shadow.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" > - - <gradient - android:endColor="#33000000" - android:centerColor="#11000000" - android:startColor="#00000000" /> - -</shape>
\ No newline at end of file diff --git a/res/layout/checkboxitem_layout.xml b/res/layout/checkboxitem_layout.xml deleted file mode 100644 index 149bb0d4..00000000 --- a/res/layout/checkboxitem_layout.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <CheckBox - android:id="@+id/checkBox_checkboxItem" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="5dp" - android:layout_marginTop="5dp" - android:text="CheckBox" /> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/dialog_appinfo.xml b/res/layout/dialog_appinfo.xml deleted file mode 100644 index 9bff1632..00000000 --- a/res/layout/dialog_appinfo.xml +++ /dev/null @@ -1,83 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical"> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="10dp"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" - android:paddingBottom="15dp" - android:gravity="center_horizontal"> - - <ImageView - android:src="@drawable/app_icon" - android:layout_width="80dp" - android:layout_height="80dp" - android:contentDescription="app_icon" - android:layout_gravity="center_vertical"/> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="vertical" - android:padding="10dp" - android:gravity="center_vertical"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/app_name" - android:textSize="20dp" - /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/app_version" - android:textSize="16dp" - /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Developed by laco0416" - android:textSize="16dp" - /> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="@string/app_url" - android:textSize="12dp" - android:autoLink="web" - /> - - </LinearLayout> - - </LinearLayout> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:text="Thanks to" - android:textStyle="bold" - android:textSize="16dp"/> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:text="@string/thanks_to" - android:textSize="16dp"/> - - </LinearLayout> -</ScrollView>
\ No newline at end of file diff --git a/res/layout/dialog_review.xml b/res/layout/dialog_review.xml deleted file mode 100644 index 42adfe72..00000000 --- a/res/layout/dialog_review.xml +++ /dev/null @@ -1,54 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > - - <ScrollView - android:layout_width="fill_parent" - android:layout_height="wrap_content" > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginTop="5dp" - android:text="星いくつ？" - android:textAppearance="?android:attr/textAppearanceMedium"/> - - <RatingBar - android:id="@+id/review_rating" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:max="5" - android:rating="1" - android:stepSize="1" /> - - <TextView - android:id="@+id/TextView01" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginTop="5dp" - android:text="コメント" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <EditText - android:id="@+id/review_comment" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="5dp" - android:ems="10" - android:inputType="textShortMessage" - android:maxLength="100" - android:maxLines="1" /> - - </LinearLayout> - </ScrollView> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/dialog_seekbar_layout.xml b/res/layout/dialog_seekbar_layout.xml deleted file mode 100644 index 3fc9a6fc..00000000 --- a/res/layout/dialog_seekbar_layout.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > - - <TextView - android:id="@+id/textView_seekDialog" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginTop="5dp" - android:text="text" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <TextView - android:id="@+id/textView_seekLevel" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginTop="5dp" - android:text="1" - android:textAppearance="?android:attr/textAppearanceMedium" /> - - <SeekBar - android:id="@+id/seekBar_seekDialog" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:padding="10dp" /> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/event_layout.xml b/res/layout/event_layout.xml deleted file mode 100644 index 911adf9f..00000000 --- a/res/layout/event_layout.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="5dp"> - - <ImageView - android:id="@+id/event_icon" - android:layout_width="36dp" - android:layout_height="36dp" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true"/> - - <TextView - android:id="@+id/event_header" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginLeft="5dp" - android:layout_toRightOf="@+id/event_icon" - android:gravity="top" /> - - <TextView - android:id="@+id/event_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignLeft="@+id/event_header" - android:layout_alignParentRight="true" - android:layout_below="@+id/event_header" - android:layout_marginBottom="3dp" - android:layout_marginTop="1dp" /> - - <TextView - android:id="@+id/event_footer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignLeft="@+id/event_text" - android:layout_below="@+id/event_text" - android:layout_marginRight="2dp" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/license_layout.xml b/res/layout/license_layout.xml deleted file mode 100644 index aa21cc74..00000000 --- a/res/layout/license_layout.xml +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="10dp"> - - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Notices of files:" - android:id="@+id/textView" - android:layout_gravity="left|center_vertical" - android:textSize="20dp" - android:textStyle="bold"/> - - <LinearLayout - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="left|center_vertical" - android:paddingLeft="10dp" - android:paddingTop="10dp" - android:paddingBottom="10dp"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="- twitter4j" - android:id="@+id/textView1" - android:layout_gravity="left|center_vertical" - android:singleLine="false" - android:textSize="14dp"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="- Crouton" - android:id="@+id/textView2" - android:layout_gravity="left|center_vertical" - android:singleLine="false" - android:textSize="14dp"/> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="- ViewPagerIndicator" - android:id="@+id/textView3" - android:layout_gravity="left|center_vertical" - android:singleLine="false" - android:textSize="14dp"/> - </LinearLayout> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="#cacaca" - android:padding="10dp"> - - <TextView - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/apache" - android:id="@+id/textView4" - android:layout_gravity="center_vertical|left" - android:textSize="10dp" - android:typeface="monospace"/> - - </FrameLayout> - - </LinearLayout> - -</ScrollView> diff --git a/res/layout/listedit_layout.xml b/res/layout/listedit_layout.xml deleted file mode 100644 index b063ccbc..00000000 --- a/res/layout/listedit_layout.xml +++ /dev/null @@ -1,56 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:background="@color/White"
- android:orientation="vertical" >
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/Gray"
- android:padding="5dp" >
-
- <TextView
- android:id="@+id/listedit_title"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="title"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/LightGray" />
-
- <TextView
- android:id="@+id/TextView02"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@+id/listedit_title"
- android:text="クリックで編集(長押しで削除)"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="@color/LightGray" />
-
- <ImageButton
- android:id="@+id/listedit_addbutton"
- style="@style/grayBtn"
- android:layout_width="40dp"
- android:layout_height="40dp"
- android:layout_alignParentRight="true"
- android:layout_centerVertical="true"
- android:scaleType="fitCenter"
- android:src="@drawable/icon_add_b" />
-
- </RelativeLayout>
-
- <FrameLayout
- android:layout_width="fill_parent"
- android:layout_height="1dp"
- android:background="@color/Gray"/>
-
- <ListView
- android:id="@+id/listedit_listview"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:fastScrollEnabled="true" >
-
- </ListView>
-
-</LinearLayout>
\ No newline at end of file diff --git a/res/layout/listpage_layout.xml b/res/layout/listpage_layout.xml deleted file mode 100644 index 6eb7e7eb..00000000 --- a/res/layout/listpage_layout.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/White" - android:gravity="center_horizontal"> - - <ListView - android:id="@+id/listpage_listview" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:dividerHeight="1px" - android:footerDividersEnabled="true" - android:clickable="false"/> -</LinearLayout> diff --git a/res/layout/listpage_refresh_layout.xml b/res/layout/listpage_refresh_layout.xml deleted file mode 100644 index 3917e455..00000000 --- a/res/layout/listpage_refresh_layout.xml +++ /dev/null @@ -1,41 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/White" - android:gravity="center_horizontal" - android:orientation="vertical" > - - <ListView - android:id="@+id/listpage_listview" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_weight="1" - android:divider="@color/Gray2" - android:dividerHeight="1dp" - android:footerDividersEnabled="true" > - - </ListView> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="5dp" - android:layout_marginLeft="5dp" - android:layout_marginRight="5dp" - android:layout_marginTop="5dp" - android:background="@color/Gray" - android:padding="1dp" > - - <Button - android:id="@+id/listpage_refresh" - style="@style/whiteBtn" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:gravity="center" - android:minHeight="36dp" - android:text="Refresh" /> - - </FrameLayout> - -</LinearLayout> diff --git a/res/layout/main.xml b/res/layout/main.xml new file mode 100644 index 00000000..5b91bfee --- /dev/null +++ b/res/layout/main.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + > + + <TextView + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:text="Hello World, MainActivity" + /> +</LinearLayout> + diff --git a/res/layout/main_layout.xml b/res/layout/main_layout.xml deleted file mode 100644 index 2f128808..00000000 --- a/res/layout/main_layout.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:scrollbarStyle="outsideInset"> - - <com.viewpagerindicator.TitlePageIndicator - android:id="@+id/indicator" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:background="#202020"/> - - <FrameLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/indicator"> - - <android.support.v4.view.ViewPager - android:id="@+id/viewpager" - android:layout_width="fill_parent" - android:layout_height="match_parent" - android:layout_gravity="top" - android:fitsSystemWindows="false"/> - </FrameLayout> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/menuitem_gray.xml b/res/layout/menuitem_gray.xml deleted file mode 100644 index c973b711..00000000 --- a/res/layout/menuitem_gray.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/grayBtn" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <TextView - android:id="@+id/textView_menuItem" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="16dp" - android:layout_marginTop="16dp" - android:paddingLeft="10dp" - android:text="Text" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/LightGray" /> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/menuitem_white.xml b/res/layout/menuitem_white.xml deleted file mode 100644 index bdd363af..00000000 --- a/res/layout/menuitem_white.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/whiteBtn" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <TextView - android:id="@+id/textView_menuItem" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="16dp" - android:layout_marginTop="16dp" - android:paddingLeft="10dp" - android:text="Text" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/Gray" /> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/menuparent_white.xml b/res/layout/menuparent_white.xml deleted file mode 100644 index 478101b0..00000000 --- a/res/layout/menuparent_white.xml +++ /dev/null @@ -1,27 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/whiteBtn" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="@color/LightGray" - android:orientation="horizontal" > - - <ImageView - android:id="@+id/menuparent_indicator" - android:layout_width="25dp" - android:layout_height="50dp" - android:layout_gravity="center_vertical" - android:src="@drawable/expand_close" /> - - <TextView - android:id="@+id/textView_menuItem" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="16dp" - android:layout_marginTop="16dp" - android:paddingLeft="10dp" - android:text="Text" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="@color/Gray" /> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/post_layout.xml b/res/layout/post_layout.xml deleted file mode 100644 index 48347883..00000000 --- a/res/layout/post_layout.xml +++ /dev/null @@ -1,165 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/White"> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="10dp" - android:scrollbars="vertical"> - - <LinearLayout - android:orientation="horizontal" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" - android:layout_marginTop="15dp"> - - <EditText - android:id="@+id/editText_tweet" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="5dp" - android:layout_marginTop="5dp" - android:gravity="top" - android:inputType="text|textMultiLine" - android:minLines="2" - android:maxLines="8" - android:scrollbars="vertical" - android:layout_weight="1" - android:autoText="false"> - - </EditText> - - <LinearLayout - android:orientation="vertical" - android:layout_width="80dp" - android:layout_height="match_parent" - android:layout_weight="1" - android:layout_marginBottom="10dp" - > - - <ImageButton - android:id="@+id/imBtn_delete" - android:layout_width="30dp" - android:layout_height="20dp" - android:src="@drawable/icon_delete" - android:scaleType="fitCenter" - style="@style/transBtn" - android:contentDescription="delete" - android:layout_weight="1" - android:layout_gravity="center_horizontal"/> - - <TextView - android:id="@+id/textView_count" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/Gray2" - android:layout_weight="1" - android:layout_gravity="center_horizontal" - android:gravity="center_horizontal|bottom" - android:text="140"/> - </LinearLayout> - </LinearLayout> - - <LinearLayout - android:id="@+id/linearLayout1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="fill_horizontal" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" - android:baselineAligned="false" - android:orientation="horizontal"> - - <LinearLayout - android:layout_width="80dp" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_weight="1" - android:background="@color/Gray" - android:orientation="horizontal" - android:padding="1dp"> - - <ImageButton - android:id="@+id/imBtn_pickpict" - style="@style/whiteBtn" - android:layout_width="wrap_content" - android:layout_height="40dp" - android:padding="0dp" - android:layout_weight="1" - android:scaleType="fitCenter" - android:src="@drawable/icon_pict" - android:contentDescription="image"/> - - <FrameLayout - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@android:color/transparent"/> - - <ImageButton - android:id="@+id/imBtn_tweetmenu" - style="@style/whiteBtn" - android:layout_width="wrap_content" - android:layout_height="40dp" - android:layout_weight="1" - android:padding="0dp" - android:scaleType="fitCenter" - android:src="@drawable/icon_menu" - android:contentDescription="menu"/> - </LinearLayout> - - <FrameLayout - android:layout_width="5dp" - android:layout_height="match_parent" - android:background="@android:color/transparent"/> - - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_weight="10" - android:background="@color/Gray" - android:padding="1dp"> - - <Button - android:id="@+id/imBtn_tweet" - style="@style/whiteBtn" - android:layout_width="match_parent" - android:layout_height="40dp" - android:gravity="center" - android:textColor="#535353" - android:text="TWEET" - android:textStyle="bold"/> - </FrameLayout> - </LinearLayout> - - - <FrameLayout - android:id="@+id/frame_inreplyto" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" - android:layout_marginTop="10dp" - android:visibility="gone"> - </FrameLayout> - - <ImageView - android:id="@+id/image_pict" - android:layout_width="100dp" - android:layout_height="100dp" - android:layout_gravity="left" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" - android:layout_marginTop="10dp" - android:clickable="true" - android:visibility="gone"/> - </LinearLayout> - -</ScrollView>
\ No newline at end of file diff --git a/res/layout/simplebutton.xml b/res/layout/simplebutton.xml deleted file mode 100644 index 2857b419..00000000 --- a/res/layout/simplebutton.xml +++ /dev/null @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<Button xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/whiteBtn" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_margin="5dp" - android:text="text" > - -</Button>
\ No newline at end of file diff --git a/res/layout/status_layout.xml b/res/layout/status_layout.xml deleted file mode 100644 index 1ad57cee..00000000 --- a/res/layout/status_layout.xml +++ /dev/null @@ -1,51 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:padding="5dp"> - - <ImageView - android:id="@+id/imageView_icon" - android:layout_width="36dp" - android:layout_height="36dp" - android:layout_alignParentLeft="true" - android:layout_alignParentTop="true"/> - - <TextView - android:id="@+id/textView_header" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginLeft="5dp" - android:layout_toRightOf="@+id/imageView_icon" - android:gravity="top" /> - - <TextView - android:id="@+id/textView_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/textView_header" - android:layout_alignLeft="@+id/textView_header" - android:layout_alignParentRight="true" - android:layout_marginBottom="3dp" - android:layout_marginTop="1dp" /> - - <TextView - android:id="@+id/textView_footer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@+id/textView_text" - android:layout_alignLeft="@+id/textView_text" - android:layout_marginRight="2dp"/> - - <ImageView - android:id="@+id/imageView_favorited" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignBottom="@+id/textView_header" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_alignTop="@+id/textView_header" - android:src="@drawable/icon_favorite" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/res/layout/statusmenu_header.xml b/res/layout/statusmenu_header.xml deleted file mode 100644 index 34abec56..00000000 --- a/res/layout/statusmenu_header.xml +++ /dev/null @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/linearLayout1" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:gravity="center_horizontal" - android:paddingBottom="5dp" - android:paddingTop="5dp" > - - <FrameLayout - android:layout_width="2dp" - android:layout_height="match_parent" - android:background="@android:color/transparent" /> - - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_weight="1" - android:background="@color/Gray" - android:padding="1dp" > - - <ImageView - android:id="@+id/statusmenu_reply" - style="@style/whiteBtn" - android:layout_width="match_parent" - android:layout_height="50dp" - android:cropToPadding="false" - android:padding="5dp" - android:src="@drawable/icon_reply" /> - </FrameLayout> - - <FrameLayout - android:layout_width="2dp" - android:layout_height="match_parent" - android:background="@android:color/transparent" /> - - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_weight="1" - android:background="@color/Gray" - android:padding="1dp" > - - <ImageView - android:id="@+id/statusmenu_retweet" - style="@style/whiteBtn" - android:layout_width="match_parent" - android:layout_height="50dp" - android:layout_weight="1" - android:padding="5dp" - android:src="@drawable/icon_retweet" /> - </FrameLayout> - - <FrameLayout - android:layout_width="2dp" - android:layout_height="match_parent" - android:background="@android:color/transparent" /> - - <FrameLayout - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_weight="1" - android:background="@color/Gray" - android:padding="1dp" > - - <ImageView - android:id="@+id/statusmenu_favorite" - style="@style/whiteBtn" - android:layout_width="match_parent" - android:layout_height="50dp" - android:layout_weight="1" - android:padding="5dp" - android:src="@drawable/icon_favorite" /> - </FrameLayout> - - <FrameLayout - android:layout_width="2dp" - android:layout_height="match_parent" - android:background="@android:color/transparent" /> - -</LinearLayout>
\ No newline at end of file diff --git a/res/layout/userinfo_layout.xml b/res/layout/userinfo_layout.xml deleted file mode 100644 index 4f36611d..00000000 --- a/res/layout/userinfo_layout.xml +++ /dev/null @@ -1,287 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:background="@color/White" > - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="10dp" > - - <LinearLayout - android:id="@+id/linearlayout1" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <ImageView - android:id="@+id/user_icon" - android:layout_width="72dp" - android:layout_height="72dp" - android:layout_marginLeft="5dp" - android:layout_marginTop="5dp" - android:clickable="true" /> - - <LinearLayout - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <TextView - android:id="@+id/user_screenname" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginTop="5dp" - android:gravity="left" - android:text="screenname" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="@color/Gray" /> - - <TextView - android:id="@+id/user_name" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginTop="2dp" - android:gravity="left" - android:text="name" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textColor="@color/Gray" /> - - </LinearLayout> - </LinearLayout> - - <FrameLayout - android:id="@+id/frame1" - android:layout_width="fill_parent" - android:layout_height="1dp" - android:layout_marginTop="5dp" - android:background="@color/Gray" /> - - <LinearLayout - android:id="@+id/linearlayout2" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" > - - <TextView - android:id="@+id/user_homepage" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginTop="5dp" - android:autoLink="web" - android:gravity="left" - android:text="url" - android:textColor="@color/Gray" /> - - <TextView - android:id="@+id/user_locate" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginTop="5dp" - android:gravity="left" - android:text="locate" - android:textColor="@color/Gray" /> - - <TextView - android:id="@+id/user_isfollowing" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginTop="5dp" - android:gravity="left" - android:text="following" - android:textColor="@color/Gray" /> - - <TextView - android:id="@+id/user_isfollowed" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginTop="5dp" - android:gravity="right" - android:text="followed" - android:textColor="@color/Gray" /> - - <TextView - android:id="@+id/user_isprotected" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginTop="5dp" - android:gravity="right" - android:text="protected" - android:textColor="@color/Gray" /> - </LinearLayout> - - <FrameLayout - android:id="@+id/frame2" - android:layout_width="fill_parent" - android:layout_height="1dp" - android:layout_marginTop="5dp" - android:background="@color/Gray" /> - - <TextView - android:id="@+id/user_bio" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginRight="10dp" - android:layout_marginTop="5dp" - android:autoLink="web" - android:text="bio" - android:textColor="@color/Gray" /> - - <FrameLayout - android:id="@+id/frame3" - android:layout_width="fill_parent" - android:layout_height="1dp" - android:layout_marginTop="5dp" - android:background="@color/Gray" /> - - <LinearLayout - android:id="@+id/linearlayout3" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:orientation="horizontal" > - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginTop="5dp" - android:gravity="right" - android:text="Tweet :" - android:textColor="@color/Gray" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginTop="5dp" - android:gravity="right" - android:text="Following :" - android:textColor="@color/Gray" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginTop="5dp" - android:gravity="right" - android:text="Followed :" - android:textColor="@color/Gray" /> - - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="10dp" - android:layout_marginTop="5dp" - android:gravity="right" - android:text="Favorite :" - android:textColor="@color/Gray" /> - </LinearLayout> - - <LinearLayout - android:layout_width="wrap_content" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <TextView - android:id="@+id/user_count_tweet" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginTop="5dp" - android:gravity="left" - android:text="0" - android:textColor="@color/Gray" /> - - <TextView - android:id="@+id/user_count_following" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginTop="5dp" - android:gravity="left" - android:text="0" - android:textColor="@color/Gray" /> - - <TextView - android:id="@+id/user_count_followed" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginTop="5dp" - android:gravity="left" - android:text="0" - android:textColor="@color/Gray" /> - - <TextView - android:id="@+id/user_count_favorite" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginLeft="5dp" - android:layout_marginTop="5dp" - android:gravity="left" - android:text="0" - android:textColor="@color/Gray" /> - </LinearLayout> - </LinearLayout> - - <FrameLayout - android:id="@+id/frame4" - android:layout_width="fill_parent" - android:layout_height="1dp" - android:layout_marginTop="5dp" - android:background="@color/Gray" /> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" - android:layout_marginTop="10dp" - android:background="@color/Gray" - android:padding="1dp" > - - <Button - android:id="@+id/user_reload" - style="@style/whiteBtn" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Refresh" /> - </FrameLayout> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="center" - android:layout_marginBottom="10dp" - android:layout_marginLeft="15dp" - android:layout_marginRight="15dp" - android:layout_marginTop="10dp" - android:background="@color/Gray" - android:padding="1dp" > - - <Button - android:id="@+id/user_menu" - style="@style/whiteBtn" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="Menu" /> - </FrameLayout> - </LinearLayout> - -</ScrollView>
\ No newline at end of file diff --git a/res/values/arrays.xml b/res/values/arrays.xml index e217f6ff..3f77f741 100644 --- a/res/values/arrays.xml +++ b/res/values/arrays.xml @@ -1,16 +1,15 @@ <?xml version="1.0" encoding="utf-8"?> <resources> <string-array name="entry_namestyle"> - <item >@string/namestyle_s_n</item> - <item >@string/namestyle_n_s</item> - <item >@string/namestyle_s</item> - <item >@string/namestyle_n</item> + <item>@string/namestyle_s_n</item> + <item>@string/namestyle_n_s</item> + <item>@string/namestyle_s</item> + <item>@string/namestyle_n</item> </string-array> <string-array name="entryvalues_namestyle"> - <item >@string/namestyle_s_n</item> - <item >@string/namestyle_n_s</item> - <item >@string/namestyle_s</item> - <item >@string/namestyle_n</item> + <item>@string/namestyle_s_n</item> + <item>@string/namestyle_n_s</item> + <item>@string/namestyle_s</item> + <item>@string/namestyle_n</item> </string-array> - </resources>
\ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml deleted file mode 100644 index af652c62..00000000 --- a/res/values/colors.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<resources> - - <color name="Black">#000</color> - <color name="LightBlue">#ffb4ecff</color> - <color name="MetroBlue">#0bd1ff</color> - <color name="White">#FFF</color> - <color name="Gray">#535353</color> - <color name="Gray2">#808080</color> - <color name="Gray3">#ffb7c2cc</color> - <color name="LightGreen">#91FF91</color> - <color name="LightRed">#ffffcfce</color> - <color name="Red">#FF1E00</color> - <color name="BrownYellow">#FFB100</color> - <color name="DarkBlue">#231493</color> - <color name="ThickGreen">#317C09</color> - <color name="LightGray">#f5f5f5</color> - <color name="Transparent">#00000000</color> -</resources>
\ No newline at end of file diff --git a/res/values/dimens.xml b/res/values/dimens.xml deleted file mode 100644 index 473e3a58..00000000 --- a/res/values/dimens.xml +++ /dev/null @@ -1,25 +0,0 @@ -<!-- - Copyright 2011 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<resources> - - <dimen name="slidingmenu_offset">80dp</dimen> - <dimen name="list_padding">10dp</dimen> - <dimen name="shadow_width">15dp</dimen> - - <integer name="num_cols">1</integer> - -</resources>
\ No newline at end of file diff --git a/res/values/keys.xml b/res/values/keys.xml new file mode 100644 index 00000000..bdb00a07 --- /dev/null +++ b/res/values/keys.xml @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="utf-8"?> +<resources> + <string name="key_test_preference">testPreference</string> + <string name="key_text_size">textSize</string> + <string name="key_on_submit">onSubmit</string> + <string name="key_clear_accounts">clearAccounts</string> + <string name="key_unfav_notify">unfavNotify</string> + <string name="key_open_ime">openIME</string> + <string name="key_confirm">confirm</string> + <string name="key_morse">morse</string> + <string name="key_namestyle">nameStyle</string> + <string name="key_retweet_visibility">retweetVisibility</string> + <string name="key_search_retweet">searchRetweet</string> + <string name="key_request_count">requestCount</string> + <string name="key_theme">theme</string> + <string name="key_app_info">appInfo</string> + <string name="key_license_notices">licenseNotice</string> +</resources>
\ No newline at end of file diff --git a/res/values/license.xml b/res/values/license.xml index 27d21ce3..72c3b316 100644 --- a/res/values/license.xml +++ b/res/values/license.xml @@ -1,5 +1,4 @@ <?xml version="1.0" encoding="utf-8"?> -<!--suppress AndroidLintTypographyOther --> <resources> <string name="apache"> Apache License diff --git a/res/values/strings.xml b/res/values/strings.xml index a38eb44c..83b01557 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -1,25 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> <resources> - - <string name="app_name">SmileEssence Lite</string> - <string name="app_version">β1.4.4.44</string> - <string name="app_url">http://smileessence.miz-hi.net/</string> - <string name="key_setting_textSize">text_size</string> - <string name="key_setting_aftersubmit">after_submit</string> - <string name="key_setting_delete_accounts">deleteAccounts</string> - <string name="key_setting_notice_unfav">notice_unfav</string> - <string name="key_setting_open_ime">open_ime</string> - <string name="key_setting_confirm_dialog">confirm_dialog</string> - <string name="key_setting_footer">footer_visible</string> - <string name="key_setting_morse">morse_enabled</string> - <string name="key_setting_namestyle">namestyle</string> + <string name="app_name">SmileEssence</string> + <string name="app_version">0.1.0</string> + <string name="app_url">http://smileessence.lacolaco.net</string> <string name="namestyle_s_n">ScreenName / Name</string> <string name="namestyle_n_s">Name / ScreenName</string> <string name="namestyle_s">ScreenName</string> <string name="namestyle_n">Name</string> - <string name="key_setting_read_retweet">show_read_retweet</string> - <string name="key_setting_listload">list_load</string> <string name="thanks_to">miz_hi, yaplus</string> - <string name="app_info">appInfo</string> - <string name="license_notices">licenseNotice</string> -</resources>
\ No newline at end of file +</resources> diff --git a/res/values/styles.xml b/res/values/styles.xml deleted file mode 100644 index d8c693c0..00000000 --- a/res/values/styles.xml +++ /dev/null @@ -1,34 +0,0 @@ -<resources>
-
- <!--
- Base application theme, dependent on API level. This theme is replaced
- by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
-
- -->
- <style name="AppBaseTheme" parent="android:Theme.Holo.Light.NoActionBar">
- <!--
- Theme customizations available in newer API levels can go in
- res/values-vXX/styles.xml, while customizations related to
- backward-compatibility can go here.
-
- -->
- </style>
-
- <!-- Application theme. -->
- <style name="AppTheme" parent="AppBaseTheme">
- <!-- All customizations that are NOT specific to a particular API-level can go here. -->
- </style>
-
- <style name="grayBtn">
- <item name="android:background">@xml/graybtn_selector</item>
- </style>
-
- <style name="whiteBtn">
- <item name="android:background">@xml/whitebtn_selector</item>
- </style>
-
- <style name="transBtn">
- <item name="android:background">@xml/transbtn_selector</item>
- </style>
-
-</resources>
\ No newline at end of file diff --git a/res/xml/graybtn_selector.xml b/res/xml/graybtn_selector.xml deleted file mode 100644 index 6f6679e1..00000000 --- a/res/xml/graybtn_selector.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:state_pressed="true"> - <color android:color="@color/MetroBlue"/> - </item> - <item android:state_pressed="false"> - <color android:color="@color/Gray"/> - </item> - -</selector>
\ No newline at end of file diff --git a/res/xml/preference.xml b/res/xml/preference.xml index 07e6c404..bcf540a7 100644 --- a/res/xml/preference.xml +++ b/res/xml/preference.xml @@ -1,78 +1,87 @@ <?xml version="1.0" encoding="utf-8"?> + <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"> <PreferenceCategory android:title="表示設定"> <Preference - android:defaultValue="10" - android:key="@string/key_setting_textSize" - android:summary="文字のサイズだよ" - android:title="文字サイズ"/> + android:title="文字サイズ" + android:key="@string/key_text_size" + android:defaultValue="10"/> + <!--<SwitchPreference--> + <!--android:defaultValue="false"--> + <!--android:key="@string/keyTheme"--> + <!--android:summary="再起動後に有効になります"--> + <!--android:title="テーマ切り替え"--> + <!--android:switchTextOff="Light"--> + <!--android:switchTextOn="Dark"/>--> <SwitchPreference - android:defaultValue="true" - android:key="@string/key_setting_morse" - android:summaryOff="無効" - android:summaryOn="有効" - android:title="モールス解読"/> - + android:title="モールス解読" + android:summaryOn="有効" + android:summaryOff="無効" + android:key="@string/key_morse" + android:defaultValue="true"/> <ListPreference - android:dialogTitle="名前形式" - android:entries="@array/entry_namestyle" - android:entryValues="@array/entryvalues_namestyle" - android:key="@string/key_setting_namestyle" - android:summary="お好きなものを選んでください" - android:title="名前の形式"/> + android:title="名前の形式" + android:summary="お好きなものを選んでください" + android:dialogTitle="名前の形式" + android:key="@string/key_namestyle" + android:entries="@array/entry_namestyle" + android:entryValues="@array/entryvalues_namestyle"/> <SwitchPreference - android:key="@string/key_setting_read_retweet" - android:summaryOn="表示する" - android:title="同じツイートのRT" - android:summaryOff="表示しない" - android:defaultValue="true"/> + android:title="同じツイートのRT" + android:summaryOn="表示する" + android:summaryOff="表示しない" + android:defaultValue="true" + android:key="@string/key_retweet_visibility"/> </PreferenceCategory> <PreferenceCategory android:title="動作設定"> <SwitchPreference - android:defaultValue="true" - android:key="@string/key_setting_aftersubmit" - android:summaryOff="そのまま" - android:summaryOn="ホームに戻る" - android:title="投稿後"/> + android:title="投稿後の動作" + android:summaryOn="ホームに戻る" + android:summaryOff="何もしない" + android:key="@string/key_on_submit" + android:defaultValue="true"/> <SwitchPreference - android:defaultValue="false" - android:key="@string/key_setting_notice_unfav" - android:summaryOff="無効" - android:summaryOn="有効" - android:title="あんふぁぼ通知"/> + android:title="あんふぁぼ通知" + android:summaryOn="有効" + android:summaryOff="無効" + android:key="@string/key_unfav_notify" + android:defaultValue="false"/> <SwitchPreference - android:defaultValue="true" - android:key="@string/key_setting_open_ime" - android:summaryOff="IMEを開かない" - android:summaryOn="IMEを開く" - android:title="投稿画面表示時"/> + android:title="投稿画面表示時" + android:summaryOn="IMEを開く" + android:summaryOff="IMEを開かない" + android:key="@string/key_open_ime" + android:defaultValue="true"/> <SwitchPreference - android:defaultValue="true" - android:key="@string/key_setting_confirm_dialog" - android:summaryOff="無効" - android:summaryOn="有効" - android:title="確認ダイアログ"/> + android:title="確認ダイアログ" + android:summaryOn="有効" + android:summaryOff="無効" + android:key="@string/key_confirm" + android:defaultValue="true"/> <SwitchPreference - android:title="リストTL自動読み込み" - android:key="@string/key_setting_listload" - android:summaryOff="無効" - android:summaryOn="有効" - android:defaultValue="false"/> + android:title="検索にRTを含める" + android:summaryOn="有効" + android:summaryOff="無効" + android:key="@string/key_search_retweet" + android:defaultValue="false"/> + <Preference + android:title="読み込み件数" + android:summary="引っ張って更新" + android:key="@string/key_request_count" + android:defaultValue="20"/> </PreferenceCategory> <PreferenceCategory android:title="その他"> <Preference - android:key="@string/key_setting_delete_accounts" - android:summary="再起動後に認証してね" - android:title="認証情報を削除"/> + android:title="認証情報を削除" + android:summary="再起動後に認証してね" + android:key="@string/key_clear_accounts"/> <Preference - android:key="@string/app_info" - android:title="このアプリについて" - /> + android:title="このアプリについて" + android:key="@string/key_app_info"/> <Preference - android:key="@string/license_notices" - android:title="オープンソースライセンス"/> - + android:title="オープンソースライセンス" + android:key="@string/key_license_notices"/> </PreferenceCategory> </PreferenceScreen>
\ No newline at end of file diff --git a/res/xml/transbtn_selector.xml b/res/xml/transbtn_selector.xml deleted file mode 100644 index a8be9f55..00000000 --- a/res/xml/transbtn_selector.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:state_pressed="true"> - <color android:color="@color/MetroBlue"/> - </item> - <item android:state_pressed="false"> - <color android:color="@color/Transparent"/> - </item> - -</selector>
\ No newline at end of file diff --git a/res/xml/whitebtn_selector.xml b/res/xml/whitebtn_selector.xml deleted file mode 100644 index 39ba21df..00000000 --- a/res/xml/whitebtn_selector.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - - <item android:state_pressed="true"> - <color android:color="@color/MetroBlue"/> - </item> - <item android:state_pressed="false"> - <color android:color="@color/White"/> - </item> - -</selector>
\ No newline at end of file diff --git a/src/net/lacolaco/smileessence/Application.java b/src/net/lacolaco/smileessence/Application.java new file mode 100644 index 00000000..d7e15471 --- /dev/null +++ b/src/net/lacolaco/smileessence/Application.java @@ -0,0 +1,11 @@ +package net.lacolaco.smileessence; + +public class Application extends com.activeandroid.app.Application +{ + + @Override + public void onCreate() + { + super.onCreate(); + } +} diff --git a/src/net/lacolaco/smileessence/activity/MainActivity.java b/src/net/lacolaco/smileessence/activity/MainActivity.java new file mode 100644 index 00000000..dc008f96 --- /dev/null +++ b/src/net/lacolaco/smileessence/activity/MainActivity.java @@ -0,0 +1,52 @@ +package net.lacolaco.smileessence.activity; + +import android.app.Activity; +import android.content.Intent; +import android.os.Bundle; +import android.view.Window; +import net.lacolaco.smileessence.R; + +public class MainActivity extends Activity +{ + + /** + * Called when the activity is first created. + */ + @Override + public void onCreate(Bundle savedInstanceState) + { + super.onCreate(savedInstanceState); + requestWindowFeature(Window.FEATURE_NO_TITLE); + setContentView(R.layout.main); + } + + @Override + protected void onResume() + { + super.onResume(); //To change body of overridden methods use File | Settings | File Templates. + } + + @Override + protected void onPause() + { + super.onPause(); //To change body of overridden methods use File | Settings | File Templates. + } + + @Override + protected void onDestroy() + { + super.onDestroy(); //To change body of overridden methods use File | Settings | File Templates. + } + + @Override + protected void onStop() + { + super.onStop(); //To change body of overridden methods use File | Settings | File Templates. + } + + @Override + protected void onNewIntent(Intent intent) + { + super.onNewIntent(intent); //To change body of overridden methods use File | Settings | File Templates. + } +} diff --git a/src/net/lacolaco/smileessence/data/IconCache.java b/src/net/lacolaco/smileessence/data/IconCache.java new file mode 100644 index 00000000..8c58421a --- /dev/null +++ b/src/net/lacolaco/smileessence/data/IconCache.java @@ -0,0 +1,6 @@ +package net.lacolaco.smileessence.data; + +public class IconCache +{ + +} diff --git a/src/net/lacolaco/smileessence/data/StatusCache.java b/src/net/lacolaco/smileessence/data/StatusCache.java new file mode 100644 index 00000000..f22e6e6a --- /dev/null +++ b/src/net/lacolaco/smileessence/data/StatusCache.java @@ -0,0 +1,6 @@ +package net.lacolaco.smileessence.data; + +public class StatusCache +{ + +} diff --git a/src/net/lacolaco/smileessence/entity/Account.java b/src/net/lacolaco/smileessence/entity/Account.java new file mode 100644 index 00000000..0faf0916 --- /dev/null +++ b/src/net/lacolaco/smileessence/entity/Account.java @@ -0,0 +1,27 @@ +package net.lacolaco.smileessence.entity; + +import com.activeandroid.Model; +import com.activeandroid.annotation.Column; +import com.activeandroid.annotation.Table; + +@Table(name = "Accounts") +public class Account extends Model +{ + + @Column(name = "Token", notNull = true) + public String accessToken; + @Column(name = "Secret", notNull = true) + public String accessSecret; + + public Account() + { + super(); + } + + public Account(String token, String tokenSecret) + { + super(); + this.accessToken = token; + this.accessSecret = tokenSecret; + } +} diff --git a/src/net/lacolaco/smileessence/entity/CommandSetting.java b/src/net/lacolaco/smileessence/entity/CommandSetting.java new file mode 100644 index 00000000..12a263ea --- /dev/null +++ b/src/net/lacolaco/smileessence/entity/CommandSetting.java @@ -0,0 +1,27 @@ +package net.lacolaco.smileessence.entity; + +import com.activeandroid.Model; +import com.activeandroid.annotation.Column; +import com.activeandroid.annotation.Table; + +@Table(name = "Commands") +public class CommandSetting extends Model +{ + + @Column(name = "CommandID") + public int commandID; + @Column(name = "Visibility") + public boolean visibility; + + public CommandSetting() + { + super(); + } + + public CommandSetting(int commandID, boolean visibility) + { + super(); + this.commandID = commandID; + this.visibility = visibility; + } +} diff --git a/src/net/lacolaco/smileessence/entity/ExtractionWord.java b/src/net/lacolaco/smileessence/entity/ExtractionWord.java new file mode 100644 index 00000000..efa01f08 --- /dev/null +++ b/src/net/lacolaco/smileessence/entity/ExtractionWord.java @@ -0,0 +1,24 @@ +package net.lacolaco.smileessence.entity; + +import com.activeandroid.Model; +import com.activeandroid.annotation.Column; +import com.activeandroid.annotation.Table; + +@Table(name = "Extraction") +public class ExtractionWord extends Model +{ + + @Column(name = "Text", notNull = true) + public String text; + + public ExtractionWord() + { + super(); + } + + public ExtractionWord(String text) + { + super(); + this.text = text; + } +} diff --git a/src/net/lacolaco/smileessence/entity/SavedHashtag.java b/src/net/lacolaco/smileessence/entity/SavedHashtag.java new file mode 100644 index 00000000..381317c5 --- /dev/null +++ b/src/net/lacolaco/smileessence/entity/SavedHashtag.java @@ -0,0 +1,24 @@ +package net.lacolaco.smileessence.entity; + +import com.activeandroid.Model; +import com.activeandroid.annotation.Column; +import com.activeandroid.annotation.Table; + +@Table(name = "Hashtag") +public class SavedHashtag extends Model +{ + + @Column(name = "Text", notNull = true) + public String text; + + public SavedHashtag() + { + super(); + } + + public SavedHashtag(String text) + { + super(); + this.text = text; + } +} diff --git a/src/net/lacolaco/smileessence/entity/Template.java b/src/net/lacolaco/smileessence/entity/Template.java new file mode 100644 index 00000000..782ae509 --- /dev/null +++ b/src/net/lacolaco/smileessence/entity/Template.java @@ -0,0 +1,27 @@ +package net.lacolaco.smileessence.entity; + +import com.activeandroid.Model; +import com.activeandroid.annotation.Column; +import com.activeandroid.annotation.Table; + +@Table(name = "Templates") +public class Template extends Model +{ + + @Column(name = "Text", notNull = true) + public String text; + @Column(name = "Position") + public int position; + + public Template() + { + super(); + } + + public Template(String text, int position) + { + super(); + this.text = text; + this.position = position; + } +} diff --git a/src/net/lacolaco/smileessence/logging/Logger.java b/src/net/lacolaco/smileessence/logging/Logger.java new file mode 100644 index 00000000..2b00d2dc --- /dev/null +++ b/src/net/lacolaco/smileessence/logging/Logger.java @@ -0,0 +1,34 @@ +package net.lacolaco.smileessence.logging; + +import android.util.Log; + +public class Logger +{ + + private static final String TAG = "SmileEssence"; + + public static void debug(String message) + { + Log.d(TAG, message); + } + + public static void info(String message) + { + Log.i(TAG, message); + } + + public static void error(String message) + { + Log.e(TAG, message); + } + + public static void warn(String message) + { + Log.w(TAG, message); + } + + public static void verbose(String message) + { + Log.v(TAG, message); + } +} diff --git a/src/net/lacolaco/smileessence/notification/NotificationType.java b/src/net/lacolaco/smileessence/notification/NotificationType.java new file mode 100644 index 00000000..a777816f --- /dev/null +++ b/src/net/lacolaco/smileessence/notification/NotificationType.java @@ -0,0 +1,7 @@ +package net.lacolaco.smileessence.notification; + +public enum NotificationType +{ + INFO, + ALERT; +} diff --git a/src/net/lacolaco/smileessence/notification/Notificator.java b/src/net/lacolaco/smileessence/notification/Notificator.java new file mode 100644 index 00000000..2f2dce90 --- /dev/null +++ b/src/net/lacolaco/smileessence/notification/Notificator.java @@ -0,0 +1,91 @@ +package net.lacolaco.smileessence.notification; + +import android.app.Activity; +import android.widget.Toast; +import de.keyboardsurfer.android.widget.crouton.Configuration; +import de.keyboardsurfer.android.widget.crouton.Crouton; +import de.keyboardsurfer.android.widget.crouton.Style; +import net.lacolaco.smileessence.logging.Logger; + +public class Notificator +{ + + private Activity activity; + private String text; + private NotificationType type; + private static boolean isRunning; + private static final int DURATION = 1000; + + public Notificator(Activity activity, String text) + { + this(activity, text, NotificationType.INFO); + } + + public Notificator(Activity activity, String text, NotificationType type) + { + this.activity = activity; + this.text = text; + this.type = type; + } + + public static void startNotification() + { + isRunning = true; + } + + public static void stopNotification() + { + isRunning = false; + Crouton.cancelAllCroutons(); + } + + public void publish() + { + if(activity == null || activity.isFinishing()) + { + return; + } + if(isRunning) + { + Logger.debug(String.format("notify by crouton %s", text)); + makeCrouton().show(); + } + else + { + Logger.debug(String.format("notify by toast %s", text)); + makeToast().show(); + } + } + + private Style getStyle() + { + Configuration.Builder conf = new Configuration.Builder(); + conf.setDuration(DURATION); + Style.Builder style = new Style.Builder(); + style.setConfiguration(conf.build()); + switch(type) + { + case INFO: + { + style.setBackgroundColor(Style.holoBlueLight); + break; + } + case ALERT: + { + style.setBackgroundColor(Style.holoRedLight); + break; + } + } + return style.build(); + } + + public Crouton makeCrouton() + { + return Crouton.makeText(activity, text, getStyle()); + } + + public Toast makeToast() + { + return Toast.makeText(activity, text, Toast.LENGTH_LONG); + } +} diff --git a/src/net/lacolaco/smileessence/preference/Pref.java b/src/net/lacolaco/smileessence/preference/Pref.java new file mode 100644 index 00000000..3b37f149 --- /dev/null +++ b/src/net/lacolaco/smileessence/preference/Pref.java @@ -0,0 +1,131 @@ +package net.lacolaco.smileessence.preference; + +import android.content.Context; +import android.content.SharedPreferences; +import android.preference.PreferenceManager; + +import java.util.Set; + +public class Pref +{ + + private Context context; + + public Pref(Context context) + { + this.context = context; + } + + private SharedPreferences getPref() + { + return PreferenceManager.getDefaultSharedPreferences(context); + } + + private String getString(int resID) + { + try + { + return context.getString(resID); + } + catch(Exception e) + { + return null; + } + } + + public boolean getValue(int keyID, boolean defaultValue) + { + return getString(keyID) != null ? getPref().getBoolean(getString(keyID), defaultValue) : defaultValue; + } + + public int getValue(int keyID, int defaultValue) + { + return getString(keyID) != null ? getPref().getInt(getString(keyID), defaultValue) : defaultValue; + } + + public float getValue(int keyID, float defaultValue) + { + return getString(keyID) != null ? getPref().getFloat(getString(keyID), defaultValue) : defaultValue; + } + + public long getValue(int keyID, long defaultValue) + { + return getString(keyID) != null ? getPref().getLong(getString(keyID), defaultValue) : defaultValue; + } + + public String getValue(int keyID, String defaultValue) + { + return getString(keyID) != null ? getPref().getString(getString(keyID), defaultValue) : defaultValue; + } + + public Set<String> getValue(int keyID, Set<String> defaultValue) + { + return getString(keyID) != null ? getPref().getStringSet(getString(keyID), defaultValue) : defaultValue; + } + + public boolean putValue(int keyID, boolean value) + { + if(getString(keyID) == null) + { + return false; + } + SharedPreferences.Editor editor = getPref().edit(); + editor.putBoolean(getString(keyID), value); + return editor.commit(); + } + + public boolean putValue(int keyID, int value) + { + if(getString(keyID) == null) + { + return false; + } + SharedPreferences.Editor editor = getPref().edit(); + editor.putInt(getString(keyID), value); + return editor.commit(); + } + + public boolean putValue(int keyID, float value) + { + if(getString(keyID) == null) + { + return false; + } + SharedPreferences.Editor editor = getPref().edit(); + editor.putFloat(getString(keyID), value); + return editor.commit(); + } + + public boolean putValue(int keyID, long value) + { + if(getString(keyID) == null) + { + return false; + } + SharedPreferences.Editor editor = getPref().edit(); + editor.putLong(getString(keyID), value); + return editor.commit(); + } + + public boolean putValue(int keyID, String value) + { + if(getString(keyID) == null) + { + return false; + } + SharedPreferences.Editor editor = getPref().edit(); + editor.putString(getString(keyID), value); + return editor.commit(); + } + + public boolean putValue(int keyID, Set<String> value) + { + if(getString(keyID) == null) + { + return false; + } + SharedPreferences.Editor editor = getPref().edit(); + editor.putStringSet(getString(keyID), value); + return editor.commit(); + } +} diff --git a/src/net/lacolaco/smileessence/resource/ResourceHelper.java b/src/net/lacolaco/smileessence/resource/ResourceHelper.java new file mode 100644 index 00000000..b00a6dc3 --- /dev/null +++ b/src/net/lacolaco/smileessence/resource/ResourceHelper.java @@ -0,0 +1,19 @@ +package net.lacolaco.smileessence.resource; + +import android.content.Context; + +public class ResourceHelper +{ + + private Context context; + + public ResourceHelper(Context context) + { + this.context = context; + } + + public String getString(int resID) + { + return context.getString(resID); + } +} diff --git a/src/net/lacolaco/smileessence/twitter/TwitterApi.java b/src/net/lacolaco/smileessence/twitter/TwitterApi.java new file mode 100644 index 00000000..cd683fb2 --- /dev/null +++ b/src/net/lacolaco/smileessence/twitter/TwitterApi.java @@ -0,0 +1,33 @@ +package net.lacolaco.smileessence.twitter; + +import net.lacolaco.smileessence.entity.Account; +import twitter4j.Twitter; +import twitter4j.TwitterFactory; +import twitter4j.TwitterStream; +import twitter4j.TwitterStreamFactory; +import twitter4j.auth.AccessToken; + +public class TwitterApi +{ + + private Account account; + + public TwitterApi(String token, String tokenSecret) + { + this.account = new Account(token, tokenSecret); + } + + public Twitter getTwitter() + { + Twitter twitter = TwitterFactory.getSingleton(); + twitter.setOAuthAccessToken(new AccessToken(account.accessToken, account.accessSecret)); + return twitter; + } + + public TwitterStream getTwitterStream() + { + TwitterStream stream = TwitterStreamFactory.getSingleton(); + stream.setOAuthAccessToken(new AccessToken(account.accessToken, account.accessSecret)); + return stream; + } +} diff --git a/src/net/miz_hi/smileessence/Client.java b/src/net/miz_hi/smileessence/Client.java deleted file mode 100644 index d5e3ed44..00000000 --- a/src/net/miz_hi/smileessence/Client.java +++ /dev/null @@ -1,132 +0,0 @@ -package net.miz_hi.smileessence; - -import android.app.Application; -import android.content.res.Resources; -import android.preference.PreferenceManager; -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.auth.AuthenticationDB; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.data.DBHelper; -import net.miz_hi.smileessence.permission.IPermission; -import net.miz_hi.smileessence.permission.PermissonChecker; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; -import net.miz_hi.smileessence.preference.PreferenceHelper; - -import java.io.File; - -public class Client -{ - - private static Application app; - private static Account mainAccount; - private static PreferenceHelper prefHelper; - private static IPermission permission; - private static int textSize; - - private Client() - { - } - - public static PreferenceHelper getPreferenceHelper() - { - return prefHelper; - } - - public static void putPreferenceValue(EnumPreferenceKey key, Object value) - { - prefHelper.putPreferenceValue(key, value); - } - - public static <T> T getPreferenceValue(EnumPreferenceKey key) - { - return prefHelper.getPreferenceValue(key); - } - - public static boolean hasAuthorizedAccount() - { - return AuthenticationDB.instance().findAll() != null && !AuthenticationDB.instance().findAll().isEmpty(); - } - - public static Application getApplication() - { - return app; - } - - public static Account getMainAccount() - { - return mainAccount; - } - - public static void setMainAccount(Account account) - { - if (account != null) - { - putPreferenceValue(EnumPreferenceKey.LAST_USED_USER_ID, account.getUserId()); - } - else - { - putPreferenceValue(EnumPreferenceKey.LAST_USED_USER_ID, -1L); - } - mainAccount = account; - - setPermission(PermissonChecker.checkPermission(mainAccount)); - } - - public static IPermission getPermission() - { - return permission; - } - - public static void setPermission(IPermission permission) - { - Client.permission = permission; - } - - public static File getApplicationFile(String fileName) - { - return new File(app.getExternalCacheDir(), fileName); - } - - public static Resources getResource() - { - return app.getResources(); - } - - public static String getString(int id) - { - return app.getResources().getString(id); - } - - public static int getColor(int resId) - { - return getResource().getColor(resId); - } - - public static int getTextSize() - { - return textSize; - } - - public static void loadPreferences() - { - int tSize = getPreferenceValue(EnumPreferenceKey.TEXT_SIZE); - if (tSize < 0) - { - putPreferenceValue(EnumPreferenceKey.TEXT_SIZE, 10); - } - textSize = getPreferenceValue(EnumPreferenceKey.TEXT_SIZE); - } - - public static void initialize(Application app) - { - Client.prefHelper = new PreferenceHelper(PreferenceManager.getDefaultSharedPreferences(app)); - Client.app = app; - Client.mainAccount = null; - loadPreferences(); - new DBHelper(app).initialize(); - MyExecutor.init(); - } - - public static final String CALLBACK_OAUTH = "oauth://smileessence"; - -} diff --git a/src/net/miz_hi/smileessence/ClientApplication.java b/src/net/miz_hi/smileessence/ClientApplication.java deleted file mode 100644 index 32a63be3..00000000 --- a/src/net/miz_hi/smileessence/ClientApplication.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.miz_hi.smileessence; - -import android.app.Application; - -public class ClientApplication extends Application -{ - @Override - public void onCreate() - { - super.onCreate(); - Client.initialize(this); - } -} diff --git a/src/net/miz_hi/smileessence/auth/Account.java b/src/net/miz_hi/smileessence/auth/Account.java deleted file mode 100644 index 8d20fb66..00000000 --- a/src/net/miz_hi/smileessence/auth/Account.java +++ /dev/null @@ -1,110 +0,0 @@ -package net.miz_hi.smileessence.auth; - -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; -import net.miz_hi.smileessence.auth.Consumers.Consumer; -import twitter4j.auth.AccessToken; - -@DatabaseTable(tableName = "accounts") -public class Account -{ - - @DatabaseField(generatedId = true) - private Integer id; - @DatabaseField - private String consumerKey; - @DatabaseField - private String consumerSecret; - @DatabaseField - private String accessToken; - @DatabaseField - private String accessTokenSecret; - @DatabaseField - private String screenName; - @DatabaseField - private Long userId; - - public Account() - { - } - - public Account(AccessToken token, Consumer consumer) - { - this.accessToken = token.getToken(); - this.accessTokenSecret = token.getTokenSecret(); - this.screenName = token.getScreenName(); - this.userId = token.getUserId(); - this.setConsumerKey(consumer.key); - this.setConsumerSecret(consumer.secret); - } - - public Integer getId() - { - return id; - } - - public void setId(Integer id) - { - this.id = id; - } - - public String getAccessToken() - { - return accessToken; - } - - public void setAccessToken(String accessToken) - { - this.accessToken = accessToken; - } - - public String getAccessTokenSecret() - { - return accessTokenSecret; - } - - public void setAccessTokenSecret(String accessTokenSecret) - { - this.accessTokenSecret = accessTokenSecret; - } - - public String getScreenName() - { - return screenName; - } - - public void setScreenName(String screenName) - { - this.screenName = screenName; - } - - public Long getUserId() - { - return userId; - } - - public void setUserId(Long userId) - { - this.userId = userId; - } - - public String getConsumerKey() - { - return consumerKey; - } - - public void setConsumerKey(String consumerKey) - { - this.consumerKey = consumerKey; - } - - public String getConsumerSecret() - { - return consumerSecret; - } - - public void setConsumerSecret(String consumerSecret) - { - this.consumerSecret = consumerSecret; - } -} diff --git a/src/net/miz_hi/smileessence/auth/AuthenticationDB.java b/src/net/miz_hi/smileessence/auth/AuthenticationDB.java deleted file mode 100644 index 56f54d05..00000000 --- a/src/net/miz_hi/smileessence/auth/AuthenticationDB.java +++ /dev/null @@ -1,102 +0,0 @@ -package net.miz_hi.smileessence.auth; - -import android.content.Context; -import android.util.Log; -import com.j256.ormlite.dao.Dao; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.data.DBHelper; - -import java.util.List; - -public class AuthenticationDB -{ - - private Context context; - private static AuthenticationDB instance = new AuthenticationDB(Client.getApplication()); - - private AuthenticationDB(Context context) - { - this.context = context; - } - - public static AuthenticationDB instance() - { - return instance; - } - - public void save(Account account) - { - DBHelper helper = new DBHelper(context); - try - { - Dao<Account, Integer> dao = helper.getDao(Account.class); - dao.createOrUpdate(account); - } - catch (Exception e) - { - Log.e(AuthenticationDB.class.getSimpleName(), "error on save"); - } - finally - { - helper.close(); - } - } - - public void delete(Account account) - { - DBHelper helper = new DBHelper(context); - try - { - Dao<Account, Integer> dao = helper.getDao(Account.class); - dao.delete(account); - } - catch (Exception e) - { - Log.e(AuthenticationDB.class.getSimpleName(), "error on delete"); - } - finally - { - helper.close(); - } - } - - public void deleteAll() - { - DBHelper helper = new DBHelper(context); - try - { - for (Account account : findAll()) - { - Dao<Account, Integer> dao = helper.getDao(Account.class); - dao.delete(account); - } - } - catch (Exception e) - { - Log.e(AuthenticationDB.class.getSimpleName(), "error on delete"); - } - finally - { - helper.close(); - } - } - - public List<Account> findAll() - { - DBHelper helper = new DBHelper(context); - try - { - Dao<Account, Integer> dao = helper.getDao(Account.class); - return dao.queryForAll(); - } - catch (Exception e) - { - Log.e(AuthenticationDB.class.getSimpleName(), "error on findAll"); - return null; - } - finally - { - helper.close(); - } - } -} diff --git a/src/net/miz_hi/smileessence/auth/AuthorizeHelper.java b/src/net/miz_hi/smileessence/auth/AuthorizeHelper.java deleted file mode 100644 index 65b35177..00000000 --- a/src/net/miz_hi/smileessence/auth/AuthorizeHelper.java +++ /dev/null @@ -1,91 +0,0 @@ -package net.miz_hi.smileessence.auth; - -import android.app.Activity; -import android.content.Intent; -import android.net.Uri; -import net.miz_hi.smileessence.auth.Consumers.Consumer; -import net.miz_hi.smileessence.core.EnumRequestCode; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.view.activity.WebViewActivity; -import twitter4j.Twitter; -import twitter4j.TwitterFactory; -import twitter4j.auth.AccessToken; -import twitter4j.auth.RequestToken; - -import java.util.concurrent.Callable; -import java.util.concurrent.Future; - -public class AuthorizeHelper -{ - - private Activity activity; - private Consumer consumer; - private Twitter twitter; - private RequestToken req; - - public static final String CALLBACK_OAUTH = "oauth://smileessence"; - public static final String OAUTH_VERIFIER = "oauth_verifier"; - - public AuthorizeHelper(Activity activity, Consumer consumer) - { - this.activity = activity; - this.consumer = consumer; - } - - public void oauthSend() - { - try - { - twitter = new TwitterFactory().getInstance(); - twitter.setOAuthConsumer(consumer.key, consumer.secret); - Future<RequestToken> f = MyExecutor.submit(new Callable<RequestToken>() - { - - @Override - public RequestToken call() throws Exception - { - return twitter.getOAuthRequestToken(CALLBACK_OAUTH); - } - }); - req = f.get(); - Intent intent = new Intent(activity, WebViewActivity.class); - intent.setData(Uri.parse(req.getAuthorizationURL())); - activity.startActivityForResult(intent, EnumRequestCode.AUTHORIZE.ordinal()); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - - public Account oauthReceive(Uri uri) - { - Account account = null; - try - { - final String verifier = uri.getQueryParameter(OAUTH_VERIFIER); - AccessToken accessToken; - Future<AccessToken> f = MyExecutor.submit(new Callable<AccessToken>() - { - - @Override - public AccessToken call() throws Exception - { - return twitter.getOAuthAccessToken(req, verifier); - } - }); - accessToken = f.get(); - if (accessToken != null) - { - account = new Account(accessToken, consumer); - AuthenticationDB db = AuthenticationDB.instance(); - db.save(account); - } - } - catch (Exception e) - { - e.printStackTrace(); - } - return account; - } -} diff --git a/src/net/miz_hi/smileessence/auth/Consumers.java b/src/net/miz_hi/smileessence/auth/Consumers.java deleted file mode 100644 index d85758ed..00000000 --- a/src/net/miz_hi/smileessence/auth/Consumers.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.miz_hi.smileessence.auth; - -import java.util.HashMap; - -public class Consumers -{ - public static HashMap<String, Consumer> consumersMap = new HashMap<String, Consumers.Consumer>(); - - public static Consumer smileEssence = new Consumer("uWzFVW7gaRIxWybOsAEWzg", "CMkSxT4YfgE5Yrf77qyh8msy13UYqRTECjrQCePM11Q"); - public static Consumer smileEssenceLite = new Consumer("SIt6h4O6qmBB2URSKsF1Q", "Uil1dyrqiodLLqXIB6B0rVwVxFfFCxTf8ggAcszWc"); - - static - { - consumersMap.put("SmileEssence", smileEssence); - consumersMap.put("SmileEssenceLite", smileEssenceLite); - } - - public static Consumer getDedault() - { - return smileEssenceLite; - } - - public static class Consumer - { - - public String key; - public String secret; - - public Consumer(String key, String secret) - { - this.key = key; - this.secret = secret; - } - } -} diff --git a/src/net/miz_hi/smileessence/cache/IconCache.java b/src/net/miz_hi/smileessence/cache/IconCache.java deleted file mode 100644 index 434fe5e8..00000000 --- a/src/net/miz_hi/smileessence/cache/IconCache.java +++ /dev/null @@ -1,202 +0,0 @@ -package net.miz_hi.smileessence.cache; - -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.BitmapFactory.Options; -import android.widget.ImageView; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.model.status.user.UserModel; -import net.miz_hi.smileessence.task.impl.GetIconTask; -import net.miz_hi.smileessence.util.CountUpInteger; -import net.miz_hi.smileessence.util.StringUtils; -import net.miz_hi.smileessence.util.UiHandler; - -import java.io.File; -import java.util.Collections; -import java.util.Comparator; -import java.util.LinkedList; -import java.util.Map; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.Future; - -public class IconCache -{ - - private static ConcurrentHashMap<Long, Icon> iconCache = new ConcurrentHashMap<Long, Icon>(); - private static ConcurrentHashMap<Long, Future<Bitmap>> futureMap = new ConcurrentHashMap<Long, Future<Bitmap>>(); - private static File cacheDir = Client.getApplication().getExternalCacheDir(); - private static Bitmap emptyIcon; - private static CountUpInteger counter = new CountUpInteger(5); - - public static Icon getIcon(long id) - { - return iconCache.get(id); - } - - public static void checkIconCache(final UserModel user) - { - final String fileName = genIconName(user); - final File latestIconFile = Client.getApplicationFile(fileName); - - - boolean needsCacheUpdate = true; - if (iconCache.containsKey(user.userId)) - { - needsCacheUpdate = !iconCache.get(user.userId).fileName.equals(fileName); - } - else - { - needsCacheUpdate = !latestIconFile.exists(); - } - - if (!needsCacheUpdate) - { - if (!iconCache.containsKey(user.userId) && !futureMap.containsKey(user.userId)) - { - Options opt = new Options(); - opt.inPurgeable = true; // GC�\�ɂ��� - Bitmap bm = BitmapFactory.decodeFile(latestIconFile.getPath(), opt); - Icon icon = new Icon(bm, fileName); - IconCache.putIconToMap(user.userId, icon); - } - } - else - { - futureMap.put(user.userId, MyExecutor.submit(new GetIconTask(user))); - } - } - - public synchronized static void setIconBitmapToView(final UserModel user, final ImageView viewIcon) - { - if (futureMap.containsKey(user.userId)) - { - viewIcon.setImageBitmap(getEmptyIcon()); - viewIcon.setTag(user.userId); - final Future<Bitmap> f = futureMap.remove(user.userId); - MyExecutor.execute(new Runnable() - { - - @Override - public void run() - { - try - { - final Bitmap bm = f.get(); - new UiHandler() - { - - @Override - public void run() - { - if ((Long) viewIcon.getTag() == user.userId) - { - viewIcon.setImageBitmap(bm); - viewIcon.invalidate(); - } - } - }.post(); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - }); - } - else if (iconCache.containsKey(user.userId)) - { - Icon icon = iconCache.get(user.userId); - viewIcon.setImageBitmap(icon.use()); - } - else - { - viewIcon.setImageBitmap(getEmptyIcon()); - MyExecutor.execute(new Runnable() - { - - @Override - public void run() - { - checkIconCache(user); - } - }); - } - } - - public static String genIconName(UserModel user) - { - return String.format("%1$s_%2$s", user.userId, StringUtils.parseUrlToFileName(user.iconUrl)); - } - - public static void clearCache() - { - iconCache.clear(); - } - - public static void putIconToMap(long id, Icon icon) - { - - if (iconCache.size() > 500 && counter.isOver()) - { - - LinkedList<Map.Entry> entries = new LinkedList<Map.Entry>(iconCache.entrySet()); - Collections.sort(entries, new Comparator() - { - - @Override - public int compare(Object o1, Object o2) - { - Map.Entry e1 = (Map.Entry) o1; - Map.Entry e2 = (Map.Entry) o2; - return ((Icon) e1.getValue()).compareTo((Icon) e2.getValue()); - } - }); - - iconCache.remove(entries.poll().getKey()); - // if(removed != null) - // { - // removed.bitmap.recycle(); - // } - counter.reset(); - } - - iconCache.put(id, icon); - counter.countUp(); - } - - public static Bitmap getEmptyIcon() - { - Options opt = new Options(); - opt.inPurgeable = true; // GC�\�ɂ��� - return BitmapFactory.decodeResource(Client.getResource(), R.drawable.icon_reflesh, opt); - } - - public static class Icon implements Comparable<Icon> - { - - private Bitmap bitmap; - public String fileName; - public int count = 0; - - public Icon(Bitmap bitmap, String fileName) - { - this.bitmap = bitmap; - this.fileName = fileName; - } - - public Bitmap use() - { - count++; - return bitmap; - } - - @Override - public int compareTo(Icon another) - { - return this.count > another.count ? -1 : (this.count == another.count ? 0 : 1); - } - - } -} diff --git a/src/net/miz_hi/smileessence/cache/RelationshipCache.java b/src/net/miz_hi/smileessence/cache/RelationshipCache.java deleted file mode 100644 index 94009483..00000000 --- a/src/net/miz_hi/smileessence/cache/RelationshipCache.java +++ /dev/null @@ -1,37 +0,0 @@ -package net.miz_hi.smileessence.cache; - -import twitter4j.Relationship; - -import java.util.concurrent.ConcurrentHashMap; - - -public class RelationshipCache -{ - - private static ConcurrentHashMap<Long, Relationship> relationshipMap = new ConcurrentHashMap<Long, Relationship>(); - - public static void put(Relationship relationship) - { - if (relationshipMap.containsKey(relationship.getTargetUserId())) - { - relationshipMap.remove(relationship.getTargetUserId()); - } - - relationshipMap.put(relationship.getTargetUserId(), relationship); - } - - public static Relationship get(long id) - { - return relationshipMap.get(id); - } - - public static Relationship remove(long id) - { - return relationshipMap.remove(id); - } - - public static void clearCache() - { - relationshipMap.clear(); - } -} diff --git a/src/net/miz_hi/smileessence/cache/TweetCache.java b/src/net/miz_hi/smileessence/cache/TweetCache.java deleted file mode 100644 index e0b260cf..00000000 --- a/src/net/miz_hi/smileessence/cache/TweetCache.java +++ /dev/null @@ -1,98 +0,0 @@ -package net.miz_hi.smileessence.cache; - -import net.miz_hi.smileessence.model.status.tweet.EnumTweetType; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; - -import java.util.ArrayList; -import java.util.List; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.CopyOnWriteArrayList; - -public class TweetCache -{ - - private static TweetCache instance = new TweetCache(); - - private ConcurrentHashMap<Long, TweetModel> statusesMap = new ConcurrentHashMap<Long, TweetModel>(); - private CopyOnWriteArrayList<Long> favoriteList = new CopyOnWriteArrayList<Long>(); - private CopyOnWriteArrayList<String> hashtagList = new CopyOnWriteArrayList<String>(); - private CopyOnWriteArrayList<Long> readRetweetList = new CopyOnWriteArrayList<Long>(); - - public static void put(TweetModel tweet) - { - if (instance.statusesMap.containsKey(tweet.statusId)) - { - instance.statusesMap.remove(tweet.statusId); - } - if (tweet.type == EnumTweetType.RETWEET) - { - instance.readRetweetList.add(tweet.statusId); - } - instance.statusesMap.put(tweet.statusId, tweet); - } - - public static List<TweetModel> getList() - { - return new ArrayList<TweetModel>(instance.statusesMap.values()); - } - - public static TweetModel get(long id) - { - return instance.statusesMap.get(id); - } - - public static TweetModel remove(long id) - { - return instance.statusesMap.remove(id); - } - - public static void putFavoritedStatus(long id) - { - instance.favoriteList.add(id); - } - - public static void removeFavoritedStatus(long id) - { - instance.favoriteList.remove(id); - } - - public static boolean isFavorited(long id) - { - return instance.favoriteList.contains(id); - } - - public static boolean isNotRead(long id) - { - int count = 0; - for (Long l : instance.readRetweetList) - { - if (id == l) - { - count++; - } - } - return count <= 1; - } - - public static void putHashtag(String tag) - { - if (instance.hashtagList.contains(tag)) - { - return; - } - instance.hashtagList.add(tag); - } - - public static List<String> getHashtagList() - { - return instance.hashtagList; - } - - public static void clearCache() - { - instance.statusesMap.clear(); - instance.favoriteList.clear(); - instance.hashtagList.clear(); - instance.readRetweetList.clear(); - } -} diff --git a/src/net/miz_hi/smileessence/cache/UserCache.java b/src/net/miz_hi/smileessence/cache/UserCache.java deleted file mode 100644 index 975b8de8..00000000 --- a/src/net/miz_hi/smileessence/cache/UserCache.java +++ /dev/null @@ -1,37 +0,0 @@ -package net.miz_hi.smileessence.cache; - -import net.miz_hi.smileessence.model.status.user.UserModel; - -import java.util.concurrent.ConcurrentHashMap; - -public class UserCache -{ - - private static ConcurrentHashMap<Long, UserModel> usersMap = new ConcurrentHashMap<Long, UserModel>(); - - public static void put(UserModel user) - { - if (usersMap.containsKey(user.userId)) - { - usersMap.remove(user.userId); - } - - usersMap.put(user.userId, user); - } - - public static UserModel get(long id) - { - return usersMap.get(id); - } - - public static UserModel remove(long id) - { - return usersMap.remove(id); - } - - public static void clearCache() - { - usersMap.clear(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/CommandAddTemplate.java b/src/net/miz_hi/smileessence/command/CommandAddTemplate.java deleted file mode 100644 index 7161724a..00000000 --- a/src/net/miz_hi/smileessence/command/CommandAddTemplate.java +++ /dev/null @@ -1,28 +0,0 @@ -package net.miz_hi.smileessence.command;
-
-import net.miz_hi.smileessence.data.template.TemplateManager;
-import net.miz_hi.smileessence.notification.Notificator;
-
-public class CommandAddTemplate extends MenuCommand
-{
-
- private String text;
-
- public CommandAddTemplate(String text)
- {
- this.text = text;
- }
-
- @Override
- public String getName()
- {
- return "定型文に追加";
- }
-
- @Override
- public void workOnUiThread()
- {
- TemplateManager.addTemplate(text);
- Notificator.info("追加しました");
- }
-}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/command/CommandEditExtraWord.java b/src/net/miz_hi/smileessence/command/CommandEditExtraWord.java deleted file mode 100644 index dba90bbb..00000000 --- a/src/net/miz_hi/smileessence/command/CommandEditExtraWord.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.miz_hi.smileessence.command; - -import android.app.Activity; -import android.content.Intent; -import net.miz_hi.smileessence.view.activity.ExtraWordActivity; - -public class CommandEditExtraWord extends MenuCommand -{ - - private Activity activity; - - public CommandEditExtraWord(Activity activity) - { - this.activity = activity; - } - - @Override - public String getName() - { - return "抽出ワードの管理"; - } - - @Override - public void workOnUiThread() - { - Intent intent = new Intent(activity, ExtraWordActivity.class); - activity.startActivity(intent); - } - -} diff --git a/src/net/miz_hi/smileessence/command/CommandEditMenu.java b/src/net/miz_hi/smileessence/command/CommandEditMenu.java deleted file mode 100644 index 498b508f..00000000 --- a/src/net/miz_hi/smileessence/command/CommandEditMenu.java +++ /dev/null @@ -1,86 +0,0 @@ -package net.miz_hi.smileessence.command;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import net.miz_hi.smileessence.Client;
-import net.miz_hi.smileessence.dialog.CheckBoxListDialog;
-import net.miz_hi.smileessence.dialog.CheckBoxListDialog.CheckBoxItem;
-import net.miz_hi.smileessence.menu.TweetMenu;
-import net.miz_hi.smileessence.model.status.tweet.TweetModel;
-import net.miz_hi.smileessence.preference.EnumPreferenceKey.EnumValueType;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-
-public class CommandEditMenu extends MenuCommand
-{
-
- private Activity activity;
-
- public CommandEditMenu(Activity activity)
- {
- this.activity = activity;
- }
-
- @Override
- public String getName()
- {
- return "メニュー表示設定";
- }
-
- @Override
- public void workOnUiThread()
- {
- final CheckBoxListDialog listDialog = new CheckBoxListDialog(activity);
- listDialog.setTitle("表示する項目を設定してください");
-
- ArrayList<CheckBoxItem> list = new ArrayList<CheckBoxItem>();
- final HashMap<CheckBoxItem, ICommand> map = new HashMap<CheckBoxItem, ICommand>();
- TweetModel nullModel = TweetModel.getSampleModel();
- TweetMenu adapter = new TweetMenu(activity, nullModel);
- for (ICommand item : adapter.getStatusMenu())
- {
- if (item instanceof IHideable && item.getDefaultVisibility())
- {
- boolean startValue = Client.getPreferenceHelper().getPreferenceValue(item.getClass().getSimpleName(), EnumValueType.BOOLEAN, false);
- CheckBoxItem checkBoxItem = new CheckBoxItem(item.getName(), startValue);
- list.add(checkBoxItem);
- map.put(checkBoxItem, item);
- }
- }
-
- listDialog.setItems((list.toArray(new CheckBoxItem[0])));
-
- listDialog.setOnClicked(new OnClickListener()
- {
-
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- switch (which)
- {
- case DialogInterface.BUTTON_POSITIVE:
- {
- CheckBoxItem[] items = listDialog.getItems();
- for (CheckBoxItem item : items)
- {
- boolean value = item.value;
- ICommand command = map.get(item);
- Client.getPreferenceHelper().putPreferenceValue(command.getClass().getSimpleName(), EnumValueType.BOOLEAN, item.value);
- }
- dialog.dismiss();
- break;
- }
- default:
- {
- dialog.dismiss();
- }
- }
- }
- });
-
- listDialog.createDialog().show();
- }
-
-}
diff --git a/src/net/miz_hi/smileessence/command/CommandEditTemplate.java b/src/net/miz_hi/smileessence/command/CommandEditTemplate.java deleted file mode 100644 index c3f8c2ea..00000000 --- a/src/net/miz_hi/smileessence/command/CommandEditTemplate.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.miz_hi.smileessence.command;
-
-import android.app.Activity;
-import android.content.Intent;
-import net.miz_hi.smileessence.view.activity.TemplateActivity;
-
-public class CommandEditTemplate extends MenuCommand
-{
-
- private Activity activity;
-
- public CommandEditTemplate(Activity activity)
- {
- this.activity = activity;
- }
-
- @Override
- public String getName()
- {
- return "定型文の管理";
- }
-
- @Override
- public void workOnUiThread()
- {
- Intent intent = new Intent(activity, TemplateActivity.class);
- activity.startActivity(intent);
- }
-
-}
diff --git a/src/net/miz_hi/smileessence/command/CommandMovePage.java b/src/net/miz_hi/smileessence/command/CommandMovePage.java deleted file mode 100644 index 406420c6..00000000 --- a/src/net/miz_hi/smileessence/command/CommandMovePage.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.miz_hi.smileessence.command; - -import net.miz_hi.smileessence.system.PageController; - -public class CommandMovePage extends MenuCommand -{ - - String pageTitle; - int position; - - public CommandMovePage(String title, int position) - { - this.pageTitle = title; - this.position = position; - } - - @Override - public String getName() - { - return pageTitle; - } - - @Override - public void workOnUiThread() - { - PageController.getInstance().move(position); - } - -} diff --git a/src/net/miz_hi/smileessence/command/CommandOpenPostPage.java b/src/net/miz_hi/smileessence/command/CommandOpenPostPage.java deleted file mode 100644 index 8ff4910e..00000000 --- a/src/net/miz_hi/smileessence/command/CommandOpenPostPage.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.miz_hi.smileessence.command;
-
-import net.miz_hi.smileessence.system.PostSystem;
-
-public class CommandOpenPostPage extends MenuCommand
-{
-
- @Override
- public String getName()
- {
- return "つぶやく";
- }
-
- @Override
- public void workOnUiThread()
- {
- PostSystem.openPostPage();
- }
-
-}
diff --git a/src/net/miz_hi/smileessence/command/CommandOpenUrl.java b/src/net/miz_hi/smileessence/command/CommandOpenUrl.java deleted file mode 100644 index ce946097..00000000 --- a/src/net/miz_hi/smileessence/command/CommandOpenUrl.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.miz_hi.smileessence.command; - -import android.app.Activity; -import android.content.Intent; -import android.net.Uri; - -public class CommandOpenUrl extends MenuCommand -{ - - private Activity activity; - private String url; - - public CommandOpenUrl(Activity activity, String url) - { - this.activity = activity; - this.url = url; - } - - @Override - public String getName() - { - return url; - } - - @Override - public void workOnUiThread() - { - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - activity.startActivity(intent); - } -} diff --git a/src/net/miz_hi/smileessence/command/CommandOpenUserList.java b/src/net/miz_hi/smileessence/command/CommandOpenUserList.java deleted file mode 100644 index ce4a423f..00000000 --- a/src/net/miz_hi/smileessence/command/CommandOpenUserList.java +++ /dev/null @@ -1,42 +0,0 @@ -package net.miz_hi.smileessence.command; - -import android.app.Activity; -import net.miz_hi.smileessence.data.list.ListManager; -import net.miz_hi.smileessence.model.statuslist.timeline.Timeline; -import net.miz_hi.smileessence.model.statuslist.timeline.impl.ListTimeline; -import net.miz_hi.smileessence.statuslist.StatusListAdapter; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.system.PageController; -import net.miz_hi.smileessence.view.fragment.impl.ListFragment; -import twitter4j.UserList; - -public class CommandOpenUserList extends MenuCommand -{ - - Activity activity; - UserList userList; - - public CommandOpenUserList(Activity activity, UserList userList) - { - this.activity = activity; - this.userList = userList; - } - - @Override - public String getName() - { - return userList.getFullName(); - } - - @Override - public void workOnUiThread() - { - Timeline timeline = new ListTimeline(); - StatusListManager.registerListTimeline(userList.getId(), timeline, new StatusListAdapter(activity, timeline)); - ListManager.addList(new net.miz_hi.smileessence.data.list.List(userList.getId(), userList.getFullName())); - ListFragment fragment = ListFragment.newInstance(userList.getId(), userList.getFullName()); - PageController.getInstance().addPage(fragment); - PageController.getInstance().moveToLast(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/CommandReConnect.java b/src/net/miz_hi/smileessence/command/CommandReConnect.java deleted file mode 100644 index 86e71084..00000000 --- a/src/net/miz_hi/smileessence/command/CommandReConnect.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.miz_hi.smileessence.command;
-
-import net.miz_hi.smileessence.twitter.TwitterManager;
-import net.miz_hi.smileessence.view.activity.MainActivity;
-
-public class CommandReConnect extends MenuCommand
-{
-
- public CommandReConnect()
- {
- }
-
- @Override
- public String getName()
- {
- return "再接続";
- }
-
- @Override
- public void workOnUiThread()
- {
- TwitterManager.openTwitterStream(MainActivity.getInstance());
- }
-
-}
diff --git a/src/net/miz_hi/smileessence/command/ICommand.java b/src/net/miz_hi/smileessence/command/ICommand.java deleted file mode 100644 index fd956f40..00000000 --- a/src/net/miz_hi/smileessence/command/ICommand.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.miz_hi.smileessence.command; - -public interface ICommand extends Runnable -{ - - String getName(); - - boolean getDefaultVisibility(); -} diff --git a/src/net/miz_hi/smileessence/command/IConfirmable.java b/src/net/miz_hi/smileessence/command/IConfirmable.java deleted file mode 100644 index ca680e4e..00000000 --- a/src/net/miz_hi/smileessence/command/IConfirmable.java +++ /dev/null @@ -1,6 +0,0 @@ -package net.miz_hi.smileessence.command; - -public interface IConfirmable -{ - -} diff --git a/src/net/miz_hi/smileessence/command/IHideable.java b/src/net/miz_hi/smileessence/command/IHideable.java deleted file mode 100644 index b271ab6e..00000000 --- a/src/net/miz_hi/smileessence/command/IHideable.java +++ /dev/null @@ -1,6 +0,0 @@ -package net.miz_hi.smileessence.command; - -public interface IHideable -{ - -} diff --git a/src/net/miz_hi/smileessence/command/MenuCommand.java b/src/net/miz_hi/smileessence/command/MenuCommand.java deleted file mode 100644 index 91f9f672..00000000 --- a/src/net/miz_hi/smileessence/command/MenuCommand.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.miz_hi.smileessence.command; - -import net.miz_hi.smileessence.dialog.MenuDialog; -import net.miz_hi.smileessence.util.UiHandler; - -public abstract class MenuCommand implements ICommand -{ - - @Override - public boolean getDefaultVisibility() - { - return true; - } - - @Override - public final void run() - { - new UiHandler() - { - - @Override - public void run() - { - MenuDialog.dispose(); - workOnUiThread(); - } - }.post(); - } - - public abstract void workOnUiThread(); - -} diff --git a/src/net/miz_hi/smileessence/command/main/CommandClosePage.java b/src/net/miz_hi/smileessence/command/main/CommandClosePage.java deleted file mode 100644 index 431f9081..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandClosePage.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.miz_hi.smileessence.command.main; - -import android.support.v4.app.Fragment; -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.system.PageController; -import net.miz_hi.smileessence.view.IRemovable; - - -public class CommandClosePage extends MenuCommand -{ - - @Override - public String getName() - { - return "タブを閉じる"; - } - - @Override - public void workOnUiThread() - { - PageController.getInstance().removePage(); - } - - @Override - public boolean getDefaultVisibility() - { - Fragment fragment = PageController.getInstance().getAdapter().getItem(PageController.getInstance().getCurrentPage()); - return fragment != null && fragment instanceof IRemovable; - } - -} diff --git a/src/net/miz_hi/smileessence/command/main/CommandCommercial.java b/src/net/miz_hi/smileessence/command/main/CommandCommercial.java deleted file mode 100644 index 9db04550..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandCommercial.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.miz_hi.smileessence.command.main;
-
-import net.miz_hi.smileessence.command.MenuCommand;
-import net.miz_hi.smileessence.system.PostSystem;
-
-public class CommandCommercial extends MenuCommand
-{
-
- @Override
- public String getName()
- {
- return "宣伝する";
- }
-
- @Override
- public void workOnUiThread()
- {
- String str = "Android用Twitterクライアント「SmileEssence Lite」をチェック！\r\n http://smileessence.miz-hi.net/";
- PostSystem.setText(str);
- PostSystem.openPostPage();
- }
-
-}
diff --git a/src/net/miz_hi/smileessence/command/main/CommandFinish.java b/src/net/miz_hi/smileessence/command/main/CommandFinish.java deleted file mode 100644 index 2f8a0a42..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandFinish.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.miz_hi.smileessence.command.main; - -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.view.activity.MainActivity; - - -public class CommandFinish extends MenuCommand -{ - - @Override - public String getName() - { - return "アプリを終了する"; - } - - @Override - public void workOnUiThread() - { - MainActivity.getInstance().finish(false); - } - -} diff --git a/src/net/miz_hi/smileessence/command/main/CommandInformation.java b/src/net/miz_hi/smileessence/command/main/CommandInformation.java deleted file mode 100644 index 916fd9fd..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandInformation.java +++ /dev/null @@ -1,34 +0,0 @@ -package net.miz_hi.smileessence.command.main; - -import android.app.Activity; -import android.view.LayoutInflater; -import android.view.View; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.dialog.ContentWithSingleButtonDialog; - - -public class CommandInformation extends MenuCommand -{ - - Activity activity; - - public CommandInformation(Activity activity) - { - this.activity = activity; - } - - @Override - public String getName() - { - return "このアプリについて"; - } - - @Override - public void workOnUiThread() - { - View view = LayoutInflater.from(activity).inflate(R.layout.dialog_appinfo, null); - new ContentWithSingleButtonDialog(activity, view).create().show(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/main/CommandOpenAclog.java b/src/net/miz_hi/smileessence/command/main/CommandOpenAclog.java deleted file mode 100644 index a059cdca..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandOpenAclog.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.miz_hi.smileessence.command.main; - -import android.app.Activity; -import android.content.Intent; -import android.net.Uri; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.MenuCommand; - -public class CommandOpenAclog extends MenuCommand -{ - - private Activity activity; - - public CommandOpenAclog(Activity activity) - { - this.activity = activity; - } - - @Override - public String getName() - { - return "Aclogを開く"; - } - - @Override - public void workOnUiThread() - { - String url = "http://aclog.koba789.com/" + Client.getMainAccount().getScreenName() + "/timeline"; - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - activity.startActivity(intent); - } - -} diff --git a/src/net/miz_hi/smileessence/command/main/CommandOpenFavstar.java b/src/net/miz_hi/smileessence/command/main/CommandOpenFavstar.java deleted file mode 100644 index e7abc076..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandOpenFavstar.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.miz_hi.smileessence.command.main; - -import android.app.Activity; -import android.content.Intent; -import android.net.Uri; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.MenuCommand; - -public class CommandOpenFavstar extends MenuCommand -{ - - private Activity activity; - - public CommandOpenFavstar(Activity activity) - { - this.activity = activity; - } - - @Override - public String getName() - { - return "Favstarを開く"; - } - - @Override - public void workOnUiThread() - { - String url = "http://favstar.fm/users/" + Client.getMainAccount().getScreenName() + "/recent"; - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - activity.startActivity(intent); - } - -} diff --git a/src/net/miz_hi/smileessence/command/main/CommandOpenLicense.java b/src/net/miz_hi/smileessence/command/main/CommandOpenLicense.java deleted file mode 100644 index 5afaebba..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandOpenLicense.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.miz_hi.smileessence.command.main; - -import android.app.Activity; -import android.content.Intent; -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.view.activity.LicenseActivity; - -public class CommandOpenLicense extends MenuCommand -{ - - private Activity activity; - - public CommandOpenLicense(Activity activity) - { - this.activity = activity; - } - - @Override - public String getName() - { - return "オープンソースライセンス"; - } - - @Override - public void workOnUiThread() - { - activity.startActivity(new Intent(activity, LicenseActivity.class)); - } - -} diff --git a/src/net/miz_hi/smileessence/command/main/CommandOpenSetting.java b/src/net/miz_hi/smileessence/command/main/CommandOpenSetting.java deleted file mode 100644 index ac2c4a90..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandOpenSetting.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.miz_hi.smileessence.command.main; - -import android.app.Activity; -import android.content.Intent; -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.view.activity.SettingActivity; - -public class CommandOpenSetting extends MenuCommand -{ - - private Activity activity; - - public CommandOpenSetting(Activity activity) - { - this.activity = activity; - } - - @Override - public String getName() - { - return "詳細設定"; - } - - @Override - public void workOnUiThread() - { - activity.startActivity(new Intent(activity, SettingActivity.class)); - } - -} diff --git a/src/net/miz_hi/smileessence/command/main/CommandOpenTwilog.java b/src/net/miz_hi/smileessence/command/main/CommandOpenTwilog.java deleted file mode 100644 index da2b4556..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandOpenTwilog.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.miz_hi.smileessence.command.main; - -import android.app.Activity; -import android.content.Intent; -import android.net.Uri; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.MenuCommand; - -public class CommandOpenTwilog extends MenuCommand -{ - - private Activity activity; - - public CommandOpenTwilog(Activity activity) - { - this.activity = activity; - } - - @Override - public String getName() - { - return "Twilogを開く"; - } - - @Override - public void workOnUiThread() - { - String url = "http://twilog.org/" + Client.getMainAccount().getScreenName(); - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - activity.startActivity(intent); - } - -} diff --git a/src/net/miz_hi/smileessence/command/main/CommandReport.java b/src/net/miz_hi/smileessence/command/main/CommandReport.java deleted file mode 100644 index 3f12ad21..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandReport.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.miz_hi.smileessence.command.main;
-
-import net.miz_hi.smileessence.command.MenuCommand;
-import net.miz_hi.smileessence.system.PostSystem;
-
-public class CommandReport extends MenuCommand
-{
-
- public CommandReport()
- {
- }
-
- @Override
- public String getName()
- {
- return "作者にレポートを送る";
- }
-
- @Override
- public void workOnUiThread()
- {
- PostSystem.setText("#SmileEssence @laco0416 ");
- PostSystem.openPostPage();
- }
-
-}
diff --git a/src/net/miz_hi/smileessence/command/main/CommandToAddPage.java b/src/net/miz_hi/smileessence/command/main/CommandToAddPage.java deleted file mode 100644 index 6b043bd0..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandToAddPage.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.miz_hi.smileessence.command.main; - -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.menu.AddPageMenu; -import net.miz_hi.smileessence.view.activity.MainActivity; - - -public class CommandToAddPage extends MenuCommand -{ - - @Override - public String getName() - { - return "タブを追加"; - } - - @Override - public void workOnUiThread() - { - new AddPageMenu(MainActivity.getInstance()).create().show(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/main/CommandToPageMove.java b/src/net/miz_hi/smileessence/command/main/CommandToPageMove.java deleted file mode 100644 index 95b520b5..00000000 --- a/src/net/miz_hi/smileessence/command/main/CommandToPageMove.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.miz_hi.smileessence.command.main; - -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.menu.MovePageMenu; -import net.miz_hi.smileessence.view.activity.MainActivity; - - -public class CommandToPageMove extends MenuCommand -{ - - @Override - public String getName() - { - return "タブを移動する"; - } - - @Override - public void workOnUiThread() - { - new MovePageMenu(MainActivity.getInstance()).create().show(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/post/CommandAppendHashtag.java b/src/net/miz_hi/smileessence/command/post/CommandAppendHashtag.java deleted file mode 100644 index 62e3b67c..00000000 --- a/src/net/miz_hi/smileessence/command/post/CommandAppendHashtag.java +++ /dev/null @@ -1,28 +0,0 @@ -package net.miz_hi.smileessence.command.post; - -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.system.PostSystem; - -public class CommandAppendHashtag extends MenuCommand -{ - - private String hashtag; - - public CommandAppendHashtag(String hashtag) - { - this.hashtag = hashtag; - } - - @Override - public String getName() - { - return "#" + hashtag; - } - - @Override - public void workOnUiThread() - { - PostSystem.appendText(" #" + hashtag); - PostSystem.openPostPage(); - } -} diff --git a/src/net/miz_hi/smileessence/command/post/CommandInsertText.java b/src/net/miz_hi/smileessence/command/post/CommandInsertText.java deleted file mode 100644 index cd4e80d6..00000000 --- a/src/net/miz_hi/smileessence/command/post/CommandInsertText.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.miz_hi.smileessence.command.post; - -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.system.PostSystem; - -public class CommandInsertText extends MenuCommand -{ - - private String text; - - public CommandInsertText(String text) - { - this.text = text; - } - - @Override - public String getName() - { - return text; - } - - @Override - public void workOnUiThread() - { - PostSystem.insertText(text); - PostSystem.openPostPage(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/post/CommandMakeAnonymous.java b/src/net/miz_hi/smileessence/command/post/CommandMakeAnonymous.java deleted file mode 100644 index 9a351e6d..00000000 --- a/src/net/miz_hi/smileessence/command/post/CommandMakeAnonymous.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.miz_hi.smileessence.command.post;
-
-import net.miz_hi.smileessence.command.MenuCommand;
-import net.miz_hi.smileessence.system.PostSystem;
-
-public class CommandMakeAnonymous extends MenuCommand
-{
-
- @Override
- public String getName()
- {
- return "匿名にする";
- }
-
- @Override
- public void workOnUiThread()
- {
- String str = "？？？「" + PostSystem.getState().getText() + "」";
- PostSystem.setText(str);
- PostSystem.openPostPage();
- }
-
-}
diff --git a/src/net/miz_hi/smileessence/command/post/CommandParseMorse.java b/src/net/miz_hi/smileessence/command/post/CommandParseMorse.java deleted file mode 100644 index e30b3942..00000000 --- a/src/net/miz_hi/smileessence/command/post/CommandParseMorse.java +++ /dev/null @@ -1,27 +0,0 @@ -package net.miz_hi.smileessence.command.post;
-
-import net.miz_hi.smileessence.command.MenuCommand;
-import net.miz_hi.smileessence.system.PostSystem;
-import net.miz_hi.smileessence.util.Morse;
-
-public class CommandParseMorse extends MenuCommand
-{
-
- public CommandParseMorse()
- {
- }
-
- @Override
- public String getName()
- {
- return "モールスに変換";
- }
-
- @Override
- public void workOnUiThread()
- {
- String newStr = Morse.jaToMc(PostSystem.getState().getText());
- PostSystem.setText(newStr);
- PostSystem.openPostPage();
- }
-}
diff --git a/src/net/miz_hi/smileessence/command/status/StatusCommand.java b/src/net/miz_hi/smileessence/command/status/StatusCommand.java deleted file mode 100644 index 491ef182..00000000 --- a/src/net/miz_hi/smileessence/command/status/StatusCommand.java +++ /dev/null @@ -1,23 +0,0 @@ -package net.miz_hi.smileessence.command.status; - -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; - -public abstract class StatusCommand extends MenuCommand -{ - - protected final TweetModel status; - - public StatusCommand(TweetModel status) - { - if (status == null) - { - this.status = TweetModel.getSampleModel(); - } - else - { - this.status = status; - } - } - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandChaseTalk.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandChaseTalk.java deleted file mode 100644 index d3461372..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandChaseTalk.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import android.app.Activity; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.statuslist.StatusListAdapter; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.system.PageController; -import net.miz_hi.smileessence.talkchase.TalkChaser; -import net.miz_hi.smileessence.talkchase.TalkManager; -import net.miz_hi.smileessence.view.fragment.impl.TalkFragment; - -public class StatusCommandChaseTalk extends StatusCommand -{ - - Activity activity; - - public StatusCommandChaseTalk(Activity activity, TweetModel status) - { - super(status); - this.activity = activity; - } - - @Override - public String getName() - { - return "会話をたどる"; - } - - @Override - public void workOnUiThread() - { - final TweetModel origin = status.getOriginal(); - //すでにTalkが存在していればページを移動 - TalkChaser chaser = TalkManager.searchTalk(origin); - if (chaser != null) - { - PageController.getInstance().move(PageController.getInstance().getAdapter().getItemPosition(chaser.fragment)); - } - else - { - TalkFragment fragment = TalkFragment.newInstance(TalkManager.getNextTalkId(), origin.statusId); - final TalkChaser chaser2 = new TalkChaser(fragment); - TalkManager.addTalkChaser(chaser2); - //StatusList管理に追加 - StatusListManager.registerTweetList(chaser2.talkList, new StatusListAdapter(activity, chaser2.talkList)); - MyExecutor.execute(new Runnable() - { - - public void run() - { - chaser2.startRelation(origin.statusId); - } - }); - - PageController.getInstance().addPage(fragment); - PageController.getInstance().moveToLast(); - } - } - - @Override - public boolean getDefaultVisibility() - { - return status.getInReplyToStatusId() > -1; - } - - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandClipboard.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandClipboard.java deleted file mode 100644 index 3046f351..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandClipboard.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import android.content.ClipboardManager; -import android.content.Context; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.notification.Notificator; - -public class StatusCommandClipboard extends StatusCommand implements IHideable -{ - - public StatusCommandClipboard(TweetModel model) - { - super(model); - } - - @Override - public String getName() - { - return "クリップボードにコピー"; - } - - @Override - public void workOnUiThread() - { - try - { - ClipboardManager manager = (ClipboardManager) Client.getApplication().getSystemService(Context.CLIPBOARD_SERVICE); - manager.setText(status.getText()); - Notificator.info("クリップボードにコピーしました"); - } - catch (Exception e) - { - Notificator.alert("コピー失敗しました"); - } - } - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandCongrats.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandCongrats.java deleted file mode 100644 index d6da7925..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandCongrats.java +++ /dev/null @@ -1,67 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.task.impl.TweetTask; -import twitter4j.StatusUpdate; - -import java.util.Random; - -public class StatusCommandCongrats extends StatusCommand implements IHideable, IConfirmable -{ - - public StatusCommandCongrats(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "お祝いする"; - } - - @Override - public void workOnUiThread() - { - int favCount; - Random rand = new Random(); - int r = rand.nextInt(100); - if (r < 50) - { - favCount = 50; - } - else if (r < 80) - { - favCount = 100; - } - else if (r < 90) - { - favCount = 250; - } - else if (r < 99) - { - favCount = 1000; - } - else - { - favCount = 10000; - } - - String str = String.format("@%s Congrats on your %s ★ tweet! http://favstar.fm/t/%s", status.getOriginal().user.screenName, favCount, status.getOriginal().statusId); - StatusUpdate update = new StatusUpdate(str); - update.setInReplyToStatusId(status.getOriginal().statusId); - status.getOriginal().favorite(); - new TweetTask(update).callAsync(); - } - - @Override - public boolean getDefaultVisibility() - { - return Client.getPermission().canWarotaRT(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandCopy.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandCopy.java deleted file mode 100644 index 672963be..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandCopy.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.task.impl.TweetTask; -import twitter4j.StatusUpdate; - -public class StatusCommandCopy extends StatusCommand implements IHideable, IConfirmable -{ - - public StatusCommandCopy(TweetModel model) - { - super(model); - } - - @Override - public boolean getDefaultVisibility() - { - return Client.getPermission().canCopyTweet(); - } - - @Override - public String getName() - { - return "パクる"; - } - - @Override - public void workOnUiThread() - { - StatusUpdate update = new StatusUpdate(status.getText()); - update.setInReplyToStatusId(status.getInReplyToStatusId()); - new TweetTask(update).callAsync(); - status.favorite(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandDelete.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandDelete.java deleted file mode 100644 index 1516afc6..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandDelete.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; - -public class StatusCommandDelete extends StatusCommand implements IConfirmable -{ - - public StatusCommandDelete(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "削除"; - } - - @Override - public void workOnUiThread() - { - status.destroy(); - } - - @Override - public boolean getDefaultVisibility() - { - return status.user.isMe() || status.getOriginal().user.isMe(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandFavAndRetweet.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandFavAndRetweet.java deleted file mode 100644 index c8d5bbba..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandFavAndRetweet.java +++ /dev/null @@ -1,34 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; - -public class StatusCommandFavAndRetweet extends StatusCommand implements IHideable, IConfirmable -{ - - public StatusCommandFavAndRetweet(TweetModel model) - { - super(model); - } - - @Override - public String getName() - { - return "ふぁぼってリツイート"; - } - - @Override - public void workOnUiThread() - { - status.favorite(); - status.retweet(); - } - - @Override - public boolean getDefaultVisibility() - { - return !status.user.isProtected && !status.user.isMe() && !status.getOriginal().user.isMe(); - } -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandFavorite.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandFavorite.java deleted file mode 100644 index 15d90960..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandFavorite.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; - -public class StatusCommandFavorite extends StatusCommand -{ - - public StatusCommandFavorite(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "お気に入りに追加"; - } - - @Override - public void workOnUiThread() - { - status.favorite(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandMakeAnonymous.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandMakeAnonymous.java deleted file mode 100644 index 3b0c151d..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandMakeAnonymous.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.system.PostSystem; - -public class StatusCommandMakeAnonymous extends StatusCommand implements IHideable -{ - - public StatusCommandMakeAnonymous(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "匿名にする"; - } - - @Override - public void workOnUiThread() - { - String str = "？？？「" + status.getText() + "」"; - PostSystem.setText(str); - PostSystem.openPostPage(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandNanigaja.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandNanigaja.java deleted file mode 100644 index 8437f836..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandNanigaja.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.task.impl.TweetTask; -import twitter4j.StatusUpdate; - -public class StatusCommandNanigaja extends StatusCommand implements IHideable, IConfirmable -{ - - public StatusCommandNanigaja(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "な～にが○○じゃ"; - } - - @Override - public void workOnUiThread() - { - String base = status.getText(); - if (base.startsWith(".")) - { - base = base.replaceFirst(".", ""); - } - if (base.startsWith("@" + Client.getMainAccount().getScreenName())) - { - base.replaceFirst(Client.getMainAccount().getScreenName(), status.getOriginal().user.screenName); - } - String str = "な～にが" + base.trim() + "じゃ"; - long id = status.getOriginal().statusId; - StatusUpdate update = new StatusUpdate(str); - update.setInReplyToStatusId(id); - new TweetTask(update).callAsync(); - status.getOriginal().favorite(); - } - - @Override - public boolean getDefaultVisibility() - { - return Client.getPermission().canWarotaRT(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandOpenUrl.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandOpenUrl.java deleted file mode 100644 index ec1800f7..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandOpenUrl.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import android.app.Activity; -import net.miz_hi.smileessence.command.CommandOpenUrl; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; - -public class StatusCommandOpenUrl extends StatusCommand -{ - - private Activity activity; - - public StatusCommandOpenUrl(TweetModel status, Activity activity) - { - super(status); - this.activity = activity; - } - - @Override - public void workOnUiThread() - { - new CommandOpenUrl(activity, String.format("https://twitter.com/%s/status/%s", status.getOriginal().user.screenName, status.getOriginal().statusId)).run(); - } - - @Override - public String getName() - { - return "ブラウザで開く"; - } -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandProduce.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandProduce.java deleted file mode 100644 index cd90a2a5..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandProduce.java +++ /dev/null @@ -1,85 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import android.text.TextUtils; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; -import net.miz_hi.smileessence.task.impl.TweetTask; -import twitter4j.StatusUpdate; - -import java.util.Calendar; -import java.util.Locale; - - -public class StatusCommandProduce extends StatusCommand implements IHideable, IConfirmable -{ - - public StatusCommandProduce(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "今日のおもしろツイートです"; - } - - @Override - public void workOnUiThread() - { - String lastProduce = Client.getPreferenceValue(EnumPreferenceKey.LAST_PRODUCE_DATE); - Calendar today = Calendar.getInstance(Locale.getDefault()); - String todayStr = String.format("%02d%02d", today.get(Calendar.MONTH) + 1, today.get(Calendar.DATE)); - System.out.println(todayStr); - System.out.println(lastProduce); - if (TextUtils.isEmpty(lastProduce) || !lastProduce.equals(todayStr)) - { - Client.putPreferenceValue(EnumPreferenceKey.LAST_PRODUCE_DATE, todayStr); - MyExecutor.execute(new Runnable() - { - - public void run() - { - String first = "今日のおもしろツイートです"; - String finish = "以上です"; - new TweetTask(new StatusUpdate(first)).call(); - try - { - Thread.sleep(100); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - status.retweet(); - try - { - Thread.sleep(100); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - new TweetTask(new StatusUpdate(finish)).call(); - status.favorite(); - } - }); - } - else - { - Notificator.alert("今日はすでに認定済みです"); - } - } - - @Override - public boolean getDefaultVisibility() - { - return !status.getOriginal().user.isProtected; - } -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandReply.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandReply.java deleted file mode 100644 index d7f45995..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandReply.java +++ /dev/null @@ -1,28 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.system.PostSystem; - -public class StatusCommandReply extends StatusCommand -{ - - public StatusCommandReply(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "返信"; - } - - @Override - public void workOnUiThread() - { - PostSystem.setReply(status.getOriginal().user.screenName, status.getOriginal().statusId); - PostSystem.openPostPage(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandReplyToAll.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandReplyToAll.java deleted file mode 100644 index b4a21704..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandReplyToAll.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.system.PostSystem; -import twitter4j.UserMentionEntity; - -public class StatusCommandReplyToAll extends StatusCommand -{ - - public StatusCommandReplyToAll(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "全員に返信"; - } - - @Override - public void workOnUiThread() - { - StringBuilder builder = new StringBuilder(); - builder.append("."); - for (UserMentionEntity entity : status.getUserMentions()) - { - if (entity.getScreenName().equals(Client.getMainAccount().getScreenName())) - { - continue; - } - builder.append("@").append(entity.getScreenName()).append(" "); - } - - PostSystem.setText(builder.toString()); - PostSystem.getState().setCursor(builder.length()); - PostSystem.openPostPage(); - } - - @Override - public boolean getDefaultVisibility() - { - return status.getUserMentions() != null && status.getUserMentions().length > 1; - } -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandRetweet.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandRetweet.java deleted file mode 100644 index 7e22d562..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandRetweet.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; - -public class StatusCommandRetweet extends StatusCommand implements IConfirmable -{ - - public StatusCommandRetweet(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "リツイート"; - } - - @Override - public void workOnUiThread() - { - status.retweet(); - } - - @Override - public boolean getDefaultVisibility() - { - return !status.getOriginal().user.isProtected; - } - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandReview.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandReview.java deleted file mode 100644 index 160e838a..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandReview.java +++ /dev/null @@ -1,85 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import android.app.Activity; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.dialog.ReviewDialog; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.task.impl.TweetTask; -import twitter4j.StatusUpdate; - -public class StatusCommandReview extends StatusCommand implements IHideable -{ - - private Activity activity; - - public StatusCommandReview(Activity activity, TweetModel model) - { - super(model); - this.activity = activity; - } - - @Override - public String getName() - { - return "レビューを書く"; - } - - @Override - public void workOnUiThread() - { - final ReviewDialog reviewDialog = new ReviewDialog(activity, "ツイートを評価しよう"); - - reviewDialog.setOnClickListener(new OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) - { - if (which == DialogInterface.BUTTON_POSITIVE) - { - int star = reviewDialog.getRates(); - StringBuilder builder = new StringBuilder(); - for (int i = 0; i < 5; i++) - { - if (i < star) - { - builder.append("★"); - } - else - { - builder.append("☆"); - } - } - builder.append("\r\n"); - builder.append("コメント: "); - builder.append(reviewDialog.getText()); - builder.append("\r\n"); - builder.append("@"); - builder.append(status.getOriginal().user.screenName); - builder.append(" ( http://twitter.com/"); - builder.append(status.getOriginal().user.screenName); - builder.append("/status/"); - builder.append(status.getOriginal().statusId); - builder.append(" )"); - - StatusUpdate update = new StatusUpdate(builder.toString()); - update.setInReplyToStatusId(status.getOriginal().statusId); - new TweetTask(update).callAsync(); - status.getOriginal().favorite(); - } - } - }); - reviewDialog.create().show(); - } - - @Override - public boolean getDefaultVisibility() - { - return !status.getOriginal().user.isProtected && Client.getPermission().canWarotaRT(); - } - - -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandThankToFav.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandThankToFav.java deleted file mode 100644 index b7618fbc..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandThankToFav.java +++ /dev/null @@ -1,42 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.task.impl.TweetTask; -import twitter4j.StatusUpdate; - -public class StatusCommandThankToFav extends StatusCommand implements IHideable, IConfirmable -{ - - public StatusCommandThankToFav(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "ふぁぼあり"; - } - - @Override - public void workOnUiThread() - { - String str = "@" + status.getOriginal().user.screenName + " ふぁぼあり(o^-')b"; - StatusUpdate update = new StatusUpdate(str); - update.setInReplyToStatusId(status.getOriginal().statusId); - new TweetTask(update).callAsync(); - status.getOriginal().favorite(); - } - - - @Override - public boolean getDefaultVisibility() - { - return Client.getPermission().canWarotaRT(); - } - -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandTofuBuster.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandTofuBuster.java deleted file mode 100644 index 98c3a3fc..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandTofuBuster.java +++ /dev/null @@ -1,51 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import android.app.Activity; -import android.content.ActivityNotFoundException; -import android.content.Intent; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.util.Morse; - -public class StatusCommandTofuBuster extends StatusCommand implements IHideable -{ - - private Activity activity; - - public StatusCommandTofuBuster(Activity activity, TweetModel status) - { - super(status); - this.activity = activity; - } - - @Override - public String getName() - { - return "TofuBuster"; - } - - @Override - public void workOnUiThread() - { - String ACTION_SHOW_TEXT = "com.product.kanzmrsw.tofubuster.ACTION_SHOW_TEXT"; - String text = status.getText(); - if (Morse.isMorse(text)) - { - text = Morse.mcToJa(text); - } - Intent i = new Intent(ACTION_SHOW_TEXT); - i.putExtra(Intent.EXTRA_TEXT, text); - i.putExtra(Intent.EXTRA_SUBJECT, "SmileEssence"); - i.putExtra("isCopyEnabled", true); - try - { - activity.startActivity(i); - } - catch (ActivityNotFoundException e) - { - Notificator.alert("TofuBusterがインストールされていません"); - } - } -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandTranslate.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandTranslate.java deleted file mode 100644 index bdc5c41c..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandTranslate.java +++ /dev/null @@ -1,46 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import android.app.Activity; -import android.content.Intent; -import android.net.Uri; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; - -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; - -public class StatusCommandTranslate extends StatusCommand implements IHideable -{ - - private Activity activity; - - public StatusCommandTranslate(Activity activity, TweetModel status) - { - super(status); - this.activity = activity; - } - - @Override - public String getName() - { - return "日本語に直す"; - } - - @Override - public void workOnUiThread() - { - try - { - String query = URLEncoder.encode(status.getText(), "UTF-8"); - String url = "http://translate.google.co.jp/m/translate?q=" + query; - Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); - activity.startActivity(intent); - } - catch (UnsupportedEncodingException e) - { - e.printStackTrace(); - } - - } -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandUnOffFav.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandUnOffFav.java deleted file mode 100644 index 9b178c05..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandUnOffFav.java +++ /dev/null @@ -1,41 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.task.impl.TweetTask; -import twitter4j.StatusUpdate; - -public class StatusCommandUnOffFav extends StatusCommand implements IHideable, IConfirmable -{ - - public StatusCommandUnOffFav(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "非公式ふぁぼ"; - } - - @Override - public void workOnUiThread() - { - String str = "@" + status.getOriginal().user.screenName + " っ★"; - StatusUpdate update = new StatusUpdate(str); - update.setInReplyToStatusId(status.statusId); - new TweetTask(update).callAsync(); - status.getOriginal().favorite(); - } - - @Override - public boolean getDefaultVisibility() - { - return Client.getPermission().canWarotaRT(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandUnOffRetweet.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandUnOffRetweet.java deleted file mode 100644 index 8791be54..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandUnOffRetweet.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.system.PostSystem; - -public class StatusCommandUnOffRetweet extends StatusCommand implements IHideable -{ - - public StatusCommandUnOffRetweet(TweetModel model) - { - super(model); - } - - @Override - public String getName() - { - return "非公式RT"; - } - - @Override - public void workOnUiThread() - { - String text = " RT @" + status.getOriginal().user.screenName + ": " + status.getText(); - PostSystem.clear(true); - PostSystem.setText(text); - PostSystem.getState().setCursor(0); - PostSystem.openPostPage(); - } - - @Override - public boolean getDefaultVisibility() - { - return Client.getPermission().canUnOffRetweet() && !status.getOriginal().user.isProtected; - } -} diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandUnfavorite.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandUnfavorite.java deleted file mode 100644 index 759ca16d..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandUnfavorite.java +++ /dev/null @@ -1,33 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; - -public class StatusCommandUnfavorite extends StatusCommand implements IHideable -{ - - public StatusCommandUnfavorite(TweetModel status) - { - super(status); - } - - @Override - public String getName() - { - return "お気に入りを削除する"; - } - - @Override - public void workOnUiThread() - { - status.unfavorite(); - } - - @Override - public boolean getDefaultVisibility() - { - return true; //todo ふぁぼっている時だけ - } - -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandWarotaRT.java b/src/net/miz_hi/smileessence/command/status/impl/StatusCommandWarotaRT.java deleted file mode 100644 index c8d6b099..00000000 --- a/src/net/miz_hi/smileessence/command/status/impl/StatusCommandWarotaRT.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.miz_hi.smileessence.command.status.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.command.status.StatusCommand; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.task.impl.TweetTask; -import twitter4j.StatusUpdate; - -public class StatusCommandWarotaRT extends StatusCommand implements IHideable, IConfirmable -{ - - public StatusCommandWarotaRT(TweetModel model) - { - super(model); - } - - @Override - public String getName() - { - return "ワロタ式RT"; - } - - @Override - public void workOnUiThread() - { - StringBuilder builder = new StringBuilder(); - builder.append("ワロタｗ RT @"); - builder.append(status.getOriginal().user.screenName); - builder.append(": "); - builder.append(status.getText()); - StatusUpdate update = new StatusUpdate(builder.toString()); - update.setInReplyToStatusId(status.getOriginal().statusId); - new TweetTask(update).callAsync(); - status.getOriginal().favorite(); - } - - @Override - public boolean getDefaultVisibility() - { - return Client.getPermission().canWarotaRT() && !status.getOriginal().user.isProtected; - } -} diff --git a/src/net/miz_hi/smileessence/command/user/CommandShowUserLists.java b/src/net/miz_hi/smileessence/command/user/CommandShowUserLists.java deleted file mode 100644 index 5ba37c85..00000000 --- a/src/net/miz_hi/smileessence/command/user/CommandShowUserLists.java +++ /dev/null @@ -1,91 +0,0 @@ -package net.miz_hi.smileessence.command.user; - -import android.app.Activity; -import android.app.ProgressDialog; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.CommandOpenUserList; -import net.miz_hi.smileessence.command.ICommand; -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.dialog.SimpleMenuDialog; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.twitter.API; -import net.miz_hi.smileessence.util.UiHandler; -import twitter4j.UserList; - -import java.util.ArrayList; -import java.util.List; - -public class CommandShowUserLists extends MenuCommand -{ - - Activity activity; - - public CommandShowUserLists(Activity activity) - { - this.activity = activity; - } - - @Override - public String getName() - { - return "リストのタブを追加"; - } - - @Override - public void workOnUiThread() - { - final ProgressDialog pd = ProgressDialog.show(activity, null, "更新中...", true); - MyExecutor.execute(new Runnable() - { - public void run() - { - try - { - final List<UserList> lists = API.getReadableLists(Client.getMainAccount()); - final List<ICommand> commands = new ArrayList<ICommand>(); - for (UserList list : lists) - { - if (StatusListManager.getListTimeline(list.getId()) == null) - { - commands.add(new CommandOpenUserList(activity, list)); - } - } - - if (commands.isEmpty()) - { - Notificator.alert("追加できるリストがありません"); - } - else - { - final SimpleMenuDialog menu = new SimpleMenuDialog(activity, "リストを選択") - { - @Override - public List<ICommand> getMenuList() - { - return commands; - } - }; - new UiHandler() - { - - @Override - public void run() - { - menu.create().show(); - } - }.post(); - } - } - catch (Exception e) - { - e.printStackTrace(); - Notificator.alert("リストの取得に失敗しました"); - } - pd.dismiss(); - } - }); - } - -} diff --git a/src/net/miz_hi/smileessence/command/user/UserCommand.java b/src/net/miz_hi/smileessence/command/user/UserCommand.java deleted file mode 100644 index ab032d13..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommand.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.miz_hi.smileessence.command.user; - -import net.miz_hi.smileessence.command.MenuCommand; - - -public abstract class UserCommand extends MenuCommand -{ - - protected String userName; - - public UserCommand(String userName) - { - this.userName = userName; - } - -} diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandAddReply.java b/src/net/miz_hi/smileessence/command/user/UserCommandAddReply.java deleted file mode 100644 index 76cfdfb9..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandAddReply.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.miz_hi.smileessence.command.user;
-
-import net.miz_hi.smileessence.notification.Notificator;
-import net.miz_hi.smileessence.system.PostSystem;
-
-public class UserCommandAddReply extends UserCommand
-{
-
- public UserCommandAddReply(String userName)
- {
- super(userName);
- }
-
- @Override
- public String getName()
- {
- return "リプライ先に追加";
- }
-
- @Override
- public void workOnUiThread()
- {
- PostSystem.addReply(userName);
- Notificator.info(userName + "をリプライ先に追加しました");
- }
-}
diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandBlock.java b/src/net/miz_hi/smileessence/command/user/UserCommandBlock.java deleted file mode 100644 index 02980863..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandBlock.java +++ /dev/null @@ -1,71 +0,0 @@ -package net.miz_hi.smileessence.command.user;
-
-import net.miz_hi.smileessence.Client;
-import net.miz_hi.smileessence.command.IConfirmable;
-import net.miz_hi.smileessence.notification.Notificator;
-import net.miz_hi.smileessence.task.Task;
-import net.miz_hi.smileessence.twitter.API;
-import twitter4j.TwitterException;
-
-public class UserCommandBlock extends UserCommand implements IConfirmable
-{
-
- public UserCommandBlock(String username)
- {
- super(username);
- }
-
- @Override
- public String getName()
- {
- return "ブロック";
- }
-
- @Override
- public void workOnUiThread()
- {
- new Task<Boolean>()
- {
-
- @Override
- public Boolean call()
- {
- try
- {
- API.block(Client.getMainAccount(), userName);
- }
- catch (TwitterException e)
- {
- e.printStackTrace();
- return false;
- }
- return true;
- }
-
- @Override
- public void onPreExecute()
- {
- }
-
- @Override
- public void onPostExecute(Boolean result)
- {
- if (result)
- {
- Notificator.info("ブロックしました");
- }
- else
- {
- Notificator.alert("ブロック失敗しました");
- }
- }
- }.callAsync();
- }
-
- @Override
- public boolean getDefaultVisibility()
- {
- return !Client.getMainAccount().getScreenName().equals(userName);
- }
-
-}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandFollow.java b/src/net/miz_hi/smileessence/command/user/UserCommandFollow.java deleted file mode 100644 index dc27f657..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandFollow.java +++ /dev/null @@ -1,71 +0,0 @@ -package net.miz_hi.smileessence.command.user;
-
-import net.miz_hi.smileessence.Client;
-import net.miz_hi.smileessence.command.IConfirmable;
-import net.miz_hi.smileessence.notification.Notificator;
-import net.miz_hi.smileessence.task.Task;
-import net.miz_hi.smileessence.twitter.API;
-import twitter4j.TwitterException;
-
-public class UserCommandFollow extends UserCommand implements IConfirmable
-{
-
- public UserCommandFollow(String userName)
- {
- super(userName);
- }
-
- @Override
- public String getName()
- {
- return "フォローする";
- }
-
- @Override
- public void workOnUiThread()
- {
- new Task<Boolean>()
- {
-
- @Override
- public Boolean call()
- {
- try
- {
- API.follow(Client.getMainAccount(), userName);
- }
- catch(TwitterException e)
- {
- return false;
- }
- return true;
- }
-
- @Override
- public void onPreExecute()
- {
- }
-
- @Override
- public void onPostExecute(Boolean result)
- {
- if(result)
- {
- Notificator.info("フォローしました");
- }
- else
- {
- Notificator.alert("フォロー失敗しました");
- }
- }
-
- }.callAsync();
- }
-
- @Override
- public boolean getDefaultVisibility()
- {
- return !Client.getMainAccount().getScreenName().equals(userName);
- }
-
-}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandIntroduce.java b/src/net/miz_hi/smileessence/command/user/UserCommandIntroduce.java deleted file mode 100644 index 24e19a8c..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandIntroduce.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.miz_hi.smileessence.command.user; - -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.system.PostSystem; - -public class UserCommandIntroduce extends UserCommand implements IHideable -{ - - public UserCommandIntroduce(String userName) - { - super(userName); - } - - @Override - public String getName() - { - return "みんなに紹介する"; - } - - @Override - public void workOnUiThread() - { - String str = " (@" + userName + ")"; - PostSystem.setText(str); - PostSystem.getState().setCursor(0); - PostSystem.openPostPage(); - } - -} diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandOpenFavstar.java b/src/net/miz_hi/smileessence/command/user/UserCommandOpenFavstar.java deleted file mode 100644 index e7f8b14e..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandOpenFavstar.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.miz_hi.smileessence.command.user;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-
-public class UserCommandOpenFavstar extends UserCommand
-{
-
- private Activity activity;
-
- public UserCommandOpenFavstar(Activity activity, String userName)
- {
- super(userName);
- this.activity = activity;
- }
-
- @Override
- public String getName()
- {
- return "Favstarを開く";
- }
-
- @Override
- public void workOnUiThread()
- {
- String url = "http://favstar.fm/users/" + userName + "/recent";
- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(url));
- activity.startActivity(intent);
- }
-}
diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandOpenInfo.java b/src/net/miz_hi/smileessence/command/user/UserCommandOpenInfo.java deleted file mode 100644 index 70259f26..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandOpenInfo.java +++ /dev/null @@ -1,48 +0,0 @@ -package net.miz_hi.smileessence.command.user;
-
-import android.app.Activity;
-import android.app.ProgressDialog;
-import net.miz_hi.smileessence.core.MyExecutor;
-import net.miz_hi.smileessence.model.status.ResponseConverter;
-import net.miz_hi.smileessence.model.status.user.UserModel;
-import net.miz_hi.smileessence.system.PageController;
-import net.miz_hi.smileessence.task.impl.GetUserTask;
-import net.miz_hi.smileessence.view.fragment.impl.UserInfoFragment;
-
-public class UserCommandOpenInfo extends UserCommand
-{
-
- Activity activity;
-
- public UserCommandOpenInfo(Activity activity, String userName)
- {
- super(userName);
- this.activity = activity;
- }
-
- @Override
- public String getName()
- {
- return "ユーザー情報を見る";
- }
-
- @Override
- public void workOnUiThread()
- {
- final ProgressDialog pd = ProgressDialog.show(activity, null, "取得中...", true);
- MyExecutor.execute(new Runnable()
- {
-
- @Override
- public void run()
- {
- UserModel model = ResponseConverter.convert(new GetUserTask(userName).call());
- final UserInfoFragment fragment = UserInfoFragment.newInstance(model);
- PageController.getInstance().addPage(fragment);
- PageController.getInstance().moveToLast();
- pd.dismiss();
- }
- });
-
- }
-}
diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandOpenPage.java b/src/net/miz_hi/smileessence/command/user/UserCommandOpenPage.java deleted file mode 100644 index 07292289..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandOpenPage.java +++ /dev/null @@ -1,31 +0,0 @@ -package net.miz_hi.smileessence.command.user;
-
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
-
-public class UserCommandOpenPage extends UserCommand
-{
-
- private Activity activity;
-
- public UserCommandOpenPage(Activity activity, String userName)
- {
- super(userName);
- this.activity = activity;
- }
-
- @Override
- public String getName()
- {
- return "ユーザーページを開く";
- }
-
- @Override
- public void workOnUiThread()
- {
- String userPage = "http://twitter.com/" + userName;
- Intent intent = new Intent(Intent.ACTION_VIEW, Uri.parse(userPage));
- activity.startActivity(intent);
- }
-}
diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandOpenTimeline.java b/src/net/miz_hi/smileessence/command/user/UserCommandOpenTimeline.java deleted file mode 100644 index 6db121f9..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandOpenTimeline.java +++ /dev/null @@ -1,50 +0,0 @@ -package net.miz_hi.smileessence.command.user;
-
-import android.app.Activity;
-import net.miz_hi.smileessence.core.MyExecutor;
-import net.miz_hi.smileessence.model.status.ResponseConverter;
-import net.miz_hi.smileessence.model.status.user.UserModel;
-import net.miz_hi.smileessence.model.statuslist.timeline.impl.UserTimeline;
-import net.miz_hi.smileessence.statuslist.StatusListAdapter;
-import net.miz_hi.smileessence.statuslist.StatusListManager;
-import net.miz_hi.smileessence.system.PageController;
-import net.miz_hi.smileessence.task.impl.GetUserTask;
-import net.miz_hi.smileessence.view.fragment.impl.UserTimelineFragment;
-
-public class UserCommandOpenTimeline extends UserCommand
-{
-
- Activity activity;
-
- public UserCommandOpenTimeline(Activity activity, String userName)
- {
- super(userName);
- this.activity = activity;
- }
-
- @Override
- public String getName()
- {
- return "ユーザーのタイムラインを開く";
- }
-
- @Override
- public void workOnUiThread()
- {
- MyExecutor.execute(new Runnable()
- {
-
- @Override
- public void run()
- {
- final UserModel model = ResponseConverter.convert(new GetUserTask(userName).call());
- UserTimeline timeline = new UserTimeline();
- StatusListManager.registerUserTimeline(model.userId, timeline, new StatusListAdapter(activity, timeline));
- UserTimelineFragment fragment = UserTimelineFragment.newInstance(model);
- PageController.getInstance().addPage(fragment);
- PageController.getInstance().moveToLast();
- }
- });
- }
-
-}
diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandReply.java b/src/net/miz_hi/smileessence/command/user/UserCommandReply.java deleted file mode 100644 index 6883f604..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandReply.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.miz_hi.smileessence.command.user;
-
-import net.miz_hi.smileessence.system.PostSystem;
-
-public class UserCommandReply extends UserCommand
-{
-
- public UserCommandReply(String userName)
- {
- super(userName);
- }
-
- @Override
- public String getName()
- {
- return "返信";
- }
-
- @Override
- public void workOnUiThread()
- {
- PostSystem.setReply(userName, -1);
- PostSystem.openPostPage();
- }
-
-}
diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandSpam.java b/src/net/miz_hi/smileessence/command/user/UserCommandSpam.java deleted file mode 100644 index c5649940..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandSpam.java +++ /dev/null @@ -1,70 +0,0 @@ -package net.miz_hi.smileessence.command.user;
-
-import net.miz_hi.smileessence.Client;
-import net.miz_hi.smileessence.command.IConfirmable;
-import net.miz_hi.smileessence.notification.Notificator;
-import net.miz_hi.smileessence.task.Task;
-import net.miz_hi.smileessence.twitter.API;
-import twitter4j.TwitterException;
-
-public class UserCommandSpam extends UserCommand implements IConfirmable
-{
-
- public UserCommandSpam(String userName)
- {
- super(userName);
- }
-
- @Override
- public String getName()
- {
- return "スパム報告";
- }
-
- @Override
- public void workOnUiThread()
- {
- new Task<Boolean>()
- {
-
- @Override
- public Boolean call()
- {
- try
- {
- API.spam(Client.getMainAccount(), userName);
- }
- catch (TwitterException e)
- {
- e.printStackTrace();
- return false;
- }
- return true;
- }
-
- @Override
- public void onPreExecute()
- {
- }
-
- @Override
- public void onPostExecute(Boolean result)
- {
- if(result)
- {
- Notificator.info("スパム報告しました");
- }
- else
- {
- Notificator.alert("スパム報告失敗しました");
- }
- }
- }.callAsync();
- }
-
- @Override
- public boolean getDefaultVisibility()
- {
- return !Client.getMainAccount().getScreenName().equals(userName);
- }
-}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandUnblock.java b/src/net/miz_hi/smileessence/command/user/UserCommandUnblock.java deleted file mode 100644 index eacd0522..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandUnblock.java +++ /dev/null @@ -1,71 +0,0 @@ -package net.miz_hi.smileessence.command.user; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.TwitterException; - -public class UserCommandUnblock extends UserCommand implements IConfirmable -{ - - public UserCommandUnblock(String username) - { - super(username); - } - - @Override - public String getName() - { - return "ブロック解除"; - } - - @Override - public void workOnUiThread() - { - new Task<Boolean>() - { - - @Override - public Boolean call() - { - try - { - API.block(Client.getMainAccount(), userName); - } - catch (TwitterException e) - { - e.printStackTrace(); - return false; - } - return true; - } - - @Override - public void onPreExecute() - { - } - - @Override - public void onPostExecute(Boolean result) - { - if (result) - { - Notificator.info("ブロックしました"); - } - else - { - Notificator.alert("ブロック失敗しました"); - } - } - }.callAsync(); - } - - @Override - public boolean getDefaultVisibility() - { - return !Client.getMainAccount().getScreenName().equals(userName); - } - -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/command/user/UserCommandUnfollow.java b/src/net/miz_hi/smileessence/command/user/UserCommandUnfollow.java deleted file mode 100644 index fab639da..00000000 --- a/src/net/miz_hi/smileessence/command/user/UserCommandUnfollow.java +++ /dev/null @@ -1,71 +0,0 @@ -package net.miz_hi.smileessence.command.user; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.TwitterException; - -public class UserCommandUnfollow extends UserCommand implements IConfirmable -{ - - public UserCommandUnfollow(String userName) - { - super(userName); - } - - @Override - public String getName() - { - return "リムーヴする"; - } - - @Override - public void workOnUiThread() - { - new Task<Boolean>() - { - - @Override - public Boolean call() - { - try - { - API.unfollow(Client.getMainAccount(), userName); - } - catch (TwitterException e) - { - e.printStackTrace(); - return false; - } - return true; - } - - @Override - public void onPreExecute() - { - } - - @Override - public void onPostExecute(Boolean result) - { - if (result) - { - Notificator.info("リムーヴしました"); - } - else - { - Notificator.alert("リムーヴ失敗しました"); - } - } - }.callAsync(); - } - - @Override - public boolean getDefaultVisibility() - { - return !Client.getMainAccount().getScreenName().equals(userName); - } - -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/core/EnumRequestCode.java b/src/net/miz_hi/smileessence/core/EnumRequestCode.java deleted file mode 100644 index 2304a0dd..00000000 --- a/src/net/miz_hi/smileessence/core/EnumRequestCode.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.miz_hi.smileessence.core; - -public enum EnumRequestCode -{ - AUTHORIZE, - MAIN, - PICTURE, - CAMERA -} diff --git a/src/net/miz_hi/smileessence/core/IntentRouter.java b/src/net/miz_hi/smileessence/core/IntentRouter.java deleted file mode 100644 index e5995fc3..00000000 --- a/src/net/miz_hi/smileessence/core/IntentRouter.java +++ /dev/null @@ -1,163 +0,0 @@ -package net.miz_hi.smileessence.core; - -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.text.TextUtils; -import net.miz_hi.smileessence.command.status.impl.StatusCommandChaseTalk; -import net.miz_hi.smileessence.command.user.UserCommandOpenInfo; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.status.TweetUtils; -import net.miz_hi.smileessence.system.PostSystem; -import net.miz_hi.smileessence.util.LogHelper; -import net.miz_hi.smileessence.view.activity.MainActivity; - -public class IntentRouter -{ - - public static void onNewIntent(Intent intent) - { - LogHelper.d("/intent"); - Uri uri = intent.getData(); - if (uri != null) - { - LogHelper.d(uri.toString()); - if (isOrderToPost(uri)) - { - String text = ""; - String url = ""; - if (uri.getQueryParameter("text") != null) - { - text = uri.getQueryParameter("text").replaceAll("\\+", " "); - } - else if (uri.getQueryParameter("status") != null) - { - text = uri.getQueryParameter("status").replaceAll("\\+", " "); - } - - if (uri.getQueryParameter("url") != null) - { - url = uri.getQueryParameter("url"); - } - String str = text + " " + url; - PostSystem.setText(str); - PostSystem.openPostPage(); - } - else if (isStatusUrl(uri)) - { - TweetModel status = TweetUtils.getOrCreateStatusModel(getStatusId(uri.toString())); - new StatusCommandChaseTalk(MainActivity.getInstance(), status).run(); - } - else if (isUserUrl(uri)) - { - String screenName; - if (uri.getQueryParameter("screen_name") != null) - { - screenName = uri.getQueryParameter("screen_name"); - } - else - { - String[] arrayOfString = uri.toString().split("/"); - screenName = arrayOfString[arrayOfString.length - 1]; - } - new UserCommandOpenInfo(MainActivity.getInstance(), screenName).run(); - } - } - else if (intent.getAction() != null && intent.getAction().equals(Intent.ACTION_SEND)) - { - Bundle extra = intent.getExtras(); - if (extra != null) - { - StringBuilder builder = new StringBuilder(); - if (!TextUtils.isEmpty(extra.getCharSequence(Intent.EXTRA_SUBJECT))) - { - builder.append(extra.getCharSequence(Intent.EXTRA_SUBJECT)).append(" "); - } - builder.append(extra.getCharSequence(Intent.EXTRA_TEXT)); - PostSystem.setText(builder.toString()); - PostSystem.openPostPage(); - } - } - } - - public static boolean isOrderToPost(Uri uri) - { - if (uri.getHost().equals("twitter.com")) - { - if (uri.getPath().equals("/share")) - { - return true; - } - else - { - String[] arr = uri.toString().split("/"); - for (String s : arr) - { - if (s.startsWith("tweet") || s.startsWith("home")) - { - return true; - } - } - } - } - return false; - } - - public static boolean isStatusUrl(Uri uri) - { - if (uri.getHost().equals("twitter.com")) - { - String[] arr = uri.toString().split("/"); - for (String s : arr) - { - if (s.equals("status") || s.equals("statuses")) - { - return true; - } - } - } - return false; - } - - public static boolean isUserUrl(Uri uri) - { - if (uri.getHost().equals("twitter.com")) - { - if (uri.getQueryParameter("screen_name") != null) - { - return true; - } - - String[] arrayOfString = uri.toString().split("/"); - if (arrayOfString.length == 4 && uri.getQuery() == null) - { - return true; - } - else if (arrayOfString.length > 4) - { - if (arrayOfString[3].equals("#!") && uri.getQuery() == null) - { - return true; - } - } - } - - - return false; - } - - public static Long getStatusId(String paramUri) - { - String str = "0"; - String[] arrayOfString = paramUri.split("/"); - for (int i = 0; i < arrayOfString.length; i++) - { - if (arrayOfString[i].startsWith("status")) - { - str = arrayOfString[(i + 1)]; - break; - } - } - return Long.parseLong(str); - } -} diff --git a/src/net/miz_hi/smileessence/core/MyExecutor.java b/src/net/miz_hi/smileessence/core/MyExecutor.java deleted file mode 100644 index f0675a93..00000000 --- a/src/net/miz_hi/smileessence/core/MyExecutor.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.miz_hi.smileessence.core; - -import java.util.concurrent.*; - -public class MyExecutor -{ - - private static ExecutorService executor; - - public static void init() - { - if (executor == null) - { - executor = Executors.newFixedThreadPool(5); - } - } - - public static ExecutorService getExecutor() - { - return executor; - } - - public static void execute(Runnable runnable) - { - executor.execute(runnable); - } - - public static <T> Future<T> submit(Callable<T> callable) - { - return executor.submit(callable); - } - - public static void shutdown() - { - try - { - executor.awaitTermination(1000, TimeUnit.MILLISECONDS); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - } -} diff --git a/src/net/miz_hi/smileessence/data/DBHelper.java b/src/net/miz_hi/smileessence/data/DBHelper.java deleted file mode 100644 index e6c646fe..00000000 --- a/src/net/miz_hi/smileessence/data/DBHelper.java +++ /dev/null @@ -1,65 +0,0 @@ -package net.miz_hi.smileessence.data; - -import android.content.Context; -import android.database.sqlite.SQLiteDatabase; -import com.j256.ormlite.android.apptools.OrmLiteSqliteOpenHelper; -import com.j256.ormlite.support.ConnectionSource; -import com.j256.ormlite.table.TableUtils; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.data.extra.ExtraWord; -import net.miz_hi.smileessence.data.list.List; -import net.miz_hi.smileessence.data.template.Template; -import net.miz_hi.smileessence.util.LogHelper; - -import java.sql.SQLException; - -public class DBHelper extends OrmLiteSqliteOpenHelper -{ - - public static final String dbName = Client.getApplication().getExternalFilesDir(null) + "/database.db"; - public static final int dbVersion = 3; - - public DBHelper(Context context) - { - super(context, dbName, null, dbVersion); - } - - public void initialize() - { - try - { - TableUtils.createTableIfNotExists(getConnectionSource(), Account.class); - TableUtils.createTableIfNotExists(getConnectionSource(), Template.class); - TableUtils.createTableIfNotExists(getConnectionSource(), ExtraWord.class); - TableUtils.createTableIfNotExists(getConnectionSource(), List.class); - } - catch (SQLException e) - { - e.printStackTrace(); - LogHelper.d("error on created"); - } - } - - @Override - public void onCreate(SQLiteDatabase arg0, ConnectionSource arg1) - { - try - { - TableUtils.createTableIfNotExists(getConnectionSource(), Account.class); - TableUtils.createTableIfNotExists(getConnectionSource(), Template.class); - TableUtils.createTableIfNotExists(getConnectionSource(), ExtraWord.class); - TableUtils.createTableIfNotExists(getConnectionSource(), List.class); - } - catch (SQLException e) - { - e.printStackTrace(); - LogHelper.d("error on created"); - } - } - - @Override - public void onUpgrade(SQLiteDatabase arg0, ConnectionSource arg1, int arg2, int arg3) - { - } -} diff --git a/src/net/miz_hi/smileessence/data/extra/ExtraWord.java b/src/net/miz_hi/smileessence/data/extra/ExtraWord.java deleted file mode 100644 index b9fa08ee..00000000 --- a/src/net/miz_hi/smileessence/data/extra/ExtraWord.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.miz_hi.smileessence.data.extra; - -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; - -@DatabaseTable(tableName="extraword") -public class ExtraWord -{ - - @DatabaseField(generatedId = true) - private Integer id; - @DatabaseField - private String text; - - public ExtraWord() - { - } - - public ExtraWord(String text) - { - this.text = text; - } - - public Integer getId() - { - return id; - } - - public void setId(Integer id) - { - this.id = id; - } - - public String getText() - { - return text; - } - - public void setText(String text) - { - this.text = text; - } - -} diff --git a/src/net/miz_hi/smileessence/data/extra/ExtraWordListAdapter.java b/src/net/miz_hi/smileessence/data/extra/ExtraWordListAdapter.java deleted file mode 100644 index 36c4f341..00000000 --- a/src/net/miz_hi/smileessence/data/extra/ExtraWordListAdapter.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.miz_hi.smileessence.data.extra; - -import android.app.Activity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.listener.ExtractOnClickListener; -import net.miz_hi.smileessence.util.CustomListAdapter; - -public class ExtraWordListAdapter extends CustomListAdapter<ExtraWord> -{ - - public ExtraWordListAdapter(Activity activity) - { - super(activity, Integer.MAX_VALUE); - } - - @Override - public View getView(int position, View convertedView, ViewGroup parent) - { - if (convertedView == null) - { - convertedView = getInflater().inflate(R.layout.menuitem_white, null); - } - - ExtraWord ExtraWord = (ExtraWord) getItem(position); - - TextView viewText = (TextView) convertedView.findViewById(R.id.textView_menuItem); - viewText.setText(ExtraWord.getText()); - - ExtractOnClickListener listener = new ExtractOnClickListener(this, getActivity(), ExtraWord); - - convertedView.setOnClickListener(listener); - convertedView.setOnLongClickListener(listener); - - return convertedView; - } -} diff --git a/src/net/miz_hi/smileessence/data/extra/ExtraWordManager.java b/src/net/miz_hi/smileessence/data/extra/ExtraWordManager.java deleted file mode 100644 index cb274160..00000000 --- a/src/net/miz_hi/smileessence/data/extra/ExtraWordManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package net.miz_hi.smileessence.data.extra; - -import java.util.List; - -public class ExtraWordManager -{ - - public static void addExtractWord(String extractWord) - { - addExtractWord(new ExtraWord(extractWord)); - } - - public static void addExtractWord(ExtraWord extractWord) - { - ExtractModel.instance().save(extractWord); - } - - public static void deleteExtraWord(ExtraWord extractWord) - { - ExtractModel.instance().delete(extractWord); - } - - public static List<ExtraWord> getExtraWords() - { - return ExtractModel.instance().findAll(); - } -} diff --git a/src/net/miz_hi/smileessence/data/extra/ExtractModel.java b/src/net/miz_hi/smileessence/data/extra/ExtractModel.java deleted file mode 100644 index 07c9837b..00000000 --- a/src/net/miz_hi/smileessence/data/extra/ExtractModel.java +++ /dev/null @@ -1,102 +0,0 @@ -package net.miz_hi.smileessence.data.extra; - -import android.content.Context; -import android.util.Log; -import com.j256.ormlite.dao.Dao; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.data.DBHelper; - -import java.util.List; - -public class ExtractModel -{ - - private Context context; - private static ExtractModel instance = new ExtractModel(Client.getApplication()); - - private ExtractModel(Context context) - { - this.context = context; - } - - public static ExtractModel instance() - { - return instance; - } - - public void save(ExtraWord data) - { - DBHelper helper = new DBHelper(context); - try - { - Dao<ExtraWord, Integer> dao = helper.getDao(ExtraWord.class); - dao.createOrUpdate(data); - } - catch (Exception e) - { - Log.e(ExtractModel.class.getSimpleName(), "error on save"); - } - finally - { - helper.close(); - } - } - - public void delete(ExtraWord data) - { - DBHelper helper = new DBHelper(context); - try - { - Dao<ExtraWord, Integer> dao = helper.getDao(ExtraWord.class); - dao.delete(data); - } - catch (Exception e) - { - Log.e(ExtractModel.class.getSimpleName(), "error on removeByLists"); - } - finally - { - helper.close(); - } - } - - public void deleteAll() - { - DBHelper helper = new DBHelper(context); - try - { - for (ExtraWord data : findAll()) - { - Dao<ExtraWord, Integer> dao = helper.getDao(ExtraWord.class); - dao.delete(data); - } - } - catch (Exception e) - { - Log.e(ExtractModel.class.getSimpleName(), "error on removeByLists"); - } - finally - { - helper.close(); - } - } - - public List<ExtraWord> findAll() - { - DBHelper helper = new DBHelper(context); - try - { - Dao<ExtraWord, Integer> dao = helper.getDao(ExtraWord.class); - return dao.queryForAll(); - } - catch (Exception e) - { - Log.e(ExtractModel.class.getSimpleName(), "error on findAll"); - return null; - } - finally - { - helper.close(); - } - } -} diff --git a/src/net/miz_hi/smileessence/data/list/List.java b/src/net/miz_hi/smileessence/data/list/List.java deleted file mode 100644 index 382c06fc..00000000 --- a/src/net/miz_hi/smileessence/data/list/List.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.miz_hi.smileessence.data.list; - -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; - -@DatabaseTable(tableName = "lists") -public class List -{ - - @DatabaseField(id = true) - private int listId; - @DatabaseField - private String name; - - public List() - { - } - - public List(int id, String name) - { - this.listId = id; - this.name = name; - } - - public int getListId() - { - return listId; - } - - public void setListId(int listId) - { - this.listId = listId; - } - - public String getName() - { - return name; - } - - public void setName(String name) - { - this.name = name; - } -} diff --git a/src/net/miz_hi/smileessence/data/list/ListManager.java b/src/net/miz_hi/smileessence/data/list/ListManager.java deleted file mode 100644 index 98db5d9a..00000000 --- a/src/net/miz_hi/smileessence/data/list/ListManager.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.miz_hi.smileessence.data.list; - -public class ListManager -{ - - public static void addList(List template) - { - ListModel.instance().save(template); - } - - public static void deleteList(int id) - { - ListModel.instance().delete(id); - } - - public static java.util.List<List> getLists() - { - return ListModel.instance().findAll(); - } -} diff --git a/src/net/miz_hi/smileessence/data/list/ListModel.java b/src/net/miz_hi/smileessence/data/list/ListModel.java deleted file mode 100644 index 0cbc2e0d..00000000 --- a/src/net/miz_hi/smileessence/data/list/ListModel.java +++ /dev/null @@ -1,103 +0,0 @@ -package net.miz_hi.smileessence.data.list; - -import android.content.Context; -import android.util.Log; -import com.j256.ormlite.dao.Dao; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.data.DBHelper; - -import java.util.Collections; -import java.util.List; - -public class ListModel -{ - - private Context context; - private static ListModel instance = new ListModel(Client.getApplication()); - - private ListModel(Context context) - { - this.context = context; - } - - public static ListModel instance() - { - return instance; - } - - public void save(net.miz_hi.smileessence.data.list.List list) - { - DBHelper helper = new DBHelper(context); - try - { - Dao<net.miz_hi.smileessence.data.list.List, Integer> dao = helper.getDao(net.miz_hi.smileessence.data.list.List.class); - dao.createOrUpdate(list); - } - catch (Exception e) - { - Log.e(ListModel.class.getSimpleName(), "error on save"); - } - finally - { - helper.close(); - } - } - - public void delete(int listId) - { - DBHelper helper = new DBHelper(context); - try - { - Dao<net.miz_hi.smileessence.data.list.List, Integer> dao = helper.getDao(net.miz_hi.smileessence.data.list.List.class); - dao.delete(dao.queryBuilder().where().eq("listId", listId).query()); - } - catch (Exception e) - { - Log.e(ListModel.class.getSimpleName(), "error on delete"); - } - finally - { - helper.close(); - } - } - - public void deleteAll() - { - DBHelper helper = new DBHelper(context); - try - { - for (net.miz_hi.smileessence.data.list.List list : findAll()) - { - Dao<net.miz_hi.smileessence.data.list.List, Integer> dao = helper.getDao(net.miz_hi.smileessence.data.list.List.class); - dao.delete(list); - } - } - catch (Exception e) - { - Log.e(ListModel.class.getSimpleName(), "error on delete"); - } - finally - { - helper.close(); - } - } - - public List<net.miz_hi.smileessence.data.list.List> findAll() - { - DBHelper helper = new DBHelper(context); - try - { - Dao<net.miz_hi.smileessence.data.list.List, Integer> dao = helper.getDao(net.miz_hi.smileessence.data.list.List.class); - return dao.queryForAll(); - } - catch (Exception e) - { - Log.e(ListModel.class.getSimpleName(), "error on findAll"); - return Collections.emptyList(); - } - finally - { - helper.close(); - } - } -} diff --git a/src/net/miz_hi/smileessence/data/template/Template.java b/src/net/miz_hi/smileessence/data/template/Template.java deleted file mode 100644 index 994e580b..00000000 --- a/src/net/miz_hi/smileessence/data/template/Template.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.miz_hi.smileessence.data.template; - -import com.j256.ormlite.field.DatabaseField; -import com.j256.ormlite.table.DatabaseTable; - -@DatabaseTable(tableName="templates") -public class Template -{ - - @DatabaseField(generatedId = true) - private Integer id; - @DatabaseField - private String text; - - public Template() - { - } - - public Template(String text) - { - this.text = text; - } - - public Integer getId() - { - return id; - } - - public void setId(Integer id) - { - this.id = id; - } - - public String getText() - { - return text; - } - - public void setText(String text) - { - this.text = text; - } - -} diff --git a/src/net/miz_hi/smileessence/data/template/TemplateListAdapter.java b/src/net/miz_hi/smileessence/data/template/TemplateListAdapter.java deleted file mode 100644 index e41c5666..00000000 --- a/src/net/miz_hi/smileessence/data/template/TemplateListAdapter.java +++ /dev/null @@ -1,39 +0,0 @@ -package net.miz_hi.smileessence.data.template; - -import android.app.Activity; -import android.view.View; -import android.view.ViewGroup; -import android.widget.TextView; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.listener.TemplateOnClickListener; -import net.miz_hi.smileessence.util.CustomListAdapter; - -public class TemplateListAdapter extends CustomListAdapter<Template> -{ - - public TemplateListAdapter(Activity activity) - { - super(activity, Integer.MAX_VALUE); - } - - @Override - public View getView(int position, View convertedView, ViewGroup parent) - { - if (convertedView == null) - { - convertedView = getInflater().inflate(R.layout.menuitem_white, null); - } - - Template template = (Template) getItem(position); - - TextView viewText = (TextView) convertedView.findViewById(R.id.textView_menuItem); - viewText.setText(template.getText()); - - TemplateOnClickListener listener = new TemplateOnClickListener(this, getActivity(), template); - - convertedView.setOnClickListener(listener); - convertedView.setOnLongClickListener(listener); - - return convertedView; - } -} diff --git a/src/net/miz_hi/smileessence/data/template/TemplateManager.java b/src/net/miz_hi/smileessence/data/template/TemplateManager.java deleted file mode 100644 index c7671efb..00000000 --- a/src/net/miz_hi/smileessence/data/template/TemplateManager.java +++ /dev/null @@ -1,27 +0,0 @@ -package net.miz_hi.smileessence.data.template; - -import java.util.List; - -public class TemplateManager -{ - - public static void addTemplate(String template) - { - addTemplate(new Template(template)); - } - - public static void addTemplate(Template template) - { - TemplateModel.instance().save(template); - } - - public static void deleteTemplate(Template template) - { - TemplateModel.instance().delete(template); - } - - public static List<Template> getTemplates() - { - return TemplateModel.instance().findAll(); - } -} diff --git a/src/net/miz_hi/smileessence/data/template/TemplateModel.java b/src/net/miz_hi/smileessence/data/template/TemplateModel.java deleted file mode 100644 index dccde7c8..00000000 --- a/src/net/miz_hi/smileessence/data/template/TemplateModel.java +++ /dev/null @@ -1,102 +0,0 @@ -package net.miz_hi.smileessence.data.template; - -import android.content.Context; -import android.util.Log; -import com.j256.ormlite.dao.Dao; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.data.DBHelper; - -import java.util.List; - -public class TemplateModel -{ - - private Context context; - private static TemplateModel instance = new TemplateModel(Client.getApplication()); - - private TemplateModel(Context context) - { - this.context = context; - } - - public static TemplateModel instance() - { - return instance; - } - - public void save(Template template) - { - DBHelper helper = new DBHelper(context); - try - { - Dao<Template, Integer> dao = helper.getDao(Template.class); - dao.createOrUpdate(template); - } - catch (Exception e) - { - Log.e(TemplateModel.class.getSimpleName(), "error on save"); - } - finally - { - helper.close(); - } - } - - public void delete(Template template) - { - DBHelper helper = new DBHelper(context); - try - { - Dao<Template, Integer> dao = helper.getDao(Template.class); - dao.delete(template); - } - catch (Exception e) - { - Log.e(TemplateModel.class.getSimpleName(), "error on removeByLists"); - } - finally - { - helper.close(); - } - } - - public void deleteAll() - { - DBHelper helper = new DBHelper(context); - try - { - for (Template template : findAll()) - { - Dao<Template, Integer> dao = helper.getDao(Template.class); - dao.delete(template); - } - } - catch (Exception e) - { - Log.e(TemplateModel.class.getSimpleName(), "error on removeByLists"); - } - finally - { - helper.close(); - } - } - - public List<Template> findAll() - { - DBHelper helper = new DBHelper(context); - try - { - Dao<Template, Integer> dao = helper.getDao(Template.class); - return dao.queryForAll(); - } - catch (Exception e) - { - Log.e(TemplateModel.class.getSimpleName(), "error on findAll"); - return null; - } - finally - { - helper.close(); - } - } -} diff --git a/src/net/miz_hi/smileessence/dialog/CheckBoxListDialog.java b/src/net/miz_hi/smileessence/dialog/CheckBoxListDialog.java deleted file mode 100644 index 050c5c6e..00000000 --- a/src/net/miz_hi/smileessence/dialog/CheckBoxListDialog.java +++ /dev/null @@ -1,95 +0,0 @@ -package net.miz_hi.smileessence.dialog; - -import android.app.Activity; -import android.app.Dialog; -import android.content.DialogInterface.OnClickListener; -import android.view.LayoutInflater; -import android.widget.CheckBox; -import android.widget.CompoundButton; -import android.widget.CompoundButton.OnCheckedChangeListener; -import android.widget.LinearLayout; -import android.widget.LinearLayout.LayoutParams; -import android.widget.ScrollView; - -public class CheckBoxListDialog -{ - - private Activity activity; - private String title; - private OnClickListener onClicked; - private CheckBoxItem[] items; - - public CheckBoxListDialog(Activity activity) - { - this.activity = activity; - } - - public void setTitle(String str) - { - this.title = str; - } - - public void setOnClicked(OnClickListener listener) - { - this.onClicked = listener; - } - - public CheckBoxItem[] getItems() - { - return items; - } - - public void setItems(CheckBoxItem... items) - { - this.items = items; - } - - public Dialog createDialog() - { - LayoutInflater inflater = activity.getLayoutInflater(); - ScrollView scroll = new ScrollView(activity); - LinearLayout linearLayout = new LinearLayout(activity); - linearLayout.setOrientation(LinearLayout.VERTICAL); - LayoutParams p = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT); - p.setMargins(0, 10, 0, 10); - - for (final CheckBoxItem item : items) - { - CheckBox checkbox = new CheckBox(activity); - checkbox.setLayoutParams(p); - checkbox.setText(item.name); - checkbox.setChecked(item.value); - checkbox.setOnCheckedChangeListener(new OnCheckedChangeListener() - { - - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) - { - item.value = isChecked; - } - }); - linearLayout.addView(checkbox); - } - scroll.addView(linearLayout); - - ContentDialog dialog = new ContentDialog(activity, title); - dialog.setContentView(scroll); - dialog.setOnClickListener(onClicked); - return dialog.create(); - - } - - public static class CheckBoxItem - { - - public String name; - public boolean value; - - public CheckBoxItem(String name, boolean startValue) - { - this.name = name; - this.value = startValue; - } - } - -} diff --git a/src/net/miz_hi/smileessence/dialog/ConfirmDialog.java b/src/net/miz_hi/smileessence/dialog/ConfirmDialog.java deleted file mode 100644 index ed4c290a..00000000 --- a/src/net/miz_hi/smileessence/dialog/ConfirmDialog.java +++ /dev/null @@ -1,90 +0,0 @@ -package net.miz_hi.smileessence.dialog; - -import android.app.Activity; -import android.app.AlertDialog; -import android.content.DialogInterface; -import android.content.DialogInterface.OnClickListener; - -public class ConfirmDialog -{ - - private Activity activity; - private String textTitle; - private String textPositive = "はい"; - private String textNegative = "いいえ"; - private OnClickListener listener; - - public ConfirmDialog(Activity activity, String title) - { - this.activity = activity; - this.textTitle = title; - } - - public void setTitle(String title) - { - this.textTitle = title; - } - - public void setTextPositive(String textPositive) - { - this.textPositive = textPositive; - } - - public void setTextNegative(String textNegative) - { - this.textNegative = textNegative; - } - - public void setOnClickListener(OnClickListener listener) - { - this.listener = listener; - } - - public AlertDialog createYesNoAlert() - { - AlertDialog.Builder ad = new AlertDialog.Builder(activity); - ad.setTitle(textTitle); - ad.setCancelable(false); - ad.setPositiveButton(textPositive, listener); - ad.setNegativeButton(textNegative, listener); - return ad.create(); - } - - public static void show(Activity activity, String text, final Runnable onYes) - { - show(activity, text, onYes, null); - } - - public static void show(Activity activity, String text, final Runnable onYes, final Runnable onNo) - { - ConfirmDialog helper = new ConfirmDialog(activity, text); - OnClickListener listener = new OnClickListener() - { - - @Override - public void onClick(DialogInterface dialog, int which) - { - switch (which) - { - case DialogInterface.BUTTON_POSITIVE: - { - onYes.run(); - break; - } - case DialogInterface.BUTTON_NEGATIVE: - { - if(onNo != null) - { - onNo.run(); - } - dialog.dismiss(); - break; - } - } - } - }; - helper.setOnClickListener(listener); - helper.createYesNoAlert().show(); - } - -} diff --git a/src/net/miz_hi/smileessence/dialog/ContentDialog.java b/src/net/miz_hi/smileessence/dialog/ContentDialog.java deleted file mode 100644 index 0428129f..00000000 --- a/src/net/miz_hi/smileessence/dialog/ContentDialog.java +++ /dev/null @@ -1,58 +0,0 @@ -package net.miz_hi.smileessence.dialog;
-
-import android.app.Activity;
-import android.app.AlertDialog;
-import android.content.DialogInterface.OnClickListener;
-import android.view.View;
-
-public class ContentDialog
-{
-
- private Activity activity;
- private String title;
- private View content;
- private String positive = "決定";
- private String negative = "キャンセル";
- private OnClickListener listener;
-
- public ContentDialog(Activity activity, String title)
- {
- this.activity = activity;
- this.title = title;
- }
-
- public void setTitle(String title)
- {
- this.title = title;
- }
-
- public void setTextPositive(String textPositive)
- {
- this.positive = textPositive;
- }
-
- public void setTextNegative(String textNegative)
- {
- this.negative = textNegative;
- }
-
- public void setContentView(View content)
- {
- this.content = content;
- }
-
- public void setOnClickListener(OnClickListener listener)
- {
- this.listener = listener;
- }
-
- public AlertDialog create()
- {
- AlertDialog.Builder ad = new AlertDialog.Builder(activity);
- ad.setTitle(title);
- ad.setView(content);
- ad.setPositiveButton(positive, listener);
- ad.setNegativeButton(negative, listener);
- return ad.create();
- }
-}
diff --git a/src/net/miz_hi/smileessence/dialog/ContentWithSingleButtonDialog.java b/src/net/miz_hi/smileessence/dialog/ContentWithSingleButtonDialog.java deleted file mode 100644 index 06d0eb6d..00000000 --- a/src/net/miz_hi/smileessence/dialog/ContentWithSingleButtonDialog.java +++ /dev/null @@ -1,40 +0,0 @@ -package net.miz_hi.smileessence.dialog; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.content.DialogInterface; -import android.view.View; - -public class ContentWithSingleButtonDialog -{ - - private Activity activity; - private View view; - - public ContentWithSingleButtonDialog(Activity activity, View view) - { - this.activity = activity; - this.view = view; - } - - public Dialog create() - { - final AlertDialog.Builder dialog = new AlertDialog.Builder(activity); - - dialog.setTitle(null); - dialog.setView(view); - - dialog.setPositiveButton("OK", new DialogInterface.OnClickListener() - { - @Override - public void onClick(DialogInterface dialog, int which) - { - dialog.dismiss(); - } - }); - - return dialog.create(); - } - -} diff --git a/src/net/miz_hi/smileessence/dialog/ExpandMenuDialog.java b/src/net/miz_hi/smileessence/dialog/ExpandMenuDialog.java deleted file mode 100644 index f675c4b4..00000000 --- a/src/net/miz_hi/smileessence/dialog/ExpandMenuDialog.java +++ /dev/null @@ -1,141 +0,0 @@ -package net.miz_hi.smileessence.dialog; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.util.DisplayMetrics; -import android.view.Gravity; -import android.view.View; -import android.view.WindowManager.LayoutParams; -import android.widget.ExpandableListView; -import android.widget.ExpandableListView.OnGroupClickListener; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.ICommand; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.menu.ExpandMenuListAdapter; -import net.miz_hi.smileessence.menu.MenuElement; -import net.miz_hi.smileessence.preference.EnumPreferenceKey.EnumValueType; -import net.miz_hi.smileessence.preference.PreferenceHelper; - -import java.util.ArrayList; -import java.util.List; - -public abstract class ExpandMenuDialog extends MenuDialog -{ - - protected View titleView; - protected String title; - - public ExpandMenuDialog(Activity activity) - { - super(activity); - } - - public void setTitle(View view) - { - titleView = view; - } - - public View getTitleView() - { - return titleView; - } - - public void setTitle(String title) - { - this.title = title; - } - - public abstract List<MenuElement> getElements(); - - public Dialog create() - { - dispose(); - - AlertDialog.Builder builder = new AlertDialog.Builder(activity); - - if (titleView == null) - { - builder.setTitle(title); - } - else - { - builder.setCustomTitle(titleView); - } - - List<MenuElement> list3 = getElements(); - List stub = new ArrayList(); - for (MenuElement menuElement : list3) - { - if (menuElement.isParent()) - { - List<MenuElement> children = menuElement.getChildren(); - List stub1 = new ArrayList(); - for (MenuElement menuElement2 : children) - { - boolean isEnabled = true; - ICommand command = menuElement2.getCommand(); - if (command != null) - { - if (command instanceof IHideable) - { - PreferenceHelper pref = Client.getPreferenceHelper(); - isEnabled = pref.getPreferenceValue(command.getClass().getSimpleName(), EnumValueType.BOOLEAN, false); - } - - if (!command.getDefaultVisibility() || !isEnabled) - { - stub1.add(menuElement2); - } - } - } - children.removeAll(stub1); - } - else - { - - boolean isEnabled = true; - ICommand command = menuElement.getCommand(); - if (command != null) - { - if (command instanceof IHideable) - { - PreferenceHelper pref = Client.getPreferenceHelper(); - isEnabled = pref.getPreferenceValue(command.getClass().getSimpleName(), EnumValueType.BOOLEAN, false); - } - - if (!command.getDefaultVisibility() || !isEnabled) - { - stub.add(menuElement); - } - } - } - } - list3.removeAll(stub); - - ExpandableListView listview = new ExpandableListView(activity); - listview.setGroupIndicator(Client.getResource().getDrawable(android.R.color.transparent)); - listview.setOnGroupClickListener(new OnGroupClickListener() - { - - @Override - public boolean onGroupClick(ExpandableListView parent, View v, int groupPosition, long id) - { - parent.smoothScrollToPosition(groupPosition); - return false; - } - }); - - ExpandMenuListAdapter adapter = new ExpandMenuListAdapter(activity, list3); - listview.setAdapter(adapter); - builder.setView(listview); - dialog = builder.create(); - LayoutParams lp = dialog.getWindow().getAttributes(); - DisplayMetrics metrics = activity.getResources().getDisplayMetrics(); - lp.width = (int) (metrics.widthPixels * 0.9); - lp.gravity = Gravity.CENTER; - lp.height = (int) (metrics.heightPixels * 0.8); - - return dialog; - } -} diff --git a/src/net/miz_hi/smileessence/dialog/MenuDialog.java b/src/net/miz_hi/smileessence/dialog/MenuDialog.java deleted file mode 100644 index 1a679b52..00000000 --- a/src/net/miz_hi/smileessence/dialog/MenuDialog.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.miz_hi.smileessence.dialog; - -import android.app.Activity; -import android.app.Dialog; -import android.view.LayoutInflater; - -public abstract class MenuDialog -{ - protected Activity activity; - protected static LayoutInflater inflater; - protected static Dialog dialog; - - public MenuDialog(Activity activity) - { - this.activity = activity; - inflater = LayoutInflater.from(activity); - } - - public static Dialog getDialog() - { - return dialog; - } - - public boolean isShowing() - { - if (dialog == null) - { - return false; - } - else - { - return dialog.isShowing(); - } - } - - public abstract Dialog create(); - - public static void dispose() - { - if (dialog != null) - { - dialog.dismiss(); - } - } -} diff --git a/src/net/miz_hi/smileessence/dialog/ReviewDialog.java b/src/net/miz_hi/smileessence/dialog/ReviewDialog.java deleted file mode 100644 index ca35e357..00000000 --- a/src/net/miz_hi/smileessence/dialog/ReviewDialog.java +++ /dev/null @@ -1,57 +0,0 @@ -package net.miz_hi.smileessence.dialog; - -import android.app.Activity; -import android.app.AlertDialog; -import android.content.DialogInterface.OnClickListener; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.EditText; -import android.widget.RatingBar; -import net.miz_hi.smileessence.R; - -public class ReviewDialog -{ - - private Activity activity; - private String title; - private OnClickListener listener; - private LayoutInflater layoutInflater; - private RatingBar ratingBar; - private EditText editText; - - - public ReviewDialog(Activity activity, String title) - { - this.activity = activity; - this.title = title; - layoutInflater = LayoutInflater.from(activity); - } - - public void setOnClickListener(OnClickListener listener) - { - this.listener = listener; - } - - public int getRates() - { - return (int) this.ratingBar.getRating(); - } - - public String getText() - { - return this.editText.getText().toString(); - } - - public AlertDialog create() - { - View v = layoutInflater.inflate(R.layout.dialog_review, null); - ratingBar = (RatingBar) v.findViewById(R.id.review_rating); - editText = (EditText) v.findViewById(R.id.review_comment); - - ContentDialog dialog = new ContentDialog(activity, title); - dialog.setContentView(v); - dialog.setOnClickListener(listener); - return dialog.create(); - } - -} diff --git a/src/net/miz_hi/smileessence/dialog/SeekBarDialog.java b/src/net/miz_hi/smileessence/dialog/SeekBarDialog.java deleted file mode 100644 index aab761ce..00000000 --- a/src/net/miz_hi/smileessence/dialog/SeekBarDialog.java +++ /dev/null @@ -1,98 +0,0 @@ -package net.miz_hi.smileessence.dialog; - -import android.app.Activity; -import android.app.AlertDialog; -import android.content.DialogInterface.OnClickListener; -import android.view.LayoutInflater; -import android.view.View; -import android.widget.SeekBar; -import android.widget.SeekBar.OnSeekBarChangeListener; -import android.widget.TextView; -import net.miz_hi.smileessence.R; - -public class SeekBarDialog -{ - - private Activity activity; - private String title, text; - private OnClickListener listener; - private int seekBarMax; - private int seekBarStart = 1; - private View dialogView; - private TextView textView, levelView; - private SeekBar seekbar; - private int levelCorrect = 0; - - public SeekBarDialog(Activity activity, String title) - { - this.activity = activity; - this.title = title; - LayoutInflater layoutInflater = LayoutInflater.from(activity); - dialogView = layoutInflater.inflate(R.layout.dialog_seekbar_layout, null); - textView = (TextView) dialogView.findViewById(R.id.textView_seekDialog); - levelView = (TextView) dialogView.findViewById(R.id.textView_seekLevel); - seekbar = (SeekBar) dialogView.findViewById(R.id.seekBar_seekDialog); - } - - public void setText(String text) - { - this.text = text; - } - - public void setOnClickListener(OnClickListener listener) - { - this.listener = listener; - } - - public void setSeekBarMax(int i) - { - this.seekBarMax = i; - } - - public void setSeekBarStart(int i) - { - this.seekBarStart = i; - } - - public void setLevelCorrect(int addition) - { - this.levelCorrect = addition; - } - - public int getProgress() - { - return this.seekbar.getProgress(); - } - - public AlertDialog createSeekBarDialog() - { - ContentDialog dialog = new ContentDialog(activity, title); - textView.setText(text); - seekbar.setMax(seekBarMax); - seekbar.setProgress(seekBarStart); - levelView.setText(Integer.toString(seekBarStart + levelCorrect)); - seekbar.setOnSeekBarChangeListener(new OnSeekBarChangeListener() - { - @Override - public void onStopTrackingTouch(SeekBar seekbar) - { - } - - @Override - public void onStartTrackingTouch(SeekBar seekbar) - { - } - - @Override - public void onProgressChanged(SeekBar seekbar, int i, boolean flag) - { - levelView.setText(String.valueOf(i + levelCorrect)); - } - }); - - dialog.setContentView(dialogView); - dialog.setOnClickListener(listener); - return dialog.create(); - } - -} diff --git a/src/net/miz_hi/smileessence/dialog/SimpleMenuDialog.java b/src/net/miz_hi/smileessence/dialog/SimpleMenuDialog.java deleted file mode 100644 index 8216e6d3..00000000 --- a/src/net/miz_hi/smileessence/dialog/SimpleMenuDialog.java +++ /dev/null @@ -1,104 +0,0 @@ -package net.miz_hi.smileessence.dialog; - -import android.app.Activity; -import android.app.AlertDialog; -import android.app.Dialog; -import android.util.DisplayMetrics; -import android.view.Gravity; -import android.view.View; -import android.view.WindowManager.LayoutParams; -import android.widget.ListView; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.command.ICommand; -import net.miz_hi.smileessence.command.IHideable; -import net.miz_hi.smileessence.menu.MenuListAdapter; -import net.miz_hi.smileessence.preference.EnumPreferenceKey.EnumValueType; -import net.miz_hi.smileessence.preference.PreferenceHelper; - -import java.util.ArrayList; -import java.util.List; - -public abstract class SimpleMenuDialog extends MenuDialog -{ - - protected View titleView; - protected String title; - - public SimpleMenuDialog(Activity activity) - { - super(activity); - } - - public SimpleMenuDialog(Activity activity, String title) - { - super(activity); - this.title = title; - } - - public void setTitle(View view) - { - titleView = view; - } - - public View getTitleView() - { - return titleView; - } - - public void setTitle(String title) - { - this.title = title; - } - - public abstract List<ICommand> getMenuList(); - - public Dialog create() - { - dispose(); - - AlertDialog.Builder builder = new AlertDialog.Builder(activity); - - if (titleView == null) - { - builder.setTitle(title); - } - else - { - builder.setCustomTitle(titleView); - } - - List<ICommand> list1 = getMenuList(); - List<ICommand> list2 = new ArrayList<ICommand>(); - - for (ICommand command : list1) - { - boolean isEnabled = true; - - if (command instanceof IHideable) - { - PreferenceHelper pref = Client.getPreferenceHelper(); - isEnabled = pref.getPreferenceValue(command.getClass().getSimpleName(), EnumValueType.BOOLEAN, false); - } - - if (command.getDefaultVisibility() && isEnabled) - { - list2.add(command); - } - } - - ListView listview = new ListView(activity); - MenuListAdapter adapter = new MenuListAdapter(activity); - adapter.addAll(list2); - adapter.forceNotifyAdapter(); - listview.setAdapter(adapter); - builder.setView(listview); - dialog = builder.create(); - LayoutParams lp = dialog.getWindow().getAttributes(); - DisplayMetrics metrics = activity.getResources().getDisplayMetrics(); - lp.width = (int) (metrics.widthPixels * 0.9); - lp.gravity = Gravity.CENTER; - lp.height = (int) (metrics.heightPixels * 0.8); - - return dialog; - } -} diff --git a/src/net/miz_hi/smileessence/dialog/SingleButtonDialog.java b/src/net/miz_hi/smileessence/dialog/SingleButtonDialog.java deleted file mode 100644 index 847d8659..00000000 --- a/src/net/miz_hi/smileessence/dialog/SingleButtonDialog.java +++ /dev/null @@ -1,73 +0,0 @@ -package net.miz_hi.smileessence.dialog; - -import android.app.Activity; -import android.app.Dialog; -import android.view.Gravity; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup.LayoutParams; -import android.widget.Button; -import net.miz_hi.smileessence.R; - -public class SingleButtonDialog -{ - - private Activity activity; - private String title; - private String text; - private Runnable onClick; - - public SingleButtonDialog(Activity activity) - { - this.activity = activity; - } - - public void setTitle(String title) - { - this.title = title; - } - - public void setText(String text) - { - this.text = text; - } - - public Dialog create() - { - final Dialog dialog = new Dialog(activity); - dialog.setTitle(title); - Button button = (Button) activity.getLayoutInflater().inflate(R.layout.simplebutton, null); - button.setText(text); - button.setGravity(Gravity.CENTER); - button.setOnClickListener(new OnClickListener() - { - - @Override - public void onClick(View v) - { - if (onClick != null) - { - onClick.run(); - dialog.dismiss(); - } - } - }); - dialog.addContentView(button, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT)); - return dialog; - } - - public void setOnClick(Runnable runnable) - { - onClick = runnable; - } - - public static void show(Activity activity, String title, String text, Runnable onClick) - { - SingleButtonDialog dialog = new SingleButtonDialog(activity); - dialog.setTitle(title); - dialog.setText(text); - dialog.setOnClick(onClick); - dialog.create().show(); - } - -} diff --git a/src/net/miz_hi/smileessence/extraction/ExtractManager.java b/src/net/miz_hi/smileessence/extraction/ExtractManager.java deleted file mode 100644 index 00874e2f..00000000 --- a/src/net/miz_hi/smileessence/extraction/ExtractManager.java +++ /dev/null @@ -1,34 +0,0 @@ -package net.miz_hi.smileessence.extraction; - -import net.miz_hi.smileessence.data.extra.ExtraWord; -import net.miz_hi.smileessence.data.extra.ExtraWordManager; -import net.miz_hi.smileessence.model.status.tweet.EnumTweetType; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.statuslist.StatusList; -import net.miz_hi.smileessence.statuslist.StatusListManager; - - -public class ExtractManager -{ - - public static void check(TweetModel status) - { - if (status.type != EnumTweetType.RETWEET) - { - StatusList mentions = StatusListManager.getMentionsTimeline(); - if (mentions.getStatusIndex(status) != -1) - { - return; - } - for (ExtraWord word : ExtraWordManager.getExtraWords()) - { - if (status.getText().contains(word.getText())) - { - mentions.addToTop(status); - mentions.apply(); - return; - } - } - } - } -} diff --git a/src/net/miz_hi/smileessence/listener/ExtractOnClickListener.java b/src/net/miz_hi/smileessence/listener/ExtractOnClickListener.java deleted file mode 100644 index 691d9eb9..00000000 --- a/src/net/miz_hi/smileessence/listener/ExtractOnClickListener.java +++ /dev/null @@ -1,92 +0,0 @@ -package net.miz_hi.smileessence.listener; - -import android.app.Activity; -import android.content.DialogInterface; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.View.OnLongClickListener; -import android.widget.EditText; -import net.miz_hi.smileessence.data.extra.ExtraWord; -import net.miz_hi.smileessence.data.extra.ExtraWordManager; -import net.miz_hi.smileessence.dialog.ConfirmDialog; -import net.miz_hi.smileessence.dialog.ContentDialog; -import net.miz_hi.smileessence.util.CustomListAdapter; -import net.miz_hi.smileessence.util.UiHandler; - -public class ExtractOnClickListener implements OnClickListener, OnLongClickListener -{ - - private CustomListAdapter<ExtraWord> adapter; - private ExtraWord extraWord; - private Activity activity; - - public ExtractOnClickListener(CustomListAdapter<ExtraWord> adapter, Activity activity, ExtraWord extraWord) - { - this.adapter = adapter; - this.activity = activity; - this.extraWord = extraWord; - } - - @Override - public void onClick(final View v) - { - final EditText editText = new EditText(activity); - editText.setText(extraWord.getText()); - - ContentDialog dialog = new ContentDialog(activity, "編集"); - dialog.setContentView(editText); - dialog.setOnClickListener(new DialogInterface.OnClickListener() - { - - @Override - public void onClick(DialogInterface dialog, int which) - { - switch (which) - { - case DialogInterface.BUTTON_NEGATIVE: - { - break; - } - case DialogInterface.BUTTON_POSITIVE: - { - String newText = editText.getText().toString(); - extraWord.setText(newText); - ExtraWordManager.addExtractWord(extraWord); - adapter.clear(); - adapter.addAll(ExtraWordManager.getExtraWords()); - adapter.forceNotifyAdapter(); - break; - } - } - } - }); - dialog.create().show(); - } - - @Override - public boolean onLongClick(final View v) - { - ConfirmDialog.show(activity, "削除してよろしいですか？", new Runnable() - { - - @Override - public void run() - { - new UiHandler() - { - - @Override - public void run() - { - ExtraWordManager.deleteExtraWord(extraWord); - adapter.clear(); - adapter.addAll(ExtraWordManager.getExtraWords()); - adapter.forceNotifyAdapter(); - } - }.post(); - } - }); - return true; - } - -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/listener/PageChangeListener.java b/src/net/miz_hi/smileessence/listener/PageChangeListener.java deleted file mode 100644 index 1592f492..00000000 --- a/src/net/miz_hi/smileessence/listener/PageChangeListener.java +++ /dev/null @@ -1,77 +0,0 @@ -package net.miz_hi.smileessence.listener; - -import android.support.v4.app.Fragment; -import android.support.v4.view.ViewPager.OnPageChangeListener; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; -import net.miz_hi.smileessence.system.PageController; -import net.miz_hi.smileessence.util.UiHandler; -import net.miz_hi.smileessence.view.fragment.impl.ListFragment; -import net.miz_hi.smileessence.view.fragment.impl.PostFragment; - -public class PageChangeListener implements OnPageChangeListener -{ - - boolean isOpening = false; - - @Override - public void onPageScrollStateChanged(int position) - { - } - - @Override - public void onPageScrolled(int arg0, float arg1, int arg2) - { - } - - @Override - public void onPageSelected(final int position) - { - MyExecutor.execute(new Runnable() - { - - @Override - public void run() - { - if (position == PageController.PAGE_POST) - { - PostFragment.singleton().load(); - isOpening = true; - } - else - { - if (isOpening) - { - PostFragment.singleton().save(); - } - isOpening = false; - - Fragment fragment = PageController.getInstance().getAdapter().getItem(position); - - if (fragment instanceof ListFragment) - { - if (Client.<Boolean>getPreferenceValue(EnumPreferenceKey.LIST_LOAD)) - { - final ListFragment page = (ListFragment) fragment; - if (page.isNotInited()) - { - new UiHandler() - { - - @Override - public void run() - { - page.refresh(); - } - }.post(); - } - } - } - } - } - }); - - } - -} diff --git a/src/net/miz_hi/smileessence/listener/PostEditTextListener.java b/src/net/miz_hi/smileessence/listener/PostEditTextListener.java deleted file mode 100644 index 669f6ec7..00000000 --- a/src/net/miz_hi/smileessence/listener/PostEditTextListener.java +++ /dev/null @@ -1,55 +0,0 @@ -package net.miz_hi.smileessence.listener; - -import android.content.Context; -import android.text.Editable; -import android.text.TextWatcher; -import android.view.View; -import android.view.View.OnFocusChangeListener; -import android.view.inputmethod.InputMethodManager; -import android.widget.TextView; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.util.StringUtils; - -public class PostEditTextListener implements TextWatcher, OnFocusChangeListener -{ - - TextView viewCount; - - public PostEditTextListener(TextView viewCount) - { - this.viewCount = viewCount; - } - - @Override - public void onFocusChange(View v, boolean hasFocus) - { - if (hasFocus) - { - InputMethodManager imm = (InputMethodManager) Client.getApplication().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(v, 0); - } - else - { - InputMethodManager imm = (InputMethodManager) Client.getApplication().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(v.getWindowToken(), 0); - } - } - - @Override - public void afterTextChanged(Editable arg0) - { - } - - @Override - public void beforeTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) - { - } - - @Override - public void onTextChanged(CharSequence arg0, int arg1, int arg2, int arg3) - { - viewCount.setText(String.valueOf(140 - StringUtils.countTweetCharacters(arg0.toString()))); - } - - -} diff --git a/src/net/miz_hi/smileessence/listener/StatusOnClickListener.java b/src/net/miz_hi/smileessence/listener/StatusOnClickListener.java deleted file mode 100644 index 3dc11b78..00000000 --- a/src/net/miz_hi/smileessence/listener/StatusOnClickListener.java +++ /dev/null @@ -1,74 +0,0 @@ -package net.miz_hi.smileessence.listener; - -import android.app.Activity; -import android.app.Dialog; -import android.graphics.drawable.ColorDrawable; -import android.view.View; -import android.view.View.OnClickListener; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.menu.EventMenu; -import net.miz_hi.smileessence.menu.TweetMenu; -import net.miz_hi.smileessence.menu.UserMenu; -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.model.status.event.EventModel; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.status.user.UserModel; -import net.miz_hi.smileessence.util.UiHandler; - -public class StatusOnClickListener implements OnClickListener -{ - - private Activity activity; - private IStatusModel model; - - public StatusOnClickListener(Activity activity, IStatusModel model) - { - this.activity = activity; - this.model = model; - } - - @Override - public void onClick(final View v) - { - final int bg = ((ColorDrawable) v.getBackground()).getColor(); - v.setBackgroundColor(Client.getColor(R.color.MetroBlue)); - v.invalidate(); - new UiHandler() - { - - @Override - public void run() - { - v.setBackgroundColor(bg); - Dialog dialog = getDialog(); - if (dialog != null) - { - dialog.show(); - } - } - }.postDelayed(20); - } - - private Dialog getDialog() - { - if (model instanceof TweetModel) - { - return new TweetMenu(activity, (TweetModel) model).create(); - } - else if (model instanceof EventModel) - { - return new EventMenu(activity, (EventModel) model).create(); - } - else if (model instanceof UserModel) - { - return new UserMenu(activity, (UserModel) model).create(); - } - else - { - return null; - } - } - - -} diff --git a/src/net/miz_hi/smileessence/listener/TemplateOnClickListener.java b/src/net/miz_hi/smileessence/listener/TemplateOnClickListener.java deleted file mode 100644 index 864da551..00000000 --- a/src/net/miz_hi/smileessence/listener/TemplateOnClickListener.java +++ /dev/null @@ -1,92 +0,0 @@ -package net.miz_hi.smileessence.listener;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.view.View.OnLongClickListener;
-import android.widget.EditText;
-import net.miz_hi.smileessence.data.template.Template;
-import net.miz_hi.smileessence.data.template.TemplateManager;
-import net.miz_hi.smileessence.dialog.ConfirmDialog;
-import net.miz_hi.smileessence.dialog.ContentDialog;
-import net.miz_hi.smileessence.util.CustomListAdapter;
-import net.miz_hi.smileessence.util.UiHandler;
-
-public class TemplateOnClickListener implements OnClickListener, OnLongClickListener
-{
-
- private CustomListAdapter<Template> adapter;
- private Template template;
- private Activity activity;
-
- public TemplateOnClickListener(CustomListAdapter<Template> adapter, Activity activity, Template template)
- {
- this.adapter = adapter;
- this.activity = activity;
- this.template = template;
- }
-
- @Override
- public void onClick(final View v)
- {
- final EditText editText = new EditText(activity);
- editText.setText(template.getText());
-
- ContentDialog dialog = new ContentDialog(activity, "編集");
- dialog.setContentView(editText);
- dialog.setOnClickListener(new DialogInterface.OnClickListener()
- {
-
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- switch (which)
- {
- case DialogInterface.BUTTON_NEGATIVE:
- {
- break;
- }
- case DialogInterface.BUTTON_POSITIVE:
- {
- String newText = editText.getText().toString();
- template.setText(newText);
- TemplateManager.addTemplate(template);
- adapter.clear();
- adapter.addAll(TemplateManager.getTemplates());
- adapter.forceNotifyAdapter();
- break;
- }
- }
- }
- });
- dialog.create().show();
- }
-
- @Override
- public boolean onLongClick(final View v)
- {
- ConfirmDialog.show(activity, "削除してよろしいですか？", new Runnable()
- {
-
- @Override
- public void run()
- {
- new UiHandler()
- {
-
- @Override
- public void run()
- {
- TemplateManager.deleteTemplate(template);
- adapter.clear();
- adapter.addAll(TemplateManager.getTemplates());
- adapter.forceNotifyAdapter();
- }
- }.post();
- }
- });
- return true;
- }
-
-}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/listener/TimelineScrollListener.java b/src/net/miz_hi/smileessence/listener/TimelineScrollListener.java deleted file mode 100644 index af9c6dcd..00000000 --- a/src/net/miz_hi/smileessence/listener/TimelineScrollListener.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.miz_hi.smileessence.listener; - -import android.widget.AbsListView; -import android.widget.AbsListView.OnScrollListener; -import android.widget.ListView; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.util.CustomListAdapter; - -public class TimelineScrollListener implements OnScrollListener -{ - - private CustomListAdapter<?> adapter; - - public TimelineScrollListener(CustomListAdapter<?> adapter) - { - this.adapter = adapter; - } - - @Override - public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) - { - } - - @Override - public void onScrollStateChanged(AbsListView view, int scrollState) - { - adapter.setCanNotifyOnChange(false); - - if (view.getFirstVisiblePosition() == 0 && view.getChildAt(0) != null && view.getChildAt(0).getTop() == 0) - { - if (scrollState == SCROLL_STATE_IDLE) - { - adapter.setCanNotifyOnChange(true); - int before = adapter.getCount(); - adapter.notifyDataSetChanged(); - int after = adapter.getCount(); - int addCount = after - before; - ((ListView) view).setSelectionFromTop(addCount, 0); - if (addCount > 0) - { - Notificator.info(addCount + "件の新着があります"); - } - } - } - } - -} diff --git a/src/net/miz_hi/smileessence/menu/AddPageMenu.java b/src/net/miz_hi/smileessence/menu/AddPageMenu.java deleted file mode 100644 index 787098bd..00000000 --- a/src/net/miz_hi/smileessence/menu/AddPageMenu.java +++ /dev/null @@ -1,32 +0,0 @@ -package net.miz_hi.smileessence.menu;
-
-import android.app.Activity;
-import net.miz_hi.smileessence.command.ICommand;
-import net.miz_hi.smileessence.command.user.CommandShowUserLists;
-import net.miz_hi.smileessence.dialog.SimpleMenuDialog;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class AddPageMenu extends SimpleMenuDialog
-{
-
- public AddPageMenu(Activity activity)
- {
- super(activity);
- setTitle("追加するタブを選択");
- }
-
- @Override
- public List<ICommand> getMenuList()
- {
- List<ICommand> commands = new ArrayList<ICommand>();
-
- commands.add(new CommandShowUserLists(activity));
-
-
- return commands;
- }
-
-
-}
diff --git a/src/net/miz_hi/smileessence/menu/EventMenu.java b/src/net/miz_hi/smileessence/menu/EventMenu.java deleted file mode 100644 index eb49c065..00000000 --- a/src/net/miz_hi/smileessence/menu/EventMenu.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.miz_hi.smileessence.menu; - -import android.app.Activity; -import net.miz_hi.smileessence.command.ICommand; -import net.miz_hi.smileessence.command.user.UserCommandFollow; -import net.miz_hi.smileessence.command.user.UserCommandOpenInfo; -import net.miz_hi.smileessence.command.user.UserCommandReply; -import net.miz_hi.smileessence.command.user.UserCommandUnfollow; -import net.miz_hi.smileessence.dialog.SimpleMenuDialog; -import net.miz_hi.smileessence.model.status.event.EventModel; -import net.miz_hi.smileessence.model.status.user.UserModel; - -import java.util.ArrayList; -import java.util.List; - -public class EventMenu extends SimpleMenuDialog -{ - - private UserModel user; - - public EventMenu(Activity activity, EventModel model) - { - super(activity); - this.user = model.source; - setTitle("@" + this.user.screenName); - } - - @Override - public List<ICommand> getMenuList() - { - List<ICommand> items = new ArrayList<ICommand>(); - items.add(new UserCommandReply(user.screenName)); - items.add(new UserCommandOpenInfo(activity, user.screenName)); - items.add(new UserCommandFollow(user.screenName)); - items.add(new UserCommandUnfollow(user.screenName)); - return items; - } -} diff --git a/src/net/miz_hi/smileessence/menu/ExpandMenuListAdapter.java b/src/net/miz_hi/smileessence/menu/ExpandMenuListAdapter.java deleted file mode 100644 index 36d2f325..00000000 --- a/src/net/miz_hi/smileessence/menu/ExpandMenuListAdapter.java +++ /dev/null @@ -1,168 +0,0 @@ -package net.miz_hi.smileessence.menu; - -import android.app.Activity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.widget.BaseExpandableListAdapter; -import android.widget.ImageView; -import android.widget.TextView; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.command.ICommand; -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.dialog.ConfirmDialog; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -public class ExpandMenuListAdapter extends BaseExpandableListAdapter -{ - - private List<MenuElement> elements; - private Activity activity; - private LayoutInflater inflater; - - public ExpandMenuListAdapter(Activity activity, Collection<MenuElement> elements) - { - this.activity = activity; - this.elements = new ArrayList<MenuElement>(elements); - this.inflater = activity.getLayoutInflater(); - } - - @Override - public Object getChild(int arg0, int arg1) - { - return elements.get(arg0).getChildren().get(arg1); - } - - @Override - public long getChildId(int arg0, int arg1) - { - return arg1; - } - - @Override - public View getChildView(int arg0, int arg1, boolean arg2, View view, ViewGroup arg4) - { - - view = inflater.inflate(R.layout.menuitem_white, null); - - final ICommand item = ((MenuElement) getChild(arg0, arg1)).getCommand(); - - TextView textView = (TextView) view.findViewById(R.id.textView_menuItem); - textView.setText(item.getName()); - view.setOnClickListener(new OnClickListener() - { - @Override - public void onClick(View view) - { - if (item instanceof IConfirmable && Client.<Boolean>getPreferenceValue(EnumPreferenceKey.CONFIRM_DIALOG)) - { - ConfirmDialog.show(activity, "実行しますか？", new Runnable() - { - @Override - public void run() - { - item.run(); - } - }); - } - else - { - item.run(); - } - } - }); - return view; - } - - @Override - public int getChildrenCount(int arg0) - { - return elements.get(arg0).getChildren().size(); - } - - @Override - public Object getGroup(int arg0) - { - return elements.get(arg0); - } - - @Override - public int getGroupCount() - { - return elements.size(); - } - - @Override - public long getGroupId(int arg0) - { - return arg0; - } - - @Override - public View getGroupView(int arg0, boolean isExpanded, View view, ViewGroup parent) - { - MenuElement element = elements.get(arg0); - if (element.isParent()) - { - view = inflater.inflate(R.layout.menuparent_white, null); - TextView textView = (TextView) view.findViewById(R.id.textView_menuItem); - textView.setText(element.getName()); - ImageView indicator = (ImageView) view.findViewById(R.id.menuparent_indicator); - indicator.setImageResource(isExpanded ? R.drawable.expand_open : R.drawable.expand_close); - } - else - { - view = inflater.inflate(R.layout.menuitem_white, null); - - final ICommand item = element.getCommand(); - - TextView textView = (TextView) view.findViewById(R.id.textView_menuItem); - textView.setText(item.getName()); - - view.setOnClickListener(new OnClickListener() - { - @Override - public void onClick(View view) - { - if (item instanceof IConfirmable && Client.<Boolean>getPreferenceValue(EnumPreferenceKey.CONFIRM_DIALOG)) - { - ConfirmDialog.show(activity, "実行しますか？", new Runnable() - { - @Override - public void run() - { - item.run(); - } - }); - } - else - { - item.run(); - } - } - }); - } - - return view; - } - - @Override - public boolean hasStableIds() - { - return true; - } - - @Override - public boolean isChildSelectable(int arg0, int arg1) - { - return true; - } - - -} diff --git a/src/net/miz_hi/smileessence/menu/MainMenu.java b/src/net/miz_hi/smileessence/menu/MainMenu.java deleted file mode 100644 index 8c539ff3..00000000 --- a/src/net/miz_hi/smileessence/menu/MainMenu.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.miz_hi.smileessence.menu; - -import android.app.Activity; -import net.miz_hi.smileessence.command.CommandEditExtraWord; -import net.miz_hi.smileessence.command.CommandEditMenu; -import net.miz_hi.smileessence.command.CommandEditTemplate; -import net.miz_hi.smileessence.command.CommandReConnect; -import net.miz_hi.smileessence.command.main.*; -import net.miz_hi.smileessence.dialog.ExpandMenuDialog; - -import java.util.ArrayList; -import java.util.List; - -public class MainMenu extends ExpandMenuDialog -{ - - public MainMenu(Activity activity) - { - super(activity); - setTitle("メインメニュー"); - } - - @Override - public List<MenuElement> getElements() - { - List<MenuElement> list = new ArrayList<MenuElement>(); - - MenuElement settingMenu = new MenuElement("設定"); - settingMenu.addChild(new MenuElement(new CommandOpenSetting(activity))); - settingMenu.addChild(new MenuElement(new CommandEditTemplate(activity))); - settingMenu.addChild(new MenuElement(new CommandEditExtraWord(activity))); - settingMenu.addChild(new MenuElement(new CommandEditMenu(activity))); - list.add(settingMenu); - - MenuElement tabMenu = new MenuElement("タブ操作"); - tabMenu.addChild(new MenuElement(new CommandToPageMove())); - tabMenu.addChild(new MenuElement(new CommandClosePage())); - tabMenu.addChild(new MenuElement(new CommandToAddPage())); - list.add(tabMenu); - - MenuElement serviceMenu = new MenuElement("外部サービス"); - serviceMenu.addChild(new MenuElement(new CommandOpenFavstar(activity))); - serviceMenu.addChild(new MenuElement(new CommandOpenAclog(activity))); - serviceMenu.addChild(new MenuElement(new CommandOpenTwilog(activity))); - list.add(serviceMenu); - - MenuElement otherMenu = new MenuElement("その他"); - otherMenu.addChild(new MenuElement(new CommandReConnect())); - otherMenu.addChild(new MenuElement(new CommandCommercial())); - otherMenu.addChild(new MenuElement(new CommandReport())); - otherMenu.addChild(new MenuElement(new CommandFinish())); - list.add(otherMenu); - - return list; - } -} diff --git a/src/net/miz_hi/smileessence/menu/MenuElement.java b/src/net/miz_hi/smileessence/menu/MenuElement.java deleted file mode 100644 index 86f34ea7..00000000 --- a/src/net/miz_hi/smileessence/menu/MenuElement.java +++ /dev/null @@ -1,52 +0,0 @@ -package net.miz_hi.smileessence.menu; - -import net.miz_hi.smileessence.command.ICommand; - -import java.util.ArrayList; -import java.util.List; - -public class MenuElement -{ - - private String name; - private List<MenuElement> children = new ArrayList<MenuElement>(); - private ICommand command; - - public MenuElement(String name) - { - this.name = name; - } - - public MenuElement(ICommand command) - { - this.name = command.getName(); - this.command = command; - } - - public String getName() - { - return name; - } - - public boolean isParent() - { - return children.size() > 0; - } - - public List<MenuElement> getChildren() - { - return children; - } - - public void addChild(MenuElement element) - { - children.add(element); - } - - public ICommand getCommand() - { - return command; - } - - -} diff --git a/src/net/miz_hi/smileessence/menu/MenuListAdapter.java b/src/net/miz_hi/smileessence/menu/MenuListAdapter.java deleted file mode 100644 index 17c96690..00000000 --- a/src/net/miz_hi/smileessence/menu/MenuListAdapter.java +++ /dev/null @@ -1,62 +0,0 @@ -package net.miz_hi.smileessence.menu; - -import android.app.Activity; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.widget.TextView; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.command.ICommand; -import net.miz_hi.smileessence.command.IConfirmable; -import net.miz_hi.smileessence.dialog.ConfirmDialog; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; -import net.miz_hi.smileessence.util.CustomListAdapter; - -public class MenuListAdapter extends CustomListAdapter<ICommand> -{ - - public MenuListAdapter(Activity activity) - { - super(activity, 100); - - } - - @Override - public View getView(int position, View convertedView, ViewGroup parent) - { - if (convertedView == null) - { - convertedView = getInflater().inflate(R.layout.menuitem_white, null); - } - - final ICommand item = (ICommand) getItem(position); - - TextView textView = (TextView) convertedView.findViewById(R.id.textView_menuItem); - textView.setText(item.getName()); - convertedView.setOnClickListener(new OnClickListener() - { - @Override - public void onClick(View view) - { - if (item instanceof IConfirmable && Client.<Boolean>getPreferenceValue(EnumPreferenceKey.CONFIRM_DIALOG)) - { - ConfirmDialog.show(getActivity(), "実行しますか？", new Runnable() - { - @Override - public void run() - { - item.run(); - } - }); - } - else - { - item.run(); - } - } - }); - return convertedView; - } - -} diff --git a/src/net/miz_hi/smileessence/menu/MovePageMenu.java b/src/net/miz_hi/smileessence/menu/MovePageMenu.java deleted file mode 100644 index 7bfd1c80..00000000 --- a/src/net/miz_hi/smileessence/menu/MovePageMenu.java +++ /dev/null @@ -1,35 +0,0 @@ -package net.miz_hi.smileessence.menu;
-
-import android.app.Activity;
-import net.miz_hi.smileessence.command.CommandMovePage;
-import net.miz_hi.smileessence.command.ICommand;
-import net.miz_hi.smileessence.dialog.SimpleMenuDialog;
-import net.miz_hi.smileessence.system.PageController;
-import net.miz_hi.smileessence.view.fragment.NamedFragment;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class MovePageMenu extends SimpleMenuDialog
-{
-
- public MovePageMenu(Activity activity)
- {
- super(activity);
- setTitle("移動先のタブを選択");
- }
-
- @Override
- public List<ICommand> getMenuList()
- {
- List<ICommand> commands = new ArrayList<ICommand>();
- List<NamedFragment> pages = PageController.getInstance().getAdapter().getList();
- for (int i = 0; i < pages.size(); i++)
- {
- NamedFragment fragment = pages.get(i);
- commands.add(new CommandMovePage(fragment.getTitle(), i));
- }
- return commands;
- }
-
-}
diff --git a/src/net/miz_hi/smileessence/menu/PostingMenu.java b/src/net/miz_hi/smileessence/menu/PostingMenu.java deleted file mode 100644 index 0d5a50f0..00000000 --- a/src/net/miz_hi/smileessence/menu/PostingMenu.java +++ /dev/null @@ -1,81 +0,0 @@ -package net.miz_hi.smileessence.menu; - -import android.app.Activity; -import net.miz_hi.smileessence.cache.TweetCache; -import net.miz_hi.smileessence.command.ICommand; -import net.miz_hi.smileessence.command.post.CommandAppendHashtag; -import net.miz_hi.smileessence.command.post.CommandInsertText; -import net.miz_hi.smileessence.command.post.CommandMakeAnonymous; -import net.miz_hi.smileessence.command.post.CommandParseMorse; -import net.miz_hi.smileessence.data.template.Template; -import net.miz_hi.smileessence.data.template.TemplateManager; -import net.miz_hi.smileessence.dialog.ExpandMenuDialog; - -import java.util.ArrayList; -import java.util.List; - -public class PostingMenu extends ExpandMenuDialog -{ - - public PostingMenu(Activity activity) - { - super(activity); - setTitle("投稿メニュー"); - } - - private List<ICommand> getHashtagMenu() - { - List<ICommand> list = new ArrayList<ICommand>(); - for (String hashtag : TweetCache.getHashtagList()) - { - list.add(new CommandAppendHashtag(hashtag)); - } - return list; - } - - private List<ICommand> getTemplateMenu() - { - List<ICommand> list = new ArrayList<ICommand>(); - for (Template template : TemplateManager.getTemplates()) - { - list.add(new CommandInsertText(template.getText())); - } - return list; - } - - @Override - public List<MenuElement> getElements() - { - List<MenuElement> list = new ArrayList<MenuElement>(); - - MenuElement convert = new MenuElement("変換"); - convert.addChild(new MenuElement(new CommandParseMorse())); - convert.addChild(new MenuElement(new CommandMakeAnonymous())); - list.add(convert); - - MenuElement template = new MenuElement("定型文"); - List<ICommand> templates = getTemplateMenu(); - if (!templates.isEmpty()) - { - for (ICommand iCommand : templates) - { - template.addChild(new MenuElement(iCommand)); - } - list.add(template); - } - - MenuElement hashtag = new MenuElement("最近見たハッシュタグ"); - List<ICommand> hashtags = getHashtagMenu(); - if (!hashtags.isEmpty()) - { - for (ICommand iCommand : hashtags) - { - hashtag.addChild(new MenuElement(iCommand)); - } - list.add(hashtag); - } - return list; - } - - -} diff --git a/src/net/miz_hi/smileessence/menu/TweetMenu.java b/src/net/miz_hi/smileessence/menu/TweetMenu.java deleted file mode 100644 index 36e493ea..00000000 --- a/src/net/miz_hi/smileessence/menu/TweetMenu.java +++ /dev/null @@ -1,254 +0,0 @@ -package net.miz_hi.smileessence.menu;
-
-import android.app.Activity;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.LinearLayout;
-import android.widget.LinearLayout.LayoutParams;
-import net.miz_hi.smileessence.Client;
-import net.miz_hi.smileessence.R;
-import net.miz_hi.smileessence.command.CommandAddTemplate;
-import net.miz_hi.smileessence.command.CommandOpenUrl;
-import net.miz_hi.smileessence.command.ICommand;
-import net.miz_hi.smileessence.command.post.CommandAppendHashtag;
-import net.miz_hi.smileessence.command.status.impl.*;
-import net.miz_hi.smileessence.command.user.*;
-import net.miz_hi.smileessence.dialog.ExpandMenuDialog;
-import net.miz_hi.smileessence.model.status.tweet.TweetModel;
-import net.miz_hi.smileessence.status.StatusViewFactory;
-import twitter4j.HashtagEntity;
-import twitter4j.MediaEntity;
-import twitter4j.URLEntity;
-import twitter4j.UserMentionEntity;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-public class TweetMenu extends ExpandMenuDialog
-{
-
- private TweetModel status;
-
- public TweetMenu(Activity activity, TweetModel model)
- {
- super(activity);
- this.status = model;
- setTitle(getHeaderView());
- }
-
- private View getHeaderView()
- {
- View viewStatus = StatusViewFactory.newInstance(inflater, null).getStatusView(status);
- LayoutParams p = new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.WRAP_CONTENT);
- p.setMargins(5, 5, 5, 0);
- viewStatus.setLayoutParams(p);
-
- View commands = inflater.inflate(R.layout.statusmenu_header, null);
- View reply = commands.findViewById(R.id.statusmenu_reply);
- View retweet = commands.findViewById(R.id.statusmenu_retweet);
- View favorite = commands.findViewById(R.id.statusmenu_favorite);
-
- final StatusCommandReply commandReply = new StatusCommandReply(status);
- final StatusCommandRetweet commandRetweet = new StatusCommandRetweet(status);
- final StatusCommandFavorite commandFavorite = new StatusCommandFavorite(status);
-
- if (!commandRetweet.getDefaultVisibility())
- {
- retweet.setVisibility(View.INVISIBLE);
- }
-
- reply.setOnClickListener(new OnClickListener()
- {
-
- @Override
- public void onClick(View arg0)
- {
- commandReply.run();
- dispose();
- }
- });
- retweet.setOnClickListener(new OnClickListener()
- {
-
- @Override
- public void onClick(View v)
- {
- commandRetweet.run();
- dispose();
- }
- });
- favorite.setOnClickListener(new OnClickListener()
- {
-
- @Override
- public void onClick(View v)
- {
- commandFavorite.run();
- dispose();
- }
- });
-
- commands.setLayoutParams(p);
-
- LinearLayout header = new LinearLayout(activity);
- header.setOrientation(LinearLayout.VERTICAL);
-
- header.setBackgroundColor(Client.getColor(R.color.White));
- header.addView(viewStatus);
- header.addView(commands);
- return header;
- }
-
- public List<ICommand> getStatusMenu()
- {
- List<ICommand> list = new ArrayList<ICommand>();
- list.add(new StatusCommandDelete(status));
- list.add(new StatusCommandReplyToAll(status));
- list.add(new StatusCommandFavAndRetweet(status));
- list.add(new StatusCommandChaseTalk(activity, status));
- list.add(new StatusCommandUnfavorite(status));
- list.add(new StatusCommandCopy(status));
- list.add(new StatusCommandTofuBuster(activity, status));
- list.add(new StatusCommandUnOffRetweet(status));
- list.add(new StatusCommandWarotaRT(status));
- list.add(new StatusCommandMakeAnonymous(status));
- list.add(new StatusCommandNanigaja(status));
- list.add(new StatusCommandUnOffFav(status));
- list.add(new StatusCommandThankToFav(status));
- list.add(new StatusCommandCongrats(status));
- list.add(new UserCommandIntroduce(status.getOriginal().user.screenName));
- list.add(new StatusCommandReview(activity, status));
- list.add(new StatusCommandProduce(status));
- list.add(new StatusCommandTranslate(activity, status));
- list.add(new CommandAddTemplate(status.getText()));
- list.add(new StatusCommandClipboard(status));
- list.add(new StatusCommandOpenUrl(status, activity));
- return list;
- }
-
- private List<ICommand> getURLMenu()
- {
- List<ICommand> list = new ArrayList<ICommand>();
- if (status.getUrls() != null)
- {
- for (URLEntity urlEntity : status.getUrls())
- {
- String url = urlEntity.getExpandedURL();
- if (url != null)
- {
- list.add(new CommandOpenUrl(activity, url));
- }
- }
- }
- if (status.getMedias() != null)
- {
- for (MediaEntity mediaEntity : status.getMedias())
- {
- String url = mediaEntity.getMediaURL();
- if (url != null)
- {
- list.add(new CommandOpenUrl(activity, url));
- }
- }
- }
- return list;
- }
-
- private List<ICommand> getHashtagMenu()
- {
- List<ICommand> list = new ArrayList<ICommand>();
- if (status.getHashtags() != null)
- {
- for (HashtagEntity hashtag : status.getHashtags())
- {
- list.add(new CommandAppendHashtag(hashtag.getText()));
- }
- }
- return list;
- }
-
- private List<String> getUsersList()
- {
- List<String> list = new ArrayList<String>();
- list.add(status.user.screenName);
- if (status.getUserMentions() != null)
- {
- for (UserMentionEntity e : status.getUserMentions())
- {
- if (!list.contains(e.getScreenName()))
- {
- list.add(e.getScreenName());
- }
- }
- }
- if (!list.contains(status.getOriginal().user.screenName))
- {
- list.add(status.getOriginal().user.screenName);
- }
- return list;
- }
-
- private Map<String, List<ICommand>> getUserMenu(List<String> userList)
- {
- Map<String, List<ICommand>> map = new HashMap<String, List<ICommand>>();
- for (String userName : userList)
- {
- ArrayList<ICommand> list = new ArrayList<ICommand>();
- list.add(new UserCommandReply(userName));
- list.add(new UserCommandAddReply(userName));
- list.add(new UserCommandOpenInfo(activity, userName));
- list.add(new UserCommandOpenTimeline(activity, userName));
- list.add(new UserCommandSpam(userName));
- map.put(userName, list);
- }
- return map;
- }
-
- @Override
- public List<MenuElement> getElements()
- {
- List<MenuElement> list = new ArrayList<MenuElement>();
- List<ICommand> url = getURLMenu();
- if (!url.isEmpty())
- {
- for (ICommand iCommand : url)
- {
- list.add(new MenuElement(iCommand));
- }
- }
-
- MenuElement command = new MenuElement("コマンド");
- List<ICommand> commands = getStatusMenu();
- for (ICommand iCommand : commands)
- {
- command.addChild(new MenuElement(iCommand));
- }
- list.add(command);
-
- for (String name : getUsersList())
- {
- MenuElement user = new MenuElement("@" + name);
- List<ICommand> userMenu = getUserMenu(getUsersList()).get(name);
- for (ICommand iCommand : userMenu)
- {
- user.addChild(new MenuElement(iCommand));
- }
- list.add(user);
- }
-
- MenuElement hashtag = new MenuElement("ハッシュタグ");
- List<ICommand> hashtags = getHashtagMenu();
- if (!hashtags.isEmpty())
- {
- for (ICommand iCommand : hashtags)
- {
- hashtag.addChild(new MenuElement(iCommand));
- }
- list.add(hashtag);
- }
-
- return list;
- }
-}
diff --git a/src/net/miz_hi/smileessence/menu/UserMenu.java b/src/net/miz_hi/smileessence/menu/UserMenu.java deleted file mode 100644 index 1a3aed0d..00000000 --- a/src/net/miz_hi/smileessence/menu/UserMenu.java +++ /dev/null @@ -1,38 +0,0 @@ -package net.miz_hi.smileessence.menu; - -import android.app.Activity; -import net.miz_hi.smileessence.command.ICommand; -import net.miz_hi.smileessence.command.user.*; -import net.miz_hi.smileessence.dialog.SimpleMenuDialog; -import net.miz_hi.smileessence.model.status.user.UserModel; - -import java.util.ArrayList; -import java.util.List; - -public class UserMenu extends SimpleMenuDialog -{ - - private String userName; - - public UserMenu(Activity activity, UserModel model) - { - super(activity); - this.userName = model.screenName; - setTitle("@" + userName); - } - - @Override - public List<ICommand> getMenuList() - { - List<ICommand> items = new ArrayList<ICommand>(); - - items.add(new UserCommandOpenTimeline(activity, userName)); - items.add(new UserCommandOpenPage(activity, userName)); - items.add(new UserCommandOpenFavstar(activity, userName)); - items.add(new UserCommandFollow(userName)); - items.add(new UserCommandUnfollow(userName)); - items.add(new UserCommandBlock(userName)); - items.add(new UserCommandSpam(userName)); - return items; - } -} diff --git a/src/net/miz_hi/smileessence/model/status/IStatusModel.java b/src/net/miz_hi/smileessence/model/status/IStatusModel.java deleted file mode 100644 index b62bd729..00000000 --- a/src/net/miz_hi/smileessence/model/status/IStatusModel.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.miz_hi.smileessence.model.status; - -import net.miz_hi.smileessence.model.status.user.UserModel; - - -public interface IStatusModel -{ - - UserModel getUser(); - - String getTextTop(); - - String getTextContent(); - - String getTextBottom(); -} diff --git a/src/net/miz_hi/smileessence/model/status/ResponseConverter.java b/src/net/miz_hi/smileessence/model/status/ResponseConverter.java deleted file mode 100644 index 1f7cde78..00000000 --- a/src/net/miz_hi/smileessence/model/status/ResponseConverter.java +++ /dev/null @@ -1,57 +0,0 @@ -package net.miz_hi.smileessence.model.status; - -import net.miz_hi.smileessence.cache.TweetCache; -import net.miz_hi.smileessence.cache.UserCache; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.status.user.UserModel; -import twitter4j.DirectMessage; -import twitter4j.Status; -import twitter4j.TwitterResponse; -import twitter4j.User; - - -public final class ResponseConverter -{ - - private final TwitterResponse response; - private IStatusModel model; - - public static <T extends IStatusModel> T convert(TwitterResponse response) - { - ResponseConverter converter = new ResponseConverter(response); - return (T) converter.build(); - } - - private ResponseConverter(TwitterResponse response) - { - this.response = response; - } - - private void convert() - { - if (response instanceof Status) - { - model = new TweetModel((Status) response); - TweetCache.put((TweetModel) model); - } - else if (response instanceof DirectMessage) - { - //TODO - } - else if (response instanceof User) - { - model = new UserModel((User) response); - UserCache.put((UserModel) model); - } - else - { - } - } - - private IStatusModel build() - { - convert(); - return model; - } - -} diff --git a/src/net/miz_hi/smileessence/model/status/event/EventModel.java b/src/net/miz_hi/smileessence/model/status/event/EventModel.java deleted file mode 100644 index 437fde5a..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/EventModel.java +++ /dev/null @@ -1,50 +0,0 @@ -package net.miz_hi.smileessence.model.status.event; - -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.model.status.user.UserModel; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.util.StringUtils; - -import java.util.Date; - -public abstract class EventModel implements Comparable<EventModel>, IStatusModel -{ - - protected Date date; - public UserModel source; - - protected EventModel(UserModel retweeter) - { - this.date = new Date(); - this.source = retweeter; - } - - @Override - public UserModel getUser() - { - return source; - } - - @Override - public abstract String getTextTop(); - - @Override - public abstract String getTextContent(); - - @Override - public String getTextBottom() - { - return StringUtils.dateToString(date); - } - - @Override - public int compareTo(EventModel another) - { - return this.date.compareTo(another.date); - } - - public void raise() - { - Notificator.buildEvent(this).raise(); - } -} diff --git a/src/net/miz_hi/smileessence/model/status/event/IAttackEvent.java b/src/net/miz_hi/smileessence/model/status/event/IAttackEvent.java deleted file mode 100644 index c00f36ff..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/IAttackEvent.java +++ /dev/null @@ -1,6 +0,0 @@ -package net.miz_hi.smileessence.model.status.event; - -public interface IAttackEvent -{ - -} diff --git a/src/net/miz_hi/smileessence/model/status/event/StatusEvent.java b/src/net/miz_hi/smileessence/model/status/event/StatusEvent.java deleted file mode 100644 index 20c93969..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/StatusEvent.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.miz_hi.smileessence.model.status.event; - -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.status.user.UserModel; - -public abstract class StatusEvent extends EventModel -{ - - public TweetModel tweet; - - public StatusEvent(UserModel retweeter, TweetModel tweet) - { - super(retweeter); - this.tweet = tweet; - } - - @Override - public String getTextContent() - { - return tweet.getText(); - } -} diff --git a/src/net/miz_hi/smileessence/model/status/event/UserEvent.java b/src/net/miz_hi/smileessence/model/status/event/UserEvent.java deleted file mode 100644 index 9344f571..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/UserEvent.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.miz_hi.smileessence.model.status.event; - -import net.miz_hi.smileessence.model.status.user.UserModel; - -public abstract class UserEvent extends EventModel -{ - - public UserEvent(UserModel source) - { - super(source); - } - - @Override - public String getTextContent() - { - return ""; - } - - -} diff --git a/src/net/miz_hi/smileessence/model/status/event/impl/BlockEvent.java b/src/net/miz_hi/smileessence/model/status/event/impl/BlockEvent.java deleted file mode 100644 index 779a49e0..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/impl/BlockEvent.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.miz_hi.smileessence.model.status.event.impl; - -import net.miz_hi.smileessence.model.status.event.UserEvent; -import net.miz_hi.smileessence.model.status.user.UserModel; - -public class BlockEvent extends UserEvent -{ - - public BlockEvent(UserModel source) - { - super(source); - } - - @Override - public String getTextTop() - { - return source.screenName + "にブロックされた"; - } - -} diff --git a/src/net/miz_hi/smileessence/model/status/event/impl/DirectMessageEvent.java b/src/net/miz_hi/smileessence/model/status/event/impl/DirectMessageEvent.java deleted file mode 100644 index ea2e3bbe..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/impl/DirectMessageEvent.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.miz_hi.smileessence.model.status.event.impl; - -import net.miz_hi.smileessence.model.status.event.UserEvent; -import net.miz_hi.smileessence.model.status.user.UserModel; - -public class DirectMessageEvent extends UserEvent -{ - - public DirectMessageEvent(UserModel source) - { - super(source); - } - - @Override - public String getTextTop() - { - return source.screenName + "からDMを受信"; - } - -} diff --git a/src/net/miz_hi/smileessence/model/status/event/impl/FavoriteEvent.java b/src/net/miz_hi/smileessence/model/status/event/impl/FavoriteEvent.java deleted file mode 100644 index d6b5bf14..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/impl/FavoriteEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.miz_hi.smileessence.model.status.event.impl; - -import net.miz_hi.smileessence.model.status.event.IAttackEvent; -import net.miz_hi.smileessence.model.status.event.StatusEvent; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.status.user.UserModel; - -public class FavoriteEvent extends StatusEvent implements IAttackEvent -{ - - public FavoriteEvent(UserModel source, TweetModel targetStatus) - { - super(source, targetStatus); - } - - @Override - public String getTextTop() - { - return source.screenName + "にふぁぼられた"; - } -} diff --git a/src/net/miz_hi/smileessence/model/status/event/impl/FollowEvent.java b/src/net/miz_hi/smileessence/model/status/event/impl/FollowEvent.java deleted file mode 100644 index bd5cb007..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/impl/FollowEvent.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.miz_hi.smileessence.model.status.event.impl; - -import net.miz_hi.smileessence.model.status.event.UserEvent; -import net.miz_hi.smileessence.model.status.user.UserModel; - -public class FollowEvent extends UserEvent -{ - - public FollowEvent(UserModel source) - { - super(source); - } - - @Override - public String getTextTop() - { - return source.screenName + "にフォローされた"; - } - -} diff --git a/src/net/miz_hi/smileessence/model/status/event/impl/ReplyEvent.java b/src/net/miz_hi/smileessence/model/status/event/impl/ReplyEvent.java deleted file mode 100644 index 38ace817..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/impl/ReplyEvent.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.miz_hi.smileessence.model.status.event.impl; - -import net.miz_hi.smileessence.model.status.event.StatusEvent; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.status.user.UserModel; - -public class ReplyEvent extends StatusEvent -{ - - public ReplyEvent(UserModel user, TweetModel status) - { - super(user, status); - } - - @Override - public String getTextTop() - { - return source.screenName + "からの返信"; - } -} diff --git a/src/net/miz_hi/smileessence/model/status/event/impl/RetweetEvent.java b/src/net/miz_hi/smileessence/model/status/event/impl/RetweetEvent.java deleted file mode 100644 index f9e9e03b..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/impl/RetweetEvent.java +++ /dev/null @@ -1,21 +0,0 @@ -package net.miz_hi.smileessence.model.status.event.impl; - -import net.miz_hi.smileessence.model.status.event.IAttackEvent; -import net.miz_hi.smileessence.model.status.event.StatusEvent; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.status.user.UserModel; - -public class RetweetEvent extends StatusEvent implements IAttackEvent -{ - - public RetweetEvent(UserModel retweeter, TweetModel status) - { - super(retweeter, status); - } - - @Override - public String getTextTop() - { - return source.screenName + "にリツイートされた"; - } -} diff --git a/src/net/miz_hi/smileessence/model/status/event/impl/UnblockEvent.java b/src/net/miz_hi/smileessence/model/status/event/impl/UnblockEvent.java deleted file mode 100644 index 25ca76ba..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/impl/UnblockEvent.java +++ /dev/null @@ -1,20 +0,0 @@ -package net.miz_hi.smileessence.model.status.event.impl; - -import net.miz_hi.smileessence.model.status.event.UserEvent; -import net.miz_hi.smileessence.model.status.user.UserModel; - -public class UnblockEvent extends UserEvent -{ - - public UnblockEvent(UserModel source) - { - super(source); - } - - @Override - public String getTextTop() - { - return source.screenName + "にブロック解除された"; - } - -} diff --git a/src/net/miz_hi/smileessence/model/status/event/impl/UnfavoriteEvent.java b/src/net/miz_hi/smileessence/model/status/event/impl/UnfavoriteEvent.java deleted file mode 100644 index b0d73678..00000000 --- a/src/net/miz_hi/smileessence/model/status/event/impl/UnfavoriteEvent.java +++ /dev/null @@ -1,22 +0,0 @@ -package net.miz_hi.smileessence.model.status.event.impl; - -import net.miz_hi.smileessence.model.status.event.IAttackEvent; -import net.miz_hi.smileessence.model.status.event.StatusEvent; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.status.user.UserModel; - -public class UnfavoriteEvent extends StatusEvent implements IAttackEvent -{ - - public UnfavoriteEvent(UserModel source, TweetModel targetStatus) - { - super(source, targetStatus); - } - - @Override - public String getTextTop() - { - return source.screenName + "にあんふぁぼされた"; - } - -} diff --git a/src/net/miz_hi/smileessence/model/status/tweet/EnumTweetType.java b/src/net/miz_hi/smileessence/model/status/tweet/EnumTweetType.java deleted file mode 100644 index 5280779c..00000000 --- a/src/net/miz_hi/smileessence/model/status/tweet/EnumTweetType.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.miz_hi.smileessence.model.status.tweet; - - -public enum EnumTweetType -{ - NORMAL, - RETWEET, - REPLY,; -} diff --git a/src/net/miz_hi/smileessence/model/status/tweet/TweetModel.java b/src/net/miz_hi/smileessence/model/status/tweet/TweetModel.java deleted file mode 100644 index 441697b4..00000000 --- a/src/net/miz_hi/smileessence/model/status/tweet/TweetModel.java +++ /dev/null @@ -1,268 +0,0 @@ -package net.miz_hi.smileessence.model.status.tweet; - -import android.text.Html; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.cache.TweetCache; -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.model.status.ResponseConverter; -import net.miz_hi.smileessence.model.status.user.UserModel; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; -import net.miz_hi.smileessence.status.EnumNameStyle; -import net.miz_hi.smileessence.status.TweetUtils; -import net.miz_hi.smileessence.task.impl.DestroyTask; -import net.miz_hi.smileessence.task.impl.FavoriteTask; -import net.miz_hi.smileessence.task.impl.RetweetTask; -import net.miz_hi.smileessence.task.impl.UnFavoriteTask; -import net.miz_hi.smileessence.util.StringUtils; -import twitter4j.*; - -import java.util.ArrayList; -import java.util.Date; -import java.util.List; - -/** - * data model for view and menu - */ -public class TweetModel implements Comparable<TweetModel>, IStatusModel -{ - - public Date createdAt; - public long statusId; - public UserModel user; - private long inReplyToStatusId; - private String text; - private URLEntity[] urls; - private MediaEntity[] medias; - private HashtagEntity[] hashtags; - private UserMentionEntity[] userMentions; - private String source; - /** - * ツイートの種類 - */ - public EnumTweetType type = EnumTweetType.NORMAL; - /** - * 子ツイート(RTでない場合は自分自身) - */ - private TweetModel original; - /** - * 親ツイート - */ - private List<TweetModel> parents = new ArrayList<TweetModel>(); - - public TweetModel(Status status) - { - if (status.isRetweet()) - { - original = ResponseConverter.convert(status.getRetweetedStatus()); - original.addParent(this); - } - else - { - original = this; - } - - createdAt = status.getCreatedAt(); - statusId = status.getId(); - inReplyToStatusId = status.getInReplyToStatusId(); - user = ResponseConverter.convert(status.getUser()); - text = status.getText(); - urls = status.getURLEntities(); - medias = status.getMediaEntities(); - hashtags = status.getHashtagEntities(); - userMentions = status.getUserMentionEntities(); - source = Html.fromHtml(status.getSource()).toString(); - - if (hashtags != null) - { - for (HashtagEntity hashtag : hashtags) - { - TweetCache.putHashtag(hashtag.getText()); - } - } - - type = status.isRetweet() ? EnumTweetType.RETWEET : (TweetUtils.isReply(status) ? EnumTweetType.REPLY : EnumTweetType.NORMAL); - } - - @Override - public int compareTo(TweetModel another) - { - return another.createdAt.compareTo(this.createdAt); - } - - private TweetModel() - { - } - - public static TweetModel getSampleModel() - { - TweetModel status = new TweetModel(); - status.original = status; - status.createdAt = new Date(); - status.statusId = 0; - status.inReplyToStatusId = 0; - status.user = UserModel.getNullUserModel(); - status.text = ""; - status.urls = new URLEntity[0]; - status.medias = new MediaEntity[0]; - status.hashtags = new HashtagEntity[0]; - status.userMentions = new UserMentionEntity[0]; - status.source = ""; - status.type = EnumTweetType.NORMAL; - return status; - } - - public TweetModel getOriginal() - { - return original; - } - - public List<TweetModel> getParents() - { - return parents; - } - - public void addParent(TweetModel parent) - { - parents.add(parent); - } - - public void deleteParent(TweetModel parent) - { - parents.remove(parent); - } - - public long getInReplyToStatusId() - { - return original.inReplyToStatusId; - } - - public String getText() - { - return original.text; - } - - public URLEntity[] getUrls() - { - return original.urls; - } - - public MediaEntity[] getMedias() - { - return original.medias; - } - - public HashtagEntity[] getHashtags() - { - return original.hashtags; - } - - public UserMentionEntity[] getUserMentions() - { - return original.userMentions; - } - - public String getSource() - { - return original.source; - } - - /** - * do destroy async - */ - public void destroy() - { - if (user.isMe()) - { - new DestroyTask(statusId).callAsync(); - } - else - { - new DestroyTask(original.statusId).callAsync(); - } - } - - /** - * do favorite async - */ - public void favorite() - { - new FavoriteTask(original.statusId).callAsync(); - } - - /** - * do unfavorite async - */ - public void unfavorite() - { - new UnFavoriteTask(original.statusId).callAsync(); - } - - /** - * do retweet async - */ - public void retweet() - { - new RetweetTask(original.statusId).callAsync(); - } - - @Override - public UserModel getUser() - { - return original.user; - } - - @Override - public String getTextTop() - { - UserModel shownUser = original.user; - StringBuilder builder = new StringBuilder(); - String style = Client.getPreferenceValue(EnumPreferenceKey.NAME_STYLE); - if (style.equals(EnumNameStyle.S_N.get()) || style.equals(EnumNameStyle.S.get())) - { - builder.append(shownUser.screenName); - } - else if (style.equals(EnumNameStyle.N_S.get()) || style.equals(EnumNameStyle.N.get())) - { - builder.append(shownUser.name); - } - if (style.equals(EnumNameStyle.S_N.get())) - { - builder.append(" / "); - builder.append(shownUser.name); - } - else if (style.equals(EnumNameStyle.N_S.get())) - { - builder.append(" / "); - builder.append(shownUser.screenName); - } - return builder.toString(); - } - - @Override - public String getTextContent() - { - return getText(); - } - - @Override - public String getTextBottom() - { - StringBuilder builder = new StringBuilder(); - if (type == EnumTweetType.RETWEET) - { - builder.append("(RT: "); - builder.append(user.screenName); - builder.append(") "); - builder.append(StringUtils.dateToString(original.createdAt)); - builder.append(" via "); - builder.append(original.source); - } - else - { - builder.append(StringUtils.dateToString(createdAt)); - builder.append(" via "); - builder.append(source); - } - return builder.toString(); - } -} diff --git a/src/net/miz_hi/smileessence/model/status/user/UserModel.java b/src/net/miz_hi/smileessence/model/status/user/UserModel.java deleted file mode 100644 index 16e90ccd..00000000 --- a/src/net/miz_hi/smileessence/model/status/user/UserModel.java +++ /dev/null @@ -1,196 +0,0 @@ -package net.miz_hi.smileessence.model.status.user; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.cache.IconCache; -import net.miz_hi.smileessence.cache.RelationshipCache; -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; -import net.miz_hi.smileessence.status.EnumNameStyle; -import net.miz_hi.smileessence.task.impl.GetRelationshipTask; -import net.miz_hi.smileessence.task.impl.GetUserTask; -import twitter4j.Relationship; -import twitter4j.User; - -import java.util.Date; -import java.util.concurrent.Future; - -public class UserModel implements IStatusModel -{ - - public long userId; - public String screenName; - public String name; - public String homePageUrl; - public String location; - public String description; - public String iconUrl; - public int statusCount; - public int friendCount; - public int followerCount; - public int favoriteCount; - public Date createdAt; - public boolean isProtected; - - - private UserModel() - { - } - - public UserModel(User user) - { - userId = user.getId(); - updateData(user); - } - - public UserModel updateData(User user) - { - screenName = user.getScreenName(); - name = user.getName(); - homePageUrl = user.getURL(); - location = user.getLocation(); - description = user.getDescription(); - iconUrl = user.getProfileImageURL(); - statusCount = user.getStatusesCount(); - friendCount = user.getFriendsCount(); - followerCount = user.getFollowersCount(); - favoriteCount = user.getFavouritesCount(); - createdAt = user.getCreatedAt(); - isProtected = user.isProtected(); - IconCache.checkIconCache(UserModel.this); - return this; - } - - public User getRawUser() - { - Future<User> resp = new GetUserTask(userId).callAsync(); - try - { - return resp.get(); - } - catch (Exception e) - { - e.printStackTrace(); - return null; - } - } - - public boolean isMe() - { - return userId == Client.getMainAccount().getUserId(); - } - - private Relationship getRelationship(boolean force) - { - if (force) - { - Future<Boolean> b = new GetRelationshipTask(userId).callAsync(); - try - { - b.get(); - } - catch (Exception e) - { - e.printStackTrace(); - return null; - } - } - return RelationshipCache.get(userId); - } - - public boolean isFriend(boolean force) - { - Relationship rel = getRelationship(force); - if (rel == null) - { - if (force) - { - return false; - } - return isFriend(true); - } - return rel.isSourceFollowingTarget(); - } - - public boolean isFollower(boolean force) - { - Relationship rel = getRelationship(force); - if (rel == null) - { - if (force) - { - return false; - } - return isFriend(true); - } - return rel.isSourceFollowedByTarget(); - } - - public static UserModel getNullUserModel() - { - UserModel user = new UserModel(); - user.screenName = ""; - user.name = ""; - user.homePageUrl = ""; - user.location = ""; - user.description = ""; - user.iconUrl = ""; - user.statusCount = 0; - user.friendCount = 0; - user.followerCount = 0; - user.favoriteCount = 0; - user.createdAt = new Date(); - user.isProtected = false; - return user; - } - - @Override - public UserModel getUser() - { - return this; - } - - @Override - public String getTextTop() - { - StringBuilder builder = new StringBuilder(); - String style = Client.getPreferenceValue(EnumPreferenceKey.NAME_STYLE); - if (style.equals(EnumNameStyle.S_N.get()) || style.equals(EnumNameStyle.S.get())) - { - builder.append(screenName); - } - else if (style.equals(EnumNameStyle.N_S.get()) || style.equals(EnumNameStyle.N.get())) - { - builder.append(name); - } - if (style.equals(EnumNameStyle.S_N.get())) - { - builder.append(" / "); - builder.append(name); - } - else if (style.equals(EnumNameStyle.N_S.get())) - { - builder.append(" / "); - builder.append(screenName); - } - return builder.toString(); - } - - @Override - public String getTextContent() - { - if (description.length() > 100) - { - return description.substring(0, 100) + "..."; - } - else - { - return description; - } - } - - @Override - public String getTextBottom() - { - return location; - } -} diff --git a/src/net/miz_hi/smileessence/model/statuslist/StatusList.java b/src/net/miz_hi/smileessence/model/statuslist/StatusList.java deleted file mode 100644 index ad11c85a..00000000 --- a/src/net/miz_hi/smileessence/model/statuslist/StatusList.java +++ /dev/null @@ -1,61 +0,0 @@ -package net.miz_hi.smileessence.model.statuslist; - -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.statuslist.StatusListManager; - -import java.util.ArrayList; - - -public abstract class StatusList -{ - - private final ArrayList<IStatusModel> list = new ArrayList<IStatusModel>(); - - public synchronized void addToTop(IStatusModel status) - { - list.add(0, status); - } - - public synchronized void addToBottom(IStatusModel status) - { - list.add(list.size(), status); - } - - public synchronized IStatusModel getStatus(int index) - { - return list.get(index); - } - - public synchronized int getStatusIndex(IStatusModel status) - { - return list.indexOf(status); - } - - public synchronized void remove(int index) - { - list.remove(index); - } - - public synchronized void remove(IStatusModel status) - { - list.remove(status); - } - - public synchronized IStatusModel[] getStatusList() - { - return list.toArray(new IStatusModel[list.size()]); - } - - public synchronized void apply() - { - StatusListManager.getAdapter(this).notifyAdapter(); - } - - public synchronized void applyForce() - { - StatusListManager.getAdapter(this).forceNotifyAdapter(); - } - - public abstract boolean checkStatus(IStatusModel status); - -} diff --git a/src/net/miz_hi/smileessence/model/statuslist/impl/HistoryList.java b/src/net/miz_hi/smileessence/model/statuslist/impl/HistoryList.java deleted file mode 100644 index e7bbb56b..00000000 --- a/src/net/miz_hi/smileessence/model/statuslist/impl/HistoryList.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.miz_hi.smileessence.model.statuslist.impl; - -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.model.status.event.EventModel; -import net.miz_hi.smileessence.model.statuslist.StatusList; - - -public class HistoryList extends StatusList -{ - - @Override - public boolean checkStatus(IStatusModel status) - { - return status instanceof EventModel; - } - -} diff --git a/src/net/miz_hi/smileessence/model/statuslist/impl/TalkList.java b/src/net/miz_hi/smileessence/model/statuslist/impl/TalkList.java deleted file mode 100644 index 79711592..00000000 --- a/src/net/miz_hi/smileessence/model/statuslist/impl/TalkList.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.miz_hi.smileessence.model.statuslist.impl; - -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.statuslist.StatusList; - - -public class TalkList extends StatusList -{ - - @Override - public boolean checkStatus(IStatusModel status) - { - return status instanceof TweetModel; - } - -} diff --git a/src/net/miz_hi/smileessence/model/statuslist/timeline/Timeline.java b/src/net/miz_hi/smileessence/model/statuslist/timeline/Timeline.java deleted file mode 100644 index b004d91c..00000000 --- a/src/net/miz_hi/smileessence/model/statuslist/timeline/Timeline.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.miz_hi.smileessence.model.statuslist.timeline; - -import net.miz_hi.smileessence.model.statuslist.StatusList; - -public abstract class Timeline extends StatusList -{ - - public abstract void loadNewer(); - - public abstract void loadOlder(); - -} diff --git a/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/HomeTimeline.java b/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/HomeTimeline.java deleted file mode 100644 index b6ff1412..00000000 --- a/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/HomeTimeline.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.miz_hi.smileessence.model.statuslist.timeline.impl; - -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.statuslist.timeline.Timeline; - - -public class HomeTimeline extends Timeline -{ - - @Override - public void loadNewer() - { - //TODO REST API - } - - @Override - public void loadOlder() - { - //TODO REST API - } - - @Override - public boolean checkStatus(IStatusModel status) - { - return status instanceof TweetModel; - } - -} diff --git a/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/ListTimeline.java b/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/ListTimeline.java deleted file mode 100644 index 70ce7cbb..00000000 --- a/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/ListTimeline.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.miz_hi.smileessence.model.statuslist.timeline.impl; - -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.statuslist.timeline.Timeline; - - -public class ListTimeline extends Timeline -{ - - @Override - public void loadNewer() - { - //TODO REST API - } - - @Override - public void loadOlder() - { - //TODO REST API - } - - @Override - public boolean checkStatus(IStatusModel status) - { - return status instanceof TweetModel; - } - -} diff --git a/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/MentionsTimeline.java b/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/MentionsTimeline.java deleted file mode 100644 index 8c967e45..00000000 --- a/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/MentionsTimeline.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.miz_hi.smileessence.model.statuslist.timeline.impl; - -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.statuslist.timeline.Timeline; - - -public class MentionsTimeline extends Timeline -{ - - @Override - public void loadNewer() - { - //TODO REST API - } - - @Override - public void loadOlder() - { - //TODO REST API - } - - @Override - public boolean checkStatus(IStatusModel status) - { - return status instanceof TweetModel; - } - -} diff --git a/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/UserTimeline.java b/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/UserTimeline.java deleted file mode 100644 index 6f5b4628..00000000 --- a/src/net/miz_hi/smileessence/model/statuslist/timeline/impl/UserTimeline.java +++ /dev/null @@ -1,29 +0,0 @@ -package net.miz_hi.smileessence.model.statuslist.timeline.impl; - -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.statuslist.timeline.Timeline; - - -public class UserTimeline extends Timeline -{ - - @Override - public void loadNewer() - { - //TODO REST API - } - - @Override - public void loadOlder() - { - //TODO REST API - } - - @Override - public boolean checkStatus(IStatusModel status) - { - return status instanceof TweetModel; - } - -} diff --git a/src/net/miz_hi/smileessence/notification/Notice.java b/src/net/miz_hi/smileessence/notification/Notice.java deleted file mode 100644 index 5b7c61ef..00000000 --- a/src/net/miz_hi/smileessence/notification/Notice.java +++ /dev/null @@ -1,57 +0,0 @@ -package net.miz_hi.smileessence.notification; - -import de.keyboardsurfer.android.widget.crouton.Style; - -public class Notice -{ - - String text; - Style style; - - public Notice(String text) - { - this.text = text; - this.style = Style.INFO; - } - - public Notice setStyle(Style style) - { - this.style = style; - return this; - } - - public String getText() - { - return text; - } - - public Style getStyle() - { - return style; - } - - public void raise() - { - Notificator.crouton(this); - } - - public static Notice getNullEvent() - { - return new NullEvent(); - } - - public static class NullEvent extends Notice - { - - private NullEvent() - { - super(""); - } - - @Override - public void raise() - { - //Null Operation - } - } -} diff --git a/src/net/miz_hi/smileessence/notification/Notificator.java b/src/net/miz_hi/smileessence/notification/Notificator.java deleted file mode 100644 index 11b693f1..00000000 --- a/src/net/miz_hi/smileessence/notification/Notificator.java +++ /dev/null @@ -1,133 +0,0 @@ -package net.miz_hi.smileessence.notification; - -import android.app.Activity; -import android.widget.Toast; -import de.keyboardsurfer.android.widget.crouton.Configuration; -import de.keyboardsurfer.android.widget.crouton.Crouton; -import de.keyboardsurfer.android.widget.crouton.Style; -import net.miz_hi.smileessence.model.status.event.EventModel; -import net.miz_hi.smileessence.model.status.event.IAttackEvent; -import net.miz_hi.smileessence.model.status.event.StatusEvent; -import net.miz_hi.smileessence.util.CountUpInteger; -import net.miz_hi.smileessence.util.UiHandler; -import net.miz_hi.smileessence.view.activity.MainActivity; - -public class Notificator -{ - - private static long lastUserId = -1; - private static long lastStatusId = -1; - private static CountUpInteger counterSourceUser = new CountUpInteger(5); - private static CountUpInteger counterTargetStatus = new CountUpInteger(5); - - public static void toast(final String text) - { - final Activity activity = MainActivity.getInstance(); - if (activity == null || activity.isFinishing()) - { - return; - } - new UiHandler() - { - - @Override - public void run() - { - Toast.makeText(activity, text, Toast.LENGTH_SHORT).show(); - } - }.post(); - } - - public static void info(String text) - { - crouton(new Notice(text)); - } - - public static void alert(String text) - { - crouton(new Notice(text).setStyle(Style.ALERT)); - } - - private static Style getStyle(Style type) - { - Configuration.Builder config = new Configuration.Builder(); - config.setDuration(1000); - Style.Builder builder = new Style.Builder(); - builder.setHeight(64).setConfiguration(config.build()); - if (type == Style.INFO) - { - builder.setBackgroundColorValue(Style.holoBlueLight); - } - else if (type == Style.ALERT) - { - builder.setBackgroundColorValue(Style.holoRedLight); - } - return builder.build(); - } - - public static void crouton(final Notice event) - { - final Activity activity = MainActivity.getInstance(); - if (activity == null || activity.isFinishing()) - { - return; - } - - new UiHandler() - { - - @Override - public void run() - { - Crouton.makeText(activity, event.getText(), getStyle(event.getStyle())).show(); - } - }.post(); - } - - public static Notice buildEvent(final EventModel model) - { - if (model instanceof StatusEvent) - { - StatusEvent se = (StatusEvent) model; - if (se instanceof IAttackEvent) - { - if (lastUserId != se.source.userId) - { - counterSourceUser.reset(); - lastUserId = se.source.userId; - } - else - { - if (counterSourceUser.isOver()) - { - return Notice.getNullEvent(); - } - - if (counterSourceUser.countUp()) - { - return new Notice(se.source.screenName + "から攻撃を受けています"); - } - } - - if (lastStatusId != se.tweet.statusId) - { - counterTargetStatus.reset(); - lastStatusId = se.tweet.statusId; - } - else - { - if (counterTargetStatus.isOver()) - { - return Notice.getNullEvent(); - } - if (counterTargetStatus.countUp()) - { - return new Notice("あなたのツイートが攻撃を受けています"); - } - } - } - } - - return new Notice(model.getTextTop()); - } -} diff --git a/src/net/miz_hi/smileessence/permission/IPermission.java b/src/net/miz_hi/smileessence/permission/IPermission.java deleted file mode 100644 index 83b59c25..00000000 --- a/src/net/miz_hi/smileessence/permission/IPermission.java +++ /dev/null @@ -1,13 +0,0 @@ -package net.miz_hi.smileessence.permission; - -public interface IPermission -{ - - public String getPermissionName(); - - public boolean canWarotaRT(); - - public boolean canCopyTweet(); - - public boolean canUnOffRetweet(); -} diff --git a/src/net/miz_hi/smileessence/permission/PermissionBeginner.java b/src/net/miz_hi/smileessence/permission/PermissionBeginner.java deleted file mode 100644 index a1a14caa..00000000 --- a/src/net/miz_hi/smileessence/permission/PermissionBeginner.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.miz_hi.smileessence.permission; - -public class PermissionBeginner implements IPermission -{ - - @Override - public String getPermissionName() - { - return "Beginner"; - } - - @Override - public boolean canWarotaRT() - { - return true; - } - - @Override - public boolean canCopyTweet() - { - return false; - } - - @Override - public boolean canUnOffRetweet() - { - return false; - } - -} diff --git a/src/net/miz_hi/smileessence/permission/PermissionExpert.java b/src/net/miz_hi/smileessence/permission/PermissionExpert.java deleted file mode 100644 index ee529583..00000000 --- a/src/net/miz_hi/smileessence/permission/PermissionExpert.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.miz_hi.smileessence.permission; - -public class PermissionExpert implements IPermission -{ - - @Override - public String getPermissionName() - { - return "Expert"; - } - - @Override - public boolean canWarotaRT() - { - return true; - } - - @Override - public boolean canCopyTweet() - { - return true; - } - - @Override - public boolean canUnOffRetweet() - { - return true; - } - -} diff --git a/src/net/miz_hi/smileessence/permission/PermissionIntermediate.java b/src/net/miz_hi/smileessence/permission/PermissionIntermediate.java deleted file mode 100644 index 72504641..00000000 --- a/src/net/miz_hi/smileessence/permission/PermissionIntermediate.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.miz_hi.smileessence.permission; - -public class PermissionIntermediate implements IPermission -{ - - @Override - public String getPermissionName() - { - return "Intermediate"; - } - - @Override - public boolean canWarotaRT() - { - return true; - } - - @Override - public boolean canCopyTweet() - { - return true; - } - - @Override - public boolean canUnOffRetweet() - { - return false; - } - -} diff --git a/src/net/miz_hi/smileessence/permission/PermissonChecker.java b/src/net/miz_hi/smileessence/permission/PermissonChecker.java deleted file mode 100644 index 596f76fb..00000000 --- a/src/net/miz_hi/smileessence/permission/PermissonChecker.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.miz_hi.smileessence.permission; - -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.User; - -import java.util.concurrent.Callable; -import java.util.concurrent.Future; - -public class PermissonChecker -{ - - public static IPermission checkPermission(final Account account) - { - Future<User> future = MyExecutor.submit(new Callable<User>() - { - - @Override - public User call() throws Exception - { - return API.getUser(account, account.getUserId()); - } - }); - try - { - User user = future.get(); - - float ratio = (float) user.getFriendsCount() / (float) user.getFollowersCount(); - if (ratio > 2 && user.getFollowersCount() < 100) - { - return new PermissionBeginner(); - } - else if (user.getFavouritesCount() < 10000) - { - return new PermissionIntermediate(); - } - else - { - return new PermissionExpert(); - } - } - catch (Exception e) - { - e.printStackTrace(); - } - return new PermissionBeginner(); - } -} diff --git a/src/net/miz_hi/smileessence/preference/EnumPreferenceKey.java b/src/net/miz_hi/smileessence/preference/EnumPreferenceKey.java deleted file mode 100644 index 60739390..00000000 --- a/src/net/miz_hi/smileessence/preference/EnumPreferenceKey.java +++ /dev/null @@ -1,56 +0,0 @@ -package net.miz_hi.smileessence.preference; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; - -public enum EnumPreferenceKey -{ - LAST_USED_USER_ID(EnumValueType.LONG, "user_id", -1L), - VISIBLE_FOORER(EnumValueType.BOOLEAN, Client.getString(R.string.key_setting_footer), true), - TEXT_SIZE(EnumValueType.INTEGER, Client.getString(R.string.key_setting_textSize), 10), - AFTER_SUBMIT(EnumValueType.BOOLEAN, Client.getString(R.string.key_setting_aftersubmit), true), - NOTICE_UNFAV(EnumValueType.BOOLEAN, Client.getString(R.string.key_setting_notice_unfav), false), - OPEN_IME(EnumValueType.BOOLEAN, Client.getString(R.string.key_setting_open_ime), true), - CONFIRM_DIALOG(EnumValueType.BOOLEAN, Client.getString(R.string.key_setting_confirm_dialog),true), - READ_MORSE(EnumValueType.BOOLEAN, Client.getString(R.string.key_setting_morse), true), - NAME_STYLE(EnumValueType.STRING, Client.getString(R.string.key_setting_namestyle), Client.getString(R.string.namestyle_s_n)), - SHOW_READ_RETWEET(EnumValueType.BOOLEAN, Client.getString(R.string.key_setting_read_retweet), true), - LIST_LOAD(EnumValueType.BOOLEAN, Client.getString(R.string.key_setting_listload), false), - LAST_PRODUCE_DATE(EnumValueType.STRING, "last_produce_date", ""), - ; - - private final EnumValueType type; - private final String key; - private final Object defaultValue; - - private EnumPreferenceKey(EnumValueType type, String key, Object defaultValue) - { - this.type = type; - this.key = key; - this.defaultValue = defaultValue; - } - - public String getKey() - { - return this.key; - } - - public EnumValueType getType() - { - return this.type; - } - - public Object getDefaultValue() - { - return this.defaultValue; - } - - public enum EnumValueType - { - BOOLEAN, - INTEGER, - LONG, - FLOAT, - STRING - } -} diff --git a/src/net/miz_hi/smileessence/preference/PreferenceHelper.java b/src/net/miz_hi/smileessence/preference/PreferenceHelper.java deleted file mode 100644 index 4c1daea3..00000000 --- a/src/net/miz_hi/smileessence/preference/PreferenceHelper.java +++ /dev/null @@ -1,81 +0,0 @@ -package net.miz_hi.smileessence.preference; - -import android.content.SharedPreferences; -import android.content.SharedPreferences.Editor; -import net.miz_hi.smileessence.preference.EnumPreferenceKey.EnumValueType; - -public class PreferenceHelper -{ - - private SharedPreferences preference; - - public PreferenceHelper(SharedPreferences pref) - { - this.preference = pref; - } - - public void putPreferenceValue(EnumPreferenceKey key, Object value) - { - putPreferenceValue(key.getKey(), key.getType(), value); - } - - public <T> T getPreferenceValue(EnumPreferenceKey key) - { - return (T) getPreferenceValue(key.getKey(), key.getType(), key.getDefaultValue()); - } - - public void putPreferenceValue(String key, EnumValueType type, Object value) - { - Editor editor = preference.edit(); - if (type == EnumValueType.BOOLEAN) - { - editor.putBoolean(key, (Boolean) value); - } - else if (type == EnumValueType.STRING) - { - editor.putString(key, (String) value); - } - else if (type == EnumValueType.INTEGER) - { - editor.putInt(key, (Integer) value); - } - else if (type == EnumValueType.FLOAT) - { - editor.putFloat(key, (Float) value); - } - else if (type == EnumValueType.LONG) - { - editor.putLong(key, (Long) value); - } - - editor.commit(); - } - - public <T> T getPreferenceValue(String key, EnumValueType type, T defaultValue) - { - if (type == EnumValueType.BOOLEAN) - { - return (T) (Boolean) preference.getBoolean(key, (Boolean) defaultValue); - } - else if (type == EnumValueType.STRING) - { - return (T) preference.getString(key, (String) defaultValue); - } - else if (type == EnumValueType.INTEGER) - { - return (T) (Integer) preference.getInt(key, (Integer) defaultValue); - } - else if (type == EnumValueType.FLOAT) - { - return (T) (Float) preference.getFloat(key, (Float) defaultValue); - } - else if (type == EnumValueType.LONG) - { - return (T) (Long) preference.getLong(key, (Long) defaultValue); - } - else - { - return defaultValue; - } - } -} diff --git a/src/net/miz_hi/smileessence/status/EnumNameStyle.java b/src/net/miz_hi/smileessence/status/EnumNameStyle.java deleted file mode 100644 index 08e0b68a..00000000 --- a/src/net/miz_hi/smileessence/status/EnumNameStyle.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.miz_hi.smileessence.status; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; - -public enum EnumNameStyle -{ - - S_N(Client.getString(R.string.namestyle_s_n)), - N_S(Client.getString(R.string.namestyle_n_s)), - S(Client.getString(R.string.namestyle_s)), - N(Client.getString(R.string.namestyle_n)); - - private final String str; - - private EnumNameStyle(String s) - { - this.str = s; - } - - public String get() - { - return str; - } -} diff --git a/src/net/miz_hi/smileessence/status/StatusViewFactory.java b/src/net/miz_hi/smileessence/status/StatusViewFactory.java deleted file mode 100644 index 621312b3..00000000 --- a/src/net/miz_hi/smileessence/status/StatusViewFactory.java +++ /dev/null @@ -1,136 +0,0 @@ -package net.miz_hi.smileessence.status; - -import android.view.LayoutInflater; -import android.view.View; -import android.widget.ImageView; -import android.widget.TextView; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.cache.IconCache; -import net.miz_hi.smileessence.cache.TweetCache; -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.model.status.event.EventModel; -import net.miz_hi.smileessence.model.status.event.StatusEvent; -import net.miz_hi.smileessence.model.status.tweet.EnumTweetType; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.status.user.UserModel; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; -import net.miz_hi.smileessence.util.Morse; - -public class StatusViewFactory -{ - - LayoutInflater inflater; - View baseView; - ImageView icon; - TextView textTop; - TextView textContent; - TextView textBottom; - ImageView favorited; - int colorTop; - int colorContent; - int colorBottom; - - private StatusViewFactory() - { - } - - public static StatusViewFactory newInstance(LayoutInflater inflater, View baseView) - { - StatusViewFactory factory = new StatusViewFactory(); - factory.inflater = inflater; - if (baseView == null) - { - factory.baseView = factory.inflater.inflate(R.layout.status_layout, null); - } - else - { - factory.baseView = baseView; - } - factory.icon = (ImageView) factory.baseView.findViewById(R.id.imageView_icon); - factory.textTop = (TextView) factory.baseView.findViewById(R.id.textView_header); - factory.textContent = (TextView) factory.baseView.findViewById(R.id.textView_text); - factory.textBottom = (TextView) factory.baseView.findViewById(R.id.textView_footer); - factory.favorited = (ImageView) factory.baseView.findViewById(R.id.imageView_favorited); - return factory; - } - - public View getStatusView(IStatusModel model) - { - // initialize - favorited.setVisibility(View.GONE); - int textSize = Client.getTextSize(); - textTop.setTextSize(textSize); - textContent.setTextSize(textSize); - textBottom.setTextSize(textSize - 2); - colorTop = Client.getColor(R.color.ThickGreen); - colorContent = Client.getColor(R.color.Gray); - colorBottom = Client.getColor(R.color.Gray2); - //adjust to model - if (model instanceof TweetModel) - { - adjustToTweetView((TweetModel) model); - } - else if (model instanceof EventModel) - { - adjustToEventView((EventModel) model); - } - else if (model instanceof UserModel) - { - adjustToUserModel((UserModel) model); - } - //coloring - textTop.setTextColor(colorTop); - textContent.setTextColor(colorContent); - textBottom.setTextColor(colorBottom); - //set value - icon.setTag(model.getUser().userId); - IconCache.setIconBitmapToView(model.getUser(), icon); - textTop.setText(model.getTextTop()); - String text; - if (Morse.isMorse(model.getTextContent()) && Client.<Boolean>getPreferenceValue(EnumPreferenceKey.READ_MORSE)) - { - text = model.getTextContent() + "\n(" + Morse.mcToJa(model.getTextContent()) + ")"; - } - else - { - text = model.getTextContent(); - } - textContent.setText(text); - textBottom.setText(model.getTextBottom()); - - return baseView; - } - - private void adjustToTweetView(TweetModel model) - { - if (model.type == EnumTweetType.RETWEET) - { - baseView.setBackgroundColor(Client.getColor(R.color.LightBlue)); - } - else if (model.type == EnumTweetType.REPLY) - { - baseView.setBackgroundColor(Client.getColor(R.color.LightRed)); - } - - if (model.user.isMe()) - { - colorTop = Client.getColor(R.color.DarkBlue); - } - favorited.setVisibility(TweetCache.isFavorited(model.statusId) ? View.VISIBLE : View.GONE); - } - - private void adjustToEventView(EventModel model) - { - if (model instanceof StatusEvent) - { - colorTop = Client.getColor(R.color.DarkBlue); - } - } - - private void adjustToUserModel(UserModel model) - { - //TODO - } - -} diff --git a/src/net/miz_hi/smileessence/status/TweetUtils.java b/src/net/miz_hi/smileessence/status/TweetUtils.java deleted file mode 100644 index 1f7042f3..00000000 --- a/src/net/miz_hi/smileessence/status/TweetUtils.java +++ /dev/null @@ -1,67 +0,0 @@ -package net.miz_hi.smileessence.status; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.cache.TweetCache; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.model.status.ResponseConverter; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.Status; -import twitter4j.UserMentionEntity; - -import java.util.concurrent.Callable; -import java.util.concurrent.Future; - -public class TweetUtils -{ - - public static boolean isReply(Status st) - { - if (st == null) - { - return false; - } - for (UserMentionEntity ume : st.getUserMentionEntities()) - { - if (ume.getScreenName().equals(Client.getMainAccount().getScreenName())) - { - return true; - } - } - return false; - } - - public static TweetModel getOrCreateStatusModel(final long id) - { - TweetModel statusModel = TweetCache.get(id); - if (statusModel == null) - { - Future<Status> f = MyExecutor.submit(new Callable<Status>() - { - - @Override - public Status call() throws Exception - { - return API.getStatus(Client.getMainAccount(), id); - } - }); - Status status; - try - { - status = f.get(); - } - catch (Exception e) - { - e.printStackTrace(); - status = null; - } - if (status == null) - { - return null; - } - statusModel = ResponseConverter.convert(status); - } - return statusModel; - } - -} diff --git a/src/net/miz_hi/smileessence/statuslist/StatusListAdapter.java b/src/net/miz_hi/smileessence/statuslist/StatusListAdapter.java deleted file mode 100644 index 941c39c3..00000000 --- a/src/net/miz_hi/smileessence/statuslist/StatusListAdapter.java +++ /dev/null @@ -1,118 +0,0 @@ -package net.miz_hi.smileessence.statuslist; - -import android.app.Activity; -import android.view.View; -import android.view.ViewGroup; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.listener.StatusOnClickListener; -import net.miz_hi.smileessence.model.status.IStatusModel; -import net.miz_hi.smileessence.model.statuslist.StatusList; -import net.miz_hi.smileessence.status.StatusViewFactory; -import net.miz_hi.smileessence.util.CustomListAdapter; - -import java.util.Collection; - -public class StatusListAdapter extends CustomListAdapter<IStatusModel> -{ - - private StatusList statusList; - private IStatusModel[] statusArray; - private int count; - - public StatusListAdapter(Activity activity, StatusList statusList) - { - super(activity, 0); - this.statusList = statusList; - } - - @Deprecated - @Override - public void addAll(Collection<IStatusModel> collection) - { - } - - @Deprecated - @Override - public void addFirst(IStatusModel element) - { - } - - @Deprecated - @Override - public void addLast(IStatusModel element) - { - } - - @Deprecated - @Override - public void removeElement(IStatusModel element) - { - } - - @Deprecated - @Override - public void clear() - { - } - - @Override - public View getView(int position, View convertedView, ViewGroup parent) - { - if (convertedView == null) - { - convertedView = getInflater().inflate(R.layout.status_layout, null); - } - IStatusModel model = (IStatusModel) getItem(position); - - int colorBg; - if (position % 2 == 0) - { - colorBg = Client.getColor(R.color.White); - } - else - { - colorBg = Client.getColor(R.color.LightGray); - } - convertedView.setBackgroundColor(colorBg); - - convertedView = StatusViewFactory.newInstance(getInflater(), convertedView).getStatusView(model); - - convertedView.setOnClickListener(new StatusOnClickListener(getActivity(), model)); - - return convertedView; - } - - @Override - public void notifyDataSetChanged() - { - statusArray = statusList.getStatusList(); - count = statusArray.length; - super.notifyDataSetChanged(); - } - - @Override - public int getCount() - { - return count; - } - - @Override - public Object getItem(int arg0) - { - if (statusArray != null && statusArray.length >= arg0) - { - return statusArray[arg0]; - } - else - { - return null; - } - } - - @Override - public long getItemId(int arg0) - { - return arg0; - } -} diff --git a/src/net/miz_hi/smileessence/statuslist/StatusListManager.java b/src/net/miz_hi/smileessence/statuslist/StatusListManager.java deleted file mode 100644 index 64240660..00000000 --- a/src/net/miz_hi/smileessence/statuslist/StatusListManager.java +++ /dev/null @@ -1,134 +0,0 @@ -package net.miz_hi.smileessence.statuslist; - -import android.app.Activity; -import android.util.SparseArray; -import net.miz_hi.smileessence.data.list.ListManager; -import net.miz_hi.smileessence.model.statuslist.StatusList; -import net.miz_hi.smileessence.model.statuslist.impl.HistoryList; -import net.miz_hi.smileessence.model.statuslist.timeline.Timeline; -import net.miz_hi.smileessence.model.statuslist.timeline.impl.HomeTimeline; -import net.miz_hi.smileessence.model.statuslist.timeline.impl.MentionsTimeline; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - - -public class StatusListManager -{ - - private Timeline home; - private Timeline mentions; - private StatusList history; - private ArrayList<StatusList> tweetLists = new ArrayList<StatusList>(); - private HashMap<Long, Timeline> userTimelineMap = new HashMap<Long, Timeline>(); - private SparseArray<Timeline> listTimelineMap = new SparseArray<Timeline>(); - private HashMap<StatusList, StatusListAdapter> adapterMap = new HashMap<StatusList, StatusListAdapter>(); - private static StatusListManager instance; - - public static void initStatusLists(Activity activity) - { - instance = new StatusListManager(); - instance.tweetLists.clear(); - instance.userTimelineMap.clear(); - instance.listTimelineMap.clear(); - instance.adapterMap.clear(); - Timeline ho = new HomeTimeline(); - MentionsTimeline m = new MentionsTimeline(); - StatusList hi = new HistoryList(); - setHomeTimeline(ho, new StatusListAdapter(activity, ho)); - setMentionsTimeline(m, new StatusListAdapter(activity, m)); - setHistoryTimeline(hi, new StatusListAdapter(activity, hi)); - } - - public synchronized static void registerTweetList(StatusList timeline, StatusListAdapter adapter) - { - instance.tweetLists.add(timeline); - instance.adapterMap.put(timeline, adapter); - adapter.forceNotifyAdapter(); - } - - public synchronized static void removeTweetList(StatusList timeline) - { - instance.tweetLists.remove(timeline); - instance.adapterMap.remove(timeline); - } - - public synchronized static List<StatusList> getTweetLists() - { - return instance.tweetLists; - } - - public synchronized static void setHomeTimeline(Timeline timeline, StatusListAdapter adapter) - { - instance.home = timeline; - registerTweetList(timeline, adapter); - } - - public synchronized static Timeline getHomeTimeline() - { - return instance.home; - } - - public synchronized static void setMentionsTimeline(Timeline timeline, StatusListAdapter adapter) - { - instance.mentions = timeline; - registerTweetList(timeline, adapter); - } - - public synchronized static Timeline getMentionsTimeline() - { - return instance.mentions; - } - - public synchronized static void setHistoryTimeline(StatusList timeline, StatusListAdapter adapter) - { - instance.history = timeline; - instance.adapterMap.put(timeline, adapter); - } - - public synchronized static StatusList getHistoryTimeline() - { - return instance.history; - } - - public synchronized static void registerUserTimeline(long userId, Timeline timeline, StatusListAdapter adapter) - { - instance.userTimelineMap.put(userId, timeline); - registerTweetList(timeline, adapter); - } - - public synchronized static void removeUserTimeline(long userId) - { - instance.adapterMap.remove(instance.userTimelineMap.remove(userId)); - } - - public synchronized static Timeline getUserTimeline(long userId) - { - return instance.userTimelineMap.get(userId); - } - - public synchronized static void registerListTimeline(int listId, Timeline timeline, StatusListAdapter adapter) - { - instance.listTimelineMap.put(listId, timeline); - registerTweetList(timeline, adapter); - } - - public synchronized static void removeListTimeline(int id) - { - Timeline timeline = instance.listTimelineMap.get(id); - instance.adapterMap.remove(timeline); - instance.listTimelineMap.remove(id); - ListManager.deleteList(id); - } - - public synchronized static Timeline getListTimeline(int id) - { - return instance.listTimelineMap.get(id); - } - - public synchronized static StatusListAdapter getAdapter(StatusList key) - { - return instance.adapterMap.get(key); - } -} diff --git a/src/net/miz_hi/smileessence/system/MainActivitySystem.java b/src/net/miz_hi/smileessence/system/MainActivitySystem.java deleted file mode 100644 index 980744c5..00000000 --- a/src/net/miz_hi/smileessence/system/MainActivitySystem.java +++ /dev/null @@ -1,189 +0,0 @@ -package net.miz_hi.smileessence.system; - -import android.app.Activity; -import android.content.Intent; -import android.database.Cursor; -import android.net.Uri; -import android.provider.MediaStore; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.auth.AuthenticationDB; -import net.miz_hi.smileessence.auth.AuthorizeHelper; -import net.miz_hi.smileessence.auth.Consumers; -import net.miz_hi.smileessence.cache.IconCache; -import net.miz_hi.smileessence.cache.TweetCache; -import net.miz_hi.smileessence.cache.UserCache; -import net.miz_hi.smileessence.core.EnumRequestCode; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.data.list.ListManager; -import net.miz_hi.smileessence.dialog.SingleButtonDialog; -import net.miz_hi.smileessence.extraction.ExtractManager; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.statuslist.timeline.Timeline; -import net.miz_hi.smileessence.model.statuslist.timeline.impl.ListTimeline; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; -import net.miz_hi.smileessence.statuslist.StatusListAdapter; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.task.impl.GetHomeTimelineTask; -import net.miz_hi.smileessence.task.impl.GetMentionsTask; -import net.miz_hi.smileessence.twitter.TwitterManager; -import net.miz_hi.smileessence.view.fragment.impl.ListFragment; -import twitter4j.Paging; - -import java.util.List; - -public class MainActivitySystem -{ - - public AuthorizeHelper authHelper; - public Uri tempFilePath; - - public void onDestroyed() - { - TwitterManager.closeTwitterStream(); - PostSystem.clear(false); - IconCache.clearCache(); - TweetCache.clearCache(); - UserCache.clearCache(); - MyExecutor.shutdown(); - } - - public boolean checkAccount(Activity activity) - { - if (Client.hasAuthorizedAccount()) - { - accountSetup(); - return true; - } - else - { - authHelper = new AuthorizeHelper(activity, Consumers.getDedault()); - //NOT AUTHORIZED - SingleButtonDialog.show(activity, "認証してください", "認証ページヘ", new Runnable() - { - - @Override - public void run() - { - authHelper.oauthSend(); - } - }); - return false; - } - } - - public void authorize(Activity activity, Uri data) - { - Account account = authHelper.oauthReceive(data); - Client.setMainAccount(account); - if (checkAccount(activity)) - { - startTwitter(activity); - loadListPage(activity); - } - } - - public void accountSetup() - { - long lastUsedId = Client.getPreferenceValue(EnumPreferenceKey.LAST_USED_USER_ID); - - for (Account account : AuthenticationDB.instance().findAll()) - { - if (account.getUserId() == lastUsedId) - { - Client.setMainAccount(account); - break; - } - } - if (Client.getMainAccount() == null) - { - Client.setMainAccount(AuthenticationDB.instance().findAll().get(0)); - } - } - - public void loadListPage(Activity activity) - { - for (net.miz_hi.smileessence.data.list.List list : ListManager.getLists()) - { - Timeline timeline = new ListTimeline(); - StatusListManager.registerListTimeline(list.getListId(), timeline, new StatusListAdapter(activity, timeline)); - ListFragment fragment = ListFragment.newInstance(list.getListId(), list.getName()); - PageController.getInstance().addPage(fragment); - } - } - - public void startTwitter(Activity activity) - { - - boolean connected = TwitterManager.openTwitterStream(activity); - - if (connected) - { - final GetHomeTimelineTask getHome = new GetHomeTimelineTask(Client.getMainAccount(), new Paging(1, 100)); - final GetMentionsTask getMentions = new GetMentionsTask(Client.getMainAccount(), new Paging(1, 200)); - - - MyExecutor.execute(new Runnable() - { - - @Override - public void run() - { - try - { - - List<TweetModel> home = getHome.call(); - List<TweetModel> mentions = getMentions.call(); - for (TweetModel tweetModel : home) - { - StatusListManager.getHomeTimeline().addToBottom(tweetModel); - ExtractManager.check(tweetModel); - } - for (TweetModel tweetModel : mentions) - { - StatusListManager.getMentionsTimeline().addToBottom(tweetModel); - } - StatusListManager.getAdapter(StatusListManager.getHomeTimeline()).forceNotifyAdapter(); - StatusListManager.getAdapter(StatusListManager.getMentionsTimeline()).forceNotifyAdapter(); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - }); - } - else - { - Notificator.alert("接続出来ません"); - } - } - - public void receivePicture(Activity activity, Intent data, int reqCode) - { - try - { - Uri uri; - if (reqCode == EnumRequestCode.PICTURE.ordinal()) - { - uri = data.getData(); - } - else - { - uri = tempFilePath; - } - Cursor c = activity.getContentResolver().query(uri, null, null, null, null); - c.moveToFirst(); - String path = c.getString(c.getColumnIndex(MediaStore.MediaColumns.DATA)); - PostSystem.getState().setPicturePath(path); - PostSystem.openPostPage(); - Notificator.info("画像をセットしました"); - } - catch (Exception e) - { - e.printStackTrace(); - Notificator.alert("失敗しました"); - } - } -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/system/PageController.java b/src/net/miz_hi/smileessence/system/PageController.java deleted file mode 100644 index 1bf1362c..00000000 --- a/src/net/miz_hi/smileessence/system/PageController.java +++ /dev/null @@ -1,122 +0,0 @@ -package net.miz_hi.smileessence.system; - -import android.app.Activity; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.view.ViewPager; -import net.miz_hi.smileessence.util.UiHandler; -import net.miz_hi.smileessence.view.fragment.NamedFragment; -import net.miz_hi.smileessence.view.fragment.NamedFragmentPagerAdapter; -import net.miz_hi.smileessence.view.fragment.impl.HistoryFragment; -import net.miz_hi.smileessence.view.fragment.impl.HomeFragment; -import net.miz_hi.smileessence.view.fragment.impl.MentionsFragment; -import net.miz_hi.smileessence.view.fragment.impl.PostFragment; - -import java.util.ArrayList; -import java.util.List; - - -public class PageController -{ - - private static PageController instance; - public static final int PAGE_POST = 0; - private NamedFragmentPagerAdapter adapter; - private ViewPager pager; - private FragmentActivity activity; - - public static PageController getInstance() - { - return instance; - } - - public static void init(FragmentActivity activity, ViewPager pager) - { - instance = new PageController(activity, pager); - } - - private PageController(FragmentActivity activity, ViewPager pager) - { - adapter = new NamedFragmentPagerAdapter(activity.getSupportFragmentManager()); - this.activity = activity; - this.pager = pager; - initPages(activity); - } - - private void initPages(Activity activity) - { - adapter.add((NamedFragment) Fragment.instantiate(activity, PostFragment.class.getName())); - adapter.add((NamedFragment) Fragment.instantiate(activity, HomeFragment.class.getName())); - adapter.add((NamedFragment) Fragment.instantiate(activity, MentionsFragment.class.getName())); - adapter.add((NamedFragment) Fragment.instantiate(activity, HistoryFragment.class.getName())); - } - - public void move(final int index) - { - new UiHandler() - { - - @Override - public void run() - { - pager.setCurrentItem(index, true); - } - }.post(); - } - - public void moveToLast() - { - new UiHandler() - { - - @Override - public void run() - { - pager.setCurrentItem(adapter.getCount(), false); - } - }.post(); - } - - public int getCurrentPage() - { - return instance.pager.getCurrentItem(); - } - - public void addPage(final NamedFragment fragment) - { - new UiHandler() - { - - @Override - public void run() - { - adapter.add(fragment); - } - }.post(); - } - - public void removePage() - { - new UiHandler() - { - - @Override - public void run() - { - int current = instance.pager.getCurrentItem(); - adapter.remove(current); - List<NamedFragment> list = new ArrayList<NamedFragment>(); - list.addAll(instance.adapter.getList()); - instance.adapter = new NamedFragmentPagerAdapter(activity.getSupportFragmentManager(), list); //Refresh page caches - pager.setAdapter(instance.adapter); - pager.setCurrentItem(current); - } - }.post(); - - } - - public NamedFragmentPagerAdapter getAdapter() - { - return adapter; - } -} diff --git a/src/net/miz_hi/smileessence/system/PostSystem.java b/src/net/miz_hi/smileessence/system/PostSystem.java deleted file mode 100644 index 2c2b4516..00000000 --- a/src/net/miz_hi/smileessence/system/PostSystem.java +++ /dev/null @@ -1,205 +0,0 @@ -package net.miz_hi.smileessence.system; - -import android.text.TextUtils; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.impl.TweetTask; -import net.miz_hi.smileessence.util.StringUtils; -import net.miz_hi.smileessence.util.UiHandler; -import net.miz_hi.smileessence.view.fragment.impl.PostFragment; -import twitter4j.StatusUpdate; - -import java.io.File; - -public class PostSystem -{ - - public static final long NONE_ID = -1; - private static PostPageState state = new PostPageState(); - - private PostSystem() - { - } - - public static PostPageState getState() - { - return state; - } - - public static void clear(boolean keepPicture) - { - state.setText(""); - state.setCursor(0); - state.clearReply(); - if (!keepPicture) - { - state.clearPicturePath(); - } - } - - public static void setText(String str) - { - state.setText(str); - } - - public static void appendText(String str) - { - state.setText(state.getText() + str); - } - - public static void insertText(String str) - { - int cursor = state.cursor; - StringBuilder sb = new StringBuilder(state.getText()); - sb.insert(cursor, str); - cursor = cursor + sb.length(); - if (cursor > sb.length()) - { - cursor = sb.length(); - } - state.setText(sb.toString()); - state.setCursor(cursor); - } - - public static void setReply(String userName, long statusId) - { - state.setText("@" + userName + " "); - state.setCursor(state.getText().length()); - state.setInReplyToStatusId(statusId); - PostFragment.singleton().update(); - } - - public static void addReply(String userName) - { - state.clearReply(); - StringBuilder sb = new StringBuilder(state.getText()); - - if ((sb.indexOf("@" + userName) != -1)) - { - return; - } - else - { - sb.append(String.format("@%s ", userName)); - } - - if (sb.charAt(0) != '.') - { - sb.insert(0, "."); - } - state.setText(sb.toString()); - state.setCursor(state.getText().length()); - PostFragment.singleton().update(); - } - - - public static boolean submit(String text) - { - if (TextUtils.isEmpty(text) && state.getPicturePath() == null) - { - Notificator.alert("何か入力してください"); - return false; - } - else if (StringUtils.countTweetCharacters(text) > 140) - { - Notificator.alert("文字数が多すぎます"); - return false; - } - else - { - final StatusUpdate update = new StatusUpdate(text); - if (state.getInReplyToStatusId() >= 0) - { - update.setInReplyToStatusId(state.getInReplyToStatusId()); - } - if (state.getPicturePath() != null) - { - update.setMedia(new File(state.getPicturePath())); - } - new UiHandler() - { - - @Override - public void run() - { - new TweetTask(update).callAsync(); - clear(false); - } - }.postAtFrontOfQueue(); - } - return true; - } - - public static void openPostPage() - { - // new UiHandler() - // { - // - // @Override - // public void run() - // { - PageController.getInstance().move(PageController.PAGE_POST); - PostFragment.singleton().load(); - // } - // }.post(); - } - - - public static class PostPageState - { - - private String text = ""; - private int cursor = 0; - private long inReplyTo = NONE_ID; - private String pictPath; - - public String getText() - { - return text; - } - - public void setText(String text) - { - this.text = text; - } - - public void setCursor(int index) - { - this.cursor = index; - } - - public int getCursor() - { - return cursor; - } - - public long getInReplyToStatusId() - { - return inReplyTo; - } - - public void setInReplyToStatusId(long statusId) - { - inReplyTo = statusId; - } - - public void clearReply() - { - setInReplyToStatusId(NONE_ID); - } - - public String getPicturePath() - { - return pictPath; - } - - public void setPicturePath(String path) - { - pictPath = path; - } - - public void clearPicturePath() - { - setPicturePath(null); - } - } -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/talkchase/TalkChaser.java b/src/net/miz_hi/smileessence/talkchase/TalkChaser.java deleted file mode 100644 index c2328013..00000000 --- a/src/net/miz_hi/smileessence/talkchase/TalkChaser.java +++ /dev/null @@ -1,87 +0,0 @@ -package net.miz_hi.smileessence.talkchase; - -import net.miz_hi.smileessence.cache.TweetCache; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.statuslist.StatusList; -import net.miz_hi.smileessence.model.statuslist.impl.TalkList; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.status.TweetUtils; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.view.fragment.impl.TalkFragment; - -public class TalkChaser -{ - - public TalkFragment fragment; - public long chasingId; - public StatusList talkList; - - public TalkChaser(TalkFragment fragment) - { - this.talkList = new TalkList(); - this.fragment = fragment; - } - - public void hitNewTweet(TweetModel tweet) - { - this.talkList.addToTop(tweet.getOriginal()); - updateChasingId(tweet.getOriginal().statusId); - } - - private void updateChasingId(long id) - { - this.chasingId = id; - fragment.setChasingId(chasingId); - } - - /** - * Call on Network Thread - */ - public void startRelation(long statusId) - { - TweetModel start = TweetUtils.getOrCreateStatusModel(statusId); - if (start == null) - { - Notificator.alert("ツイートの取得に失敗しました"); - return; - } - talkList.addToTop(start); - - //Load older - long inReplyTo = start.getInReplyToStatusId(); - while (inReplyTo > 0) - { - TweetModel older = TweetUtils.getOrCreateStatusModel(inReplyTo); - talkList.addToBottom(older); - inReplyTo = older.getInReplyToStatusId(); - } - - //Load newer - inReplyTo = start.statusId; - while (true) - { - long before = inReplyTo; - for (TweetModel newer : TweetCache.getList()) - { - if (newer.getInReplyToStatusId() == inReplyTo) - { - talkList.addToTop(newer); - inReplyTo = newer.statusId; - break; - } - } - if (before == inReplyTo) - { - break; - } - } - - updateChasingId(((TweetModel) talkList.getStatus(0)).statusId); - StatusListManager.getAdapter(talkList).forceNotifyAdapter(); - } - - public void stopRelation() - { - TalkManager.removeTalkChaser(this); - } -} diff --git a/src/net/miz_hi/smileessence/talkchase/TalkManager.java b/src/net/miz_hi/smileessence/talkchase/TalkManager.java deleted file mode 100644 index 110899f3..00000000 --- a/src/net/miz_hi/smileessence/talkchase/TalkManager.java +++ /dev/null @@ -1,75 +0,0 @@ -package net.miz_hi.smileessence.talkchase; - -import android.util.SparseArray; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; - -/** - * Relationの管理 - * 実際のRelation処理はRelationLogicが行う - */ -public class TalkManager -{ - - static int count = 0; - static SparseArray<TalkChaser> chaserList = new SparseArray<TalkChaser>(); - - public static void addTalkChaser(TalkChaser chaser) - { - chaserList.put(count++, chaser); - } - - public static int getNextTalkId() - { - return count; - } - - public static TalkChaser getChaser(int talkId) - { - return chaserList.get(talkId); - } - - public static void removeTalkChaser(TalkChaser chaser) - { - chaserList.remove(chaserList.indexOfValue(chaser)); - count--; - } - - public static TalkChaser getTalkByChasingId(long statusId) - { - for (int i = 0; i < chaserList.size(); i++) - { - TalkChaser chaser = chaserList.valueAt(i); - if (chaser.chasingId == statusId) - { - return chaser; - } - } - return null; - } - - public static TalkChaser searchTalk(TweetModel tweet) - { - for (int i = 0; i < chaserList.size(); i++) - { - TalkChaser chaser = chaserList.valueAt(i); - if (chaser.talkList.getStatusIndex(tweet) != -1) - { - return chaser; - } - } - return null; - } - - public static void check(TweetModel tweet) - { - for (int i = 0; i < chaserList.size(); i++) - { - TalkChaser chaser = chaserList.valueAt(i); - if (tweet.getInReplyToStatusId() == chaser.chasingId) - { - chaser.hitNewTweet(tweet); - break; - } - } - } -} diff --git a/src/net/miz_hi/smileessence/task/Task.java b/src/net/miz_hi/smileessence/task/Task.java deleted file mode 100644 index cbd70643..00000000 --- a/src/net/miz_hi/smileessence/task/Task.java +++ /dev/null @@ -1,65 +0,0 @@ -package net.miz_hi.smileessence.task; - -import android.os.Handler; -import net.miz_hi.smileessence.core.MyExecutor; - -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -public abstract class Task<T> implements Callable<T> -{ - - protected Runnable callback; - - public void setCallBack(Runnable callback) - { - this.callback = callback; - } - - public Future<T> callAsync() - { - final Handler handler = new Handler(); - final Future<T> future = MyExecutor.submit(this); - MyExecutor.execute(new Runnable() - { - - @Override - public void run() - { - - try - { - final T result = future.get(); - handler.post(new Runnable() - { - - @Override - public void run() - { - onPostExecute(result); - if (callback != null) - { - callback.run(); - } - } - }); - } - catch (InterruptedException e) - { - e.printStackTrace(); - } - catch (ExecutionException e) - { - e.printStackTrace(); - } - } - }); - return future; - } - - public abstract void onPreExecute(); - - public abstract void onPostExecute(T result); - -} diff --git a/src/net/miz_hi/smileessence/task/impl/DestroyTask.java b/src/net/miz_hi/smileessence/task/impl/DestroyTask.java deleted file mode 100644 index 4b15aa11..00000000 --- a/src/net/miz_hi/smileessence/task/impl/DestroyTask.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.TwitterException; - -public class DestroyTask extends Task<Boolean> -{ - - private Account account; - private long statusId; - - public DestroyTask(long statusId) - { - this(Client.getMainAccount(), statusId); - } - - public DestroyTask(Account account, long statusId) - { - this.account = account; - this.statusId = statusId; - } - - @Override - public Boolean call() - { - try - { - API.destroyTweet(account, statusId); - return true; - } - catch (TwitterException e) - { - e.printStackTrace(); - return false; - } - } - - @Override - public void onPreExecute() - { - } - - @Override - public void onPostExecute(Boolean result) - { - if (result) - { - Notificator.info("削除しました"); - } - else - { - Notificator.alert("削除失敗しました"); - } - } - -} diff --git a/src/net/miz_hi/smileessence/task/impl/FavoriteTask.java b/src/net/miz_hi/smileessence/task/impl/FavoriteTask.java deleted file mode 100644 index 94276212..00000000 --- a/src/net/miz_hi/smileessence/task/impl/FavoriteTask.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.TwitterException; - -public class FavoriteTask extends Task<Boolean> -{ - - private Account account; - private long statusId; - - public FavoriteTask(long statusId) - { - this(Client.getMainAccount(), statusId); - } - - public FavoriteTask(Account account, long statusId) - { - this.account = account; - this.statusId = statusId; - } - - @Override - public Boolean call() - { - try - { - API.favorite(account, statusId); - return true; - } - catch (TwitterException e) - { - e.printStackTrace(); - return false; - } - } - - @Override - public void onPostExecute(Boolean result) - { - if (result) - { - Notificator.info("お気に入りに追加しました"); - } - else - { - Notificator.alert("お気に入りの追加に失敗しました"); - } - } - - @Override - public void onPreExecute() - { - } - -} diff --git a/src/net/miz_hi/smileessence/task/impl/GetHomeTimelineTask.java b/src/net/miz_hi/smileessence/task/impl/GetHomeTimelineTask.java deleted file mode 100644 index 96d81c72..00000000 --- a/src/net/miz_hi/smileessence/task/impl/GetHomeTimelineTask.java +++ /dev/null @@ -1,68 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.model.status.ResponseConverter; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.Paging; -import twitter4j.Status; -import twitter4j.TwitterException; - -import java.util.LinkedList; -import java.util.List; - -public class GetHomeTimelineTask extends Task<List<TweetModel>> -{ - - private Account account; - private Paging page; - - public GetHomeTimelineTask(Account account, Paging page) - { - this.account = account; - this.page = page; - } - - @Override - public List<TweetModel> call() - { - LinkedList<Status> resp = new LinkedList<Status>(); - - try - { - resp.addAll(API.getHomeTimeline(account, page)); - } - catch (TwitterException e) - { - e.printStackTrace(); - } - - LinkedList<TweetModel> list = new LinkedList<TweetModel>(); - - while (!resp.isEmpty()) - { - TweetModel model = ResponseConverter.convert(resp.pollLast()); - list.offerFirst(model); - } - - return list; - } - - @Override - public void onPreExecute() - { - - } - - @Override - public void onPostExecute(List<TweetModel> result) - { - if (result.size() < 1) - { - Notificator.alert("タイムラインの取得に失敗しました"); - } - } - -} diff --git a/src/net/miz_hi/smileessence/task/impl/GetIconTask.java b/src/net/miz_hi/smileessence/task/impl/GetIconTask.java deleted file mode 100644 index e2fe3cc4..00000000 --- a/src/net/miz_hi/smileessence/task/impl/GetIconTask.java +++ /dev/null @@ -1,69 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import android.graphics.Bitmap; -import android.graphics.Bitmap.CompressFormat; -import android.graphics.BitmapFactory; -import android.graphics.BitmapFactory.Options; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.cache.IconCache; -import net.miz_hi.smileessence.cache.IconCache.Icon; -import net.miz_hi.smileessence.model.status.user.UserModel; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.util.LogHelper; - -import java.io.File; -import java.io.FileOutputStream; -import java.io.InputStream; -import java.net.HttpURLConnection; -import java.net.URL; - -public class GetIconTask extends Task<Bitmap> -{ - - private UserModel user; - - public GetIconTask(UserModel user) - { - this.user = user; - } - - @Override - public Bitmap call() - { - try - { - URL url = new URL(user.iconUrl); - HttpURLConnection connection = (HttpURLConnection) url.openConnection(); - connection.setDoInput(true); - connection.connect(); - InputStream input = connection.getInputStream(); - Options opt = new Options(); - opt.inPurgeable = true; // GC - Bitmap bm = BitmapFactory.decodeStream(input, null, opt); - File file = Client.getApplicationFile(IconCache.genIconName(user)); - FileOutputStream fos = new FileOutputStream(file); - bm.compress(CompressFormat.PNG, 90, fos); - fos.close(); - return bm; - } - catch (Exception e) - { - e.printStackTrace(); - return IconCache.getEmptyIcon(); - } - } - - @Override - public void onPreExecute() - { - } - - @Override - public void onPostExecute(Bitmap result) - { - Icon icon = new Icon(result, IconCache.genIconName(user)); - IconCache.putIconToMap(user.userId, icon); - icon.use(); - LogHelper.d("icon get from web"); - } -} diff --git a/src/net/miz_hi/smileessence/task/impl/GetListTimelineTask.java b/src/net/miz_hi/smileessence/task/impl/GetListTimelineTask.java deleted file mode 100644 index fd55a918..00000000 --- a/src/net/miz_hi/smileessence/task/impl/GetListTimelineTask.java +++ /dev/null @@ -1,70 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.model.status.ResponseConverter; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.Paging; -import twitter4j.Status; -import twitter4j.TwitterException; - -import java.util.LinkedList; -import java.util.List; - -public class GetListTimelineTask extends Task<List<TweetModel>> -{ - - private Account account; - private Paging page; - private int listId; - - public GetListTimelineTask(Account account, int listId, Paging page) - { - this.account = account; - this.page = page; - this.listId = listId; - } - - @Override - public List<TweetModel> call() - { - LinkedList<Status> resp = new LinkedList<Status>(); - - try - { - resp.addAll(API.getListTimeline(account, listId, page)); - } - catch (TwitterException e) - { - e.printStackTrace(); - } - - LinkedList<TweetModel> list = new LinkedList<TweetModel>(); - - while (!resp.isEmpty()) - { - TweetModel model = ResponseConverter.convert(resp.pollLast()); - list.offerFirst(model); - } - - return list; - } - - @Override - public void onPreExecute() - { - - } - - @Override - public void onPostExecute(List<TweetModel> result) - { - if (result.size() < 1) - { - Notificator.alert("リストの取得に失敗しました"); - } - } - -} diff --git a/src/net/miz_hi/smileessence/task/impl/GetMentionsTask.java b/src/net/miz_hi/smileessence/task/impl/GetMentionsTask.java deleted file mode 100644 index 994dc7d8..00000000 --- a/src/net/miz_hi/smileessence/task/impl/GetMentionsTask.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.model.status.ResponseConverter; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.Paging; -import twitter4j.Status; -import twitter4j.TwitterException; - -import java.util.LinkedList; -import java.util.List; - -public class GetMentionsTask extends Task<List<TweetModel>> -{ - - private Account account; - private Paging page; - - public GetMentionsTask(Account account, Paging page) - { - this.account = account; - this.page = page; - } - - @Override - public List<TweetModel> call() - { - LinkedList<Status> resp = new LinkedList<Status>(); - try - { - resp.addAll(API.getMentions(account, page)); - } - catch (TwitterException e) - { - e.printStackTrace(); - } - - LinkedList<TweetModel> list = new LinkedList<TweetModel>(); - while (!resp.isEmpty()) - { - TweetModel model = ResponseConverter.convert(resp.pollLast()); - list.offerFirst(model); - } - return list; - } - - @Override - public void onPreExecute() - { - } - - @Override - public void onPostExecute(List<TweetModel> result) - { - if (result.size() < 1) - { - Notificator.alert("メンションの取得に失敗しました"); - } - } - -} diff --git a/src/net/miz_hi/smileessence/task/impl/GetRelationshipTask.java b/src/net/miz_hi/smileessence/task/impl/GetRelationshipTask.java deleted file mode 100644 index 4c00b64e..00000000 --- a/src/net/miz_hi/smileessence/task/impl/GetRelationshipTask.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.cache.RelationshipCache; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.Relationship; -import twitter4j.TwitterException; - - -public class GetRelationshipTask extends Task<Boolean> -{ - - long userId; - - public GetRelationshipTask(long userId) - { - this.userId = userId; - } - - @Override - public Boolean call() - { - try - { - Relationship rel = API.getRelationship(Client.getMainAccount(), userId); - RelationshipCache.put(rel); - return true; - } - catch (TwitterException e) - { - e.printStackTrace(); - return false; - } - } - - @Override - public void onPreExecute() - { - } - - @Override - public void onPostExecute(Boolean result) - { - - } -} diff --git a/src/net/miz_hi/smileessence/task/impl/GetTweetTask.java b/src/net/miz_hi/smileessence/task/impl/GetTweetTask.java deleted file mode 100644 index 96fb241d..00000000 --- a/src/net/miz_hi/smileessence/task/impl/GetTweetTask.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.Status; -import twitter4j.TwitterException; - - -public class GetTweetTask extends Task<Status> -{ - - long statusId; - - public GetTweetTask(long statusId) - { - this.statusId = statusId; - } - - @Override - public Status call() - { - try - { - return API.getStatus(Client.getMainAccount(), statusId); - } - catch (TwitterException e) - { - e.printStackTrace(); - return null; - } - } - - @Override - public void onPreExecute() - { - } - - @Override - public void onPostExecute(Status result) - { - } - -} diff --git a/src/net/miz_hi/smileessence/task/impl/GetUserTask.java b/src/net/miz_hi/smileessence/task/impl/GetUserTask.java deleted file mode 100644 index a1c0a8f3..00000000 --- a/src/net/miz_hi/smileessence/task/impl/GetUserTask.java +++ /dev/null @@ -1,62 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.TwitterException; -import twitter4j.User; - - -public class GetUserTask extends Task<User> -{ - - long userId = -1; - String screenName = null; - - public GetUserTask(long userId) - { - this.userId = userId; - } - - public GetUserTask(String screenName) - { - this.screenName = screenName; - } - - @Override - public User call() - { - if (userId < 0 && screenName == null) - { - return null; - } - try - { - if (screenName == null) - { - return API.getUser(Client.getMainAccount(), userId); - } - else - { - return API.getUser(Client.getMainAccount(), screenName); - } - - } - catch (TwitterException e) - { - e.printStackTrace(); - return null; - } - } - - @Override - public void onPreExecute() - { - } - - @Override - public void onPostExecute(User result) - { - } - -} diff --git a/src/net/miz_hi/smileessence/task/impl/GetUserTimelineTask.java b/src/net/miz_hi/smileessence/task/impl/GetUserTimelineTask.java deleted file mode 100644 index 5bab1190..00000000 --- a/src/net/miz_hi/smileessence/task/impl/GetUserTimelineTask.java +++ /dev/null @@ -1,70 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.model.status.ResponseConverter; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.Paging; -import twitter4j.Status; -import twitter4j.TwitterException; - -import java.util.LinkedList; -import java.util.List; - -public class GetUserTimelineTask extends Task<List<TweetModel>> -{ - - private Account account; - private Paging page; - private long userId; - - public GetUserTimelineTask(Account account, long userId, Paging page) - { - this.account = account; - this.page = page; - this.userId = userId; - } - - @Override - public List<TweetModel> call() - { - LinkedList<Status> resp = new LinkedList<Status>(); - - try - { - resp.addAll(API.getUserTimeline(account, userId, page)); - } - catch (TwitterException e) - { - e.printStackTrace(); - } - - LinkedList<TweetModel> list = new LinkedList<TweetModel>(); - - while (!resp.isEmpty()) - { - TweetModel model = ResponseConverter.convert(resp.pollLast()); - list.offerFirst(model); - } - - return list; - } - - @Override - public void onPreExecute() - { - - } - - @Override - public void onPostExecute(List<TweetModel> result) - { - if (result.size() < 1) - { - Notificator.alert("タイムラインの取得に失敗しました"); - } - } - -} diff --git a/src/net/miz_hi/smileessence/task/impl/RetweetTask.java b/src/net/miz_hi/smileessence/task/impl/RetweetTask.java deleted file mode 100644 index 633ff17e..00000000 --- a/src/net/miz_hi/smileessence/task/impl/RetweetTask.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.TwitterException; - -public class RetweetTask extends Task<Boolean> -{ - - private Account account; - private long statusId; - - public RetweetTask(long statusId) - { - this(Client.getMainAccount(), statusId); - } - - public RetweetTask(Account account, long statusId) - { - this.account = account; - this.statusId = statusId; - } - - @Override - public Boolean call() - { - try - { - API.retweet(account, statusId); - return true; - } - catch (TwitterException e) - { - e.printStackTrace(); - return false; - } - } - - @Override - public void onPreExecute() - { - } - - @Override - public void onPostExecute(Boolean result) - { - if (result) - { - Notificator.info("リツイートしました"); - } - else - { - Notificator.info("リツイートに失敗しました"); - } - } - -} diff --git a/src/net/miz_hi/smileessence/task/impl/TweetTask.java b/src/net/miz_hi/smileessence/task/impl/TweetTask.java deleted file mode 100644 index 0e838c98..00000000 --- a/src/net/miz_hi/smileessence/task/impl/TweetTask.java +++ /dev/null @@ -1,61 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.StatusUpdate; -import twitter4j.TwitterException; - -public class TweetTask extends Task<Boolean> -{ - - private Account account; - private StatusUpdate status; - - public TweetTask(StatusUpdate status) - { - this(Client.getMainAccount(), status); - } - - public TweetTask(Account account, StatusUpdate status) - { - this.account = account; - this.status = status; - } - - @Override - public void onPostExecute(Boolean result) - { - if (result) - { - Notificator.info("投稿しました"); - } - else - { - Notificator.alert("投稿失敗しました"); - } - } - - @Override - public Boolean call() - { - try - { - API.tweet(account, status); - return true; - } - catch (TwitterException e) - { - e.printStackTrace(); - return false; - } - } - - @Override - public void onPreExecute() - { - - } -} diff --git a/src/net/miz_hi/smileessence/task/impl/UnFavoriteTask.java b/src/net/miz_hi/smileessence/task/impl/UnFavoriteTask.java deleted file mode 100644 index 208c7d12..00000000 --- a/src/net/miz_hi/smileessence/task/impl/UnFavoriteTask.java +++ /dev/null @@ -1,60 +0,0 @@ -package net.miz_hi.smileessence.task.impl; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.auth.Account; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.task.Task; -import net.miz_hi.smileessence.twitter.API; -import twitter4j.TwitterException; - -public class UnFavoriteTask extends Task<Boolean> -{ - - private Account account; - private long statusId; - - public UnFavoriteTask(long statusId) - { - this(Client.getMainAccount(), statusId); - } - - public UnFavoriteTask(Account account, long statusId) - { - this.account = account; - this.statusId = statusId; - } - - @Override - public Boolean call() - { - try - { - API.unfavorite(account, statusId); - return true; - } - catch (TwitterException e) - { - e.printStackTrace(); - return false; - } - } - - @Override - public void onPostExecute(Boolean result) - { - if (result) - { - Notificator.info("お気に入りを削除しました"); - } - else - { - Notificator.alert("お気に入りの削除に失敗しました"); - } - } - - @Override - public void onPreExecute() - { - } - -} diff --git a/src/net/miz_hi/smileessence/twitter/API.java b/src/net/miz_hi/smileessence/twitter/API.java deleted file mode 100644 index db2fe721..00000000 --- a/src/net/miz_hi/smileessence/twitter/API.java +++ /dev/null @@ -1,150 +0,0 @@ -package net.miz_hi.smileessence.twitter; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.auth.Account; -import twitter4j.*; - - -public class API -{ - - /* - * TWEET - */ - - public static Status getStatus(Account account, long id) throws TwitterException - { - return TwitterManager.getTwitter(account).showStatus(id); - } - - public static void favorite(Account account, long statusId) throws TwitterException - { - TwitterManager.getTwitter(account).createFavorite(statusId); - } - - public static void unfavorite(Account account, long statusId) throws TwitterException - { - TwitterManager.getTwitter(account).destroyFavorite(statusId); - } - - public static void retweet(Account account, long statusId) throws TwitterException - { - TwitterManager.getTwitter(account).retweetStatus(statusId); - } - - public static void destroyTweet(Account account, long statusId) throws TwitterException - { - TwitterManager.getTwitter(account).destroyStatus(statusId); - } - - public static void tweet(Account account, String str) throws TwitterException - { - Tweet.update(account, str); - } - - public static void tweet(Account account, String str, long l) throws TwitterException - { - Tweet.update(account, str, l); - } - - public static void tweet(Account account, StatusUpdate update) throws TwitterException - { - Tweet.update(account, update); - } - - public static boolean isStatusUpdateLimit() - { - return Tweet.isStatusUpdateLimit(); - } - - /* - * USER - */ - - public static User getUser(Account account, long id) throws TwitterException - { - return TwitterManager.getTwitter(account).showUser(id); - } - - public static User getUser(Account account, String screenName) throws TwitterException - { - return TwitterManager.getTwitter(account).showUser(screenName); - } - - public static void follow(Account account, String screenName) throws TwitterException - { - TwitterManager.getTwitter(account).createFriendship(screenName); - } - - public static void unfollow(Account account, String screenName) throws TwitterException - { - TwitterManager.getTwitter(account).destroyFriendship(screenName); - } - - public static void block(Account account, String screenName) throws TwitterException - { - TwitterManager.getTwitter(account).createBlock(screenName); - } - - public static void unblock(Account account, String screenName) throws TwitterException - { - TwitterManager.getTwitter(account).destroyBlock(screenName); - } - - public static void spam(Account account, String screenName) throws TwitterException - { - TwitterManager.getTwitter(account).reportSpam(screenName); - } - - /* - * RELATIONSHIP - */ - - public static Relationship getRelationship(Account account, long id) throws TwitterException - { - return TwitterManager.getTwitter(account).showFriendship(account.getUserId(), id); - } - - public static Relationship getRelationship(Account account, String screenName) throws TwitterException - { - return TwitterManager.getTwitter(account).showFriendship(account.getScreenName(), screenName); - } - - /* - * TIMELINE - */ - - public static ResponseList<Status> getHomeTimeline(Account account, Paging page) throws TwitterException - { - return TwitterManager.getTwitter(account).getHomeTimeline(page); - } - - public static ResponseList<Status> getMentions(Account account, Paging page) throws TwitterException - { - return TwitterManager.getTwitter(account).getMentionsTimeline(page); - } - - public static ResponseList<Status> getUserTimeline(Account account, long userId, Paging page) throws TwitterException - { - return TwitterManager.getTwitter(account).getUserTimeline(userId, page); - } - - public static ResponseList<Status> getUserTimeline(Account account, String screenName, Paging page) throws TwitterException - { - return TwitterManager.getTwitter(account).getUserTimeline(screenName, page); - } - - /* - * LIST - */ - - public static ResponseList<UserList> getReadableLists(Account account) throws TwitterException - { - return TwitterManager.getTwitter(account).getUserLists(Client.getMainAccount().getUserId()); - } - - public static ResponseList<Status> getListTimeline(Account account, int listId, Paging page) throws TwitterException - { - return TwitterManager.getTwitter(account).getUserListStatuses(listId, page); - } -} diff --git a/src/net/miz_hi/smileessence/twitter/MyUserStreamListener.java b/src/net/miz_hi/smileessence/twitter/MyUserStreamListener.java deleted file mode 100644 index d7ece734..00000000 --- a/src/net/miz_hi/smileessence/twitter/MyUserStreamListener.java +++ /dev/null @@ -1,295 +0,0 @@ -package net.miz_hi.smileessence.twitter; - -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.cache.TweetCache; -import net.miz_hi.smileessence.extraction.ExtractManager; -import net.miz_hi.smileessence.model.status.ResponseConverter; -import net.miz_hi.smileessence.model.status.event.EventModel; -import net.miz_hi.smileessence.model.status.event.impl.*; -import net.miz_hi.smileessence.model.status.tweet.EnumTweetType; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.status.user.UserModel; -import net.miz_hi.smileessence.model.statuslist.StatusList; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.talkchase.TalkManager; -import net.miz_hi.smileessence.util.LogHelper; -import net.miz_hi.smileessence.view.activity.MainActivity; -import twitter4j.*; - -public class MyUserStreamListener implements UserStreamListener, ConnectionLifeCycleListener -{ - - private int exceptionCount; - - public MyUserStreamListener() - { - } - - @Override - public void onDeletionNotice(StatusDeletionNotice arg0) - { - LogHelper.d("on status delete"); - final TweetModel model = TweetCache.get(arg0.getStatusId()); - if (model != null) - { - for (StatusList list : StatusListManager.getTweetLists()) - { - //ツイートを削除 - list.remove(model); - //RTなら子のリストから削除 - model.getOriginal().deleteParent(model); - //このツイートのRTも削除する - for (TweetModel parent : model.getParents()) - { - list.remove(parent); - } - list.applyForce(); - } - } - } - - @Override - public void onScrubGeo(long arg0, long arg1) - { - } - - @Override - public void onStallWarning(StallWarning arg0) - { - } - - @Override - public void onStatus(Status status) - { - if (MainActivity.getInstance() == null || MainActivity.getInstance().isFinishing()) - { - return; - } - TweetModel model = ResponseConverter.convert(status); - //自分へのRT - if (model.type == EnumTweetType.RETWEET && model.getOriginal().user.isMe()) - { - EventModel event = new RetweetEvent(model.user, model); - StatusList history = StatusListManager.getHistoryTimeline(); - history.addToTop(event); - history.apply(); - event.raise(); - } - //RTではないリプライ - else if (model.type == EnumTweetType.REPLY) - { - StatusList mentions = StatusListManager.getMentionsTimeline(); - mentions.addToTop(model); - mentions.apply(); - Notificator.buildEvent(new ReplyEvent(model.user, model)).raise(); - } - //一度見たツイートを弾く - if (Client.<Boolean>getPreferenceValue(EnumPreferenceKey.SHOW_READ_RETWEET) || TweetCache.isNotRead(model.statusId)) - { - StatusList home = StatusListManager.getHomeTimeline(); - home.addToTop(model); - home.apply(); - } - - TalkManager.check(model); - ExtractManager.check(model); - } - - @Override - public void onTrackLimitationNotice(int arg0) - { - } - - @Override - public void onException(Exception arg0) - { - if (exceptionCount > 0) - { - exceptionCount = 1; - arg0.printStackTrace(); - Notificator.alert("切断されました"); - } - } - - @Override - public void onBlock(User sourceUser, User targetUser) - { - if (targetUser.getId() == Client.getMainAccount().getUserId()) - { - EventModel event = new BlockEvent(ResponseConverter.<UserModel>convert(sourceUser)); - StatusList history = StatusListManager.getHistoryTimeline(); - history.addToTop(event); - history.apply(); - event.raise(); - } - } - - @Override - public void onDeletionNotice(long arg0, long arg1) - { - } - - @Override - public void onDirectMessage(DirectMessage message) - { - if (message.getRecipientId() == Client.getMainAccount().getUserId()) - { - EventModel event = new DirectMessageEvent(ResponseConverter.<UserModel>convert(message.getSender())); - StatusList history = StatusListManager.getHistoryTimeline(); - history.addToTop(event); - history.apply(); - event.raise(); - } - } - - @Override - public void onFavorite(User sourceUser, User targetUser, Status targetStatus) - { - if (sourceUser.getId() == Client.getMainAccount().getUserId()) - { - if (targetStatus.isRetweet()) - { - TweetCache.putFavoritedStatus(targetStatus.getRetweetedStatus().getId()); - } - else - { - TweetCache.putFavoritedStatus(targetStatus.getId()); - } - StatusList home = StatusListManager.getHomeTimeline(); - StatusList mentions = StatusListManager.getMentionsTimeline(); - home.apply(); - mentions.apply(); - } - if (targetUser.getId() == Client.getMainAccount().getUserId()) - { - EventModel event = new FavoriteEvent(ResponseConverter.<UserModel>convert(sourceUser), ResponseConverter.<TweetModel>convert(targetStatus)); - StatusList history = StatusListManager.getHistoryTimeline(); - history.addToTop(event); - history.apply(); - event.raise(); - } - } - - @Override - public void onFollow(User sourceUser, User targetUser) - { - if (sourceUser.getId() != Client.getMainAccount().getUserId()) - { - EventModel event = new FollowEvent(ResponseConverter.<UserModel>convert(sourceUser)); - StatusList history = StatusListManager.getHistoryTimeline(); - history.addToTop(event); - history.apply(); - event.raise(); - } - } - - @Override - public void onFriendList(long[] arg0) - { - } - - @Override - public void onUnblock(User sourceUser, User targetUser) - { - if (targetUser.getId() == Client.getMainAccount().getUserId()) - { - EventModel event = new UnblockEvent(ResponseConverter.<UserModel>convert(sourceUser)); - StatusList history = StatusListManager.getHistoryTimeline(); - history.addToTop(event); - history.apply(); - event.raise(); - } - } - - @Override - public void onUnfavorite(User sourceUser, User targetUser, Status targetStatus) - { - if (sourceUser.getId() == Client.getMainAccount().getUserId()) - { - if (targetStatus.isRetweet()) - { - TweetCache.removeFavoritedStatus(targetStatus.getRetweetedStatus().getId()); - } - else - { - TweetCache.removeFavoritedStatus(targetStatus.getId()); - } - StatusList home = StatusListManager.getHomeTimeline(); - StatusList mentions = StatusListManager.getMentionsTimeline(); - home.apply(); - mentions.apply(); - } - - if (Client.<Boolean>getPreferenceValue(EnumPreferenceKey.NOTICE_UNFAV)) - { - if (targetUser.getId() == Client.getMainAccount().getUserId()) - { - EventModel event = new UnfavoriteEvent(ResponseConverter.<UserModel>convert(sourceUser), ResponseConverter.<TweetModel>convert(targetStatus)); - StatusList history = StatusListManager.getHistoryTimeline(); - history.addToTop(event); - history.apply(); - event.raise(); - } - } - } - - @Override - public void onUserListCreation(User arg0, UserList arg1) - { - } - - @Override - public void onUserListDeletion(User arg0, UserList arg1) - { - } - - @Override - public void onUserListMemberAddition(User arg0, User arg1, UserList arg2) - { - } - - @Override - public void onUserListMemberDeletion(User arg0, User arg1, UserList arg2) - { - } - - @Override - public void onUserListSubscription(User arg0, User arg1, UserList arg2) - { - } - - @Override - public void onUserListUnsubscription(User arg0, User arg1, UserList arg2) - { - } - - @Override - public void onUserListUpdate(User arg0, UserList arg1) - { - } - - @Override - public void onUserProfileUpdate(User arg0) - { - } - - @Override - public void onCleanUp() - { - } - - @Override - public void onConnect() - { - Notificator.info("接続しました"); - exceptionCount = 0; - } - - @Override - public void onDisconnect() - { - } - -} diff --git a/src/net/miz_hi/smileessence/twitter/Tweet.java b/src/net/miz_hi/smileessence/twitter/Tweet.java deleted file mode 100644 index a46aaf00..00000000 --- a/src/net/miz_hi/smileessence/twitter/Tweet.java +++ /dev/null @@ -1,79 +0,0 @@ -package net.miz_hi.smileessence.twitter;
-
-import net.miz_hi.smileessence.auth.Account;
-import net.miz_hi.smileessence.notification.Notificator;
-import net.miz_hi.smileessence.util.CountUpInteger;
-import twitter4j.StatusUpdate;
-import twitter4j.Twitter;
-import twitter4j.TwitterException;
-
-public class Tweet
-{
-
- private static boolean isStatusUpdateLimit = false;
- private static CountUpInteger count = new CountUpInteger(5);
- public static final String MESSAGE_TWEET_SUCCESS = "投稿しました";
- public static final String MESSAGE_TWEET_DEPLICATE = "投稿失敗しました";
- private static final String ERROR_STATUS_DUPLICATE = "Status is a duplicate";
- private static final String ERROR_STATUS_LIMIT = "User is over daily status update limit";
-
- protected static void update(Account account, String str) throws TwitterException
- {
- StatusUpdate update = new StatusUpdate(str);
- update(account, update);
- }
-
- protected static void update(Account account, String str, long l) throws TwitterException
- {
- StatusUpdate update = new StatusUpdate(str);
- update.setInReplyToStatusId(l);
- update(account, update);
- }
-
- protected static void update(Account account, StatusUpdate update) throws TwitterException
- {
- try
- {
- Twitter twitter = TwitterManager.getTwitter(account);
- twitter.updateStatus(update);
- isStatusUpdateLimit = false;
- count.reset();
- }
- catch (TwitterException e)
- {
- e.printStackTrace();
- int code = e.getStatusCode();
- String message = e.getErrorMessage();
- if (code == 403)
- {
- if(message != null)
- {
- if(message.equals(ERROR_STATUS_DUPLICATE))
- {
- if(!count.countUp())
- {
- String str = update.getStatus() + " ";
- long id = update.getInReplyToStatusId();
- StatusUpdate update1 = new StatusUpdate(str);
- update1.setInReplyToStatusId(id);
- update(account, update1);
- return;
- }
- }
- else if (message.equals(ERROR_STATUS_LIMIT))
- {
- isStatusUpdateLimit = true;
- Notificator.alert("規制されています");
- return;
- }
- }
- }
- throw e;
- }
- }
-
- protected static boolean isStatusUpdateLimit()
- {
- return isStatusUpdateLimit;
- }
-}
diff --git a/src/net/miz_hi/smileessence/twitter/TwitterManager.java b/src/net/miz_hi/smileessence/twitter/TwitterManager.java deleted file mode 100644 index fcb5f71a..00000000 --- a/src/net/miz_hi/smileessence/twitter/TwitterManager.java +++ /dev/null @@ -1,97 +0,0 @@ -package net.miz_hi.smileessence.twitter;
-
-import android.app.Activity;
-import android.text.TextUtils;
-import net.miz_hi.smileessence.Client;
-import net.miz_hi.smileessence.auth.Account;
-import net.miz_hi.smileessence.util.CountUpInteger;
-import net.miz_hi.smileessence.util.NetworkUtils;
-import twitter4j.Twitter;
-import twitter4j.TwitterFactory;
-import twitter4j.TwitterStream;
-import twitter4j.TwitterStreamFactory;
-import twitter4j.conf.ConfigurationBuilder;
-
-public class TwitterManager
-{
-
- private static Twitter twitter;
- private static TwitterStream twitterStream;
- private static boolean isStatusUpdateLimit = false;
- private static Account lastAccount;
- private static CountUpInteger count = new CountUpInteger(5);
-
- private static ConfigurationBuilder generateConfig(Account account)
- {
- ConfigurationBuilder cb = new ConfigurationBuilder();
- cb.setOAuthConsumerKey(account.getConsumerKey());
- cb.setOAuthConsumerSecret(account.getConsumerSecret());
- cb.setOAuthAccessToken(account.getAccessToken());
- cb.setOAuthAccessTokenSecret(account.getAccessTokenSecret());
- cb.setUseSSL(true);
- cb.setMediaProvider("TWITTER");
- return cb;
- }
-
- public static Twitter getTwitter()
- {
- return getTwitter(Client.getMainAccount());
- }
-
- public static Twitter getTwitter(Account account)
- {
- if (lastAccount == null || !account.equals(lastAccount) || twitter == null)
- {
- twitter = new TwitterFactory(generateConfig(account).build()).getInstance();
- lastAccount = account;
- }
- return twitter;
- }
-
- public static TwitterStream getTwitterStream(Account account)
- {
- if (twitterStream == null)
- {
- ConfigurationBuilder cb = generateConfig(account);
- cb.setUserStreamRepliesAllEnabled(false);
- MyUserStreamListener usListener = new MyUserStreamListener();
- twitterStream = new TwitterStreamFactory(cb.build()).getInstance();
- twitterStream.addListener(usListener);
- twitterStream.addConnectionLifeCycleListener(usListener);
- }
- return twitterStream;
- }
-
- public static boolean openTwitterStream(Activity activity)
- {
- if (NetworkUtils.cannotConnect(activity))
- {
- return false;
- }
- if (twitterStream != null)
- {
- twitterStream.shutdown();
- }
- else
- {
- twitterStream = getTwitterStream(Client.getMainAccount());
- }
- twitterStream.user();
- return true;
- }
-
- public static void closeTwitterStream()
- {
- if (twitterStream != null)
- {
- twitterStream.shutdown();
- twitterStream = null;
- }
- }
-
- public static boolean isOauthed(Account account)
- {
- return !TextUtils.isEmpty(account.getAccessToken());
- }
-
-}
diff --git a/src/net/miz_hi/smileessence/util/ColorUtils.java b/src/net/miz_hi/smileessence/util/ColorUtils.java deleted file mode 100644 index b7448a28..00000000 --- a/src/net/miz_hi/smileessence/util/ColorUtils.java +++ /dev/null @@ -1,12 +0,0 @@ -package net.miz_hi.smileessence.util; - -import android.graphics.Color; - -public class ColorUtils -{ - - public static int setAlpha(int color, int alpha) - { - return Color.argb(alpha, Color.red(color), Color.green(color), Color.blue(color)); - } -} diff --git a/src/net/miz_hi/smileessence/util/CountUpInteger.java b/src/net/miz_hi/smileessence/util/CountUpInteger.java deleted file mode 100644 index d6a5f485..00000000 --- a/src/net/miz_hi/smileessence/util/CountUpInteger.java +++ /dev/null @@ -1,30 +0,0 @@ -package net.miz_hi.smileessence.util; - -public class CountUpInteger -{ - - private int count = 0; - private int maxCount; - - public CountUpInteger(int maxCount) - { - this.maxCount = maxCount; - } - - public boolean countUp() - { - count++; - return isOver(); - } - - public boolean isOver() - { - return count >= maxCount; - } - - public void reset() - { - count = 0; - } - -} diff --git a/src/net/miz_hi/smileessence/util/CustomListAdapter.java b/src/net/miz_hi/smileessence/util/CustomListAdapter.java deleted file mode 100644 index 5b3783c4..00000000 --- a/src/net/miz_hi/smileessence/util/CustomListAdapter.java +++ /dev/null @@ -1,189 +0,0 @@ -package net.miz_hi.smileessence.util; - -import android.app.Activity; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.widget.BaseAdapter; - -import java.util.ArrayList; -import java.util.Collection; - -public abstract class CustomListAdapter<T> extends BaseAdapter -{ - - private T[] array; - private ArrayList<T> list; - private int count; - private final Object lock = new Object(); - private boolean canNotifyOnChange = true; - private Activity activity; - private LayoutInflater inflater; - private int capacity; - - public CustomListAdapter(Activity activity, int capacity) - { - this.capacity = capacity; - this.list = new ArrayList<T>(); - this.activity = activity; - this.inflater = LayoutInflater.from(activity); - } - - public void addAll(Collection<T> collection) - { - synchronized (lock) - { - for (T element : collection) - { - if (list.contains(element)) - { - list.remove(element); - } - list.add(element); - if (list.size() >= capacity) - { - break; - } - } - } - } - - public void addFirst(T element) - { - synchronized (lock) - { - if (list.contains(element)) - { - return; - } - list.add(0, element); - - if (list.size() >= capacity) - { - list.remove(list.size() - 1); - } - } - } - - public void addLast(T element) - { - synchronized (lock) - { - if (list.contains(element)) - { - list.remove(element); - } - list.add(element); - } - } - - public void removeElement(T element) - { - synchronized (lock) - { - list.remove(element); - } - } - - public void clear() - { - synchronized (lock) - { - list.clear(); - } - } - - public void notifyAdapter() - { - if (canNotifyOnChange) - { - forceNotifyAdapter(); - } - } - - public void forceNotifyAdapter() - { - synchronized (lock) - { - new UiHandler() - { - - @Override - public void run() - { - notifyDataSetChanged(); - } - }.post(); - } - } - - public void setCanNotifyOnChange(boolean notifyOnChange) - { - synchronized (lock) - { - this.canNotifyOnChange = notifyOnChange; - } - } - - public boolean getCanNotifyOnChange() - { - synchronized (lock) - { - return canNotifyOnChange; - } - } - - public Activity getActivity() - { - return activity; - } - - - @Override - public void notifyDataSetChanged() - { - synchronized (lock) - { - array = (T[]) list.toArray(); - count = array.length; - CustomListAdapter.super.notifyDataSetChanged(); - } - } - - @Override - public int getCount() - { - return count; - } - - @Override - public Object getItem(int position) - { - synchronized (lock) - { - if (array != null && array.length >= position) - { - return array[position]; - } - else - { - return null; - } - } - } - - @Override - public long getItemId(int position) - { - return position; - } - - public LayoutInflater getInflater() - { - return inflater; - } - - @Override - public abstract View getView(int position, View convertedView, ViewGroup parent); - -} diff --git a/src/net/miz_hi/smileessence/util/LogHelper.java b/src/net/miz_hi/smileessence/util/LogHelper.java deleted file mode 100644 index bb2890be..00000000 --- a/src/net/miz_hi/smileessence/util/LogHelper.java +++ /dev/null @@ -1,17 +0,0 @@ -package net.miz_hi.smileessence.util; - -import android.util.Log; - -public class LogHelper -{ - - public static void d(Object obj) - { - Log.d("SE", obj.toString()); - } - - public static void printI(Object obj) - { - Log.i("SE", obj.toString()); - } -} diff --git a/src/net/miz_hi/smileessence/util/Morse.java b/src/net/miz_hi/smileessence/util/Morse.java deleted file mode 100644 index da7fe6e1..00000000 --- a/src/net/miz_hi/smileessence/util/Morse.java +++ /dev/null @@ -1,136 +0,0 @@ -package net.miz_hi.smileessence.util;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * 和文モールス変換ライブラリ
- *
- * @author flour
- * @version 2.2
- * @arrange laco0416
- */
-public class Morse
-{
-
- private static HashMap<String, String> jaMc;
- private static HashMap<String, String> mcJa;
-
- /**
- * 与えられた文字列がモールス文を含むかどうかを返す
- *
- * @param mc 判定する文字列
- * @return モールスを含むならtrue, そうでなければfalse
- */
- public static boolean isMorse(String mc)
- {
- Pattern pattern = Pattern.compile("[－・]+");
- Matcher matcher = pattern.matcher(mc);
- ArrayList<String> list = new ArrayList<String>();
- while (matcher.find())
- {
- list.add(matcher.group());
- }
- if (list.size() <= 1)
- {
- return false;
- }
- else
- {
- for (String s : list)
- {
- if (!s.equals("・・・") && !s.equals("・・") && !s.equals("・"))
- {
- return true;
- }
- }
- return false;
- }
- }
-
- /**
- * 和文モールスをカタカナ・数字に復元する *
- *
- * @param str 復元したい文字列
- * @return 復元部分が置換された文字列
- */
- public static String mcToJa(String str)
- {
- String[] strArr = toRightMorse(str).split(" ");
- StringBuilder sb = new StringBuilder();
- for (String tok : strArr)
- {
- sb.append(mcJa.containsKey(tok) ? mcJa.get(tok) : tok);
- }
- return sb.toString();
- }
-
- /**
- * ひらがな・カタカナ・数字をモールス文に変換する
- *
- * @param str 変換したい文字列
- * @return 変換部分が置換された文字列
- */
- public static String jaToMc(String str)
- {
- StringBuilder sb = new StringBuilder();
- for (int i = 0; i < str.length(); i++)
- {
- String tok = String.valueOf(str.charAt(i));
- if (jaMc.containsKey(tok))
- {
- sb.append(jaMc.get(tok));
- sb.append(" ");
- }
- else
- {
- sb.append(tok);
- }
- }
- return sb.toString().trim();
- }
-
-
- private static String toRightMorse(String str)
- {
- str = str.replace("‐", "－").replace(" ", " ").trim();
- Pattern pattern = Pattern.compile("[^・－ ][・－]");
- StringBuilder sb = new StringBuilder(str);
- Matcher matcher = pattern.matcher(str);
- while (matcher.find())
- {
- int i = matcher.start();
- sb.insert(i + 1, " ");
- matcher.reset(sb);
- }
- pattern = Pattern.compile("[・－][^・－ ]");
- matcher = pattern.matcher(sb);
- while (matcher.find())
- {
- int i = matcher.start();
- sb.insert(i + 1, " ");
- matcher.reset(sb);
- }
- return sb.toString();
- }
-
- static
- {
- jaMc = new HashMap<String, String>();
- mcJa = new HashMap<String, String>();
-
- String[][] ja2 = {{"・－", "イ"}, {"・－・－", "ロ"}, {"－・・・", "ハ"}, {"－・－・", "ニ"}, {"－・・", "ホ"}, {"・", "ヘ"}, {"・・－・・", "ト"}, {"・・－・", "チ"}, {"－－・", "リ"}, {"・・・・", "ヌ"}, {"－・－－・", "ル"}, {"・－－－", "ヲ"}, {"－・－", "ワ"}, {"・－・・", "カ"}, {"－－", "ヨ"}, {"－・", "タ"}, {"－－－", "レ"}, {"－－－・", "ソ"}, {"・－－・", "ツ"}, {"－－・－", "ネ"}, {"・－・", "ナ"}, {"・・・", "ラ"}, {"－", "ム"}, {"・・－", "ウ"}, {"・－・・－", "ヰ"}, {"・・－－", "ノ"}, {"・－・・・", "オ"}, {"・・・－", "ク"}, {"・－－", "ヤ"}, {"－・・－", "マ"}, {"－・－－", "ケ"}, {"－－・・", "フ"}, {"－－－－", "コ"}, {"－・－－－", "エ"}, {"・－・－－", "テ"}, {"－－・－－", "ア"}, {"－・－・－", "サ"}, {"－・－・・", "キ"}, {"－・・－－", "ユ"}, {"－・・・－", "メ"}, {"・・－・－", "ミ"}, {"－－・－・", "シ"}, {"・－－・・", "ヱ"}, {"－－・・－", "ヒ"}, {"－・・－・", "モ"}, {"・－－－・", "セ"}, {"－－－・－", "ス"}, {"・－・－・", "ン"}, {"・・", "゛"}, {"・・－－・", "゜"}, {"・－－・－", "ー"}, {"・－・－・－", "、"}, {"－・－－・－", "（"}, {"・－・・－・", "）"}, {"・－－－－", "1"}, {"・・－－－", "2"}, {"・・・－－", "3"}, {"・・・・－", "4"}, {"・・・・・", "5"}, {"－・・・・", "6"}, {"－－・・・", "7"}, {"－－－・・", "8"}, {"－－－－・", "9"}, {"－－－－－", "0"}, {"", ""}};
- for (String[] pr : ja2)
- {
- mcJa.put(pr[0], pr[1]);
- jaMc.put(pr[1], pr[0]);
- }
-
- String[][] ja1 = {{"い", "・－"}, {"ィ", "・－"}, {"ぃ", "・－"}, {"ろ", "・－・－"}, {"は", "－・・・"}, {"に", "－・－・"}, {"ほ", "－・・"}, {"へ", "・"}, {"と", "・・－・・"}, {"ち", "・・－・"}, {"り", "－－・"}, {"ぬ", "・・・・"}, {"る", "－・－－・"}, {"を", "・－－－"}, {"わ", "－・－"}, {"ヮ", "－・－"}, {"ゎ", "－・－"}, {"か", "・－・・"}, {"ヵ", "・－・・"}, {"よ", "－－"}, {"ョ", "－－"}, {"ょ", "－－"}, {"た", "－・"}, {"れ", "－－－"}, {"そ", "－－－・"}, {"つ", "・－－・"}, {"ッ", "・－－・"}, {"っ", "・－－・"}, {"ね", "－－・－"}, {"な", "・－・"}, {"ら", "・・・"}, {"む", "－"}, {"う", "・・－"}, {"ゥ", "・・－"}, {"ぅ", "・・－"}, {"ゐ", "・－・・－"}, {"の", "・・－－"}, {"お", "・－・・・"}, {"ォ", "・－・・・"}, {"ぉ", "・－・・・"}, {"く", "・・・－"}, {"や", "・－－"}, {"ャ", "・－－"}, {"ゃ", "・－－"}, {"ま", "－・・－"}, {"け", "－・－－"}, {"ヶ", "－・－－"}, {"ふ", "－－・・"}, {"こ", "－－－－"}, {"え", "－・－－－"}, {"ェ", "－・－－－"}, {"ぇ", "－・－－－"}, {"て", "・－・－－"}, {"あ", "－－・－－"}, {"ァ", "－－・－－"}, {"ぁ", "－－・－－"}, {"さ", "－・－・－"}, {"き", "－・－・・"}, {"ゆ", "－・・－－"}, {"ュ", "－・・－－"}, {"ゅ", "－・・－－"}, {"め", "－・・・－"}, {"み", "・・－・－"}, {"し", "－－・－・"}, {"ゑ", "・－－・・"}, {"ひ", "－－・・－"}, {"も", "－・・－・"}, {"せ", "・－－－・"}, {"す", "－－－・－"}, {"ん", "・－・－・"}, {"ガ", "・－・・ ・・"}, {"が", "・－・・ ・・"}, {"ギ", "－・－・・ ・・"}, {"ぎ", "－・－・・ ・・"}, {"グ", "・・・－ ・・"}, {"ぐ", "・・・－ ・・"}, {"ゲ", "－・－－ ・・"}, {"げ", "－・－－ ・・"}, {"ゴ", "－－－－ ・・"}, {"ご", "－－－－ ・・"}, {"ザ", "－・－・－ ・・"}, {"ざ", "－・－・－ ・・"}, {"ジ", "－－・－・ ・・"}, {"じ", "－－・－・ ・・"}, {"ズ", "－－－・－ ・・"}, {"ず", "－－－・－ ・・"}, {"ゼ", "・－－－・ ・・"}, {"ぜ", "・－－－・ ・・"}, {"ゾ", "－－－・ ・・"}, {"ぞ", "－－－・ ・・"}, {"ダ", "－・ ・・"}, {"だ", "－・ ・・"}, {"ヂ", "・・－・ ・・"}, {"ぢ", "・・－・ ・・"}, {"ヅ", "・－－・ ・・"}, {"づ", "・－－・ ・・"}, {"デ", "・－・－－ ・・"}, {"で", "・－・－－ ・・"}, {"ド", "・・－・・ ・・"}, {"ど", "・・－・・ ・・"}, {"バ", "－・・・ ・・"}, {"ば", "－・・・ ・・"}, {"ビ", "－－・・－ ・・"}, {"び", "－－・・－ ・・"}, {"ブ", "－－・・ ・・"}, {"ぶ", "－－・・ ・・"}, {"ベ", "・ ・・"}, {"べ", "・ ・・"}, {"ボ", "－・・ ・・"}, {"ぼ", "－・・ ・・"}, {"パ", "－・・・ ・・－－・"}, {"ぱ", "－・・・ ・・－－・"}, {"ピ", "－－・・－ ・・－－・"}, {"ぴ", "－－・・－ ・・－－・"}, {"プ", "－－・・ ・・－－・"}, {"ぷ", "－－・・ ・・－－・"}, {"ペ", "・ ・・－－・"}, {"ぺ", "・ ・・－－・"}, {"ポ", "－・・ ・・－－・"}, {"ぽ", "－・・ ・・－－・"}, {"ヴ", "・・－ ・・"}};
- for (String[] to : ja1)
- jaMc.put(to[0], to[1]);
- }
-
-}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/util/NetworkUtils.java b/src/net/miz_hi/smileessence/util/NetworkUtils.java deleted file mode 100644 index 05da3f4e..00000000 --- a/src/net/miz_hi/smileessence/util/NetworkUtils.java +++ /dev/null @@ -1,16 +0,0 @@ -package net.miz_hi.smileessence.util; - -import android.app.Activity; -import android.net.ConnectivityManager; -import android.net.NetworkInfo; - -public class NetworkUtils -{ - - public static boolean cannotConnect(Activity activity) - { - ConnectivityManager cm = (ConnectivityManager) activity.getSystemService(Activity.CONNECTIVITY_SERVICE); - NetworkInfo info = cm.getActiveNetworkInfo(); - return info == null || !info.isConnected(); - } -} diff --git a/src/net/miz_hi/smileessence/util/StringUtils.java b/src/net/miz_hi/smileessence/util/StringUtils.java deleted file mode 100644 index 5001a059..00000000 --- a/src/net/miz_hi/smileessence/util/StringUtils.java +++ /dev/null @@ -1,64 +0,0 @@ -package net.miz_hi.smileessence.util; - -import android.net.Uri; -import com.twitter.Extractor; - -import java.util.Calendar; -import java.util.Date; -import java.util.List; - -public class StringUtils -{ - - public static String parseUrlToFileName(String string) - { - return Uri.parse(string).getLastPathSegment(); - } - - public static String dateToString(Date date) - { - Calendar cal = Calendar.getInstance(); - Calendar calToday = Calendar.getInstance(); - - cal.setTime(date); - - int y = cal.get(Calendar.YEAR); - int m = cal.get(Calendar.MONTH); - int d = cal.get(Calendar.DATE); - int h = cal.get(Calendar.HOUR_OF_DAY); - int min = cal.get(Calendar.MINUTE); - int s = cal.get(Calendar.SECOND); - - StringBuilder builder = new StringBuilder(); - - if (cal.get(Calendar.YEAR) != calToday.get(Calendar.YEAR)) - { - builder.append(y).append("/"); - } - if (cal.get(Calendar.DAY_OF_YEAR) != calToday.get(Calendar.DAY_OF_YEAR)) - { - builder.append(String.format("%02d", m + 1)).append("/").append(String.format("%02d", d)).append(" "); - } - builder.append(String.format("%02d", h)).append(":").append(String.format("%02d", min)).append(":").append(String.format("%02d", s)); - - return builder.toString(); - } - - public static int countTweetCharacters(String text) - { - int count = text.length(); - - Extractor extractor = new Extractor(); - List<String> urls = extractor.extractURLs(text); - for (String url : urls) - { - count -= (url.length() - 22); - if (url.startsWith("https://")) - { - count += 1; - } - } - return count; - } - -} diff --git a/src/net/miz_hi/smileessence/util/UiHandler.java b/src/net/miz_hi/smileessence/util/UiHandler.java deleted file mode 100644 index 3dfe2f1b..00000000 --- a/src/net/miz_hi/smileessence/util/UiHandler.java +++ /dev/null @@ -1,45 +0,0 @@ -package net.miz_hi.smileessence.util; - -import android.os.Handler; -import android.os.Looper; - -public abstract class UiHandler extends Handler implements Runnable -{ - public UiHandler() - { - super(Looper.getMainLooper()); - } - - public UiHandler(Handler.Callback callback) - { - super(Looper.getMainLooper(), callback); - } - - public boolean post() - { - return post(this); - } - - public boolean postAtFrontOfQueue() - { - return postAtFrontOfQueue(this); - } - - public boolean postAtTime(Object token, long uptimeMillis) - { - return postAtTime(this, token, uptimeMillis); - } - - public boolean postAtTime(long uptimeMillis) - { - return postAtTime(this, uptimeMillis); - } - - public boolean postDelayed(long delayMillis) - { - return postDelayed(this, delayMillis); - } - - @Override - public abstract void run(); -} diff --git a/src/net/miz_hi/smileessence/view/IRemainable.java b/src/net/miz_hi/smileessence/view/IRemainable.java deleted file mode 100644 index 5aeea8a1..00000000 --- a/src/net/miz_hi/smileessence/view/IRemainable.java +++ /dev/null @@ -1,9 +0,0 @@ -package net.miz_hi.smileessence.view; - - -public interface IRemainable -{ - String save(); - - void load(String data); -} diff --git a/src/net/miz_hi/smileessence/view/IRemovable.java b/src/net/miz_hi/smileessence/view/IRemovable.java deleted file mode 100644 index f63fd32b..00000000 --- a/src/net/miz_hi/smileessence/view/IRemovable.java +++ /dev/null @@ -1,6 +0,0 @@ -package net.miz_hi.smileessence.view; - -public interface IRemovable -{ - void onRemoved(); -} diff --git a/src/net/miz_hi/smileessence/view/activity/ExtraWordActivity.java b/src/net/miz_hi/smileessence/view/activity/ExtraWordActivity.java deleted file mode 100644 index 28feba0f..00000000 --- a/src/net/miz_hi/smileessence/view/activity/ExtraWordActivity.java +++ /dev/null @@ -1,76 +0,0 @@ -package net.miz_hi.smileessence.view.activity;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ListView;
-import android.widget.TextView;
-import net.miz_hi.smileessence.R;
-import net.miz_hi.smileessence.data.extra.ExtraWord;
-import net.miz_hi.smileessence.data.extra.ExtraWordListAdapter;
-import net.miz_hi.smileessence.data.extra.ExtraWordManager;
-import net.miz_hi.smileessence.dialog.ContentDialog;
-
-public class ExtraWordActivity extends Activity
-{
-
- @Override
- protected void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.listedit_layout);
-
- TextView titleView = (TextView) findViewById(R.id.listedit_title);
- titleView.setText("抽出ワードの管理");
- ListView listView = (ListView) findViewById(R.id.listedit_listview);
- ImageButton buttonAdd = (ImageButton) findViewById(R.id.listedit_addbutton);
- final ExtraWordListAdapter adapter = new ExtraWordListAdapter(this);
- listView.setAdapter(adapter);
- adapter.addAll(ExtraWordManager.getExtraWords());
- adapter.forceNotifyAdapter();
- buttonAdd.setOnClickListener(new OnClickListener()
- {
-
- @Override
- public void onClick(View v)
- {
- final EditText editText = new EditText(ExtraWordActivity.this);
- ContentDialog dialog = new ContentDialog(ExtraWordActivity.this, "編集");
- dialog.setContentView(editText);
- dialog.setOnClickListener(new DialogInterface.OnClickListener()
- {
-
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- switch (which)
- {
- case DialogInterface.BUTTON_NEGATIVE:
- {
- break;
- }
- case DialogInterface.BUTTON_POSITIVE:
- {
- String newText = editText.getText().toString();
-
- ExtraWord extraWord = new ExtraWord(newText);
- ExtraWordManager.addExtractWord(extraWord);
- adapter.clear();
- adapter.addAll(ExtraWordManager.getExtraWords());
- adapter.forceNotifyAdapter();
- break;
- }
- }
- }
- });
- dialog.setTextPositive("決定");
- dialog.setTextNegative("キャンセル");
- dialog.create().show();
- }
- });
- }
-}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/view/activity/LicenseActivity.java b/src/net/miz_hi/smileessence/view/activity/LicenseActivity.java deleted file mode 100644 index 342d6d09..00000000 --- a/src/net/miz_hi/smileessence/view/activity/LicenseActivity.java +++ /dev/null @@ -1,15 +0,0 @@ -package net.miz_hi.smileessence.view.activity; - -import android.app.Activity; -import android.os.Bundle; -import net.miz_hi.smileessence.R; - -public class LicenseActivity extends Activity -{ - - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setContentView(R.layout.license_layout); - } -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/view/activity/MainActivity.java b/src/net/miz_hi/smileessence/view/activity/MainActivity.java deleted file mode 100644 index 766ee39d..00000000 --- a/src/net/miz_hi/smileessence/view/activity/MainActivity.java +++ /dev/null @@ -1,205 +0,0 @@ -package net.miz_hi.smileessence.view.activity; - -import android.app.Activity; -import android.content.Intent; -import android.os.Bundle; -import android.support.v4.app.FragmentActivity; -import android.support.v4.view.ViewPager; -import android.view.KeyEvent; -import android.view.Window; -import android.view.WindowManager; -import com.viewpagerindicator.TitlePageIndicator; -import com.viewpagerindicator.TitlePageIndicator.OnCenterItemClickListener; -import de.keyboardsurfer.android.widget.crouton.Crouton; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.core.EnumRequestCode; -import net.miz_hi.smileessence.core.IntentRouter; -import net.miz_hi.smileessence.dialog.ConfirmDialog; -import net.miz_hi.smileessence.listener.PageChangeListener; -import net.miz_hi.smileessence.menu.MainMenu; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.system.MainActivitySystem; -import net.miz_hi.smileessence.system.PageController; - -public class MainActivity extends FragmentActivity -{ - - private static MainActivity instance; - public MainActivitySystem system; - private ViewPager pager; - - public static MainActivity getInstance() - { - return instance; - } - - @Override - public void onCreate(Bundle bundle) - { - super.onCreate(bundle); - requestWindowFeature(Window.FEATURE_NO_TITLE); - setContentView(R.layout.main_layout); - instance = this; - system = new MainActivitySystem(); - StatusListManager.initStatusLists(instance); - initializeViews(); - IntentRouter.onNewIntent(getIntent()); - } - - private void initializeViews() - { - pager = (ViewPager) findViewById(R.id.viewpager); - PageController.init(instance, pager); - pager.setAdapter(PageController.getInstance().getAdapter()); - pager.destroyDrawingCache(); - - TitlePageIndicator indicator = (TitlePageIndicator) findViewById(R.id.indicator); - indicator.setTextSize(21); - indicator.setViewPager(pager); - indicator.setOnPageChangeListener(new PageChangeListener()); - indicator.setOnCenterItemClickListener(new OnCenterItemClickListener() - { - - @Override - public void onCenterItemClick(int position) - { - new MainMenu(instance).create().show(); - } - }); - } - - @Override - protected void onPostCreate(Bundle savedInstanceState) - { - super.onPostCreate(savedInstanceState); - if (system.checkAccount(instance)) - { - system.startTwitter(instance); - system.loadListPage(instance); - } - PageController.getInstance().move(1); - } - - @Override - protected void onResume() - { - super.onResume(); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - } - - @Override - protected void onPause() - { - super.onPause(); - getWindow().clearFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON); - Crouton.cancelAllCroutons(); - } - - @Override - protected void onDestroy() - { - super.onDestroy(); - Crouton.cancelAllCroutons(); - system.onDestroyed(); - instance = null; - } - - @Override - public void onActivityResult(int reqCode, int resultCode, Intent data) - { - if (resultCode != Activity.RESULT_OK) - { - return; - } - if (reqCode == EnumRequestCode.AUTHORIZE.ordinal()) - { - system.authorize(instance, data.getData()); - } - else if (reqCode == EnumRequestCode.PICTURE.ordinal() || reqCode == EnumRequestCode.CAMERA.ordinal()) - { - system.receivePicture(instance, data, reqCode); - } - } - - @Override - protected void onNewIntent(Intent intent) - { - IntentRouter.onNewIntent(intent); - } - - @Override - public boolean dispatchKeyEvent(KeyEvent event) - { - if (event.getAction() != KeyEvent.ACTION_DOWN) - { - return super.dispatchKeyEvent(event); - } - switch (event.getKeyCode()) - { - case KeyEvent.KEYCODE_BACK: - { - finish(); - return false; - } - case KeyEvent.KEYCODE_MENU: - { - openMenu(); - return true; - } - default: - { - return super.dispatchKeyEvent(event); - } - } - } - - @Override - public void finish() - { - if (pager.getCurrentItem() != 1) - { - pager.setCurrentItem(1, true); - } - else - { - finish(!Client.<Boolean>getPreferenceValue(EnumPreferenceKey.CONFIRM_DIALOG)); - } - } - - private void forceFinish() - { - super.finish(); - } - - public void finish(boolean force) - { - if (!force) - { - ConfirmDialog.show(this, "終了しますか？", new Runnable() - { - - @Override - public void run() - { - forceFinish(); - } - }); - } - else - { - forceFinish(); - } - } - - public void openMenu() - { - new MainMenu(instance).create().show(); - } - - public ViewPager getViewPager() - { - return pager; - } -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/view/activity/SettingActivity.java b/src/net/miz_hi/smileessence/view/activity/SettingActivity.java deleted file mode 100644 index bc9311e8..00000000 --- a/src/net/miz_hi/smileessence/view/activity/SettingActivity.java +++ /dev/null @@ -1,113 +0,0 @@ -package net.miz_hi.smileessence.view.activity;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.content.DialogInterface.OnClickListener;
-import android.os.Bundle;
-import android.preference.Preference;
-import android.preference.Preference.OnPreferenceClickListener;
-import android.preference.PreferenceActivity;
-import net.miz_hi.smileessence.Client;
-import net.miz_hi.smileessence.R;
-import net.miz_hi.smileessence.auth.AuthenticationDB;
-import net.miz_hi.smileessence.command.main.CommandInformation;
-import net.miz_hi.smileessence.command.main.CommandOpenLicense;
-import net.miz_hi.smileessence.dialog.ConfirmDialog;
-import net.miz_hi.smileessence.dialog.SeekBarDialog;
-import net.miz_hi.smileessence.notification.Notificator;
-import net.miz_hi.smileessence.preference.EnumPreferenceKey;
-
-public class SettingActivity extends PreferenceActivity
-{
-
- @Override
- protected void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
- addPreferencesFromResource(R.xml.preference);
-
- Preference textSize = findPreference(getResources().getString(R.string.key_setting_textSize));
- textSize.setOnPreferenceClickListener(new OnPreferenceClickListener()
- {
- @Override
- public boolean onPreferenceClick(Preference preference)
- {
- final SeekBarDialog helper = new SeekBarDialog(SettingActivity.this, "テキストサイズ");
- helper.setSeekBarMax(16);
- helper.setSeekBarStart(Client.getTextSize() - 8);
- helper.setLevelCorrect(8);
- helper.setText("デフォルト = 10");
- helper.setOnClickListener(new OnClickListener()
- {
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- Client.putPreferenceValue(EnumPreferenceKey.TEXT_SIZE, helper.getProgress() + 8);
- Client.loadPreferences();
- }
- });
- helper.createSeekBarDialog().show();
- return true;
- }
- });
-
- Preference deleteAccounts = findPreference(getResources().getString(R.string.key_setting_delete_accounts));
- deleteAccounts.setOnPreferenceClickListener(new OnPreferenceClickListener()
- {
- @Override
- public boolean onPreferenceClick(Preference preference)
- {
- ConfirmDialog helper = new ConfirmDialog(SettingActivity.this, "本当にリセットしますか？");
- helper.setOnClickListener(new OnClickListener()
- {
-
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- switch (which)
- {
- case DialogInterface.BUTTON_POSITIVE:
- {
- Notificator.toast("全ての認証情報をリセットします。再起動してください");
- AuthenticationDB.instance().deleteAll();
- finish();
- MainActivity.getInstance().finish(true);
- break;
- }
- default:
- {
- dialog.dismiss();
- }
- }
-
- }
- });
- helper.createYesNoAlert().show();
- return true;
- }
- });
-
- Preference appInfo = findPreference(getResources().getString(R.string.app_info));
- appInfo.setOnPreferenceClickListener(new OnPreferenceClickListener()
- {
- @Override
- public boolean onPreferenceClick(Preference preference)
- {
- new CommandInformation((Activity) preference.getContext()).run();
- return true;
- }
- });
-
- Preference licenseNotice = findPreference(getResources().getString(R.string.license_notices));
- licenseNotice.setOnPreferenceClickListener(new OnPreferenceClickListener()
- {
- @Override
- public boolean onPreferenceClick(Preference preference)
- {
- new CommandOpenLicense((Activity) preference.getContext()).run();
- return true;
- }
- });
- }
-
-}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/view/activity/TemplateActivity.java b/src/net/miz_hi/smileessence/view/activity/TemplateActivity.java deleted file mode 100644 index 61eb1a63..00000000 --- a/src/net/miz_hi/smileessence/view/activity/TemplateActivity.java +++ /dev/null @@ -1,76 +0,0 @@ -package net.miz_hi.smileessence.view.activity;
-
-import android.app.Activity;
-import android.content.DialogInterface;
-import android.os.Bundle;
-import android.view.View;
-import android.view.View.OnClickListener;
-import android.widget.EditText;
-import android.widget.ImageButton;
-import android.widget.ListView;
-import android.widget.TextView;
-import net.miz_hi.smileessence.R;
-import net.miz_hi.smileessence.data.template.Template;
-import net.miz_hi.smileessence.data.template.TemplateListAdapter;
-import net.miz_hi.smileessence.data.template.TemplateManager;
-import net.miz_hi.smileessence.dialog.ContentDialog;
-
-public class TemplateActivity extends Activity
-{
-
- @Override
- protected void onCreate(Bundle savedInstanceState)
- {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.listedit_layout);
-
- TextView titleView = (TextView) findViewById(R.id.listedit_title);
- titleView.setText("定型文の管理");
- ListView listView = (ListView) findViewById(R.id.listedit_listview);
- ImageButton buttonAdd = (ImageButton) findViewById(R.id.listedit_addbutton);
- final TemplateListAdapter adapter = new TemplateListAdapter(this);
- listView.setAdapter(adapter);
- adapter.addAll(TemplateManager.getTemplates());
- adapter.forceNotifyAdapter();
- buttonAdd.setOnClickListener(new OnClickListener()
- {
-
- @Override
- public void onClick(View v)
- {
- final EditText editText = new EditText(TemplateActivity.this);
- ContentDialog dialog = new ContentDialog(TemplateActivity.this, "編集");
- dialog.setContentView(editText);
- dialog.setOnClickListener(new DialogInterface.OnClickListener()
- {
-
- @Override
- public void onClick(DialogInterface dialog, int which)
- {
- switch (which)
- {
- case DialogInterface.BUTTON_NEGATIVE:
- {
- break;
- }
- case DialogInterface.BUTTON_POSITIVE:
- {
- String newText = editText.getText().toString();
-
- Template template = new Template(newText);
- TemplateManager.addTemplate(template);
- adapter.clear();
- adapter.addAll(TemplateManager.getTemplates());
- adapter.forceNotifyAdapter();
- break;
- }
- }
- }
- });
- dialog.setTextPositive("決定");
- dialog.setTextNegative("キャンセル");
- dialog.create().show();
- }
- });
- }
-}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/view/activity/WebViewActivity.java b/src/net/miz_hi/smileessence/view/activity/WebViewActivity.java deleted file mode 100644 index 4eeab1ac..00000000 --- a/src/net/miz_hi/smileessence/view/activity/WebViewActivity.java +++ /dev/null @@ -1,49 +0,0 @@ -package net.miz_hi.smileessence.view.activity; - -import android.app.Activity; -import android.content.Intent; -import android.net.Uri; -import android.os.Bundle; -import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; -import android.webkit.CookieSyncManager; -import android.webkit.WebView; -import android.webkit.WebViewClient; -import net.miz_hi.smileessence.Client; - -public class WebViewActivity extends Activity -{ - - @Override - public void onCreate(Bundle bundle) - { - super.onCreate(bundle); - WebView webView = new WebView(this); - - CookieSyncManager.createInstance(this).resetSync(); - setContentView(webView, new LayoutParams(ViewGroup.LayoutParams.FILL_PARENT, ViewGroup.LayoutParams.FILL_PARENT)); - Uri uri = getIntent().getData(); - if (uri == null) - { - finish(); - } - webView.setWebViewClient(new WebViewClient() - { - @Override - public void onPageFinished(WebView view, String url) - { - super.onPageFinished(view, url); - if (url.startsWith(Client.CALLBACK_OAUTH)) - { - Intent intent = new Intent(); - intent.setData(Uri.parse(url)); - setResult(RESULT_OK, intent); - finish(); - } - } - - }); - - webView.loadUrl(uri.toString()); - } -} diff --git a/src/net/miz_hi/smileessence/view/fragment/NamedFragment.java b/src/net/miz_hi/smileessence/view/fragment/NamedFragment.java deleted file mode 100644 index 5ca97b5c..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/NamedFragment.java +++ /dev/null @@ -1,24 +0,0 @@ -package net.miz_hi.smileessence.view.fragment; - -import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; - -public abstract class NamedFragment extends Fragment -{ - - @Override - public void onCreate(Bundle savedInstanceState) - { - super.onCreate(savedInstanceState); - setRetainInstance(true); - } - - public abstract String getTitle(); - - @Override - public abstract View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState); - -} diff --git a/src/net/miz_hi/smileessence/view/fragment/NamedFragmentPagerAdapter.java b/src/net/miz_hi/smileessence/view/fragment/NamedFragmentPagerAdapter.java deleted file mode 100644 index 1a88f361..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/NamedFragmentPagerAdapter.java +++ /dev/null @@ -1,94 +0,0 @@ -package net.miz_hi.smileessence.view.fragment; - -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentManager; -import android.support.v4.app.FragmentStatePagerAdapter; -import net.miz_hi.smileessence.view.IRemovable; - -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -public class NamedFragmentPagerAdapter extends FragmentStatePagerAdapter -{ - - private ArrayList<NamedFragment> pageList = new ArrayList<NamedFragment>(); - - public NamedFragmentPagerAdapter(FragmentManager fm, Collection<NamedFragment> fragments) - { - super(fm); - pageList.addAll(fragments); - } - - public NamedFragmentPagerAdapter(FragmentManager fm) - { - super(fm); - } - - @Override - public synchronized CharSequence getPageTitle(int position) - { - return pageList.get(position).getTitle(); - } - - @Override - public synchronized int getCount() - { - return pageList.size(); - } - - public List<NamedFragment> getList() - { - return pageList; - } - - public synchronized boolean add(NamedFragment element) - { - boolean frag = true; - for (NamedFragment fragment : pageList) - { - if (fragment.getTitle().equals(element.getTitle())) - { - pageList.remove(fragment); - frag = false; - break; - } - } - pageList.add(element); - return frag; - } - - public synchronized void set(NamedFragment element, int index) - { - pageList.add(index, element); - } - - public synchronized void remove(NamedFragment element) - { - pageList.remove(element); - if (element instanceof IRemovable) - { - ((IRemovable) element).onRemoved(); - } - } - - public synchronized void remove(int i) - { - NamedFragment fragment = pageList.get(i); - remove(fragment); - } - - @Override - public Fragment getItem(int position) - { - return pageList.get(position); - } - - @Override - public int getItemPosition(Object object) - { - int index = pageList.indexOf(object); - return index != -1 ? index : POSITION_NONE; - } - -} diff --git a/src/net/miz_hi/smileessence/view/fragment/impl/DirectMessageFragment.java b/src/net/miz_hi/smileessence/view/fragment/impl/DirectMessageFragment.java deleted file mode 100644 index 69f932e0..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/impl/DirectMessageFragment.java +++ /dev/null @@ -1,26 +0,0 @@ -package net.miz_hi.smileessence.view.fragment.impl; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import net.miz_hi.smileessence.view.fragment.NamedFragment; - -public class DirectMessageFragment extends NamedFragment -{ - - @Override - public String getTitle() - { - // TODO Auto-generated method stub - return null; - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - // TODO Auto-generated method stub - return null; - } - -} diff --git a/src/net/miz_hi/smileessence/view/fragment/impl/HistoryFragment.java b/src/net/miz_hi/smileessence/view/fragment/impl/HistoryFragment.java deleted file mode 100644 index d4b95505..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/impl/HistoryFragment.java +++ /dev/null @@ -1,47 +0,0 @@ -package net.miz_hi.smileessence.view.fragment.impl; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; -import android.widget.LinearLayout; -import android.widget.ListView; -import android.widget.TextView; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.listener.TimelineScrollListener; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.util.CustomListAdapter; -import net.miz_hi.smileessence.view.fragment.NamedFragment; - -public class HistoryFragment extends NamedFragment -{ - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - LinearLayout page = (LinearLayout) inflater.inflate(R.layout.listpage_layout, container, false); - ListView listView = (ListView) page.findViewById(R.id.listpage_listview); - TextView text = new TextView(getActivity()); - text.setText("ふぁぼられたり、リツイートされたりした履歴が表示されます"); - text.setTextColor(Client.getColor(R.color.Gray2)); - text.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); - text.setVisibility(View.GONE); - ((ViewGroup) listView.getParent()).addView(text); - listView.setEmptyView(text); - listView.setFastScrollEnabled(true); - CustomListAdapter<?> adapter = StatusListManager.getAdapter(StatusListManager.getHistoryTimeline()); - listView.setAdapter(adapter); - listView.setOnScrollListener(new TimelineScrollListener(adapter)); - - return page; - } - - @Override - public String getTitle() - { - return "History"; - } - -} diff --git a/src/net/miz_hi/smileessence/view/fragment/impl/HomeFragment.java b/src/net/miz_hi/smileessence/view/fragment/impl/HomeFragment.java deleted file mode 100644 index 2d882544..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/impl/HomeFragment.java +++ /dev/null @@ -1,44 +0,0 @@ -package net.miz_hi.smileessence.view.fragment.impl; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; -import android.widget.LinearLayout; -import android.widget.ListView; -import android.widget.ProgressBar; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.listener.TimelineScrollListener; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.util.CustomListAdapter; -import net.miz_hi.smileessence.view.fragment.NamedFragment; - -public class HomeFragment extends NamedFragment -{ - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - LinearLayout page = (LinearLayout) inflater.inflate(R.layout.listpage_layout, container, false); - ListView listView = (ListView) page.findViewById(R.id.listpage_listview); - ProgressBar progress = new ProgressBar(getActivity()); - progress.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); - progress.setVisibility(View.GONE); - ((ViewGroup) listView.getParent()).addView(progress); - listView.setEmptyView(progress); - listView.setFastScrollEnabled(true); - CustomListAdapter<?> adapter = StatusListManager.getAdapter(StatusListManager.getHomeTimeline()); - listView.setAdapter(adapter); - listView.setOnScrollListener(new TimelineScrollListener(adapter)); - listView.destroyDrawingCache(); - return page; - } - - @Override - public String getTitle() - { - return "Home"; - } - -} diff --git a/src/net/miz_hi/smileessence/view/fragment/impl/ListFragment.java b/src/net/miz_hi/smileessence/view/fragment/impl/ListFragment.java deleted file mode 100644 index 98a6f08a..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/impl/ListFragment.java +++ /dev/null @@ -1,118 +0,0 @@ -package net.miz_hi.smileessence.view.fragment.impl; - -import android.app.ProgressDialog; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.ListView; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.listener.TimelineScrollListener; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.statuslist.timeline.Timeline; -import net.miz_hi.smileessence.statuslist.StatusListAdapter; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.task.impl.GetListTimelineTask; -import net.miz_hi.smileessence.view.IRemovable; -import net.miz_hi.smileessence.view.activity.MainActivity; -import net.miz_hi.smileessence.view.fragment.NamedFragment; -import twitter4j.Paging; - -import java.util.Collections; -import java.util.List; - -public class ListFragment extends NamedFragment implements IRemovable, OnClickListener -{ - - String name; - int id; - boolean inited; - - public static ListFragment newInstance(int id, String fullName) - { - ListFragment fragment = new ListFragment(); - fragment.name = fullName; - fragment.id = id; - fragment.inited = false; - return fragment; - } - - - @Override - public String getTitle() - { - return name; - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View page = inflater.inflate(R.layout.listpage_refresh_layout, container, false); - ListView listView = (ListView) page.findViewById(R.id.listpage_listview); - listView.setFastScrollEnabled(true); - StatusListAdapter adapter = StatusListManager.getAdapter(StatusListManager.getListTimeline(id)); - listView.setAdapter(adapter); - listView.setOnScrollListener(new TimelineScrollListener(adapter)); - Button refresh = (Button) page.findViewById(R.id.listpage_refresh); - refresh.setOnClickListener(this); - return page; - } - - public void refresh() - { - inited = true; - final ProgressDialog pd = ProgressDialog.show(MainActivity.getInstance(), "", name + "を取得中..."); - MyExecutor.execute(new Runnable() - { - public void run() - { - - Timeline timeline = StatusListManager.getListTimeline(id); - StatusListAdapter adapter = StatusListManager.getAdapter(timeline); - List<TweetModel> list; - if (timeline.getStatusList().length > 0) - { - long lastId = ((TweetModel) timeline.getStatus(0)).statusId; - list = new GetListTimelineTask(Client.getMainAccount(), id, new Paging(1, 50, lastId)).call(); - } - else - { - list = new GetListTimelineTask(Client.getMainAccount(), id, new Paging(1, 50)).call(); - } - - Collections.reverse(list); - for (TweetModel status : list) - { - timeline.addToTop(status); - } - adapter.forceNotifyAdapter(); - pd.dismiss(); - } - }); - } - - @Override - public void onRemoved() - { - StatusListManager.removeListTimeline(id); - } - - @Override - public void onClick(View v) - { - if (v.getId() == R.id.listpage_refresh) - { - refresh(); - } - } - - public boolean isNotInited() - { - return !inited; - } - -} diff --git a/src/net/miz_hi/smileessence/view/fragment/impl/MentionsFragment.java b/src/net/miz_hi/smileessence/view/fragment/impl/MentionsFragment.java deleted file mode 100644 index 7aa60e99..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/impl/MentionsFragment.java +++ /dev/null @@ -1,43 +0,0 @@ -package net.miz_hi.smileessence.view.fragment.impl; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; -import android.widget.ListView; -import android.widget.ProgressBar; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.listener.TimelineScrollListener; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.util.CustomListAdapter; -import net.miz_hi.smileessence.view.fragment.NamedFragment; - -public class MentionsFragment extends NamedFragment -{ - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View page = inflater.inflate(R.layout.listpage_layout, container, false); - ListView listView = (ListView) page.findViewById(R.id.listpage_listview); - ProgressBar progress = new ProgressBar(getActivity()); - progress.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); - progress.setVisibility(View.GONE); - ((ViewGroup) listView.getParent()).addView(progress); - listView.setEmptyView(progress); - listView.setFastScrollEnabled(true); - CustomListAdapter<?> adapter = StatusListManager.getAdapter(StatusListManager.getMentionsTimeline()); - listView.setAdapter(adapter); - listView.setOnScrollListener(new TimelineScrollListener(adapter)); - - return page; - } - - @Override - public String getTitle() - { - return "Mentions"; - } - -} diff --git a/src/net/miz_hi/smileessence/view/fragment/impl/PostFragment.java b/src/net/miz_hi/smileessence/view/fragment/impl/PostFragment.java deleted file mode 100644 index 39f09081..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/impl/PostFragment.java +++ /dev/null @@ -1,477 +0,0 @@ -package net.miz_hi.smileessence.view.fragment.impl; - -import android.annotation.SuppressLint; -import android.content.ContentValues; -import android.content.Context; -import android.content.Intent; -import android.graphics.Bitmap; -import android.graphics.BitmapFactory; -import android.graphics.BitmapFactory.Options; -import android.os.Bundle; -import android.provider.MediaStore; -import android.provider.MediaStore.MediaColumns; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.view.inputmethod.InputMethodManager; -import android.widget.*; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.command.ICommand; -import net.miz_hi.smileessence.command.MenuCommand; -import net.miz_hi.smileessence.core.EnumRequestCode; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.dialog.ConfirmDialog; -import net.miz_hi.smileessence.dialog.SimpleMenuDialog; -import net.miz_hi.smileessence.listener.PostEditTextListener; -import net.miz_hi.smileessence.menu.PostingMenu; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.notification.Notificator; -import net.miz_hi.smileessence.preference.EnumPreferenceKey; -import net.miz_hi.smileessence.status.StatusViewFactory; -import net.miz_hi.smileessence.status.TweetUtils; -import net.miz_hi.smileessence.system.MainActivitySystem; -import net.miz_hi.smileessence.system.PostSystem; -import net.miz_hi.smileessence.system.PostSystem.PostPageState; -import net.miz_hi.smileessence.util.UiHandler; -import net.miz_hi.smileessence.view.activity.MainActivity; -import net.miz_hi.smileessence.view.fragment.NamedFragment; - -import java.util.ArrayList; -import java.util.List; - -@SuppressLint("ValidFragment") -public class PostFragment extends NamedFragment implements OnClickListener -{ - - TextView textCount; - EditText editText; - FrameLayout frameInReplyTo; - ImageView imagePict; - private static PostFragment singleton; - - public static PostFragment singleton() - { - return singleton; - } - - public PostFragment() - { - singleton = this; - } - - @Override - public String getTitle() - { - return "Post"; - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View page = inflater.inflate(R.layout.post_layout, container, false); - editText = (EditText) page.findViewById(R.id.editText_tweet); - frameInReplyTo = (FrameLayout) page.findViewById(R.id.frame_inreplyto); - imagePict = (ImageView) page.findViewById(R.id.image_pict); - textCount = (TextView) page.findViewById(R.id.textView_count); - Button imageButtonSubmit = (Button) page.findViewById(R.id.imBtn_tweet); - ImageButton imageButtonDelete = (ImageButton) page.findViewById(R.id.imBtn_delete); - ImageButton imageButtonMenu = (ImageButton) page.findViewById(R.id.imBtn_tweetmenu); - ImageButton imageButtonPict = (ImageButton) page.findViewById(R.id.imBtn_pickpict); - - PostEditTextListener listener = new PostEditTextListener(textCount); - editText.setTextSize(Client.getTextSize() + 3); - editText.addTextChangedListener(listener); - editText.setOnFocusChangeListener(listener); - imageButtonSubmit.setOnClickListener(this); - imageButtonDelete.setOnClickListener(this); - imageButtonMenu.setOnClickListener(this); - imageButtonPict.setOnClickListener(this); - imagePict.setOnClickListener(this); - - return page; - } - - public void update() - { - new UiHandler() - { - - @Override - public void run() - { - PostPageState state = PostSystem.getState(); - String text = state.getText(); - setText(text); - int cursor = state.getCursor(); - setCursor(cursor); - long inReplyTo = state.getInReplyToStatusId(); - setInReplyTo(inReplyTo); - String picturePath = state.getPicturePath(); - setPicture(picturePath); - } - }.post(); - } - - public void load() - { - new UiHandler() - { - - @Override - public void run() - { - PostPageState state = PostSystem.getState(); - String text = state.getText(); - setText(text); - int cursor = state.getCursor(); - setCursor(cursor); - long inReplyTo = state.getInReplyToStatusId(); - setInReplyTo(inReplyTo); - String picturePath = state.getPicturePath(); - setPicture(picturePath); - openIme(); - } - }.post(); - } - - /** - * save to state: text, cursor - */ - public void save() - { - if (editText != null) - { - PostPageState state = PostSystem.getState(); - String text = editText.getText().toString(); - state.setText(text); - int cursor = editText.getSelectionEnd(); - state.setCursor(cursor); - } - hideIme(); - } - - public void setText(final String s) - { - if (editText == null) - { - return; - } - - new UiHandler() - { - - @Override - public void run() - { - editText.setText(s); - } - }.post(); - } - - public void setCursor(final int i) - { - if (editText == null) - { - return; - } - - new UiHandler() - { - - @Override - public void run() - { - if (i < 0) - { - editText.setSelection(0); - } - else if (i > editText.getText().length()) - { - editText.setSelection(editText.getText().length()); - } - else - { - editText.setSelection(i); - } - - } - }.post(); - } - - public void setInReplyTo(final long l) - { - if (frameInReplyTo == null) - { - return; - } - - if (l == PostSystem.NONE_ID) - { - new UiHandler() - { - - @Override - public void run() - { - frameInReplyTo.setVisibility(View.GONE); - } - }.post(); - } - else - { - MyExecutor.execute(new Runnable() - { - - @Override - public void run() - { - try - { - TweetModel status = TweetUtils.getOrCreateStatusModel(l); - final View v = StatusViewFactory.newInstance(MainActivity.getInstance().getLayoutInflater(), null).getStatusView(status); - new UiHandler() - { - - @Override - public void run() - { - frameInReplyTo.removeAllViews(); - frameInReplyTo.addView(v); - frameInReplyTo.setVisibility(View.VISIBLE); - } - }.post(); - } - catch (Exception e) - { - e.printStackTrace(); - } - } - }); - } - } - - - public void setPicture(final String path) - { - if (imagePict == null) - { - return; - } - if (path == null) - { - imagePict.setVisibility(View.GONE); - return; - } - MyExecutor.execute(new Runnable() - { - public void run() - { - new UiHandler() - { - - @Override - public void run() - { - Options opt = new Options(); - opt.inPurgeable = true; // GC可能にする - opt.inSampleSize = 2; - Bitmap bm = BitmapFactory.decodeFile(path, opt); - imagePict.setImageBitmap(bm); - imagePict.setVisibility(View.VISIBLE); - } - }.post(); - } - }); - } - - public void clear() - { - editText.setText(""); - setInReplyTo(PostSystem.NONE_ID); - PostSystem.clear(true); - removePicture(); - } - - public void clearBySubmit() - { - editText.setText(""); - setInReplyTo(PostSystem.NONE_ID); - PostSystem.clear(false); - imagePict.setVisibility(View.GONE); - } - - public void removePicture() - { - if (imagePict.isShown()) - { - ConfirmDialog.show(MainActivity.getInstance(), "画像の投稿を取り消しますか？", new Runnable() - { - - @Override - public void run() - { - PostSystem.getState().clearPicturePath(); - imagePict.setVisibility(View.GONE); - Notificator.info("取り消しました"); - } - }); - } - } - - public void openIme() - { - if (editText == null) - { - return; - } - - new UiHandler() - { - - @Override - public void run() - { - if (Client.<Boolean>getPreferenceValue(EnumPreferenceKey.OPEN_IME)) - { - InputMethodManager imm = (InputMethodManager) Client.getApplication().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.showSoftInput(editText, 0); - } - } - }.post(); - } - - public void hideIme() - { - if (editText == null) - { - return; - } - - new UiHandler() - { - - @Override - public void run() - { - InputMethodManager imm = (InputMethodManager) Client.getApplication().getSystemService(Context.INPUT_METHOD_SERVICE); - imm.hideSoftInputFromWindow(editText.getWindowToken(), 0); - } - }.post(); - } - - private void startGallery() - { - Intent intent = new Intent(Intent.ACTION_PICK); - intent.setType("image/*"); - getActivity().startActivityForResult(intent, EnumRequestCode.PICTURE.ordinal()); - } - - private void startCamera() - { - MainActivitySystem system = MainActivity.getInstance().system; - ContentValues values = new ContentValues(); - String filename = System.currentTimeMillis() + ".jpg"; - // 必要な情報を詰める - values.put(MediaColumns.TITLE, filename); - values.put(MediaColumns.MIME_TYPE, "image/jpeg"); - - // Uriを取得して覚えておく、Intentにも保存先として渡す - system.tempFilePath = getActivity().getContentResolver().insert(MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values); - // インテントの設定 - Intent intent = new Intent(); - intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE); - intent.putExtra(MediaStore.EXTRA_OUTPUT, system.tempFilePath); - getActivity().startActivityForResult(intent, EnumRequestCode.CAMERA.ordinal()); - } - - @Override - public void onClick(View v) - { - switch (v.getId()) - { - case R.id.imBtn_tweet: - { - if (PostSystem.submit(editText.getText().toString())) - { - if (Client.<Boolean>getPreferenceValue(EnumPreferenceKey.AFTER_SUBMIT)) - { - MainActivity.getInstance().getViewPager().setCurrentItem(1); - } - clearBySubmit(); - } - break; - } - case R.id.imBtn_tweetmenu: - { - save(); - new PostingMenu(getActivity()).create().show(); - break; - } - case R.id.imBtn_pickpict: - { - save(); - SimpleMenuDialog selectImageDialog = new SimpleMenuDialog(getActivity()) - { - @Override - public List<ICommand> getMenuList() - { - List<ICommand> list = new ArrayList<ICommand>(); - list.add(new MenuCommand() - { - @Override - public void workOnUiThread() - { - startGallery(); - } - - @Override - public String getName() - { - return "画像を選択"; - } - }); - - list.add(new MenuCommand() - { - @Override - public void workOnUiThread() - { - startCamera(); - } - - @Override - public String getName() - { - return "カメラを起動"; - } - }); - return list; - } - }; - selectImageDialog.create().show(); - break; - } - case R.id.imBtn_delete: - { - ConfirmDialog.show(getActivity(), "全消去しますか？", new Runnable() - { - @Override - public void run() - { - clear(); - } - }); - break; - } - case R.id.image_pict: - { - removePicture(); - break; - } - default: - break; - } - } -}
\ No newline at end of file diff --git a/src/net/miz_hi/smileessence/view/fragment/impl/SearchFragmemt.java b/src/net/miz_hi/smileessence/view/fragment/impl/SearchFragmemt.java deleted file mode 100644 index ecdff144..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/impl/SearchFragmemt.java +++ /dev/null @@ -1,25 +0,0 @@ -package net.miz_hi.smileessence.view.fragment.impl; - -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import net.miz_hi.smileessence.view.fragment.NamedFragment; - -public class SearchFragmemt extends NamedFragment -{ - - @Override - public String getTitle() - { - return "Search"; - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - // TODO Auto-generated method stub - return null; - } - -} diff --git a/src/net/miz_hi/smileessence/view/fragment/impl/TalkFragment.java b/src/net/miz_hi/smileessence/view/fragment/impl/TalkFragment.java deleted file mode 100644 index 01a0733e..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/impl/TalkFragment.java +++ /dev/null @@ -1,80 +0,0 @@ -package net.miz_hi.smileessence.view.fragment.impl; - -import android.annotation.SuppressLint; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; -import android.widget.ListView; -import android.widget.ProgressBar; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.listener.TimelineScrollListener; -import net.miz_hi.smileessence.statuslist.StatusListAdapter; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.talkchase.TalkChaser; -import net.miz_hi.smileessence.talkchase.TalkManager; -import net.miz_hi.smileessence.view.IRemovable; -import net.miz_hi.smileessence.view.fragment.NamedFragment; - -@SuppressLint("ValidFragment") -public class TalkFragment extends NamedFragment implements IRemovable -{ - - long chasingId = -1; - int talkId; - ListView listView; - - private TalkFragment() - { - } - - public static TalkFragment newInstance(int talkId, long chasingId) - { - TalkFragment relFragment = new TalkFragment(); - relFragment.talkId = talkId; - relFragment.chasingId = chasingId; - return relFragment; - } - - public long getChasingId() - { - return chasingId; - } - - public void setChasingId(long id) - { - chasingId = id; - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View page = inflater.inflate(R.layout.listpage_layout, container, false); - listView = (ListView) page.findViewById(R.id.listpage_listview); - ProgressBar progress = new ProgressBar(getActivity()); - progress.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); - progress.setVisibility(View.GONE); - ((ViewGroup) listView.getParent()).addView(progress); - listView.setEmptyView(progress); - listView.setFastScrollEnabled(true); - TalkChaser chaser = TalkManager.getChaser(talkId); - StatusListAdapter adapter = StatusListManager.getAdapter(chaser.talkList); - listView.setAdapter(adapter); - listView.setOnScrollListener(new TimelineScrollListener(adapter)); - return page; - } - - @Override - public String getTitle() - { - return "Talk-" + (talkId + 1); - } - - @Override - public void onRemoved() - { - TalkChaser chaser = TalkManager.getChaser(talkId); - chaser.stopRelation(); - } -} diff --git a/src/net/miz_hi/smileessence/view/fragment/impl/UserInfoFragment.java b/src/net/miz_hi/smileessence/view/fragment/impl/UserInfoFragment.java deleted file mode 100644 index 289b3acf..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/impl/UserInfoFragment.java +++ /dev/null @@ -1,157 +0,0 @@ -package net.miz_hi.smileessence.view.fragment.impl; - -import android.annotation.SuppressLint; -import android.app.ProgressDialog; -import android.os.Bundle; -import android.text.TextUtils; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.widget.Button; -import android.widget.ImageView; -import android.widget.TextView; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.cache.IconCache; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.menu.UserMenu; -import net.miz_hi.smileessence.model.status.user.UserModel; -import net.miz_hi.smileessence.task.impl.GetUserTask; -import net.miz_hi.smileessence.util.UiHandler; -import net.miz_hi.smileessence.view.IRemovable; -import net.miz_hi.smileessence.view.fragment.NamedFragment; - -@SuppressLint("ValidFragment") -public class UserInfoFragment extends NamedFragment implements OnClickListener, IRemovable -{ - - UserModel user; - TextView screennameView; - TextView nameView; - TextView homepageView; - TextView locateView; - TextView isFollowingView; - TextView isFollowedView; - TextView isProtectedView; - TextView descriptionView; - TextView tweetcountView; - TextView followingView; - TextView followedView; - TextView favoriteView; - ImageView iconView; - - private UserInfoFragment() - { - } - - public static UserInfoFragment newInstance(UserModel user) - { - UserInfoFragment fragment = new UserInfoFragment(); - fragment.user = user; - return fragment; - } - - @Override - public String getTitle() - { - return user.screenName + "'s Profile"; - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View page = inflater.inflate(R.layout.userinfo_layout, container, false); - Button reload = (Button) page.findViewById(R.id.user_reload); - reload.setOnClickListener(this); - Button menu = (Button) page.findViewById(R.id.user_menu); - menu.setOnClickListener(this); - - screennameView = (TextView) page.findViewById(R.id.user_screenname); - nameView = (TextView) page.findViewById(R.id.user_name); - homepageView = (TextView) page.findViewById(R.id.user_homepage); - locateView = (TextView) page.findViewById(R.id.user_locate); - isFollowingView = (TextView) page.findViewById(R.id.user_isfollowing); - isFollowedView = (TextView) page.findViewById(R.id.user_isfollowed); - isProtectedView = (TextView) page.findViewById(R.id.user_isprotected); - descriptionView = (TextView) page.findViewById(R.id.user_bio); - tweetcountView = (TextView) page.findViewById(R.id.user_count_tweet); - followingView = (TextView) page.findViewById(R.id.user_count_following); - followedView = (TextView) page.findViewById(R.id.user_count_followed); - favoriteView = (TextView) page.findViewById(R.id.user_count_favorite); - iconView = (ImageView) page.findViewById(R.id.user_icon); - reload(false); - return page; - } - - private void reload(final boolean force) - { - new UiHandler() - { - - @Override - public void run() - { - screennameView.setText(user.screenName); - nameView.setText(user.name); - if (TextUtils.isEmpty(user.homePageUrl)) - { - homepageView.setVisibility(View.GONE); - } - else - { - homepageView.setText(user.homePageUrl); - } - if (TextUtils.isEmpty(user.location)) - { - locateView.setVisibility(View.GONE); - } - else - { - locateView.setText(user.location); - } - isFollowingView.setText(user.isFriend(force) ? "フォローしています" : user.isMe() ? "あなたです" : "フォローしていません"); - isFollowedView.setText(user.isFollower(force) ? "フォローされています" : user.isMe() ? "あなたです" : "フォローされていません"); - isProtectedView.setText(user.isProtected ? "非公開" : "公開"); - descriptionView.setText(user.description); - tweetcountView.setText(Integer.toString(user.statusCount)); - followingView.setText(Integer.toString(user.friendCount)); - followedView.setText(Integer.toString(user.followerCount)); - favoriteView.setText(Integer.toString(user.favoriteCount)); - IconCache.setIconBitmapToView(user, iconView); - } - }.post(); - } - - @Override - public void onClick(View v) - { - switch (v.getId()) - { - case R.id.user_reload: - { - final ProgressDialog pd = ProgressDialog.show(getActivity(), null, "情報を更新中...", true); - MyExecutor.execute(new Runnable() - { - public void run() - { - user.updateData(new GetUserTask(user.userId).call()); - reload(true); - pd.dismiss(); - } - }); - break; - } - case R.id.user_menu: - { - new UserMenu(getActivity(), user).create().show(); - break; - } - } - } - - @Override - public void onRemoved() - { - } - -} diff --git a/src/net/miz_hi/smileessence/view/fragment/impl/UserTimelineFragment.java b/src/net/miz_hi/smileessence/view/fragment/impl/UserTimelineFragment.java deleted file mode 100644 index 7219d61d..00000000 --- a/src/net/miz_hi/smileessence/view/fragment/impl/UserTimelineFragment.java +++ /dev/null @@ -1,124 +0,0 @@ -package net.miz_hi.smileessence.view.fragment.impl; - -import android.annotation.SuppressLint; -import android.app.ProgressDialog; -import android.os.Bundle; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.view.ViewGroup.LayoutParams; -import android.widget.Button; -import android.widget.ListView; -import android.widget.ProgressBar; -import net.miz_hi.smileessence.Client; -import net.miz_hi.smileessence.R; -import net.miz_hi.smileessence.core.MyExecutor; -import net.miz_hi.smileessence.listener.TimelineScrollListener; -import net.miz_hi.smileessence.model.status.tweet.TweetModel; -import net.miz_hi.smileessence.model.status.user.UserModel; -import net.miz_hi.smileessence.model.statuslist.timeline.Timeline; -import net.miz_hi.smileessence.statuslist.StatusListAdapter; -import net.miz_hi.smileessence.statuslist.StatusListManager; -import net.miz_hi.smileessence.task.impl.GetUserTask; -import net.miz_hi.smileessence.task.impl.GetUserTimelineTask; -import net.miz_hi.smileessence.view.IRemovable; -import net.miz_hi.smileessence.view.fragment.NamedFragment; -import twitter4j.Paging; - -import java.util.Collections; -import java.util.List; - -@SuppressLint("ValidFragment") -public class UserTimelineFragment extends NamedFragment implements IRemovable, OnClickListener -{ - - UserModel user; - - private UserTimelineFragment() - { - } - - public static UserTimelineFragment newInstance(UserModel user) - { - UserTimelineFragment fragment = new UserTimelineFragment(); - fragment.user = user; - return fragment; - } - - @Override - public String getTitle() - { - return user.screenName + "'s Timeline"; - } - - @Override - public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) - { - View page = inflater.inflate(R.layout.listpage_refresh_layout, container, false); - ListView listView = (ListView) page.findViewById(R.id.listpage_listview); - ProgressBar progress = new ProgressBar(getActivity()); - progress.setLayoutParams(new LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT)); - progress.setVisibility(View.GONE); - ((ViewGroup) listView.getParent()).addView(progress); - listView.setEmptyView(progress); - listView.setFastScrollEnabled(true); - - StatusListAdapter adapter = StatusListManager.getAdapter(StatusListManager.getUserTimeline(user.userId)); - getUserTimeline(); - listView.setAdapter(adapter); - listView.setOnScrollListener(new TimelineScrollListener(adapter)); - Button refresh = (Button) page.findViewById(R.id.listpage_refresh); - refresh.setOnClickListener(this); - - return page; - } - - private void getUserTimeline() - { - final ProgressDialog pd = ProgressDialog.show(getActivity(), "", "取得中..."); - MyExecutor.execute(new Runnable() - { - public void run() - { - Timeline timeline = StatusListManager.getUserTimeline(user.userId); - StatusListAdapter adapter = StatusListManager.getAdapter(timeline); - user.updateData(new GetUserTask(user.userId).call()); - List<TweetModel> list; - if (timeline.getStatusList().length > 0) - { - long lastId = ((TweetModel) timeline.getStatus(0)).statusId; - list = new GetUserTimelineTask(Client.getMainAccount(), user.userId, new Paging(1, 20, lastId)).call(); - } - else - { - list = new GetUserTimelineTask(Client.getMainAccount(), user.userId, new Paging(1, 20)).call(); - } - - Collections.reverse(list); - for (TweetModel status : list) - { - timeline.addToTop(status); - } - adapter.forceNotifyAdapter(); - pd.dismiss(); - } - }); - } - - @Override - public void onRemoved() - { - StatusListManager.removeUserTimeline(user.userId); - } - - @Override - public void onClick(View v) - { - if (v.getId() == R.id.listpage_refresh) - { - getUserTimeline(); - } - } - -} diff --git a/src/twitter4j.properties b/src/twitter4j.properties new file mode 100644 index 00000000..14fb65c5 --- /dev/null +++ b/src/twitter4j.properties @@ -0,0 +1,3 @@ +debug=true +oauth.consumerKey=SIt6h4O6qmBB2URSKsF1Q +oauth.consumerSecret=Uil1dyrqiodLLqXIB6B0rVwVxFfFCxTf8ggAcszWc
\ No newline at end of file |
