delete some activities

delete arslan
delete FragmentTabHostDemo
delete MySwipeActivity
delete DrawerActivity

FisherAndroidChart/build.gradle → FisherView/build.gradle

@@ -4,12 +4,12 @@ apply plugin: 'com.github.dcendents.android-maven'
 group='com.github.RustFisher'
 
 android {
-    compileSdkVersion 24
-    buildToolsVersion "24.0.2"
+    compileSdkVersion 25
+    buildToolsVersion '25.0.2'
 
     defaultConfig {
         minSdkVersion 17
-        targetSdkVersion 24
+        targetSdkVersion 25
         versionCode 1
         versionName "1.0"
     }
@@ -22,7 +22,8 @@ android {
 }
 
 dependencies {
-    compile fileTree(dir: 'libs', include: ['*.jar'])
+    compile fileTree(include: ['*.jar'], dir: 'libs')
     testCompile 'junit:junit:4.12'
-    compile 'com.android.support:appcompat-v7:24.2.1'
+    compile 'com.android.support:support-v4:25.1.0'
+    compile 'com.android.support:appcompat-v7:25.1.0'
 }

FisherAndroidChart/src/androidTest/java/com/rustfisher/fisherandroidchart/ApplicationTest.java → FisherView/src/androidTest/java/com/rustfisher/view/ApplicationTest.java

@@ -1,4 +1,4 @@
-package com.rustfisher.fisherandroidchart;
+package com.rustfisher.view;
 
 import android.app.Application;
 import android.test.ApplicationTestCase;

FisherAndroidChart/src/main/AndroidManifest.xml → FisherView/src/main/AndroidManifest.xml

@@ -1,5 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.rustfisher.fisherandroidchart">
+    package="com.rustfisher.view">
 
     <application
         android:allowBackup="true"

FisherAndroidChart/src/main/java/com/rustfisher/fisherandroidchart/BulbView.java → FisherView/src/main/java/com/rustfisher/view/BulbView.java

@@ -1,4 +1,4 @@
-package com.rustfisher.fisherandroidchart;
+package com.rustfisher.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -8,7 +8,6 @@
 import android.graphics.RectF;
 import android.graphics.SweepGradient;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.util.TypedValue;
 import android.widget.ImageView;
 

FisherAndroidChart/src/main/java/com/rustfisher/fisherandroidchart/DashboardProgressView.java → FisherView/src/main/java/com/rustfisher/view/DashboardProgressView.java

@@ -1,4 +1,4 @@
-package com.rustfisher.fisherandroidchart;
+package com.rustfisher.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;

FisherAndroidChart/src/main/java/com/rustfisher/fisherandroidchart/Info.java → FisherView/src/main/java/com/rustfisher/view/Info.java

@@ -1,4 +1,4 @@
-package com.rustfisher.fisherandroidchart;
+package com.rustfisher.view;
 
 public final class Info {
     public static String getInfo() {

FisherAndroidChart/src/main/java/com/rustfisher/fisherandroidchart/MultiLinesChartSView.java → FisherView/src/main/java/com/rustfisher/view/MultiLinesChartSView.java

@@ -1,11 +1,10 @@
-package com.rustfisher.fisherandroidchart;
+package com.rustfisher.view;
 
 import android.content.Context;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Path;
-import android.support.annotation.Nullable;
 import android.support.v4.view.MotionEventCompat;
 import android.util.AttributeSet;
 import android.util.Log;

app/src/main/java/com/rust/aboutview/view/OptionCircle.java → FisherView/src/main/java/com/rustfisher/view/OptionCircle.java

@@ -1,12 +1,10 @@
-package com.rust.aboutview.view;
+package com.rustfisher.view;
 
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.graphics.Typeface;
-import android.graphics.drawable.BitmapDrawable;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;
 import android.widget.ImageView;

FisherView/src/main/res/values/strings.xml

@@ -0,0 +1,3 @@
+<resources>
+    <string name="app_name">FisherView</string>
+</resources>

FisherAndroidChart/src/test/java/com/rustfisher/fisherandroidchart/ExampleUnitTest.java → FisherView/src/test/java/com/rustfisher/view/ExampleUnitTest.java

@@ -1,4 +1,4 @@
-package com.rustfisher.fisherandroidchart;
+package com.rustfisher.view;
 
 import org.junit.Test;
 

aboutView.iml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<module external.linked.project.id="aboutView" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
+<module external.linked.project.id="aboutView" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" external.system.module.group="" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
   <component name="FacetManager">
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
@@ -13,7 +13,7 @@
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />
     </content>
-    <orderEntry type="jdk" jdkName="1.8" jdkType="JavaSDK" />
+    <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
 </module>

app/build.gradle

@@ -30,7 +30,7 @@ dependencies {
     // Because RxAndroid releases are few and far between, it is recommended you also
     // explicitly depend on RxJava's latest version for bug fixes and new features.
     compile 'io.reactivex:rxjava:1.1.6'
-    compile project(':FisherAndroidChart')
+    compile project(':FisherView')
 
     // view flipper
     compile 'com.github.devlight:infinitecycleviewpager:1.0.2'

app/src/main/AndroidManifest.xml

@@ -25,16 +25,15 @@
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
 
-        <service android:name="com.rust.service.MyService">
+        <service android:name=".service.MyService">
             <intent-filter>
                 <action android:name="com.rust.aidl.IMyService" />
             </intent-filter>
         </service>
 
-        <service android:name="com.rust.service.FloatingBarService" />
-        <service android:name="com.rust.service.AudioPlayService" />
+        <service android:name=".service.FloatingBarService" />
         <service
-            android:name="com.rust.service.MyDayDream"
+            android:name=".service.MyDayDream"
             android:exported="true"
             android:icon="@drawable/littleboygreen_x128"
             android:label="@string/my_day_dream_label"
@@ -46,7 +45,7 @@
         </service>
 
         <activity
-            android:name=".MainActivity"
+            android:name=".activity.MainActivity"
             android:screenOrientation="portrait"
             android:theme="@style/ActionBarTheme">
             <intent-filter>
@@ -56,44 +55,22 @@
             </intent-filter>
         </activity>
 
-        <activity android:name=".ImageProcessingActivity" />
-        <activity android:name=".ResolutionRatioActivity" />
-        <activity android:name=".MySwipeActivity" />
-        <activity android:name=".DrawerActivity" />
-        <activity android:name="com.rust.arslan.ArslanActivity" />
-        <activity android:name="com.rust.arslan.SettingsActivity" />
-        <activity android:name="com.rust.arslan.NetworkActivity" />
-        <activity android:name=".NotificationActivity" />
-        <activity android:name="com.rust.aboutview.ClipChildrenActivity" />
-        <activity android:name=".FrameAnimationActivity" />
-        <activity android:name=".CirclesActivity" />
+        <activity android:name=".activity.ImageProcessingActivity" />
+        <activity android:name=".activity.FrameAnimationActivity" />
+        <activity android:name=".activity.CirclesActivity" />
         <activity
-            android:name="com.rust.contactview.PeopleMainActivity"
+            android:name=".contactview.PeopleMainActivity"
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
-            android:name="com.rust.contactview.AddDataActivity"
+            android:name=".contactview.AddDataActivity"
             android:label="@string/title_add_data_activity"
             android:theme="@style/AppTheme.NoActionBar" />
-        <activity android:name="com.rust.contactview.ContactPeopleActivity" />
-        <activity android:name=".DrawLineActivity" />
-        <activity
-            android:name=".FragmentTabHostDemo"
-            android:theme="@style/Theme.AppCompat.Light.DarkActionBar" />
-        <activity android:name=".activity.FragmentCommunicationActivity" />
-        <activity
-            android:name=".activity.WriteHexFileActivity"
-            android:screenOrientation="portrait" />
-        <activity
-            android:name=".activity.AudioPlayerActivity"
-            android:screenOrientation="portrait" />
+        <activity android:name=".contactview.ContactPeopleActivity" />
+        <activity android:name=".activity.DrawLineActivity" />
         <activity
             android:name=".activity.ColorBoardActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".activity.RxAndroidActivity"
-            android:screenOrientation="portrait" />
-
         <activity
             android:name=".activity.DashboardActivity"
             android:screenOrientation="portrait" />
@@ -106,18 +83,6 @@
             android:name=".activity.SurfaceViewDemoActivity"
             android:screenOrientation="portrait" />
 
-        <activity
-            android:name=".activity.ReadWriteCSVActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".activity.FlipPageActivity"
-            android:screenOrientation="portrait" />
-
-        <activity
-            android:name=".activity.ThreadPoolActivity"
-            android:screenOrientation="portrait" />
-
     </application>
 
 </manifest>

app/src/main/java/com/rust/aboutview/AboutViewConfig.java

@@ -4,7 +4,7 @@
  * Define some names
  * Create : 2016-2-22
  */
-public interface AboutViewConfig {
-    String APP_CONFIG = "AboutView_config";
-    String SHOW_FLOAT_BAR = "Show_floating_bar";
+public class AboutViewConfig {
+    public static final String APP_CONFIG = "AboutView_config";
+    public static final String SHOW_FLOAT_BAR = "Show_floating_bar";
 }