Skip to content

Commit 50408c3

Browse files
CloudyPadmalCloudyPadmal
authored
Merge pull request #1334 from fossasia/development
chore: merge dev in to master for io.pslab
2 parents b35495a + 0fd3626 commit 50408c3

File tree

186 files changed

+665
-672
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+665
-672
lines changed

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PSLab Android App
22

3-
<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>
3+
<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>
44
<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>
55

66
[![Build Status](https://travis-ci.org/fossasia/pslab-android.svg?branch=development)](https://travis-ci.org/fossasia/pslab-android)

‎app/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ android {
55
compileSdkVersion rootProject.ext.compileSdkVersion
66
buildToolsVersion rootProject.ext.buildToolsVersion
77
defaultConfig {
8-
applicationId "org.pslab"
8+
applicationId "io.pslab"
99
minSdkVersion rootProject.ext.minSdkVersion
1010
targetSdkVersion rootProject.ext.targetSdkVersion
1111
versionCode 1
12-
versionName "1.1.0"
12+
versionName "2.0.0"
1313
multiDexEnabled true
1414
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1515
}

‎app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
3-
package="org.pslab">
3+
package="io.pslab">
44

55
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
66
<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-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.pslab;
1+
package io.pslab;
22

33
import android.app.Application;
44

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.pslab;
1+
package io.pslab;
22

33
import ir.mirrajabi.searchdialog.core.Searchable;
44

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

33
import android.content.pm.ActivityInfo;
44
import android.os.Bundle;
55
import android.support.v7.app.AppCompatActivity;
66
import android.support.v7.widget.LinearLayoutManager;
77
import android.support.v7.widget.RecyclerView;
88

9-
import org.pslab.R;
10-
import org.pslab.adapters.AccelerometerAdapter;
9+
import io.pslab.R;
10+
import io.pslab.adapters.AccelerometerAdapter;
1111

1212
public class AccelerometerActivity extends AppCompatActivity {
1313

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

33
import android.annotation.SuppressLint;
44
import android.content.SharedPreferences;
@@ -31,12 +31,12 @@
3131
import com.github.mikephil.charting.data.LineData;
3232
import com.github.mikephil.charting.data.LineDataSet;
3333

34-
import org.pslab.R;
35-
import org.pslab.communication.ScienceLab;
36-
import org.pslab.communication.sensors.BMP180;
37-
import org.pslab.others.MathUtils;
38-
import org.pslab.others.ScienceLabCommon;
39-
import org.pslab.others.SwipeGestureDetector;
34+
import io.pslab.R;
35+
import io.pslab.communication.ScienceLab;
36+
import io.pslab.communication.sensors.BMP180;
37+
import io.pslab.others.MathUtils;
38+
import io.pslab.others.ScienceLabCommon;
39+
import io.pslab.others.SwipeGestureDetector;
4040

4141
import java.io.IOException;
4242
import java.text.DecimalFormat;

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

33
import android.content.SharedPreferences;
44
import android.hardware.Sensor;
@@ -24,9 +24,9 @@
2424
import android.widget.RadioButton;
2525
import android.widget.TextView;
2626

27-
import org.pslab.R;
28-
import org.pslab.others.MathUtils;
29-
import org.pslab.others.SwipeGestureDetector;
27+
import io.pslab.R;
28+
import io.pslab.others.MathUtils;
29+
import io.pslab.others.SwipeGestureDetector;
3030

3131
import butterknife.BindView;
3232
import butterknife.ButterKnife;

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

+6-8
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

3-
import android.content.DialogInterface;
43
import android.os.Bundle;
54
import android.support.annotation.NonNull;
65
import android.support.annotation.Nullable;
76
import android.support.design.widget.BottomNavigationView;
87
import android.support.v4.app.Fragment;
98
import android.support.v4.app.FragmentTransaction;
10-
import android.support.v7.app.AlertDialog;
119
import android.support.v7.app.AppCompatActivity;
1210
import android.view.MenuItem;
1311

14-
import org.pslab.fragment.ControlFragmentAdvanced;
15-
import org.pslab.fragment.ControlFragmentMain;
16-
import org.pslab.fragment.ControlFragmentRead;
12+
import io.pslab.fragment.ControlFragmentAdvanced;
13+
import io.pslab.fragment.ControlFragmentMain;
14+
import io.pslab.fragment.ControlFragmentRead;
1715

18-
import org.pslab.R;
19-
import org.pslab.others.ControlActivityCommon;
16+
import io.pslab.R;
17+
import io.pslab.others.ControlActivityCommon;
2018

2119
import butterknife.BindView;
2220
import butterknife.ButterKnife;

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

33
import android.os.Bundle;
44
import android.support.annotation.Nullable;
55
import android.support.v7.app.AppCompatActivity;
66
import android.support.v7.widget.Toolbar;
77
import android.view.MenuItem;
88

9-
import org.pslab.R;
10-
import org.pslab.communication.ScienceLab;
11-
import org.pslab.fragment.LALogicLinesFragment;
12-
import org.pslab.others.ScienceLabCommon;
9+
import io.pslab.R;
10+
import io.pslab.communication.ScienceLab;
11+
import io.pslab.fragment.LALogicLinesFragment;
12+
import io.pslab.others.ScienceLabCommon;
1313

1414
import butterknife.BindView;
1515
import butterknife.ButterKnife;

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

33
import android.Manifest;
44
import android.content.Context;
@@ -30,14 +30,14 @@
3030
import android.widget.TextView;
3131
import android.widget.Toast;
3232

33-
import org.pslab.R;
34-
import org.pslab.fragment.LuxMeterFragmentConfig;
35-
import org.pslab.fragment.LuxMeterFragmentData;
36-
import org.pslab.others.CustomSnackBar;
37-
import org.pslab.others.GPSLogger;
38-
import org.pslab.others.MathUtils;
39-
import org.pslab.fragment.SettingsFragment;
40-
import org.pslab.others.SwipeGestureDetector;
33+
import io.pslab.R;
34+
import io.pslab.fragment.LuxMeterFragmentConfig;
35+
import io.pslab.fragment.LuxMeterFragmentData;
36+
import io.pslab.others.CustomSnackBar;
37+
import io.pslab.others.GPSLogger;
38+
import io.pslab.others.MathUtils;
39+
import io.pslab.fragment.SettingsFragment;
40+
import io.pslab.others.SwipeGestureDetector;
4141

4242
import butterknife.BindView;
4343
import butterknife.ButterKnife;

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

33
import android.app.PendingIntent;
44
import android.app.ProgressDialog;
@@ -29,24 +29,24 @@
2929
import android.widget.TextView;
3030
import android.widget.Toast;
3131

32-
import org.pslab.R;
33-
import org.pslab.communication.CommunicationHandler;
34-
import org.pslab.fragment.AboutUsFragment;
35-
import org.pslab.fragment.FAQFragment;
36-
import org.pslab.fragment.HomeFragment;
37-
import org.pslab.fragment.InstrumentsFragment;
38-
import org.pslab.fragment.PSLabPinLayoutFragment;
39-
import org.pslab.others.CustomTabService;
40-
import org.pslab.others.InitializationVariable;
41-
import org.pslab.others.ScienceLabCommon;
42-
import org.pslab.receivers.USBDetachReceiver;
32+
import io.pslab.R;
33+
import io.pslab.communication.CommunicationHandler;
34+
import io.pslab.fragment.AboutUsFragment;
35+
import io.pslab.fragment.FAQFragment;
36+
import io.pslab.fragment.HomeFragment;
37+
import io.pslab.fragment.InstrumentsFragment;
38+
import io.pslab.fragment.PSLabPinLayoutFragment;
39+
import io.pslab.others.CustomTabService;
40+
import io.pslab.others.InitializationVariable;
41+
import io.pslab.others.ScienceLabCommon;
42+
import io.pslab.receivers.USBDetachReceiver;
4343

4444
import java.io.IOException;
4545

4646
import butterknife.BindView;
4747
import butterknife.ButterKnife;
4848

49-
import static org.pslab.others.ScienceLabCommon.scienceLab;
49+
import static io.pslab.others.ScienceLabCommon.scienceLab;
5050

5151
public class MainActivity extends AppCompatActivity {
5252

@@ -131,9 +131,9 @@ protected void onCreate(Bundle savedInstanceState) {
131131
mHandler = new Handler();
132132

133133
navHeader = navigationView.getHeaderView(0);
134-
txtName = navHeader.findViewById(org.pslab.R.id.name);
135-
imgProfile = navHeader.findViewById(org.pslab.R.id.img_profile);
136-
activityTitles = getResources().getStringArray(org.pslab.R.array.nav_item_activity_titles);
134+
txtName = navHeader.findViewById(io.pslab.R.id.name);
135+
imgProfile = navHeader.findViewById(io.pslab.R.id.img_profile);
136+
activityTitles = getResources().getStringArray(io.pslab.R.array.nav_item_activity_titles);
137137

138138
setPSLabVersionIDs();
139139

@@ -279,7 +279,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
279279
});
280280

281281
if (drawer != null) {
282-
ActionBarDrawerToggle actionBarDrawerToggle = new ActionBarDrawerToggle(this, drawer, toolbar, org.pslab.R.string.openDrawer, org.pslab.R.string.closeDrawer) {
282+
ActionBarDrawerToggle actionBarDrawerToggle = new ActionBarDrawerToggle(this, drawer, toolbar, io.pslab.R.string.openDrawer, io.pslab.R.string.closeDrawer) {
283283
@Override
284284
public void onDrawerClosed(View drawerView) {
285285
super.onDrawerClosed(drawerView);

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

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

33
import android.support.v7.app.AppCompatActivity;
44
import android.os.Bundle;
55

6-
import org.pslab.R;
6+
import io.pslab.R;
77
import org.osmdroid.api.IMapController;
88
import org.osmdroid.tileprovider.tilesource.TileSourceFactory;
99
import org.osmdroid.util.GeoPoint;

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

33
import android.content.SharedPreferences;
44
import android.graphics.Typeface;
@@ -18,11 +18,11 @@
1818

1919
import android.widget.TextView;
2020

21-
import org.pslab.R;
22-
import org.pslab.communication.ScienceLab;
23-
import org.pslab.others.MathUtils;
24-
import org.pslab.others.ScienceLabCommon;
25-
import org.pslab.others.SwipeGestureDetector;
21+
import io.pslab.R;
22+
import io.pslab.communication.ScienceLab;
23+
import io.pslab.others.MathUtils;
24+
import io.pslab.others.ScienceLabCommon;
25+
import io.pslab.others.SwipeGestureDetector;
2626

2727
import java.text.DecimalFormat;
2828
import java.util.Locale;
@@ -87,7 +87,7 @@ protected void onCreate(final Bundle savedInstanceState) {
8787
setContentView(R.layout.activity_multimeter_main);
8888
ButterKnife.bind(this);
8989
scienceLab = ScienceLabCommon.scienceLab;
90-
knobMarker = getResources().getStringArray(org.pslab.R.array.multimeter_knob_states);
90+
knobMarker = getResources().getStringArray(io.pslab.R.array.multimeter_knob_states);
9191
setUpBottomSheet();
9292
multimeter_data = this.getSharedPreferences(NAME, MODE_PRIVATE);
9393
knobState = multimeter_data.getInt("KnobState", 2);

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

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

33

44
import android.annotation.SuppressLint;
@@ -35,20 +35,20 @@
3535
import com.github.mikephil.charting.data.LineDataSet;
3636
import com.github.mikephil.charting.interfaces.datasets.ILineDataSet;
3737

38-
import org.pslab.R;
39-
import org.pslab.communication.AnalyticsClass;
40-
import org.pslab.communication.ScienceLab;
41-
import org.pslab.experimentsetup.Oscilloscope.OscillatorExperimentFragment;
42-
import org.pslab.experimentsetup.Sensors.SpeedOfSoundFragment;
43-
import org.pslab.fragment.ChannelParametersFragment;
44-
import org.pslab.fragment.DataAnalysisFragment;
45-
import org.pslab.fragment.TimebaseTriggerFragment;
46-
import org.pslab.fragment.XYPlotFragment;
47-
import org.pslab.others.AudioJack;
48-
import org.pslab.others.MathUtils;
49-
import org.pslab.others.Plot2D;
50-
import org.pslab.others.ScienceLabCommon;
51-
import org.pslab.others.SwipeGestureDetector;
38+
import io.pslab.R;
39+
import io.pslab.communication.AnalyticsClass;
40+
import io.pslab.communication.ScienceLab;
41+
import io.pslab.experimentsetup.Oscilloscope.OscillatorExperimentFragment;
42+
import io.pslab.experimentsetup.Sensors.SpeedOfSoundFragment;
43+
import io.pslab.fragment.ChannelParametersFragment;
44+
import io.pslab.fragment.DataAnalysisFragment;
45+
import io.pslab.fragment.TimebaseTriggerFragment;
46+
import io.pslab.fragment.XYPlotFragment;
47+
import io.pslab.others.AudioJack;
48+
import io.pslab.others.MathUtils;
49+
import io.pslab.others.Plot2D;
50+
import io.pslab.others.ScienceLabCommon;
51+
import io.pslab.others.SwipeGestureDetector;
5252

5353
import java.text.DecimalFormat;
5454
import java.util.ArrayList;
@@ -59,7 +59,7 @@
5959
import butterknife.BindView;
6060
import butterknife.ButterKnife;
6161

62-
import static org.pslab.others.MathUtils.map;
62+
import static io.pslab.others.MathUtils.map;
6363

6464
/**
6565
* 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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

33
import android.os.Bundle;
44
import android.support.annotation.Nullable;
@@ -9,8 +9,8 @@
99

1010
import com.gigamole.navigationtabstrip.NavigationTabStrip;
1111

12-
import org.pslab.R;
13-
import org.pslab.adapters.PerformExperimentAdapter;
12+
import io.pslab.R;
13+
import io.pslab.adapters.PerformExperimentAdapter;
1414

1515
import butterknife.BindView;
1616
import butterknife.ButterKnife;

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.pslab.activity;
1+
package io.pslab.activity;
22

33
import android.annotation.SuppressLint;
44
import android.content.SharedPreferences;
@@ -22,12 +22,12 @@
2222
import com.sdsmdg.harjot.crollerTest.Croller;
2323
import com.sdsmdg.harjot.crollerTest.OnCrollerChangeListener;
2424

25-
import org.pslab.R;
26-
import org.pslab.communication.ScienceLab;
27-
import org.pslab.items.SquareImageButton;
28-
import org.pslab.others.ScienceLabCommon;
29-
import org.pslab.others.MathUtils;
30-
import org.pslab.others.SwipeGestureDetector;
25+
import io.pslab.R;
26+
import io.pslab.communication.ScienceLab;
27+
import io.pslab.items.SquareImageButton;
28+
import io.pslab.others.ScienceLabCommon;
29+
import io.pslab.others.MathUtils;
30+
import io.pslab.others.SwipeGestureDetector;
3131

3232
import java.util.Locale;
3333
import java.util.Timer;

0 commit comments

Comments
 (0)