chore: merge dev in to master for io.pslab

README.md

@@ -1,6 +1,6 @@
 # PSLab Android App
 
-<a href="https://play.google.com/store/apps/details?id=org.fossasia.pslab"><img alt="Get it on Google Play" height="80" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"></a>
+<a href="https://play.google.com/store/apps/details?id=io.pslab"><img alt="Get it on Google Play" height="80" src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"></a>
 <a href="https://f-droid.org/app/org.fossasia.pslab"><img alt="Get it on F-Droid" height="80" src="https://f-droid.org/badge/get-it-on.png"></a>
 
 [![Build Status](https://travis-ci.org/fossasia/pslab-android.svg?branch=development)](https://travis-ci.org/fossasia/pslab-android)

app/build.gradle

@@ -5,11 +5,11 @@ android {
     compileSdkVersion rootProject.ext.compileSdkVersion
     buildToolsVersion rootProject.ext.buildToolsVersion
     defaultConfig {
-        applicationId "org.pslab"
+        applicationId "io.pslab"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
         versionCode 1
-        versionName "1.1.0"
+        versionName "2.0.0"
         multiDexEnabled true
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }

app/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.pslab">
+    package="io.pslab">
 
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />

app/src/main/java/org/pslab/PSLabApplication.java → app/src/main/java/io/pslab/PSLabApplication.java

@@ -1,4 +1,4 @@
-package org.pslab;
+package io.pslab;
 
 import android.app.Application;
 

app/src/main/java/org/pslab/SearchModel.java → app/src/main/java/io/pslab/SearchModel.java

@@ -1,4 +1,4 @@
-package org.pslab;
+package io.pslab;
 
 import ir.mirrajabi.searchdialog.core.Searchable;
 

app/src/main/java/org/pslab/activity/AccelerometerActivity.java → app/src/main/java/io/pslab/activity/AccelerometerActivity.java

@@ -1,13 +1,13 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 
-import org.pslab.R;
-import org.pslab.adapters.AccelerometerAdapter;
+import io.pslab.R;
+import io.pslab.adapters.AccelerometerAdapter;
 
 public class AccelerometerActivity extends AppCompatActivity {
 

app/src/main/java/org/pslab/activity/Barometer_activity.java → app/src/main/java/io/pslab/activity/Barometer_activity.java

@@ -1,4 +1,4 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
 import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
@@ -31,12 +31,12 @@
 import com.github.mikephil.charting.data.LineData;
 import com.github.mikephil.charting.data.LineDataSet;
 
-import org.pslab.R;
-import org.pslab.communication.ScienceLab;
-import org.pslab.communication.sensors.BMP180;
-import org.pslab.others.MathUtils;
-import org.pslab.others.ScienceLabCommon;
-import org.pslab.others.SwipeGestureDetector;
+import io.pslab.R;
+import io.pslab.communication.ScienceLab;
+import io.pslab.communication.sensors.BMP180;
+import io.pslab.others.MathUtils;
+import io.pslab.others.ScienceLabCommon;
+import io.pslab.others.SwipeGestureDetector;
 
 import java.io.IOException;
 import java.text.DecimalFormat;

app/src/main/java/org/pslab/activity/CompassActivity.java → app/src/main/java/io/pslab/activity/CompassActivity.java

@@ -1,4 +1,4 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
 import android.content.SharedPreferences;
 import android.hardware.Sensor;
@@ -24,9 +24,9 @@
 import android.widget.RadioButton;
 import android.widget.TextView;
 
-import org.pslab.R;
-import org.pslab.others.MathUtils;
-import org.pslab.others.SwipeGestureDetector;
+import io.pslab.R;
+import io.pslab.others.MathUtils;
+import io.pslab.others.SwipeGestureDetector;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/org/pslab/activity/ControlActivity.java → app/src/main/java/io/pslab/activity/ControlActivity.java

@@ -1,22 +1,20 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
-import android.content.DialogInterface;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.design.widget.BottomNavigationView;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentTransaction;
-import android.support.v7.app.AlertDialog;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
-import org.pslab.fragment.ControlFragmentAdvanced;
-import org.pslab.fragment.ControlFragmentMain;
-import org.pslab.fragment.ControlFragmentRead;
+import io.pslab.fragment.ControlFragmentAdvanced;
+import io.pslab.fragment.ControlFragmentMain;
+import io.pslab.fragment.ControlFragmentRead;
 
-import org.pslab.R;
-import org.pslab.others.ControlActivityCommon;
+import io.pslab.R;
+import io.pslab.others.ControlActivityCommon;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/org/pslab/activity/LogicalAnalyzerActivity.java → app/src/main/java/io/pslab/activity/LogicalAnalyzerActivity.java

@@ -1,15 +1,15 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 
-import org.pslab.R;
-import org.pslab.communication.ScienceLab;
-import org.pslab.fragment.LALogicLinesFragment;
-import org.pslab.others.ScienceLabCommon;
+import io.pslab.R;
+import io.pslab.communication.ScienceLab;
+import io.pslab.fragment.LALogicLinesFragment;
+import io.pslab.others.ScienceLabCommon;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/org/pslab/activity/LuxMeterActivity.java → app/src/main/java/io/pslab/activity/LuxMeterActivity.java

@@ -1,4 +1,4 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
 import android.Manifest;
 import android.content.Context;
@@ -30,14 +30,14 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.pslab.R;
-import org.pslab.fragment.LuxMeterFragmentConfig;
-import org.pslab.fragment.LuxMeterFragmentData;
-import org.pslab.others.CustomSnackBar;
-import org.pslab.others.GPSLogger;
-import org.pslab.others.MathUtils;
-import org.pslab.fragment.SettingsFragment;
-import org.pslab.others.SwipeGestureDetector;
+import io.pslab.R;
+import io.pslab.fragment.LuxMeterFragmentConfig;
+import io.pslab.fragment.LuxMeterFragmentData;
+import io.pslab.others.CustomSnackBar;
+import io.pslab.others.GPSLogger;
+import io.pslab.others.MathUtils;
+import io.pslab.fragment.SettingsFragment;
+import io.pslab.others.SwipeGestureDetector;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/org/pslab/activity/MainActivity.java → app/src/main/java/io/pslab/activity/MainActivity.java

@@ -1,4 +1,4 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
 import android.app.PendingIntent;
 import android.app.ProgressDialog;
@@ -29,24 +29,24 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import org.pslab.R;
-import org.pslab.communication.CommunicationHandler;
-import org.pslab.fragment.AboutUsFragment;
-import org.pslab.fragment.FAQFragment;
-import org.pslab.fragment.HomeFragment;
-import org.pslab.fragment.InstrumentsFragment;
-import org.pslab.fragment.PSLabPinLayoutFragment;
-import org.pslab.others.CustomTabService;
-import org.pslab.others.InitializationVariable;
-import org.pslab.others.ScienceLabCommon;
-import org.pslab.receivers.USBDetachReceiver;
+import io.pslab.R;
+import io.pslab.communication.CommunicationHandler;
+import io.pslab.fragment.AboutUsFragment;
+import io.pslab.fragment.FAQFragment;
+import io.pslab.fragment.HomeFragment;
+import io.pslab.fragment.InstrumentsFragment;
+import io.pslab.fragment.PSLabPinLayoutFragment;
+import io.pslab.others.CustomTabService;
+import io.pslab.others.InitializationVariable;
+import io.pslab.others.ScienceLabCommon;
+import io.pslab.receivers.USBDetachReceiver;
 
 import java.io.IOException;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-import static org.pslab.others.ScienceLabCommon.scienceLab;
+import static io.pslab.others.ScienceLabCommon.scienceLab;
 
 public class MainActivity extends AppCompatActivity {
 
@@ -131,9 +131,9 @@ protected void onCreate(Bundle savedInstanceState) {
         mHandler = new Handler();
 
         navHeader = navigationView.getHeaderView(0);
-        txtName = navHeader.findViewById(org.pslab.R.id.name);
-        imgProfile = navHeader.findViewById(org.pslab.R.id.img_profile);
-        activityTitles = getResources().getStringArray(org.pslab.R.array.nav_item_activity_titles);
+        txtName = navHeader.findViewById(io.pslab.R.id.name);
+        imgProfile = navHeader.findViewById(io.pslab.R.id.img_profile);
+        activityTitles = getResources().getStringArray(io.pslab.R.array.nav_item_activity_titles);
 
         setPSLabVersionIDs();
 
@@ -279,7 +279,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
         });
 
         if (drawer != null) {
-            ActionBarDrawerToggle actionBarDrawerToggle = new ActionBarDrawerToggle(this, drawer, toolbar, org.pslab.R.string.openDrawer, org.pslab.R.string.closeDrawer) {
+            ActionBarDrawerToggle actionBarDrawerToggle = new ActionBarDrawerToggle(this, drawer, toolbar, io.pslab.R.string.openDrawer, io.pslab.R.string.closeDrawer) {
                 @Override
                 public void onDrawerClosed(View drawerView) {
                     super.onDrawerClosed(drawerView);

app/src/main/java/org/pslab/activity/MapsActivity.java → app/src/main/java/io/pslab/activity/MapsActivity.java

@@ -1,9 +1,9 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 
-import org.pslab.R;
+import io.pslab.R;
 import org.osmdroid.api.IMapController;
 import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
 import org.osmdroid.util.GeoPoint;

app/src/main/java/org/pslab/activity/MultimeterActivity.java → app/src/main/java/io/pslab/activity/MultimeterActivity.java

@@ -1,4 +1,4 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
 import android.content.SharedPreferences;
 import android.graphics.Typeface;
@@ -18,11 +18,11 @@
 
 import android.widget.TextView;
 
-import org.pslab.R;
-import org.pslab.communication.ScienceLab;
-import org.pslab.others.MathUtils;
-import org.pslab.others.ScienceLabCommon;
-import org.pslab.others.SwipeGestureDetector;
+import io.pslab.R;
+import io.pslab.communication.ScienceLab;
+import io.pslab.others.MathUtils;
+import io.pslab.others.ScienceLabCommon;
+import io.pslab.others.SwipeGestureDetector;
 
 import java.text.DecimalFormat;
 import java.util.Locale;
@@ -87,7 +87,7 @@ protected void onCreate(final Bundle savedInstanceState) {
         setContentView(R.layout.activity_multimeter_main);
         ButterKnife.bind(this);
         scienceLab = ScienceLabCommon.scienceLab;
-        knobMarker = getResources().getStringArray(org.pslab.R.array.multimeter_knob_states);
+        knobMarker = getResources().getStringArray(io.pslab.R.array.multimeter_knob_states);
         setUpBottomSheet();
         multimeter_data = this.getSharedPreferences(NAME, MODE_PRIVATE);
         knobState = multimeter_data.getInt("KnobState", 2);

app/src/main/java/org/pslab/activity/OscilloscopeActivity.java → app/src/main/java/io/pslab/activity/OscilloscopeActivity.java

@@ -1,4 +1,4 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
 
 import android.annotation.SuppressLint;
@@ -35,20 +35,20 @@
 import com.github.mikephil.charting.data.LineDataSet;
 import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
 
-import org.pslab.R;
-import org.pslab.communication.AnalyticsClass;
-import org.pslab.communication.ScienceLab;
-import org.pslab.experimentsetup.Oscilloscope.OscillatorExperimentFragment;
-import org.pslab.experimentsetup.Sensors.SpeedOfSoundFragment;
-import org.pslab.fragment.ChannelParametersFragment;
-import org.pslab.fragment.DataAnalysisFragment;
-import org.pslab.fragment.TimebaseTriggerFragment;
-import org.pslab.fragment.XYPlotFragment;
-import org.pslab.others.AudioJack;
-import org.pslab.others.MathUtils;
-import org.pslab.others.Plot2D;
-import org.pslab.others.ScienceLabCommon;
-import org.pslab.others.SwipeGestureDetector;
+import io.pslab.R;
+import io.pslab.communication.AnalyticsClass;
+import io.pslab.communication.ScienceLab;
+import io.pslab.experimentsetup.Oscilloscope.OscillatorExperimentFragment;
+import io.pslab.experimentsetup.Sensors.SpeedOfSoundFragment;
+import io.pslab.fragment.ChannelParametersFragment;
+import io.pslab.fragment.DataAnalysisFragment;
+import io.pslab.fragment.TimebaseTriggerFragment;
+import io.pslab.fragment.XYPlotFragment;
+import io.pslab.others.AudioJack;
+import io.pslab.others.MathUtils;
+import io.pslab.others.Plot2D;
+import io.pslab.others.ScienceLabCommon;
+import io.pslab.others.SwipeGestureDetector;
 
 import java.text.DecimalFormat;
 import java.util.ArrayList;
@@ -59,7 +59,7 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 
-import static org.pslab.others.MathUtils.map;
+import static io.pslab.others.MathUtils.map;
 
 /**
  * Created by viveksb007 on 10/5/17.

app/src/main/java/org/pslab/activity/PerformExperimentActivity.java → app/src/main/java/io/pslab/activity/PerformExperimentActivity.java

@@ -1,4 +1,4 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -9,8 +9,8 @@
 
 import com.gigamole.navigationtabstrip.NavigationTabStrip;
 
-import org.pslab.R;
-import org.pslab.adapters.PerformExperimentAdapter;
+import io.pslab.R;
+import io.pslab.adapters.PerformExperimentAdapter;
 
 import butterknife.BindView;
 import butterknife.ButterKnife;

app/src/main/java/org/pslab/activity/PowerSourceActivity.java → app/src/main/java/io/pslab/activity/PowerSourceActivity.java

@@ -1,4 +1,4 @@
-package org.pslab.activity;
+package io.pslab.activity;
 
 import android.annotation.SuppressLint;
 import android.content.SharedPreferences;
@@ -22,12 +22,12 @@
 import com.sdsmdg.harjot.crollerTest.Croller;
 import com.sdsmdg.harjot.crollerTest.OnCrollerChangeListener;
 
-import org.pslab.R;
-import org.pslab.communication.ScienceLab;
-import org.pslab.items.SquareImageButton;
-import org.pslab.others.ScienceLabCommon;
-import org.pslab.others.MathUtils;
-import org.pslab.others.SwipeGestureDetector;
+import io.pslab.R;
+import io.pslab.communication.ScienceLab;
+import io.pslab.items.SquareImageButton;
+import io.pslab.others.ScienceLabCommon;
+import io.pslab.others.MathUtils;
+import io.pslab.others.SwipeGestureDetector;
 
 import java.util.Locale;
 import java.util.Timer;