Making Production Ready + Code CleanUp + Improved Code Quality - 4

source-code/app/src/main/AndroidManifest.xml

@@ -16,6 +16,7 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
+        android:supportsRtl="true"
         android:theme="@style/AppTheme" >
         <activity
             android:name=".activity.HomeActivity"

source-code/app/src/main/java/org/buildmlearn/toolkit/activity/AboutBuildmLearn.java

@@ -9,6 +9,8 @@
 
 import org.buildmlearn.toolkit.R;
 
+import java.util.Locale;
+
 /**
  * @brief Gives brief info about BuildmLearn community and toolkit
  */
@@ -30,9 +32,10 @@ protected void onCreate(Bundle savedInstanceState) {
             pInfo = getPackageManager().getPackageInfo(getPackageName(), 0);
             String version = pInfo.versionName;
             assert findViewById(R.id.app_version) != null;
-            ((TextView)findViewById(R.id.app_version)).setText("Version: " + version);
+            ((TextView) findViewById(R.id.app_version)).setText(String.format(Locale.ENGLISH, "Version: %s", version));
         } catch (PackageManager.NameNotFoundException e) {
             assert findViewById(R.id.app_version) != null;
+            assert ((TextView) findViewById(R.id.app_version)) != null;
             ((TextView)findViewById(R.id.app_version)).setText("Version: 1.0");
             e.printStackTrace();
         }

source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateActivity.java

@@ -7,7 +7,6 @@
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.Toolbar;
-import android.view.View;
 
 import org.buildmlearn.toolkit.R;
 import org.buildmlearn.toolkit.adapter.TemplateAdapter;
