Skip to content

Commit

Permalink
Fix listener on selected categories.
Browse files Browse the repository at this point in the history
  • Loading branch information
@iamvaliyev
iamvaliyev committed May 27, 2017
1 parent f0c8d1a commit 14015a1
Show file tree
Hide file tree
Showing 61 changed files with 260 additions and 185 deletions.
Empty file modified LICENSE
100644 → 100755
View file
Empty file.
Empty file modified README.md
100644 → 100755
View file
Empty file.
Empty file modified build.gradle
100644 → 100755
View file
Empty file.
Empty file modified build/generated/mockable-android-25.jar
100644 → 100755
View file
Empty file.
115 changes: 62 additions & 53 deletions build/intermediates/dex-cache/cache.xml
100644 → 100755
View file

Large diffs are not rendered by default.

Empty file modified gradle.properties
100644 → 100755
View file
Empty file.
Empty file modified gradle/wrapper/gradle-wrapper.jar
100644 → 100755
View file
Empty file.
Empty file modified gradle/wrapper/gradle-wrapper.properties
100644 → 100755
View file
Empty file.
Empty file modified gradlew.bat
100644 → 100755
View file
Empty file.
Empty file modified library/.gitignore
100644 → 100755
View file
Empty file.
30 changes: 0 additions & 30 deletions library/build.gradle
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,34 +89,4 @@ task javadocJar(type: Jar, dependsOn: javadoc) {
artifacts {
archives javadocJar
archives sourcesJar
}

Properties properties = new Properties()
properties.load(project.rootProject.file('local.properties').newDataInputStream())

bintray {
user = properties.getProperty("bintray.user")
key = properties.getProperty("bintray.apikey")

configurations = ['archives']
pkg {
repo = "maven"
// it is the name that appears in bintray when logged
name = "io.github.iamvaliyev.MultiTabMenu"
websiteUrl = siteUrl
vcsUrl = gitUrl
licenses = ["Apache-2.0"]
publish = true
version {
name = '1.0.0'
desc = 'Selectable MultiTabMenu'
released = new Date()
vcsTag = '1.0.0'
gpg {
sign = true //Determines whether to GPG sign the files. The default is false
passphrase = properties.getProperty("bintray.gpg.password")
//Optional. The passphrase for GPG signing'
}
}
}
}
12 changes: 1 addition & 11 deletions library/library.iml
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
Expand All @@ -20,7 +19,7 @@
<option name="RES_FOLDER_RELATIVE_PATH" value="/src/main/res" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/src/main/res" />
<option name="ASSETS_FOLDER_RELATIVE_PATH" value="/src/main/assets" />
<option name="LIBRARY_PROJECT" value="true" />
<option name="PROJECT_TYPE" value="1" />
</configuration>
</facet>
</component>
Expand Down Expand Up @@ -48,43 +47,36 @@
<sourceFolder url="file://$MODULE_DIR$/src/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/.DS_Store" />
<excludeFolder url="file://$MODULE_DIR$/build/docs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />
Expand Down Expand Up @@ -116,9 +108,7 @@
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/typedefs.txt" />
<excludeFolder url="file://$MODULE_DIR$/build/libs" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/poms" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 25 Platform" jdkType="Android SDK" />
Expand Down
Empty file modified library/proguard-rules.pro
100644 → 100755
View file
Empty file.
Empty file modified library/src/androidTest/java/io/github/iamvaliyev/multitabmenu/ExampleInstrumentedTest.java
100644 → 100755
View file
Empty file.
Empty file modified library/src/main/AndroidManifest.xml
100644 → 100755
View file
Empty file.
Empty file modified library/src/main/java/io/github/iamvaliyev/multitabmenu/CategoryWrapper.java
100644 → 100755
View file
Empty file.
183 changes: 128 additions & 55 deletions library/src/main/java/io/github/iamvaliyev/multitabmenu/MultiTabMenu.java
100644 → 100755
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
import android.support.v4.content.ContextCompat;
import android.util.AttributeSet;
import android.util.Log;
import android.view.MotionEvent;
import android.view.View;
import android.widget.AdapterView;
import android.widget.FrameLayout;
Expand Down Expand Up @@ -121,80 +120,154 @@ public void setAdapter(final ParentAdapter adap) {
selectedCategory = adapter.getItem(0);
selectedSubCategory = adapter.getChildAdapter(0).getItem(0);

slCategories.setOnTouchListener(new OnTouchListener() {
@Override
public boolean onTouch(View view, MotionEvent motionEvent) {
if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
isTouching = true;
} else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
isTouching = false;

if (onCategorySelectedListener != null)
onCategorySelectedListener.onCategorySelected(categories.get(slCategories.getSelectedItemPosition()));

selectedCategory = adapter.getItem(slCategories.getSelectedItemPosition());

slSubCategories.setAdapter(adapter.getChildAdapter(slCategories.getSelectedItemPosition()));


if (onCategorySelectedListener != null)
onCategorySelectedListener.OnSubCategorySelected(categories.get(slCategories.getSelectedItemPosition()).getChildItems().get(slSubCategories.getSelectedItemPosition()));

selectedSubCategory = adapter.getChildAdapter(slCategories.getSelectedItemPosition()).getItem(slSubCategories.getSelectedItemPosition());

}
return false;
}
});

