Skip to content
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

Jump to bottom

ON BOARDING SCREEN #505

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ON BOARDING SCREEN #505

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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 18 additions & 0 deletions build.gradle
View file
Open in desktop
Expand Up @@ -33,6 +33,24 @@ allprojects {
google()
jcenter()
maven { url "https://jitpack.io" }

//added dependency for liquid animation
def githubProperties = new Properties()
githubProperties.load(new FileInputStream(rootProject.file("github.properties")))
repositories {
maven {
name = "GitHubPackages"

url = uri("https://maven.pkg.github.com/Cuberto/liquid-swipe-android")
credentials {
/** Create github.properties in root project folder file with
** gpr.usr=GITHUB_USER_ID & gpr.key=PERSONAL_ACCESS_TOKEN
** Or set env variable GPR_USER & GPR_API_KEY if not adding a properties file**/
username = githubProperties['gpr.usr'] ?: System.getenv("GPR_USER")
password = githubProperties['gpr.key'] ?: System.getenv("GPR_API_KEY")
}
}
}
}
}

Expand Down
21 changes: 13 additions & 8 deletions folioreader/AndroidManifest.xml
View file
Open in desktop
Expand Up @@ -3,41 +3,46 @@
xmlns:tools="http://schemas.android.com/tools"
package="com.folioreader">

<uses-sdk tools:overrideLibrary="org.readium.r2.streamer, org.readium.r2.shared" />

<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />

<uses-sdk tools:overrideLibrary="org.readium.r2.streamer, org.readium.r2.shared" />

<application
android:allowBackup="true"
android:networkSecurityConfig="@xml/network_security_config"
tools:replace="android:allowBackup">

<!-- <activity android:name=".android.sample.onBoarding.IntroductoryActivity">-->
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
<!-- </activity>-->

<provider
android:name=".AppContext"
android:authorities="${applicationId}.provider.appcontext"
android:exported="false" />

<activity
android:name="com.folioreader.ui.activity.FolioActivity"
android:name=".ui.activity.FolioActivity"
android:label="@string/app_name"
android:theme="@style/FolioActivityDayTheme" />

<activity
android:name="com.folioreader.ui.activity.ContentHighlightActivity"
android:name=".ui.activity.ContentHighlightActivity"
android:theme="@style/AppTheme.NoActionBar" />

<activity
android:name="com.folioreader.ui.activity.SearchActivity"
android:name=".ui.activity.SearchActivity"
android:launchMode="singleTop">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>

<meta-data
android:name="android.app.searchable"
android:resource="@xml/searchable" />
</activity>

</application>

</manifest>
8 changes: 8 additions & 0 deletions folioreader/build.gradle
View file
Open in desktop
Expand Up @@ -118,5 +118,13 @@ dependencies {

// Lifecycle
implementation "androidx.lifecycle:lifecycle-extensions:$versions.lifecycle"

//// //onboarding and design dependencies
// implementation 'com.airbnb.android:lottie:3.4.1'
// implementation 'com.cuberto:liquid-swipe:1.0.0'
//// implementation 'androidx.core:core-ktx:1.5.0'
//// implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.31"
//// implementation "androidx.core:core-ktx:1.5.0"

}
apply from: '../folioreader/bintray/bintrayv1.gradle'
3 changes: 3 additions & 0 deletions folioreader/res/values/colors.xml
View file
Open in desktop
Expand Up @@ -28,5 +28,8 @@
<color name="highlight_green">#C0ED72</color>
<color name="highlight_blue">#ADD8FF</color>
<color name="highlight_pink">#FFB0CA</color>
<color name="drawer_icon_color">#7373E3</color>
<color name="purple_200">#C5CAE9</color>


</resources>
3 changes: 3 additions & 0 deletions github.properties
View file
Open in desktop
@@ -0,0 +1,3 @@
gpr.usr = 66123919
gpr.key = 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
//tanishpvtid
7 changes: 7 additions & 0 deletions sample/build.gradle
View file
Open in desktop
Expand Up @@ -52,6 +52,7 @@ dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "androidx.appcompat:appcompat:$versions.appcompat"
implementation "androidx.constraintlayout:constraintlayout:$versions.constraintLayout"
implementation 'com.google.android.material:material:1.4.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation "androidx.test.ext:junit:1.1.1"
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
Expand All @@ -70,5 +71,11 @@ dependencies {
details.useVersion("3.3.2-5309881")
}
}
// //onboarding and design dependencies
implementation 'com.airbnb.android:lottie:3.4.1'
implementation 'com.cuberto:liquid-swipe:1.0.0'
implementation 'androidx.core:core-ktx:1.5.0'
implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.31"
implementation "androidx.core:core-ktx:1.5.0"

}
15 changes: 12 additions & 3 deletions sample/src/main/AndroidManifest.xml
View file
Open in desktop
Expand Up @@ -11,15 +11,24 @@
android:supportsRtl="true"
android:theme="@style/AppTheme">

<activity
android:name=".HomeActivity"
android:label="@string/app_name">

<activity android:name=".onBoarding.IntroductoryActivity">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>


