Skip to content

Fix #2390 - issue in first demo screen #2414

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Fix #2390 - issue in first demo screen #2414

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion app/src/main/java/org/fossasia/phimpme/base/BaseActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,14 @@ public void onShow(MaterialShowcaseView itemView, int position) {

sequence.setConfig(config);

sequence.addSequenceItem(nav_home, getResources().getString(R.string.home_button), getResources().getString(R.string.ok_button));
sequence.addSequenceItem(
new MaterialShowcaseView.Builder(this)
.setTarget(nav_home)
.setDismissText(getResources().getString(R.string.ok_button))
.setContentText(getResources().getString(R.string.home_button))
.setDismissOnTouch(true)
.build()
);

sequence.addSequenceItem(
new MaterialShowcaseView.Builder(this)
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/jni/OpenCV.mk
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ LOCAL_PATH:=$(subst ?,,$(firstword ?$(subst \, ,$(subst /, ,$(call my-dir)))))
OPENCV_TARGET_ARCH_ABI:=$(TARGET_ARCH_ABI)
OPENCV_THIS_DIR:=$(patsubst $(LOCAL_PATH)\\%,%,$(patsubst $(LOCAL_PATH)/%,%,$(call my-dir)))
OPENCV_MK_DIR:=$(dir $(lastword $(MAKEFILE_LIST)))
OPENCV_LIBS_DIR:=$(OPENCV_THIS_DIR)/../jniLibs/$(OPENCV_TARGET_ARCH_ABI)
OPENCV_LIBS_DIR:=$(OPENCV_THIS_DIR)/libs/$(OPENCV_TARGET_ARCH_ABI)
OPENCV_3RDPARTY_LIBS_DIR:=$(OPENCV_THIS_DIR)/../3rdparty/libs/$(OPENCV_TARGET_ARCH_ABI)
OPENCV_BASEDIR:=
OPENCV_LOCAL_C_INCLUDES:="$(LOCAL_PATH)/$(OPENCV_THIS_DIR)/include/opencv" "$(LOCAL_PATH)/$(OPENCV_THIS_DIR)/include"
Expand Down
Binary file added app/src/main/jni/libs/armeabi-v7a/libnative_camera_r2.2.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi-v7a/libnative_camera_r2.3.3.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi-v7a/libnative_camera_r3.0.1.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi-v7a/libnative_camera_r4.0.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi-v7a/libnative_camera_r4.0.3.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi-v7a/libnative_camera_r4.1.1.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi-v7a/libnative_camera_r4.2.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi-v7a/libnative_camera_r4.3.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi-v7a/libnative_camera_r4.4.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi/libnative_camera_r2.2.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi/libnative_camera_r2.3.3.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi/libnative_camera_r3.0.1.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi/libnative_camera_r4.0.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi/libnative_camera_r4.0.3.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi/libnative_camera_r4.1.1.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi/libnative_camera_r4.2.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi/libnative_camera_r4.3.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/armeabi/libnative_camera_r4.4.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/mips/libnative_camera_r4.0.3.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/mips/libnative_camera_r4.1.1.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/mips/libnative_camera_r4.2.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/mips/libnative_camera_r4.3.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/mips/libnative_camera_r4.4.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/x86/libnative_camera_r2.3.3.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/x86/libnative_camera_r3.0.1.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/x86/libnative_camera_r4.0.3.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/x86/libnative_camera_r4.1.1.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/x86/libnative_camera_r4.2.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/x86/libnative_camera_r4.3.0.so
View file
Open in desktop
Binary file not shown.
Binary file added app/src/main/jni/libs/x86/libnative_camera_r4.4.0.so
View file
Open in desktop
Binary file not shown.
20 changes: 10 additions & 10 deletions app/src/main/res/layout/dialog_album_detail.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@
android:id="@+id/trcia"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginStart="30dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">

<ImageView
Expand Down Expand Up @@ -74,8 +74,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginStart="30dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">

<TextView
Expand All @@ -100,8 +100,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginStart="30dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">

<TextView
Expand All @@ -126,8 +126,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginStart="30dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">

<TextView
Expand All @@ -152,8 +152,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginStart="30dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">

<TextView
Expand All @@ -178,8 +178,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginStart="30dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">

<TextView
Expand Down Expand Up @@ -209,9 +209,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="17dp"
android:layout_marginStart="30dp"
android:layout_marginTop="17dp"
android:layout_marginBottom="17dp"
android:orientation="horizontal">

<TextView
Expand Down Expand Up @@ -242,9 +242,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginStart="30dp"
android:layout_marginTop="10dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">

<TextView
Expand All @@ -269,8 +269,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginStart="30dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">

<TextView
Expand All @@ -295,8 +295,8 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:layout_marginStart="30dp"
android:layout_marginBottom="10dp"
android:orientation="horizontal">

<TextView
Expand Down
3 changes: 0 additions & 3 deletions build.sh
View file
Open in desktop

This file was deleted.