Skip to content

Commit 9a3a15f

Browse files
committed
increased build num; updated whatsnew
1 parent 9862da3 commit 9a3a15f

File tree

10 files changed

+45
-60
lines changed

10 files changed

+45
-60
lines changed

app/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@ android {
99
vectorDrawables.useSupportLibrary = true
1010
minSdkVersion 21
1111
multiDexEnabled true
12-
targetSdkVersion 27
13-
versionCode 69
14-
versionName "8.4.2"
12+
targetSdkVersion 28
13+
versionCode 72
14+
versionName "8.4.5"
1515
}
1616
buildTypes {
1717
release {

app/src/main/assets/whatsnew.json

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,25 @@
11
{
22
"data": [
33
{
4-
"title": "Nice Icons",
5-
"content": "Completely customize colors,texts and icons.",
6-
"icon": "golf"
4+
"title": "Add watermark",
5+
"content": "Now add watermark to PDFs while creating, or on created PDFs",
6+
"icon": "ic_branding_watermark_black_24dp"
77
},
88
{
9-
"title": "Such Easy",
10-
"content": "Setting this up only takes 2 lines of code,impressive you say?",
11-
"icon": "smile"
9+
"title": "Adding or removing password made easy",
10+
"content": "Now, easily add or remove password from the navigation drawer on left",
11+
"icon": "ic_lock_open_black_24dp"
1212
},
1313
{
14-
"title": "Very Sleep",
15-
"content": "It helps you get more sleep by writing less code.",
16-
"icon": ""
17-
},
18-
{
19-
"title": "Text Only",
20-
"content": "No icon? Just go with plain text.",
21-
"icon": ""
14+
"title": "Set master password yourself",
15+
"content": "Go to settings -> you can change master password too :)",
16+
"icon": "ic_lock_black_24dp"
2217
}
23-
]
18+
],
19+
"old_data": {
20+
"version_code": [
21+
//paste old data here
22+
23+
]
24+
}
2425
}

app/src/main/java/swati4star/createpdf/activity/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,11 +101,11 @@ protected void onCreate(Bundle savedInstanceState) {
101101
mFeedbackUtils.rateUs();
102102
mSharedPreferences.edit().putInt(LAUNCH_COUNT, count + 1).apply();
103103

104-
String versionName = mSharedPreferences.getString(VERSION_NAME, BuildConfig.VERSION_NAME);
104+
String versionName = mSharedPreferences.getString(VERSION_NAME, "");
105105
if (!versionName.equals(BuildConfig.VERSION_NAME)) {
106106
WhatsNewUtils.displayDialog(this);
107+
mSharedPreferences.edit().putString(VERSION_NAME, BuildConfig.VERSION_NAME).apply();
107108
}
108-
mSharedPreferences.edit().putString(VERSION_NAME, BuildConfig.VERSION_NAME).apply();
109109
getRuntimePermissions();
110110
}
111111

app/src/main/java/swati4star/createpdf/adapter/WhatsNewAdapter.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,11 @@
22

33
import android.content.Context;
44
import android.content.res.Resources;
5-
import android.graphics.Bitmap;
6-
import android.graphics.BitmapFactory;
7-
import android.graphics.drawable.Drawable;
85
import android.support.annotation.NonNull;
96
import android.support.v7.widget.RecyclerView;
107
import android.view.LayoutInflater;
118
import android.view.View;
129
import android.view.ViewGroup;
13-
import android.widget.ArrayAdapter;
14-
import android.widget.BaseAdapter;
1510
import android.widget.ImageView;
1611
import android.widget.TextView;
1712

app/src/main/java/swati4star/createpdf/util/WhatsNewUtils.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import android.support.v7.widget.LinearLayoutManager;
66
import android.support.v7.widget.RecyclerView;
77
import android.widget.Button;
8-
import android.widget.ListView;
98
import android.widget.TextView;
109

1110
import org.json.JSONArray;

app/src/main/res/drawable/golf.xml

Lines changed: 0 additions & 12 deletions
This file was deleted.

app/src/main/res/drawable/smile.xml

Lines changed: 0 additions & 9 deletions
This file was deleted.

app/src/main/res/layout/fragment_home.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,13 @@
110110
app:option_icon="@drawable/ic_lock_open_black_24dp"
111111
app:option_text="@string/remove_password" />
112112

113+
</LinearLayout>
114+
115+
<LinearLayout
116+
android:layout_width="match_parent"
117+
android:layout_height="wrap_content"
118+
android:orientation="horizontal">
119+
113120
<swati4star.createpdf.customviews.MyCardView
114121
android:id="@+id/rotate_pages"
115122
android:layout_width="0dp"
Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:layout_width="match_parent"
4-
android:layout_height="match_parent"
5-
android:orientation="vertical">
3+
android:layout_width="match_parent"
4+
android:layout_height="wrap_content"
5+
android:orientation="vertical">
66

77
<TextView
88
android:id="@+id/title"
99
android:layout_width="match_parent"
1010
android:layout_height="wrap_content"
1111
android:layout_margin="15dp"
1212
android:gravity="center_horizontal"
13-
android:textStyle="bold"/>
13+
android:textStyle="bold" />
1414

1515
<LinearLayout
1616
android:layout_width="match_parent"
@@ -20,15 +20,17 @@
2020
<android.support.v7.widget.RecyclerView
2121
android:id="@+id/whatsNewListView"
2222
android:layout_width="match_parent"
23-
android:layout_height="wrap_content"></android.support.v7.widget.RecyclerView>
23+
android:layout_height="wrap_content"/>
24+
2425
</LinearLayout>
2526

2627

2728
<Button
2829
android:id="@+id/continueButton"
2930
android:layout_width="match_parent"
3031
android:layout_height="wrap_content"
31-
android:background="@color/colorAccent"
32-
android:textAllCaps="false"/>
32+
android:background="?attr/bottomSheetColor"
33+
android:textColor="?attr/bottomSheetTextColor"
34+
android:textAllCaps="false" />
3335

3436
</LinearLayout>
Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3-
android:layout_width="match_parent"
4-
android:layout_height="match_parent"
5-
android:orientation="vertical">
3+
android:layout_width="match_parent"
4+
android:layout_height="wrap_content"
5+
android:layout_marginTop="5dp"
6+
android:orientation="vertical">
67

78
<LinearLayout
89
android:layout_width="match_parent"
@@ -14,21 +15,22 @@
1415
<ImageView
1516
android:id="@+id/icon"
1617
android:layout_width="25dp"
17-
android:layout_height="25dp"/>
18+
android:layout_height="25dp" />
1819

1920
<TextView
21+
android:layout_marginStart="5dp"
2022
android:id="@+id/title"
2123
android:layout_width="match_parent"
2224
android:layout_height="wrap_content"
2325
android:layout_gravity="center_vertical"
24-
android:textStyle="bold"/>
26+
android:textStyle="bold" />
2527
</LinearLayout>
2628

2729
<TextView
2830
android:id="@+id/description"
2931
android:layout_width="match_parent"
3032
android:layout_height="wrap_content"
3133
android:layout_marginLeft="15dp"
32-
android:layout_marginTop="5dp"/>
34+
android:layout_marginTop="5dp" />
3335

3436
</LinearLayout>

0 commit comments

Comments
 (0)