slSubCategories.setOnTouchListener(new OnTouchListener() {
@Override
public boolean onTouch(View view, MotionEvent motionEvent) {
if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
isTouching = true;
} else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
isTouching = false;
if (onCategorySelectedListener != null)
onCategorySelectedListener.OnSubCategorySelected(categories.get(slCategories.getSelectedItemPosition()).getChildItems().get(slSubCategories.getSelectedItemPosition()));

selectedSubCategory = adapter.getChildAdapter(slCategories.getSelectedItemPosition()).getItem(slSubCategories.getSelectedItemPosition());
}
return false;
}
});
// slCategories.setOnTouchListener(new OnTouchListener() {
// @Override
// public boolean onTouch(View view, MotionEvent motionEvent) {
// Log.e("onTouch", "onTouch");
// if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
// isTouching = true;
// } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
// isTouching = false;
//
// if (onCategorySelectedListener != null)
// onCategorySelectedListener.onCategorySelected(categories.get(slCategories.getSelectedItemPosition()));
//
// selectedCategory = adapter.getItem(slCategories.getSelectedItemPosition());
//
// slSubCategories.setAdapter(adapter.getChildAdapter(slCategories.getSelectedItemPosition()));
//
//
// if (onCategorySelectedListener != null)
// onCategorySelectedListener.OnSubCategorySelected(categories.get(slCategories.getSelectedItemPosition()).getChildItems().get(slSubCategories.getSelectedItemPosition()));
//
// selectedSubCategory = adapter.getChildAdapter(slCategories.getSelectedItemPosition()).getItem(slSubCategories.getSelectedItemPosition());
//
// }
// return false;
// }
// });
//
// slSubCategories.setOnTouchListener(new OnTouchListener() {
// @Override
// public boolean onTouch(View view, MotionEvent motionEvent) {
// if (motionEvent.getAction() == MotionEvent.ACTION_DOWN) {
// isTouching = true;
// } else if (motionEvent.getAction() == MotionEvent.ACTION_UP) {
// isTouching = false;
// if (onCategorySelectedListener != null)
// onCategorySelectedListener.OnSubCategorySelected(categories.get(slCategories.getSelectedItemPosition()).getChildItems().get(slSubCategories.getSelectedItemPosition()));
//
// selectedSubCategory = adapter.getChildAdapter(slCategories.getSelectedItemPosition()).getItem(slSubCategories.getSelectedItemPosition());
// }
// return false;
// }
// });

// slCategories.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
// slCategories.setOnItemClickListener(new AdapterView.OnItemClickListener() {
// @Override
// public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
// if (onCategorySelectedListener != null)
// onCategorySelectedListener.onCategorySelected(categories.get(i));
// public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
// try {
// if (onCategorySelectedListener != null)
// onCategorySelectedListener.onCategorySelected(categories.get(position));
//
// selectedCategory = adapter.getItem(i);
// selectedCategory = adapter.getItem(position);
//
// slSubCategories.setAdapter(adapter.getChildAdapter(i));
// slSubCategories.setAdapter(adapter.getChildAdapter(position));
// } catch (Exception e) {
//
// }
// }
// });
//
// slCategories.setOnScrollPositionListener(new FeatureCoverFlow.OnScrollPositionListener() {
// @Override
// public void onNothingSelected(AdapterView<?> adapterView) {
// public void onScrolledToPosition(int position) {
// try {
// if (onCategorySelectedListener != null)
// onCategorySelectedListener.onCategorySelected(categories.get(position));
//
// selectedCategory = adapter.getItem(position);
//
// slSubCategories.setAdapter(adapter.getChildAdapter(position));
// } catch (Exception e) {
//
// }
// }
//
// @Override
// public void onScrolling() {
//
// }
// });
//

