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

Lines changed: 1 addition & 1 deletion
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

Lines changed: 2 additions & 2 deletions
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

Lines changed: 1 addition & 1 deletion
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 renamed to ‎app/src/main/java/io/pslab/PSLabApplication.java

Lines changed: 1 addition & 1 deletion
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 renamed to ‎app/src/main/java/io/pslab/SearchModel.java

Lines changed: 1 addition & 1 deletion
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 renamed to ‎app/src/main/java/io/pslab/activity/AccelerometerActivity.java

Lines changed: 3 additions & 3 deletions
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 renamed to ‎app/src/main/java/io/pslab/activity/Barometer_activity.java

Lines changed: 7 additions & 7 deletions
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 renamed to ‎app/src/main/java/io/pslab/activity/CompassActivity.java

Lines changed: 4 additions & 4 deletions
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 renamed to ‎app/src/main/java/io/pslab/activity/ControlActivity.java

Lines changed: 6 additions & 8 deletions
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 renamed to ‎app/src/main/java/io/pslab/activity/LogicalAnalyzerActivity.java

Lines changed: 5 additions & 5 deletions
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;

0 commit comments

Comments
 (0)