1. forgot to update string.xml app_version and its done now

2. another path on last patch so: ready for version 1.8.1
unitools-apps · Sep 22, 2019 · 9da004a · 9da004a
1 parent 4dd4c38
commit 9da004a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 24 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,9 +6,9 @@ android {
         applicationId "com.github.ali77gh.unitools"
         minSdkVersion 19
         targetSdkVersion 28
-        versionName '1.8.0'
+        versionName '1.8.1'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
-        versionCode 5
+        versionCode 6
     }
     buildTypes {
         release {

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,19 +1 @@
-[
-  {
-    "outputType": {
-      "type": "APK"
-    },
-    "apkInfo": {
-      "type": "MAIN",
-      "splits": [],
-      "versionCode": 5,
-      "versionName": "1.8.0",
-      "enabled": true,
-      "outputFile": "app-release.apk",
-      "fullName": "release",
-      "baseName": "release"
-    },
-    "path": "app-release.apk",
-    "properties": {}
-  }
-]
+[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":6,"versionName":"1.8.1","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
diff --git a/app/src/main/java/com/github/ali77gh/unitools/ui/dialogs/AddClassDialog.java b/app/src/main/java/com/github/ali77gh/unitools/ui/dialogs/AddClassDialog.java
@@ -16,8 +16,7 @@
 import com.github.ali77gh.unitools.core.CH;
 import com.github.ali77gh.unitools.data.model.Time;
 import com.github.ali77gh.unitools.data.model.UClass;
-
-;
+import com.github.ali77gh.unitools.data.repo.UClassRepo;
 
 /**
  * Created by ali77gh on 10/12/18.
@@ -54,7 +53,13 @@ protected void onCreate(Bundle savedInstanceState) {
             title.setText(getActivity().getResources().getString(R.string.edit_new_class));
             label.setText(uClass.what);
             where.setText(uClass.where);
+
+            if (uClass.teacherName == null) { // while user data is older then version 1.8.0
+                uClass.teacherName = "";
+                UClassRepo.Update(uClass);
+            }
             teacher.setText(uClass.teacherName);
+
             hour.setText(String.valueOf(uClass.time.hour));
             min.setText(String.valueOf(uClass.time.min));
         }

diff --git a/app/src/main/java/com/github/ali77gh/unitools/ui/dialogs/ClassInfoDialog.java b/app/src/main/java/com/github/ali77gh/unitools/ui/dialogs/ClassInfoDialog.java
@@ -19,6 +19,7 @@
 import com.github.ali77gh.unitools.core.Translator;
 import com.github.ali77gh.unitools.data.model.UClass;
 import com.github.ali77gh.unitools.data.repo.UClassRepo;
+import com.github.ali77gh.unitools.data.repo.UserInfoRepo;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -100,6 +101,10 @@ protected void onCreate(Bundle savedInstanceState) {
 
     private void LoadData(UClass uClass) {
         name.setText(Translator.getUClassReadable(uClass));
+        if (uClass.teacherName == null){ // while user data is older then version 1.8.0
+            uClass.teacherName = "";
+            UClassRepo.Update(uClass);
+        }
         if (!uClass.teacherName.equals("")) {
             teacherName.setText(CH.getString(R.string.teacher) + " : " + uClass.teacherName);
             teacherName.setVisibility(View.VISIBLE);

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
     <string name="app_name">UniTools</string>
-    <string name="app_version">1.8.0</string>
+    <string name="app_version">1.8.1</string>
 
     <string name="LangID">"en</string>