diff --git a/.gitignore b/.gitignore index 8e7a766..d36c796 100644 --- a/.gitignore +++ b/.gitignore @@ -1,39 +1,67 @@ # Built application files -/*/build/ -.externalNativeBuild -/captures +*.apk +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ -# Crashlytics configuations -com_crashlytics_export_strings.xml +# Gradle files +.gradle/ +build/ # Local configuration file (sdk path, etc) local.properties -# Gradle generated files -.gradle/ +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ -# Signing files -.signing/ +# Android Studio captures folder +captures/ -# User-specific configurations -.idea/libraries/ +# IntelliJ +*.iml .idea/workspace.xml .idea/tasks.xml -.idea/.name -.idea/compiler.xml -.idea/copyright/profiles_settings.xml -.idea/encodings.xml -.idea/misc.xml -.idea/modules.xml -.idea/scopes/scope_settings.xml -.idea/vcs.xml -*.iml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +.idea/caches + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json -# OS-specific files -.DS_Store -.DS_Store? -._* -.Spotlight-V100 -.Trashes -ehthumbs.db -Thumbs.db +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000..30aa626 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index ba7052b..b0c7b20 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -5,26 +5,31 @@ - + diff --git a/README.md b/README.md index 00f2fdc..7956291 100644 --- a/README.md +++ b/README.md @@ -47,8 +47,8 @@ Coming Soon trailedSheet.lock(); //Disables TouchEvents(Parent and Children) trailedSheet.unlock(); //Enables TouchEvents(Parent and Children) trailedSheet.unlocked(); //Check Lock Status -trailedSheet.moveUp(); // animates moveup and triggers actionController Up -trailedSheet.moveDown(); // animates movedown and triggers actionController down +trailedSheet.moveUp(); // animates moveup and triggers eventListener Up +trailedSheet.moveDown(); // animates movedown and triggers eventListener down ``` diff --git a/app/.gitignore b/app/.gitignore index 796b96d..d36c796 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,67 @@ -/build +# Built application files +*.apk +*.ap_ +*.aab + +# Files for the ART/Dalvik VM +*.dex + +# Java class files +*.class + +# Generated files +bin/ +gen/ +out/ + +# Gradle files +.gradle/ +build/ + +# Local configuration file (sdk path, etc) +local.properties + +# Proguard folder generated by Eclipse +proguard/ + +# Log Files +*.log + +# Android Studio Navigation editor temp files +.navigation/ + +# Android Studio captures folder +captures/ + +# IntelliJ +*.iml +.idea/workspace.xml +.idea/tasks.xml +.idea/gradle.xml +.idea/assetWizardSettings.xml +.idea/dictionaries +.idea/libraries +.idea/caches + +# Keystore files +# Uncomment the following lines if you do not want to check your keystore files in. +#*.jks +#*.keystore + +# External native build folder generated in Android Studio 2.2 and later +.externalNativeBuild + +# Google Services (e.g. APIs or Firebase) +google-services.json + +# Freeline +freeline.py +freeline/ +freeline_project_description.json + +# fastlane +fastlane/report.xml +fastlane/Preview.html +fastlane/screenshots +fastlane/test_output +fastlane/readme.md \ No newline at end of file diff --git a/app/src/main/java/com/tabbara/mohammad/trailedsheetexample/MainActivity.java b/app/src/main/java/com/tabbara/mohammad/trailedsheetexample/MainActivity.java index 53050a4..893953c 100644 --- a/app/src/main/java/com/tabbara/mohammad/trailedsheetexample/MainActivity.java +++ b/app/src/main/java/com/tabbara/mohammad/trailedsheetexample/MainActivity.java @@ -7,11 +7,10 @@ import android.widget.RadioButton; import android.widget.Toast; -import com.tabbara.mohammad.trailedsheet.ActionController; -import com.tabbara.mohammad.trailedsheet.AnimationController; +import com.tabbara.mohammad.trailedsheet.TrailedSheetListeners; import com.tabbara.mohammad.trailedsheet.TrailedSheet; -public class MainActivity extends AppCompatActivity implements View.OnClickListener, AnimationController, ActionController { +public class MainActivity extends AppCompatActivity implements View.OnClickListener, TrailedSheetListeners.EventListener { private TrailedSheet trailedSheet; private boolean isAnimated; @@ -27,8 +26,7 @@ protected void onCreate(Bundle savedInstanceState) { RadioButton animatedOn = findViewById(R.id.animation_on); RadioButton animatedOff = findViewById(R.id.animation_off); animatedOn.toggle(); - trailedSheet.setActionController(this); - trailedSheet.setAnimationController(this); + trailedSheet.addEventListener(this); reset.setOnClickListener(this); moveUp.setOnClickListener(this); moveUp.setRotation(180); @@ -62,37 +60,13 @@ public void onClick(View v) { } @Override - public void onPointerCaptureChanged(boolean hasCapture) { - - } - - @Override - public void exitUp(int id) { + public void onExitUp(int id) { Toast.makeText(this,"Up",Toast.LENGTH_LONG).show(); } @Override - public void exitDown(int id) { + public void onExitDown(int id) { Toast.makeText(this,"Down",Toast.LENGTH_LONG).show(); } - @Override - public void animateOnExitUp(int id) { - - } - - @Override - public void animateOnExitDown(int id) { - - } - - @Override - public void animateOnDrag(int id) { - - } - - @Override - public void animateOnUp(int id) { - - } } diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 5885930..0eb88fe 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,7 +1,7 @@ -