<activity
android:name=".HomeActivity"
android:label="@string/app_name">
<!-- <intent-filter>-->
<!-- <action android:name="android.intent.action.MAIN" />-->
<!-- <category android:name="android.intent.category.LAUNCHER" />-->
<!-- </intent-filter>-->
</activity>

</application>

</manifest>
89 changes: 89 additions & 0 deletions sample/src/main/java/com/folioreader/android/sample/onBoarding/IntroductoryActivity.java
View file
Open in desktop
@@ -0,0 +1,89 @@
package com.folioreader.android.sample.onBoarding;


import android.os.Bundle;


import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentStatePagerAdapter;
import androidx.viewpager.widget.ViewPager;

import android.content.Context;
import android.content.Intent;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.view.Window;
import android.view.WindowManager;

import com.folioreader.android.sample.HomeActivity;
import com.folioreader.android.sample.R;

public class IntroductoryActivity extends AppCompatActivity {
private static final int NUM_PAGES =3;
private ViewPager viewPager;
private ScreenSlidePagerAdapter pagerAdapter;
String prevStarted;


@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// remove title
requestWindowFeature(Window.FEATURE_NO_TITLE);
getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN,
WindowManager.LayoutParams.FLAG_FULLSCREEN);
setContentView(R.layout.activity_introductory);

getSupportActionBar().hide();


ViewPager viewPager = findViewById(R.id.pager);
ScreenSlidePagerAdapter pagerAdapter = new ScreenSlidePagerAdapter(getSupportFragmentManager());
viewPager.setAdapter(pagerAdapter);
}


private static class ScreenSlidePagerAdapter extends FragmentStatePagerAdapter {

public ScreenSlidePagerAdapter(@NonNull FragmentManager fm) {
super(fm);
}

@NonNull
@Override
public Fragment getItem(int position) {
switch (position) {
case 0:
return new OnBoardingFragment1();

case 1:
return new OnBoardingFragment2();

default:
return new OnBoardingFragment3();
}
}

@Override
public int getCount() {
return NUM_PAGES;
}
}

@Override
protected void onStart() {
super.onStart();
SharedPreferences sharedPreference = getSharedPreferences(getString(R.string.app_name), Context.MODE_PRIVATE);
if (!sharedPreference.getBoolean(prevStarted, false)) {
SharedPreferences.Editor editor = sharedPreference.edit();
editor.putBoolean(prevStarted, Boolean.TRUE);
editor.apply();
} else {
Intent intent = new Intent(this, HomeActivity.class);
startActivity(intent);
}
}
}
35 changes: 35 additions & 0 deletions sample/src/main/java/com/folioreader/android/sample/onBoarding/OnBoardingFragment1.java
View file
Open in desktop
@@ -0,0 +1,35 @@
package com.folioreader.android.sample.onBoarding;


import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;

import com.folioreader.android.sample.HomeActivity;
import com.folioreader.android.sample.R;

public class OnBoardingFragment1 extends Fragment {
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
ViewGroup root = (ViewGroup) inflater.inflate(R.layout.fragment_on_boarding1,container,false);

TextView skip = root.findViewById(R.id.skip);
skip.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent=new Intent(getActivity(), HomeActivity.class);
startActivity(intent);
}
});

return root;
}
}
35 changes: 35 additions & 0 deletions sample/src/main/java/com/folioreader/android/sample/onBoarding/OnBoardingFragment2.java
View file
Open in desktop
@@ -0,0 +1,35 @@
package com.folioreader.android.sample.onBoarding;


import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;

import com.folioreader.android.sample.HomeActivity;
import com.folioreader.android.sample.R;

public class OnBoardingFragment2 extends Fragment {

public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {

ViewGroup view = (ViewGroup) inflater.inflate(R.layout.fragment_on_boarding2, container, false);

TextView skip = view.findViewById(R.id.skip);
skip.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent=new Intent(getActivity(), HomeActivity.class);
startActivity(intent);
}
});

return view;
}
}
36 changes: 36 additions & 0 deletions sample/src/main/java/com/folioreader/android/sample/onBoarding/OnBoardingFragment3.java
View file
Open in desktop
@@ -0,0 +1,36 @@
package com.folioreader.android.sample.onBoarding;


import android.content.Intent;
import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.fragment.app.Fragment;

import com.folioreader.android.sample.HomeActivity;
import com.folioreader.android.sample.R;
import com.google.android.material.floatingactionbutton.FloatingActionButton;

public class OnBoardingFragment3 extends Fragment {

FloatingActionButton fab;
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
ViewGroup root = (ViewGroup) inflater.inflate(R.layout.fragment_on_boarding3,container,false);

fab=root.findViewById(R.id.fab);

fab.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
Intent intent=new Intent(getActivity(), HomeActivity.class);
startActivity(intent);
}
});
return root;
}
}
10 changes: 10 additions & 0 deletions sample/src/main/res/drawable/ic_forward_arrow.xml
View file
Open in desktop
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M12,4l-1.41,1.41L16.17,11H4v2h12.17l-5.58,5.59L12,20l8,-8z"/>
</vector>