v1.6.1 Rollup

*Version Bump to v1.6.1. *Change developer name. *Update Units utils.
rayliverified · Sep 4, 2018 · 19c32b3 · 19c32b3
1 parent 047f94f
commit 19c32b3
Show file tree

Hide file tree

Showing 8 changed files with 28 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
         applicationId "stream.rocketnotes"
         minSdkVersion 16
         targetSdkVersion 28
-        versionCode 21
-        versionName "1.6.0"
+        versionCode 22
+        versionName "1.6.1"
         multiDexEnabled true
     }
     buildTypes {
@@ -32,9 +32,6 @@ repositories {
 }
 
 dependencies {
-    configurations {
-        all*.exclude group: 'com.android.support', module: 'support-v13'
-    }
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     implementation 'com.github.searchy2:CustomPermissionsDialogue:2.0.0'
     implementation 'com.github.searchy2:CustomAlertViewDialogue:2.5.0'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -18,21 +18,24 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:replace="android:theme">
+        tools:replace="android:theme"
+        android:fullBackupContent="@xml/backup_descriptor">
 
         <meta-data
             android:name="PyzeAppKey"
             android:value="ERdy22a6SxORk6ndRxsEUA"/>
 
         <meta-data
             android:name="CustomAds"
-            android:value="https://apprewards.org/crosspromotion/"/>
+            android:value="https://straightup.fun/crosspromotion/"/>
 
         <activity
             android:name=".MainActivity"
             android:theme="@style/AppThemeHome">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
+                <action android:name="android.intent.action.VIEW"/>
+
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             <meta-data

diff --git a/app/src/main/java/stream/rocketnotes/SettingsFragment.java b/app/src/main/java/stream/rocketnotes/SettingsFragment.java
@@ -34,6 +34,7 @@
 import java.io.OutputStream;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 
 import es.dmoral.toasty.Toasty;
@@ -274,7 +275,7 @@ public boolean onPreferenceClick(Preference arg0) {
                 Intent intent = new Intent(mContext, stream.crosspromotion.AdActivity.class);
                 intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 intent.putExtra(AdActivity.AD_DEVELOPER_ID, getString(R.string.developer_id));
-                intent.putExtra(AdActivity.AD_TITLE, "More Apps from Stream");
+                intent.putExtra(AdActivity.AD_TITLE, getString(R.string.more_apps_title));
                 mContext.startActivity(intent);
 
                 return true;
@@ -290,7 +291,7 @@ public boolean onPreferenceClick(Preference arg0) {
                 CustomAlertDialogue.Builder alert = new CustomAlertDialogue.Builder(getActivity())
                         .setStyle(CustomAlertDialogue.Style.DIALOGUE)
                         .setTitle(mContext.getString(R.string.app_name) + " " + BuildConfig.VERSION_NAME)
-                        .setMessage("© Copyright 2018-2019 Stream Inc")
+                        .setMessage(String.format(getString(R.string.copyrightText), Calendar.getInstance().get(Calendar.YEAR)))
                         .setNegativeText("OK")
                         .setNegativeColor(R.color.positive)
                         .setNegativeTypeface(Typeface.DEFAULT_BOLD)

diff --git a/app/src/main/java/stream/rocketnotes/ShareActivity.java b/app/src/main/java/stream/rocketnotes/ShareActivity.java
@@ -91,7 +91,7 @@ protected void onCreate(Bundle savedInstanceState) {
         lp.copyFrom(window.getAttributes()); //Inherit transparent window attributes
         lp.width = WindowManager.LayoutParams.MATCH_PARENT; //Floating window WRAPS_CONTENT by default. Force fullscreen
         lp.height = WindowManager.LayoutParams.WRAP_CONTENT;
-        lp.y = Units.dpToPx(mContext, 35); // top margin
+        lp.y = Units.dpToPx(35); // top margin
         lp.gravity = (Gravity.TOP);
         window.setAttributes(lp);
 

diff --git a/app/src/main/java/stream/rocketnotes/Utils/Units.java b/app/src/main/java/stream/rocketnotes/Utils/Units.java
@@ -1,26 +1,23 @@
 package stream.rocketnotes.utils;
 
 import android.content.Context;
+import android.content.res.Resources;
 import android.util.DisplayMetrics;
 
 public class Units {
 
     /**
      * Converts dp to pixels.
      */
-    public static int dpToPx(Context context, int dp) {
-        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-        int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
-        return px;
+    public static int dpToPx(int dp) {
+        return (int) (dp * Resources.getSystem().getDisplayMetrics().density);
     }
 
     /**
      * Converts pixels to dp.
      */
     public static int pxToDp(Context context, int px) {
-        DisplayMetrics displayMetrics = context.getResources().getDisplayMetrics();
-        int dp = Math.round(px / (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT));
-        return dp;
+        return Math.round(px / Resources.getSystem().getDisplayMetrics().density);
     }
 
     public static float spToPx(Context context, float sp) {

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -2,6 +2,7 @@
     <string name="app_name">Rocket Notes</string>
 
     <!-- Settings Page -->
+    <string name="copyrightText">Copyright © %1$d Straight Up</string>
     <string name="loading">Loading&#8230;</string>
     <string name="loading_backup_database">Backing up notes&#8230;</string>
     <string name="loading_restore_database">Restoring notes&#8230;</string>
@@ -10,10 +11,12 @@
     <string name="settings_privacy">Privacy Policy</string>
     <string name="settings_thanks">Acknowledgements</string>
     <string name="settings_contact">Contact us</string>
-    <string name="url_tos">http://apprewards.org/rocketnotes/tos.html</string>
-    <string name="url_privacy">http://apprewards.org/rocketnotes/privacy.html</string>
-    <string name="url_thanks">http://apprewards.org/rocketnotes/thanks.html</string>
+    <string name="url_tos">https://straightup.fun/rocketnotes/tos.html</string>
+    <string name="url_privacy">https://straightup.fun/rocketnotes/privacy.html</string>
+    <string name="url_thanks">https://straightup.fun/rocketnotes/thanks.html</string>
     <string name="webview_error">Uh oh…something went wrong.</string>
+    <string name="more_apps_title">More Developer Apps</string>
+    <string name="more_apps_description">Other great Straight Up apps!</string>
 
     <string name="camera_retake">Retake</string>
     <string name="camera_save">Save</string>
@@ -32,7 +35,7 @@
     <string name="editpage_title">Edit Note</string>
     <string name="settingspage_title">Settings</string>
 
-    <string name="email_mailto">support@apprewards.org</string>
+    <string name="email_mailto">support@straightup.fun</string>
     <string name="email_subject">Rocket Notes Feedback</string>
-    <string name="email_message">Send to: support@apprewards.org\nFeedback:\n</string>
+    <string name="email_message">Send to: support@straightup.fun\nFeedback:\n</string>
 </resources>
diff --git a/app/src/main/res/xml/backup_descriptor.xml b/app/src/main/res/xml/backup_descriptor.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<full-backup-content>
+</full-backup-content>
diff --git a/app/src/main/res/xml/settings.xml b/app/src/main/res/xml/settings.xml
@@ -47,8 +47,8 @@
 
         <Preference
             android:key="settings_moreapps"
-            android:title="More Apps"
-            android:summary="Other great apps from Stream!"/>
+            android:title="@string/more_apps_title"
+            android:summary="@string/more_apps_description"/>
 
         <Preference
             android:key="settings_contact_us"