@@ -27,16 +26,18 @@ protected void onCreate(Bundle savedInstanceState) {
         setContentView(R.layout.activity_template);
         setSupportActionBar((Toolbar) findViewById(R.id.toolbar));
         ActionBar actionBar = getSupportActionBar();
+        assert actionBar != null;
         actionBar.setDisplayHomeAsUpEnabled(true);
         actionBar.setHomeButtonEnabled(true);
         TemplateAdapter mAdapter = new TemplateAdapter(this);
         RecyclerView mRecyclerView = (RecyclerView) findViewById(android.R.id.list);
+        assert mRecyclerView != null;
         mRecyclerView.setAdapter(mAdapter);
         mRecyclerView.setLayoutManager(new LinearLayoutManager(this));
 
         mAdapter.setOnClickListener(new TemplateAdapter.SetOnClickListener() {
             @Override
-            public void onItemClick(int position, View view) {
+            public void onItemClick(int position) {
                 Intent intent = new Intent(getApplicationContext(), TemplateEditor.class);
                 intent.putExtra(Constants.TEMPLATE_ID, position);
                 startActivity(intent);

source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TemplateEditor.java

@@ -305,9 +305,7 @@ private void setUpTemplateEditor() {
                 populateMetaView(selectedTemplate.newMetaEditorAdapter(this));
             }
             setUpActionBar();
-        } catch (InstantiationException e) {
-            e.printStackTrace();
-        } catch (IllegalAccessException e) {
+        } catch (InstantiationException | IllegalAccessException e) {
             e.printStackTrace();
         }
     }
@@ -409,7 +407,7 @@ public void onClick(DialogInterface dialog, int id) {
                                     return;
                                 }
                                 Uri fileUri = Uri.fromFile(new File(savedFilePath));
-                                ArrayList<Uri> uris = new ArrayList<Uri>();
+                                ArrayList<Uri> uris = new ArrayList<>();
                                 Intent sendIntent = new Intent(Intent.ACTION_SEND_MULTIPLE);
                                 sendIntent.setType("application/zip");
                                 uris.add(fileUri);
@@ -426,7 +424,7 @@ public void onClick(DialogInterface dialog, int id) {
                                 String keyPassword = getString(R.string.key_password);
                                 String aliasName = getString(R.string.alias_name);
                                 String aliaspassword = getString(R.string.alias_password);
-                                KeyStoreDetails keyStoreDetails = new KeyStoreDetails("TestKeyStore.jks", keyPassword, aliasName, aliaspassword);
+                                KeyStoreDetails keyStoreDetails = new KeyStoreDetails(keyPassword, aliasName, aliaspassword);
                                 SignerThread signer = new SignerThread(getApplicationContext(), selectedTemplate.getApkFilePath(), saveProject(), keyStoreDetails, selectedTemplate.getAssetsFilePath(), selectedTemplate.getAssetsFileName(TemplateEditor.this));
 
                                 mApkGenerationDialog = new MaterialDialog.Builder(TemplateEditor.this)
@@ -487,7 +485,7 @@ public void onFail(Exception e) {
                                 keyPassword = getString(R.string.key_password);
                                 aliasName = getString(R.string.alias_name);
                                 aliaspassword = getString(R.string.alias_password);
-                                keyStoreDetails = new KeyStoreDetails("TestKeyStore.jks", keyPassword, aliasName, aliaspassword);
+                                keyStoreDetails = new KeyStoreDetails(keyPassword, aliasName, aliaspassword);
                                 signer = new SignerThread(getApplicationContext(), selectedTemplate.getApkFilePath(), saveProject(), keyStoreDetails, selectedTemplate.getAssetsFilePath(), selectedTemplate.getAssetsFileName(TemplateEditor.this));
 
                                 mApkGenerationDialog = new MaterialDialog.Builder(TemplateEditor.this)
@@ -616,8 +614,10 @@ private String saveProject() {
         EditText authorEditText = (EditText) findViewById(R.id.author_name);
         EditText titleEditText = (EditText) findViewById(R.id.template_title);
         assert findViewById(R.id.author_name) != null;
+        assert ((EditText) findViewById(R.id.author_name)) != null;
         String author = ((EditText) findViewById(R.id.author_name)).getText().toString();
         assert findViewById(R.id.template_title) != null;
+        assert ((EditText) findViewById(R.id.template_title)) != null;
         String title = ((EditText) findViewById(R.id.template_title)).getText().toString();
         if ("".equals(author)) {
             assert authorEditText != null;
@@ -695,9 +695,11 @@ public void onBackPressed() {
      * @return Absolute path of the saved file. Null if there is some error.
      * @brief Saves the current project into a .buildmlearn file.
      */
-    protected String saveDraft() {
+    private String saveDraft() {
 
+        assert ((EditText) findViewById(R.id.author_name)) != null;
         String author = ((EditText) findViewById(R.id.author_name)).getText().toString();
+        assert ((EditText) findViewById(R.id.template_title)) != null;
         String title = ((EditText) findViewById(R.id.template_title)).getText().toString();
 
 

source-code/app/src/main/java/org/buildmlearn/toolkit/activity/TutorialActivity.java

@@ -28,10 +28,12 @@ protected void onCreate(Bundle savedInstanceState) {
         ViewPager mPager = (ViewPager) findViewById(R.id.pager);
         //  mPager.setAdapter(mAdapter);
 
+        assert mPager != null;
         mPager.setAdapter(mAdapter);
 
 
         CirclePageIndicator mIndicator = (CirclePageIndicator) findViewById(R.id.indicator);
+        assert mIndicator != null;
         mIndicator.setViewPager(mPager);
     }
 

source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/DraftProjectAdapter.java

@@ -11,14 +11,15 @@
 import org.buildmlearn.toolkit.views.TextViewPlus;
 
 import java.util.ArrayList;
+import java.util.Locale;
 
 /**
  * Created by scopeinfinity on 10/3/16.
  */
 public class DraftProjectAdapter extends BaseAdapter {
 
-    private Context mContext;
-    private ArrayList<SavedProject> data;
+    private final Context mContext;
+    private final ArrayList<SavedProject> data;
 
     public DraftProjectAdapter(Context mContext, ArrayList<SavedProject> data) {
         this.mContext = mContext;
@@ -68,8 +69,8 @@ public View getView(int position, View convertView, ViewGroup parent) {
         }
 
         SavedProject projectData = getItem(position);
-        holder.draftSubtitle.setText("Last Modified: " + projectData.getTime() );
-        holder.draftTitle.setText("Drafted on "+projectData.getDate());
+        holder.draftSubtitle.setText(String.format(Locale.ENGLISH, "Last Modified: %s", projectData.getTime()));
+        holder.draftTitle.setText(String.format(Locale.ENGLISH, "Drafted on %s", projectData.getDate()));
         holder.draftIcon.setText("D");
         convertView.setTag(holder);
         return convertView;

source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/SavedApiAdapter.java

@@ -21,8 +21,8 @@
 
 public class SavedApiAdapter extends BaseAdapter {
 
-    private Context mContext;
-    private ArrayList<SavedApi> data;
+    private final Context mContext;
+    private final ArrayList<SavedApi> data;
 
     public SavedApiAdapter(Context mContext, ArrayList<SavedApi> data) {
         this.mContext = mContext;
@@ -72,7 +72,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
         }
 
         SavedApi apiData = getItem(position);
-        holder.details.setText("Modified: " + apiData.getDate() + ", Author: " + apiData.getAuthor());
+        holder.details.setText(String.format(Locale.ENGLISH, "Modified: %s, Author: ", apiData.getDate(), apiData.getAuthor()));
         holder.apkName.setText(apiData.getName());
         holder.projectIcon.setText(apiData.getName().substring(0, 1).toUpperCase(Locale.US));
         convertView.setTag(holder);

source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/SavedProjectAdapter.java

@@ -1,6 +1,7 @@
 package org.buildmlearn.toolkit.adapter;
 
 import android.content.Context;
+import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -81,13 +82,13 @@ public View getView(int position, View convertView, ViewGroup parent) {
         }
 
         if (selectedPosition == position) {
-            convertView.setBackgroundColor(mContext.getResources().getColor(R.color.color_divider));
+            convertView.setBackgroundColor(ContextCompat.getColor(mContext, R.color.color_divider));
         } else {
             convertView.setBackgroundColor(0);
         }
 
         SavedProject projectData = getItem(position);
-        holder.details.setText("Modified: " + projectData.getDate() + ", Author: " + projectData.getAuthor());
+        holder.details.setText(String.format(Locale.ENGLISH, "Modified: %s, Author: ", projectData.getDate(), projectData.getAuthor()));
         holder.projectName.setText(projectData.getName());
         holder.projectIcon.setText(projectData.getName().substring(0, 1).toUpperCase(Locale.US));
         convertView.setTag(holder);

source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/TemplateAdapter.java

@@ -51,12 +51,11 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int posit
         }
 
         View view = inflater.inflate(layoutResource, viewGroup, false);
-        RecyclerView.ViewHolder viewHolder = new ViewHolder(view);
 
-        return viewHolder;
+        return new ViewHolder(view);
     }
 
-    public Template getItem(int i) {
+    private Template getItem(int i) {
         return templates[i];
     }
 
@@ -119,14 +118,14 @@ public int getColor() {
     }
 
     public interface SetOnClickListener extends ViewHolder.SetOnClickListener {
-        void onItemClick(int position, View itemView);
+        void onItemClick(int position);
     }
 
     public static class ViewHolder extends RecyclerView.ViewHolder {
-        public TextView title;
-        public TextView description;
-        public ImageView image;
-        public CardView cardView;
+        public final TextView title;
+        public final TextView description;
+        public final ImageView image;
+        public final CardView cardView;
         SetOnClickListener listener;
 
         public ViewHolder(final View v) {
@@ -141,7 +140,7 @@ public ViewHolder(final View v) {
                 @Override
                 public void onClick(View view) {
                     if (listener != null) {
-                        listener.onItemClick(getAdapterPosition(), v);
+                        listener.onItemClick(getAdapterPosition());
                     }
                 }
             });
@@ -151,40 +150,24 @@ public ImageView getImage() {
             return image;
         }
 
-        public void setImage(ImageView image) {
-            this.image = image;
-        }
-
         public CardView getCardView() {
             return cardView;
         }
 
-        public void setCardView(CardView cardView) {
-            this.cardView = cardView;
-        }
-
         public TextView getDescription() {
             return description;
         }
 
-        public void setDescription(TextView description) {
-            this.description = description;
-        }
-
         public TextView getTitle() {
             return title;
         }
 
-        public void setTitle(TextView title) {
-            this.title = title;
-        }
-
         public void setItemClickListener(SetOnClickListener itemClickListener) {
             this.listener = itemClickListener;
         }
 
         public interface SetOnClickListener {
-            void onItemClick(int position, View itemView);
+            void onItemClick(int position);
         }
     }
 }

source-code/app/src/main/java/org/buildmlearn/toolkit/adapter/TutorialAdapter.java

@@ -47,10 +47,6 @@ private Tutorial getItem(int position) {
         return mTutorials[position];
     }
 
-    public long getItemId(int position) {
-        return position;
-    }
-
     /**
      * {@inheritDoc}
      */

source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/data/ComprehensionDb.java

@@ -30,10 +30,6 @@ public void open() throws SQLException {
         db = dbHelper.getWritableDatabase();
     }
 
-    public boolean isOpen() {
-        return db.isOpen();
-    }
-
     public void close() {
         dbHelper.close();
     }

source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/data/DataUtils.java

@@ -1,7 +1,5 @@
 package org.buildmlearn.toolkit.comprehensiontemplate.data;
 
-import android.content.Context;
-
 import org.buildmlearn.toolkit.comprehensiontemplate.Constants;
 import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
@@ -18,7 +16,7 @@
  */
 public class DataUtils {
 
-    public static String[] readTitleAuthor(Context myContext) {
+    public static String[] readTitleAuthor() {
         String result[] = new String[2];
         DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance();
 

source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/LastFragment.java

@@ -63,6 +63,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
+                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing

source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/MainFragment.java

@@ -63,6 +63,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
+                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing

source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/QuestionFragment.java

@@ -64,6 +64,7 @@ public boolean onMenuItemClick(MenuItem menuItem) {
                         welcomeAlert.show();
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
                         assert welcomeAlert.findViewById(android.R.id.message) != null;
+                        assert ((TextView) welcomeAlert.findViewById(android.R.id.message)) != null;
                         ((TextView) welcomeAlert.findViewById(android.R.id.message)).setMovementMethod(LinkMovementMethod.getInstance());
                         break;
                     default: //do nothing

source-code/app/src/main/java/org/buildmlearn/toolkit/comprehensiontemplate/fragment/SplashFragment.java

@@ -33,7 +33,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
         View rootView = inflater.inflate(R.layout.fragment_splash, container, false);
 
         final Activity mActivity = getActivity();
-        final String result[] = DataUtils.readTitleAuthor(getContext());
+        final String result[] = DataUtils.readTitleAuthor();
         TextView title = (TextView) rootView.findViewById(R.id.title);
         TextView author_name = (TextView) rootView.findViewById(R.id.author_name);
 

source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/data/DataUtils.java

@@ -5,7 +5,6 @@
 import org.xml.sax.SAXException;
 
 import java.io.File;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 
 import javax.xml.parsers.DocumentBuilder;
@@ -37,9 +36,7 @@ public static String[] readTitleAuthor() {
             result[1] = doc.getElementsByTagName("name").item(0).getChildNodes()
                     .item(0).getNodeValue();
 
-        } catch (ParserConfigurationException | FileNotFoundException | SAXException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
+        } catch (ParserConfigurationException | SAXException | IOException e) {
             e.printStackTrace();
         }
         return result;

source-code/app/src/main/java/org/buildmlearn/toolkit/dictationtemplate/data/DictDb.java

@@ -25,10 +25,6 @@ public void open() throws SQLException {
         db = dbHelper.getWritableDatabase();
     }
 
-    public boolean isOpen() {
-        return db.isOpen();
-    }
-
     public void close() {
         dbHelper.close();
     }