Skip to content

Commit

Permalink
new tries
Browse files Browse the repository at this point in the history
  • Loading branch information
jjhesk committed Feb 11, 2016
1 parent 83a40a1 commit c52d6b7
Show file tree
Hide file tree
Showing 16 changed files with 361 additions and 176 deletions.
Binary file modified .gradle/2.4/taskArtifacts/fileHashes.bin
Binary file not shown.
Binary file modified .gradle/2.4/taskArtifacts/fileSnapshots.bin
Binary file not shown.
Binary file modified .gradle/2.4/taskArtifacts/outputFileStates.bin
Binary file not shown.
Binary file modified .gradle/2.4/taskArtifacts/taskArtifacts.bin
Binary file not shown.
459 changes: 339 additions & 120 deletions .idea/workspace.xml

Large diffs are not rendered by default.

35 changes: 0 additions & 35 deletions AppDemo/build.gradle

This file was deleted.

4 changes: 2 additions & 2 deletions gradle.properties
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Project-wide Gradle settings.
VERSION_NAME=1.5.4
VERSION_CODE=54
VERSION_NAME=1.5.5
VERSION_CODE=55
GROUP=com.hkm.loyalslider
PUBLISH_GROUP_ID=com.hkm.loyalslider
POM_DESCRIPTION=This is the slider for JAVA android use. Thanks to Android Image Slider. This will make it even a better one!
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -186,12 +186,14 @@ public void onSuccess() {
mImage.post(new Runnable() {
@Override
public void run() {
mAttacher.setScale(2f, mImage.getWidth() / 2, mImage.getHeight() / 2, true);
mAttacher.setScale(
initial_zoom_factor,
true);
}
});

//slidrInf.unlock();
mAttacher.setScale(initial_zoom_factor);
//mImage.getImmImage.getWidth()
//mAttacher.setScale(initial_zoom_factor);
}

@Override
Expand Down
7 changes: 6 additions & 1 deletion library/src/main/res/layout/content_zoomable_slide.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,12 @@
<uk.co.senab.photoview.PhotoView
android:id="@id/ssz_uk_co_senab_photoview"
android:layout_width="match_parent"
android:layout_height="match_parent" />
android:layout_height="match_parent"

/>
<!--
android:scaleType="fitCenter"
-->

<TextView
android:id="@id/ssz_debug_textview"
Expand Down
Binary file added weblnslider/src/main/Assets/q65.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added weblnslider/src/main/Assets/q66.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added weblnslider/src/main/Assets/q67.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added weblnslider/src/main/Assets/q68.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,6 @@ protected void customSliderView(final HashMap<String, Integer> maps) {
textSliderView
.description(name)
.image(maps.get(name))

.setScaleType(BaseSliderView.ScaleType.Fit)
.setOnSliderClickListener(this);
//add your extra information
Expand Down
13 changes: 4 additions & 9 deletions weblnslider/src/main/java/com/hkm/loyalns/Util/DataProvider.java
Original file line number Diff line number Diff line change
Expand Up @@ -30,15 +30,10 @@ public static HashMap<String, String> getDataUrlSource() {
public static HashMap<String, String> getVerticalDataSrc() {

HashMap<String, String> file_maps = new HashMap<String, String>();
file_maps.put("Hannibal", "file:///android_asset/g1.jpg");
file_maps.put("summer girl", "file:///android_asset/g2.jpg");
file_maps.put("fe", "file:///android_asset/g3.jpg");
file_maps.put("long leg", "file:///android_asset/g4.jpg");
file_maps.put("high heels", "file:///android_asset/g5.jpg");
file_maps.put("sf", "file:///android_asset/g6.jpg");
file_maps.put("sfaf", "file:///android_asset/g7.jpg");
file_maps.put("sfaf", "file:///android_asset/g8.jpg");
file_maps.put("sfaf", "file:///android_asset/g9.jpg");
file_maps.put("Choro Q N64", "file:///android_asset/q65.jpg");
file_maps.put("Choro 4 HQ PS2", "file:///android_asset/q66.jpg");
file_maps.put("Choro Rainbow Wings", "file:///android_asset/q67.jpg");
file_maps.put("Choro Q Boat Race", "file:///android_asset/q68.jpg");
return file_maps;

}
Expand Down
10 changes: 5 additions & 5 deletions weblnslider/src/main/java/com/hkm/loyalns/ZoomScreenSlider.java
Original file line number Diff line number Diff line change
Expand Up @@ -21,19 +21,19 @@ protected void defaultCompleteSlider(final SliderLayout slide, final HashMap<Str
ZoomableView zoomer = new ZoomableView(true, this);
// initialize a SliderLayout
zoomer

//ZoomableView configurations
.setInitalZoomFactor(1.3f)

//BaseSlider configurations
.setInitalZoomFactor(1.f)
//BaseSlider configurations
.description(name)
.image(maps.get(name))
.enableImageLocalStorage()
.setScaleType(BaseSliderView.ScaleType.CenterInside)
.setScaleType(BaseSliderView.ScaleType.FitCenterCrop)
.setOnSliderClickListener(this);
//add your extra information
zoomer.getBundle().putString("extra", name);
slide.addSlider(zoomer);
}
slide.stopAutoCycle();
slide.setCurrentPosition(0, true);
}
}

0 comments on commit c52d6b7

Please sign in to comment.