Merge pull request #3 from MakamuEvans/office

v2 merge
MakamuEvans · Apr 6, 2018 · c30149c · c30149c
2 parents 6f6ddda + 7bdf4d1
commit c30149c
Show file tree

Hide file tree

Showing 59 changed files with 1,837 additions and 496 deletions.
diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/.idea/modules.xml b/.idea/modules.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -2,12 +2,12 @@ apply plugin: 'com.android.application'
 
 android {
     compileSdkVersion 25
-    buildToolsVersion '26.0.2'
+    buildToolsVersion '27.0.3'
     defaultConfig {
         applicationId "com.elm.mycheck.login"
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 4
+        versionCode 5
         versionName "1.1.1"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output.json b/app/release/output.json
@@ -1 +1 @@
-[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4},"path":"app-release.apk","properties":{"packageId":"com.elm.mycheck.login","split":"","minSdkVersion":"15"}}]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5},"path":"app-release.apk","properties":{"packageId":"com.elm.mycheck.login","split":"","minSdkVersion":"15"}}]
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -14,7 +14,7 @@
     <application
         android:name=".model.Sugar"
         android:allowBackup="true"
-        android:icon="@mipmap/logo"
+        android:icon="@drawable/my_checkv2"
         android:label="@string/app_name"
         android:roundIcon="@drawable/logo"
         android:supportsRtl="true"
@@ -39,7 +39,7 @@
             android:value="myCheckv1.db" />
         <meta-data
             android:name="VERSION"
-            android:value="2" />
+            android:value="3" />
         <meta-data
             android:name="QUERY_LOG"
             android:value="true" />
@@ -99,7 +99,9 @@
             android:theme="@style/AppTheme.NoActionBar" />
         <activity
             android:name=".NewReminder"
-            android:windowSoftInputMode="adjustPan" />
+            android:launchMode="singleInstance"
+            android:windowSoftInputMode="adjustPan"
+            android:theme="@style/AppTheme.NoActionBar"/>
         <activity
             android:name=".SettingsActivity"
             android:label="@string/title_activity_settings" />

diff --git a/app/src/main/assets/sugar_upgrades/3.sql b/app/src/main/assets/sugar_upgrades/3.sql
@@ -0,0 +1,4 @@
+alter TABLE REMINDER add PUZZLETYPE VARCHAR;
+alter TABLE REMINDER add PUZZLELEVEL VARCHAR;
+alter TABLE REMINDER add POKE VARCHAR;
+alter TABLE REMINDER add ALTERNATIVEPUZZLE VARCHAR;
diff --git a/app/src/main/java/com/elm/mycheck/login/AddNote.java b/app/src/main/java/com/elm/mycheck/login/AddNote.java
@@ -138,7 +138,7 @@ public void onClick(View view) {
             new Tooltip.Builder(add_category)
                     .setText("Categorize your Note")
                     .setCancelable(true)
-                    .setBackgroundColor(getResources().getColor(R.color.colorAccentTomato))
+                    .setBackgroundColor(getResources().getColor(android.R.color.black))
                     .setTextColor(getResources().getColor(R.color.colorWhite))
                     .show();
         }

diff --git a/app/src/main/java/com/elm/mycheck/login/FullNote.java b/app/src/main/java/com/elm/mycheck/login/FullNote.java
@@ -68,7 +68,7 @@ protected void onCreate(Bundle savedInstanceState) {
       //  toolbar.setElevation(0);
         setSupportActionBar(toolbar);
         getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setElevation(0);
+        getSupportActionBar().setElevation(8);
 
         Intent intent = getIntent();
         note_id = intent.getExtras().getLong("noteId");
@@ -106,6 +106,12 @@ private void init() {
         edit = (ImageView) findViewById(R.id.action_edit);
         delete = (ImageView) findViewById(R.id.action_delete);
 
+        if (note1.getFavaouriteflag()){
+            fav.setImageResource(R.drawable.full_fav);
+        }else {
+            fav.setImageResource(R.drawable.full_unfav);
+        }
+
         in.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {
@@ -132,10 +138,10 @@ public void onClick(View view) {
                 note1.save();
 
                 if (status) {
-                    //item.setIcon(R.mipmap.ic_action_favorite_white);
+                    fav.setImageResource(R.drawable.full_fav);
                     MDToast.makeText(getBaseContext(), note1.getTitle() + " added to favourite", MDToast.LENGTH_SHORT, MDToast.TYPE_SUCCESS).show();
                 } else {
-                   // item.setIcon(R.mipmap.ic_action_favorite_border);
+                    fav.setImageResource(R.drawable.full_unfav);
                     MDToast.makeText(getBaseContext(), note1.getTitle() + " removed from favourite", MDToast.LENGTH_SHORT, MDToast.TYPE_WARNING).show();
                 }
 
@@ -239,10 +245,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 note1.save();
 
                 if (status) {
-                    item.setIcon(R.mipmap.ic_action_favorite_white);
+                    item.setIcon(R.drawable.full_fav);
                     MDToast.makeText(getBaseContext(), note1.getTitle() + " added to favourite", MDToast.LENGTH_SHORT, MDToast.TYPE_SUCCESS).show();
                 } else {
-                    item.setIcon(R.mipmap.ic_action_favorite_border);
+                    item.setIcon(R.drawable.full_unfav);
                     MDToast.makeText(getBaseContext(), note1.getTitle() + " removed from favourite", MDToast.LENGTH_SHORT, MDToast.TYPE_WARNING).show();
                 }
 

diff --git a/app/src/main/java/com/elm/mycheck/login/Navigation.java b/app/src/main/java/com/elm/mycheck/login/Navigation.java
@@ -336,6 +336,11 @@ public boolean onNavigationItemSelected(MenuItem item) {
         //lazy to rename these things.....phew!!!!!!!
 
        if (id == R.id.nav_share) {
+           Intent share = new Intent(Intent.ACTION_SEND);
+           share.setType("text/plain");
+           share.putExtra(Intent.EXTRA_SUBJECT, "I use myCheck App");
+           share.putExtra(Intent.EXTRA_TEXT, "I use myCheck App to save Notes and have Alarms with Puzzles! Download it now --> https://goo.gl/LNufqP");
+           startActivity(Intent.createChooser(share, "Share via"));
 
         } else if (id == R.id.nav_send) {
             Intent intent = new Intent(Navigation.this, SettingsActivity.class);
@@ -349,7 +354,10 @@ public boolean onNavigationItemSelected(MenuItem item) {
         } else if (id == R.id.nav_categories){
             Intent intent = new Intent(Navigation.this, ManageCategories.class);
             startActivity(intent);
-        }
+        }else if (id == R.id.nav_rate){
+           Intent intent = new Intent(Intent.ACTION_VIEW,Uri.parse("market://details?id=com.elm.mycheck.login"));
+           startActivity(intent);
+       }
 
         DrawerLayout drawer = (DrawerLayout) findViewById(R.id.drawer_layout);
         drawer.closeDrawer(GravityCompat.START);
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":4},"path":"app-release.apk","properties":{"packageId":"com.elm.mycheck.login","split":"","minSdkVersion":"15"}}]
		[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":5},"path":"app-release.apk","properties":{"packageId":"com.elm.mycheck.login","split":"","minSdkVersion":"15"}}]