Skip to content

Commit b35495a

Browse files
CloudyPadmalCloudyPadmal
authored
Merge pull request #1315 from fossasia/development
chore: merge dev into master for Fdroid
2 parents bff8bd2 + 8a58e54 commit b35495a

File tree

190 files changed

+2022
-1138
lines changed

Some content is hidden

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

190 files changed

+2022
-1138
lines changed

‎.travis.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ install:
2525
- echo yes | ${ANDROID_HOME}/tools/bin/sdkmanager "platforms;android-27"
2626

2727
script:
28-
- ./gradlew build --stacktrace
28+
- 'if [ "$TRAVIS_BRANCH" != "apk" ]; then ./gradlew build --stacktrace; fi'
2929

3030
after_success:
3131
- bash scripts/prep-key.sh

‎app/build.gradle

+3-3
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.fossasia.pslab"
8+
applicationId "org.pslab"
99
minSdkVersion rootProject.ext.minSdkVersion
1010
targetSdkVersion rootProject.ext.targetSdkVersion
11-
versionCode 17
12-
versionName "1.1.15"
11+
versionCode 1
12+
versionName "1.1.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.fossasia.pslab">
3+
package="org.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/fossasia/pslab/PSLabApplication.java ‎app/src/main/java/org/pslab/PSLabApplication.java

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

33
import android.app.Application;
44

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

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

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

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
package org.fossasia.pslab.activity;
1+
package org.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.fossasia.pslab.R;
10-
import org.fossasia.pslab.adapters.AccelerometerAdapter;
9+
import org.pslab.R;
10+
import org.pslab.adapters.AccelerometerAdapter;
1111

