Created the first release and fixed minor bugs

certified84 · Mar 6, 2021 · ac9dc4d · ac9dc4d
1 parent 5d04368
commit ac9dc4d
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 15 deletions.
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -37,13 +37,16 @@ android {
 dependencies {
 
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'com.google.android.material:material:1.2.1'
+    implementation 'com.google.android.material:material:1.3.0'
     implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.navigation:navigation-fragment:2.3.2'
-    implementation 'androidx.navigation:navigation-ui:2.3.2'
+    implementation 'androidx.navigation:navigation-fragment:2.3.3'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.3'
+    implementation 'androidx.navigation:navigation-ui:2.3.3'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.3'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.work:work-runtime:2.4.0'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
+    implementation 'androidx.work:work-runtime:2.5.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 //    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
 
@@ -84,8 +87,8 @@ dependencies {
     annotationProcessor 'com.github.bumptech.glide:compiler:4.11.0'
 
     implementation "androidx.core:core-ktx:1.3.2"
-    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0"
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.3.72"
+    implementation "androidx.lifecycle:lifecycle-viewmodel-ktx:2.3.0"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:1.4.21"
 }
 repositories {
     mavenCentral()

diff --git a/app/release/app-release.apk b/app/release/app-release.apk
diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json
@@ -1,19 +1,17 @@
 {
-  "version": 1,
+  "version": 2,
   "artifactType": {
     "type": "APK",
     "kind": "Directory"
   },
   "applicationId": "com.certified.notes",
-  "variantName": "release",
+  "variantName": "processReleaseResources",
   "elements": [
     {
       "type": "SINGLE",
       "filters": [],
-      "properties": [],
       "versionCode": 1,
       "versionName": "beta-release-1.0",
-      "enabled": true,
       "outputFile": "app-release.apk"
     }
   ]

diff --git a/app/src/main/java/com/certified/notes/ui/ProfileFragment.java b/app/src/main/java/com/certified/notes/ui/ProfileFragment.java
@@ -39,6 +39,7 @@
 import com.google.android.material.switchmaterial.SwitchMaterial;
 import com.google.android.material.textfield.TextInputEditText;
 import com.google.android.material.textfield.TextInputLayout;
+import com.google.android.material.textview.MaterialTextView;
 
 import java.io.FileNotFoundException;
 import java.io.InputStream;
@@ -270,11 +271,13 @@ private void launchNameDialog() {
         View view = inflater.inflate(R.layout.dialog_edit_profile, null);
         BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(requireContext(), R.style.BottomSheetDialogTheme);
 
+        MaterialTextView tvEditProfileDialogTitle = view.findViewById(R.id.tv_edit_profile_dialog_title);
         TextInputLayout inputLayout = view.findViewById(R.id.et_edit_profile_layout);
         TextInputEditText inputEditText = view.findViewById(R.id.et_edit_profile);
         MaterialButton btnCancel = view.findViewById(R.id.btn_cancel);
         MaterialButton btnSave = view.findViewById(R.id.btn_save);
 
+        tvEditProfileDialogTitle.setText(R.string.edit_name);
         inputLayout.setHint(getString(R.string.name));
         inputEditText.setText(userName);
 
@@ -308,11 +311,13 @@ private void launchSchoolDialog() {
         View view = inflater.inflate(R.layout.dialog_edit_profile, null);
         BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(requireContext(), R.style.BottomSheetDialogTheme);
 
+        MaterialTextView tvEditProfileDialogTitle = view.findViewById(R.id.tv_edit_profile_dialog_title);
         TextInputLayout inputLayout = view.findViewById(R.id.et_edit_profile_layout);
         TextInputEditText inputEditText = view.findViewById(R.id.et_edit_profile);
         MaterialButton btnCancel = view.findViewById(R.id.btn_cancel);
         MaterialButton btnSave = view.findViewById(R.id.btn_save);
 
+        tvEditProfileDialogTitle.setText(R.string.edit_school);
         inputLayout.setHint(getString(R.string.school));
         inputEditText.setText(userSchool);
 
@@ -346,11 +351,13 @@ private void launchDepartmentDialog() {
         View view = inflater.inflate(R.layout.dialog_edit_profile, null);
         BottomSheetDialog bottomSheetDialog = new BottomSheetDialog(requireContext(), R.style.BottomSheetDialogTheme);
 
+        MaterialTextView tvEditProfileDialogTitle = view.findViewById(R.id.tv_edit_profile_dialog_title);
         TextInputLayout inputLayout = view.findViewById(R.id.et_edit_profile_layout);
         TextInputEditText inputEditText = view.findViewById(R.id.et_edit_profile);
         MaterialButton btnCancel = view.findViewById(R.id.btn_cancel);
         MaterialButton btnSave = view.findViewById(R.id.btn_save);
 
+        tvEditProfileDialogTitle.setText(R.string.edit_department);
         inputLayout.setHint(getString(R.string.department));
         inputEditText.setText(userDepartment);
 

diff --git a/app/src/main/res/layout/dialog_edit_profile.xml b/app/src/main/res/layout/dialog_edit_profile.xml
@@ -3,17 +3,28 @@
         xmlns:app="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        xmlns:tools="http://schemas.android.com/tools"
         android:background="@drawable/bottom_sheet_bg"
         android:elevation="8dp"
         android:id="@+id/constraint_layout">
 
+    <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/tv_edit_profile_dialog_title"
+            android:layout_width="wrap_content"
+            android:layout_marginTop="16dp"
+            android:layout_height="wrap_content"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintStart_toStartOf="@+id/et_edit_profile_layout"
+            style="@style/TextAppearance.Notes.TitleText2"
+            tools:text="Edit Profile"/>
+
     <com.google.android.material.textfield.TextInputLayout
             android:id="@+id/et_edit_profile_layout"
             style="@style/Widgets.Notes.TextInputLayout"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_marginTop="16dp"
+            android:layout_marginTop="8dp"
             android:layout_marginEnd="16dp"
             android:layout_marginBottom="8dp"
             android:hint="@string/name"
@@ -25,7 +36,7 @@
             app:layout_constraintBottom_toTopOf="@+id/btn_save"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
+            app:layout_constraintTop_toBottomOf="@+id/tv_edit_profile_dialog_title">
 
         <com.google.android.material.textfield.TextInputEditText
                 android:id="@+id/et_edit_profile"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -119,4 +119,7 @@
     <string name="notes_notification">Notes Notification</string>
     <string name="ok">OK</string>
     <string name="notes_reminder">Notes reminder</string>
+    <string name="edit_name">Edit name</string>
+    <string name="edit_department">Edit Department</string>
+    <string name="edit_school">Edit School</string>
 </resources>
diff --git a/build.gradle b/build.gradle
@@ -6,8 +6,8 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.0.2'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.3.72"
+        classpath 'com.android.tools.build:gradle:4.1.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.4.21"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files