// slSubCategories.setOnItemClickListener(new AdapterView.OnItemClickListener() {
// @Override
// public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
// try {
// if (onCategorySelectedListener != null)
// onCategorySelectedListener.OnSubCategorySelected(categories.get(slCategories.getSelectedItemPosition()).getChildItems().get(position));
//
// selectedSubCategory = adapter.getChildAdapter(slCategories.getSelectedItemPosition()).getItem(position);
//
// } catch (Exception e) {
//
// }
// }
// });
//
// slSubCategories.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
// slSubCategories.setOnScrollPositionListener(new FeatureCoverFlow.OnScrollPositionListener() {
// @Override
// public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
// if (onCategorySelectedListener != null)
// onCategorySelectedListener.OnSubCategorySelected(categories.get(slCategories.getSelectedItemPosition()).getChildItems().get(i));
// public void onScrolledToPosition(int position) {
// try {
// if (onCategorySelectedListener != null)
// onCategorySelectedListener.OnSubCategorySelected(categories.get(slCategories.getSelectedItemPosition()).getChildItems().get(position));
//
// selectedSubCategory = adapter.getChildAdapter(slCategories.getSelectedItemPosition()).getItem(i);
// selectedSubCategory = adapter.getChildAdapter(slCategories.getSelectedItemPosition()).getItem(position);
// } catch (Exception e) {
//
// }
// }
//
// @Override
// public void onNothingSelected(AdapterView<?> adapterView) {
// public void onScrolling() {
//
// }
// });

slCategories.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
Log.e("onItemSelected", "onItemSelected");
if (onCategorySelectedListener != null)
onCategorySelectedListener.onCategorySelected(categories.get(i));

selectedCategory = adapter.getItem(i);

slSubCategories.setAdapter(adapter.getChildAdapter(i));
}

@Override
public void onNothingSelected(AdapterView<?> adapterView) {

}
});

slSubCategories.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
@Override
public void onItemSelected(AdapterView<?> adapterView, View view, int i, long l) {
if (onCategorySelectedListener != null)
onCategorySelectedListener.OnSubCategorySelected(categories.get(slCategories.getSelectedItemPosition()).getChildItems().get(i));

selectedSubCategory = adapter.getChildAdapter(slCategories.getSelectedItemPosition()).getItem(i);
}

@Override
public void onNothingSelected(AdapterView<?> adapterView) {

}
});

}

public OnCategorySelectedListener getOnCategorySelectedListener() {
Expand Down
14 changes: 13 additions & 1 deletion library/src/main/java/io/github/iamvaliyev/multitabmenu/adapters/ParentAdapter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import android.util.Log;
import android.view.View;
import android.view.ViewGroup;
import android.widget.BaseAdapter;

import java.util.List;

Expand Down Expand Up @@ -68,6 +69,12 @@ public long getItemId(int i) {
return i;
}


// @Override
// public View getView(int position, View convertView, ViewGroup parent) {
// return getSectionView(position, convertView, parent);
// }

@Override
public View getCoverFlowItem(int i, View view, ViewGroup viewGroup) {
Log.e("AdapterParent", i + "");
Expand All @@ -86,7 +93,12 @@ public ChildAdapter(int position) {
this.position = position;
}

@Override
// @Override
// public View getView(int childPosition, View convertView, ViewGroup parent) {
// return getChildView(position, childPosition, convertView, parent);
// }

@Override
public View getCoverFlowItem(int childPosition, View view, ViewGroup parent) {
Log.e("AdapterParentChild", position + "");
return getChildView(position, childPosition, view, parent);
Expand Down
Empty file modified library/src/main/java/io/github/iamvaliyev/multitabmenu/models/Category.java
100644 → 100755
View file
Empty file.
Empty file modified library/src/main/java/io/github/iamvaliyev/multitabmenu/widgets/Triangle.java
100644 → 100755
View file
Empty file.
Empty file modified library/src/main/java/io/github/iamvaliyev/multitabmenu/widgets/TriangleShapeView.java
100644 → 100755
View file
Empty file.
Empty file modified library/src/main/res/drawable/triangle.xml
100644 → 100755
View file
Empty file.
Loading

0 comments on commit 14015a1

Please sign in to comment.