1212
public class AccelerometerActivity extends AppCompatActivity {
1313

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

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.fossasia.pslab.activity;
1+
package org.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.fossasia.pslab.R;
35-
import org.fossasia.pslab.communication.ScienceLab;
36-
import org.fossasia.pslab.communication.sensors.BMP180;
37-
import org.fossasia.pslab.others.MathUtils;
38-
import org.fossasia.pslab.others.ScienceLabCommon;
39-
import org.fossasia.pslab.others.SwipeGestureDetector;
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;
4040

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

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.fossasia.pslab.activity;
1+
package org.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.fossasia.pslab.R;
28-
import org.fossasia.pslab.others.MathUtils;
29-
import org.fossasia.pslab.others.SwipeGestureDetector;
27+
import org.pslab.R;
28+
import org.pslab.others.MathUtils;
29+
import org.pslab.others.SwipeGestureDetector;
3030

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

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

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

33
import android.content.DialogInterface;
44
import android.os.Bundle;
@@ -11,12 +11,12 @@
1111
import android.support.v7.app.AppCompatActivity;
1212
import android.view.MenuItem;
1313

14-
import org.fossasia.pslab.fragment.ControlFragmentAdvanced;
15-
import org.fossasia.pslab.fragment.ControlFragmentMain;
16-
import org.fossasia.pslab.fragment.ControlFragmentRead;
14+
import org.pslab.fragment.ControlFragmentAdvanced;
15+
import org.pslab.fragment.ControlFragmentMain;
16+
import org.pslab.fragment.ControlFragmentRead;
1717

18-
import org.fossasia.pslab.R;
19-
import org.fossasia.pslab.others.ControlActivityCommon;
18+
import org.pslab.R;
19+
import org.pslab.others.ControlActivityCommon;
2020

2121
import butterknife.BindView;
2222
import butterknife.ButterKnife;

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
package org.fossasia.pslab.activity;
1+
package org.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.fossasia.pslab.R;
10-
import org.fossasia.pslab.communication.ScienceLab;
11-
import org.fossasia.pslab.fragment.LALogicLinesFragment;
12-
import org.fossasia.pslab.others.ScienceLabCommon;
9+
import org.pslab.R;
10+
import org.pslab.communication.ScienceLab;
11+
import org.pslab.fragment.LALogicLinesFragment;
12+
import org.pslab.others.ScienceLabCommon;
1313

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

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

+9-9
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.fossasia.pslab.activity;
1+
package org.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.fossasia.pslab.R;
34-
import org.fossasia.pslab.fragment.LuxMeterFragmentConfig;
35-
import org.fossasia.pslab.fragment.LuxMeterFragmentData;
36-
import org.fossasia.pslab.fragment.SettingsFragment;
37-
import org.fossasia.pslab.others.CustomSnackBar;
38-
import org.fossasia.pslab.others.GPSLogger;
39-
import org.fossasia.pslab.others.MathUtils;
40-
import org.fossasia.pslab.others.SwipeGestureDetector;
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;
4141

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

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

+17-17
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.fossasia.pslab.activity;
1+
package org.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.fossasia.pslab.R;
33-
import org.fossasia.pslab.communication.CommunicationHandler;
34-
import org.fossasia.pslab.fragment.AboutUsFragment;
35-
import org.fossasia.pslab.fragment.FAQFragment;
36-
import org.fossasia.pslab.fragment.HomeFragment;
37-
import org.fossasia.pslab.fragment.InstrumentsFragment;
38-
import org.fossasia.pslab.fragment.PSLabPinLayoutFragment;
39-
import org.fossasia.pslab.others.CustomTabService;
40-
import org.fossasia.pslab.others.InitializationVariable;
41-
import org.fossasia.pslab.others.ScienceLabCommon;
42-
import org.fossasia.pslab.receivers.USBDetachReceiver;
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;
4343

4444
import java.io.IOException;
4545

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

49-
import static org.fossasia.pslab.others.ScienceLabCommon.scienceLab;
49+
import static org.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.fossasia.pslab.R.id.name);
135-
imgProfile = navHeader.findViewById(org.fossasia.pslab.R.id.img_profile);
136-
activityTitles = getResources().getStringArray(org.fossasia.pslab.R.array.nav_item_activity_titles);
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);
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.fossasia.pslab.R.string.openDrawer, org.fossasia.pslab.R.string.closeDrawer) {
282+
ActionBarDrawerToggle actionBarDrawerToggle = new ActionBarDrawerToggle(this, drawer, toolbar, org.pslab.R.string.openDrawer, org.pslab.R.string.closeDrawer) {
283283
@Override
284284
public void onDrawerClosed(View drawerView) {
285285
super.onDrawerClosed(drawerView);

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

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

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

6-
import org.fossasia.pslab.R;
6+
import org.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/fossasia/pslab/activity/MultimeterActivity.java ‎app/src/main/java/org/pslab/activity/MultimeterActivity.java

+7-38
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package org.fossasia.pslab.activity;
1+
package org.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.fossasia.pslab.R;
22-
import org.fossasia.pslab.communication.ScienceLab;
23-
import org.fossasia.pslab.others.MathUtils;
24-
import org.fossasia.pslab.others.ScienceLabCommon;
25-
import org.fossasia.pslab.others.SwipeGestureDetector;
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;
2626

2727
import java.text.DecimalFormat;
2828
import java.util.Locale;
@@ -49,8 +49,6 @@ public class MultimeterActivity extends AppCompatActivity {
4949
Button reset;
5050
@BindView(R.id.read)
5151
Button read;
52-
@BindView(R.id.description_box)
53-
TextView description;
5452
@BindView(R.id.selector)
5553
SwitchCompat aSwitch;
5654

@@ -89,13 +87,12 @@ protected void onCreate(final Bundle savedInstanceState) {
8987
setContentView(R.layout.activity_multimeter_main);
9088
ButterKnife.bind(this);
9189
scienceLab = ScienceLabCommon.scienceLab;
92-
knobMarker = getResources().getStringArray(org.fossasia.pslab.R.array.multimeter_knob_states);
90+
knobMarker = getResources().getStringArray(org.pslab.R.array.multimeter_knob_states);
9391
setUpBottomSheet();
9492
multimeter_data = this.getSharedPreferences(NAME, MODE_PRIVATE);
9593
knobState = multimeter_data.getInt("KnobState", 2);
9694
switchIsChecked = multimeter_data.getBoolean("SwitchState", false);
9795
aSwitch.setChecked(switchIsChecked);
98-
setDescriptionText(knobState);
9996

10097
Typeface tf = Typeface.createFromAsset(getAssets(), "fonts/digital-7 (italic).ttf");
10198
quantity.setTypeface(tf);
@@ -110,15 +107,13 @@ protected void onCreate(final Bundle savedInstanceState) {
110107
@Override
111108
public void onState(int state) {
112109
knobState = state;
113-
setDescriptionText(knobState);
114110
saveKnobState(knobState);
115111
}
116112
});
117113
aSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
118114
@Override
119115
public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
120116
switchIsChecked = isChecked;
121-
setDescriptionText(knobState);
122117
SharedPreferences.Editor editor = multimeter_data.edit();
123118
editor.putBoolean("SwitchState", switchIsChecked);
124119
editor.commit();
@@ -134,7 +129,6 @@ public void onClick(View v) {
134129
knob.setState(knobState);
135130
quantity.setText("");
136131
unit.setText("");
137-
setDescriptionText(knobState);
138132
}
139133
});
140134
read.setOnClickListener(new View.OnClickListener() {
@@ -232,31 +226,6 @@ public void onClick(View v) {
232226

233227
}
234228

235-
236-
private void setDescriptionText(int knobState) {
237-
switch (knobState) {
238-
case 3:
239-
description.setText(R.string.resistance_description);
240-
break;
241-
case 4:
242-
description.setText(R.string.capacitance_description);
243-
break;
244-
case 5:
245-
case 6:
246-
case 7:
247-
case 8:
248-
if (!switchIsChecked) {
249-
description.setText(R.string.frequency_description);
250-
} else {
251-
description.setText(R.string.count_pulse_description);
252-
}
253-
break;
254-
default:
255-
description.setText(R.string.voltage_channel_description);
256-
break;
257-
}
258-
}
259-
260229
private void setUpBottomSheet() {
261230
bottomSheetBehavior = BottomSheetBehavior.from(bottomSheet);
262231

0 commit comments

Comments
 (0)