Skip to content

Commit

Permalink
# Reformatted TrailedSheet(Less Complex)
Browse files Browse the repository at this point in the history
# Reformatted Listeners
  • Loading branch information
Mohammad-Tabbara committed Oct 26, 2018
1 parent b728dd8 commit 456c9f0
Show file tree
Hide file tree
Showing 14 changed files with 367 additions and 196 deletions.
84 changes: 56 additions & 28 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -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
29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 10 additions & 5 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
```


Expand Down
68 changes: 67 additions & 1 deletion app/.gitignore
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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);
Expand Down Expand Up @@ -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) {

}
}
2 changes: 1 addition & 1 deletion app/src/main/res/values/styles.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<resources>

<!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ buildscript {
jcenter()
}
dependencies {
classpath 'com.android.tools.build:gradle:3.0.0'
classpath 'com.android.tools.build:gradle:3.2.1'


// NOTE: Do not place your application dependencies here; they belong
Expand Down
4 changes: 2 additions & 2 deletions gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Tue Nov 07 18:46:14 EET 2017
#Wed Oct 24 10:34:07 EEST 2018
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip
Loading

0 comments on commit 456c9f0

Please sign in to comment.