Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: added pin layout screens for PSLab v6 #2625

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

feat: added pin layout screens for PSLab v6 #2625

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b328be4
#2499
samruddhi-Rahegaonkar Feb 6, 2025
73ebd72
fix : PinLayoutV6
samruddhi-Rahegaonkar Feb 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 37 additions & 9 deletions app/src/main/java/io/pslab/activity/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,7 @@
import io.pslab.fragment.HomeFragment;
import io.pslab.fragment.InstrumentsFragment;
import io.pslab.fragment.PSLabPinLayoutFragment;
import io.pslab.fragment.PSLabPinLayoutFragment_v6;
import io.pslab.others.CustomSnackBar;
import io.pslab.others.CustomTabService;
import io.pslab.others.InitializationVariable;
Expand Down Expand Up @@ -86,6 +87,7 @@ public class MainActivity extends AppCompatActivity {
private static final String TAG_INSTRUMENTS = "instruments";
private static final String TAG_ABOUTUS = "aboutUs";
private static final String TAG_PINLAYOUT = "pinLayout";
private static final String TAG_PINLAYOUT_V6 = "pinlayoutv6";
private static final String TAG_FAQ = "faq";
private static String CURRENT_TAG = TAG_INSTRUMENTS;
private String[] activityTitles;
Expand Down Expand Up @@ -337,6 +339,7 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
OssLicensesMenuActivity.setActivityTitle(getString(R.string.third_party_libs));
startActivity(new Intent(MainActivity.this, OssLicensesMenuActivity.class));
break;

default:
navItemIndex = 0;
}
Expand Down Expand Up @@ -429,14 +432,23 @@ public boolean onOptionsItemSelected(MenuItem item) {
case R.id.menu_pslab_disconnected:
attemptToConnectPSLab();
break;
case R.id.menu_pslab_layout_front:
case R.id.menu_pslab_layout_front_v5:
PSLabPinLayoutFragment.frontSide = true;
displayPSLabPinLayout();
displayPSLabPinLayout(TAG_PINLAYOUT);
break;
case R.id.menu_pslab_layout_back:
case R.id.menu_pslab_layout_back_v5:
PSLabPinLayoutFragment.frontSide = false;
displayPSLabPinLayout();
displayPSLabPinLayout(TAG_PINLAYOUT);
break;
case R.id.menu_pslab_layout_front_v6:
PSLabPinLayoutFragment_v6.topside = true;
displayPSLabPinLayout(TAG_PINLAYOUT_V6);
break;
case R.id.menu_pslab_layout_back_v6:
PSLabPinLayoutFragment_v6.topside = false;
displayPSLabPinLayout(TAG_PINLAYOUT_V6);
break;

default:
break;
}
Expand Down Expand Up @@ -465,20 +477,36 @@ private void attemptToConnectPSLab() {
}
}

private void displayPSLabPinLayout() {
CURRENT_TAG = TAG_PINLAYOUT;
private void displayPSLabPinLayout(String fragmentTag) {
CURRENT_TAG = fragmentTag;
navigationView.getMenu().getItem(navItemIndex).setChecked(false);
setToolbarTitle(getResources().getString(R.string.pslab_pinlayout));

// Set toolbar title based on the fragment tag
if (fragmentTag.equals(TAG_PINLAYOUT)) {
setToolbarTitle(getResources().getString(R.string.pslab_pinlayout));
} else if (fragmentTag.equals(TAG_PINLAYOUT_V6)) {
setToolbarTitle(getResources().getString(R.string.pslab_pinlayout_v6));
}

Runnable mPendingRunnable = new Runnable() {
@Override
public void run() {
Fragment fragment = PSLabPinLayoutFragment.newInstance();
Fragment fragment;
if (fragmentTag.equals(TAG_PINLAYOUT)) {
fragment = PSLabPinLayoutFragment.newInstance();
} else if (fragmentTag.equals(TAG_PINLAYOUT_V6)) {
fragment = PSLabPinLayoutFragment_v6.newInstance();
} else {
return; // Exit if no valid tag is provided
}

FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
fragmentTransaction.setCustomAnimations(R.anim.fade_in, R.anim.fade_out)
.replace(R.id.frame, fragment, TAG_PINLAYOUT)
.replace(R.id.frame, fragment, fragmentTag)
.commitAllowingStateLoss();
}
};

mHandler.post(mPendingRunnable);
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/io/pslab/fragment/PSLabPinLayoutFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,4 +247,4 @@ private void midPoint(PointF point, MotionEvent event) {
} catch (Exception e) {/**/}
point.set(x / 2, y / 2);
}
}
}
273 changes: 273 additions & 0 deletions app/src/main/java/io/pslab/fragment/PSLabPinLayoutFragment_v6.java
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion app/src/main/java/io/pslab/items/PinDetails.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,4 +33,4 @@ public int getCategoryColor() {
public int getColorID() {
return colorID;
}
}
}
27 changes: 27 additions & 0 deletions app/src/main/java/io/pslab/items/PinDetails_v6.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
package io.pslab.items;

public class PinDetails_v6 {
private final String name;
private final String description;
private final int colorID;

public PinDetails_v6(String name, String description, int colorID) {
this.name = name;
this.description = description;
this.colorID = colorID;
}

public String getName() {
return name;
}

public String getDescription() {
return description;
}


public int getColorID() {
return colorID;
}

}
Binary file added app/src/main/res/drawable/pslab_v6_bottom.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/pslab_v6_bottom_colormap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/pslab_v6_top.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added app/src/main/res/drawable/pslab_v6_top_colormap.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 23 additions & 0 deletions app/src/main/res/layout/fragment_pin_layout_v6.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/white">

<ImageView
android:id="@+id/img_pslab_pin_layout_v6"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"
tools:ignore="ContentDescription" />

<ImageView
android:id="@+id/img_pslab_color_map_v6"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="fitCenter"
android:alpha="0.5"
tools:ignore="ContentDescription" />

</androidx.constraintlayout.widget.ConstraintLayout>
16 changes: 12 additions & 4 deletions app/src/main/res/menu/pslab_connectivity_menu.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,20 @@
android:title="@string/text_disconnected"
app:showAsAction="ifRoom|withText" />
<item
android:id="@+id/menu_pslab_layout_front"
android:title="@string/pslab_pinlayout_front"
android:id="@+id/menu_pslab_layout_front_v5"
android:title="@string/pslab_pinlayout_front_v5"
app:showAsAction="never" />
<item
android:id="@+id/menu_pslab_layout_back"
android:title="@string/pslab_pinlayout_back"
android:id="@+id/menu_pslab_layout_back_v5"
android:title="@string/pslab_pinlayout_back_v5"
app:showAsAction="never" />
<item
android:id="@+id/menu_pslab_layout_front_v6"
android:title="@string/pslab_pinlayout_front_v6"
app:showAsAction="never" />
<item
android:id="@+id/menu_pslab_layout_back_v6"
android:title="@string/pslab_pinlayout_back_v6"
app:showAsAction="never" />
</menu>

4 changes: 3 additions & 1 deletion app/src/main/res/values-si/string.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file doesn't require any changes, does it ?
Kindly rollback this whole file, if it doesn't.

<resources xmlns:tools="http://schemas.android.com/tools">
<string name="app_name">PSLab</string>
<string name="openDrawer">open_drawer</string>
<string name="closeDrawer">close_drawer</string>
Expand Down Expand Up @@ -1026,4 +1026,6 @@
<string name="rateapp">යෙදුම ශ්‍රේණිගත කරන්න</string>
<string name="developers">සංවර්ධකයින්</string>
<string name="unit_milliseconds">\\u0020ms</string>


</resources>
70 changes: 69 additions & 1 deletion app/src/main/res/values/colors.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
<color name="pin_pgd">#724fff</color>
<color name="pin_nrf">#ffa64f</color>
<color name="pin_usb">#ff2b4f</color>
<color name="pin_vcc">#6b6500</color>
<color name="pin_vcc">#6b6500</color>
<color name="pin_pl5">#765f40</color>
<color name="pin_dpl">#681654</color>
<color name="pin_dmi">#a68b47</color>
Expand All @@ -83,4 +83,72 @@
<color name="category_voltage">#FF4040</color>
<color name="category_wavegen">#406743</color>


<!-- Pins v6 -->
<color name="txd">#FFB380</color>
<color name="cen">#FF9955</color>
<color name="vcc">#00FF00</color>
<color name="gnd">#00FFFF</color>
<color name="rxd">#FF7F2A</color>
<color name="uart_tx">#EEFFAA</color>
<color name="uart_rx">#E5FF80</color>
<color name="sine_wave_1">#FFCC00</color>
<color name="sine_wave_2">#D4AA00</color>
<color name="square_wave_1">#FFAAAA</color>
<color name="square_wave_2">#FF8080</color>
<color name="square_wave_3">#FF5555</color>
<color name="square_wave_4">#FF2A2A</color>
<color name="logic_analyzer_1">#D5FFE6</color>
<color name="logic_analyzer_2">#AAFFCC</color>
<color name="logic_analyzer_3">#80FFB3</color>
<color name="logic_analyzer_4">#55FF99</color>
<color name="ac_channel">#0000FF</color>
<color name="channel_1">#AACCFF</color>
<color name="channel_2">#80B3FF</color>
<color name="channel_3">#5599FF</color>
<color name="ch3_gain_set">#2A7FFF</color>
<color name="microphone">#0066FF</color>
<color name="frequency">#0055D4</color>
<color name="capacitance">#0044AA</color>
<color name="resistance">#003380</color>
<color name="voltage">#002255</color>
<color name="chip_select">#E3DBDE</color>
<color name="sdi">#C8B7BE</color>
<color name="sclk">#AC939D</color>
<color name="sdo">#916F7C</color>
<color name="vdd">#800080</color>
<color name="sda">#F4D7E3</color>
<color name="scl">#E9AFC6</color>
<color name="range_0_to_3_3v">#DE87AA</color>
<color name="plus_3_3v">#D35F8D</color>
<color name="plus_minus_5v">#C83771</color>
<color name="current_3ma">#A02C5A</color>
<color name="pgc">#AA0044</color>
<color name="pgd">#D40055</color>
<color name="mclr">#FF0066</color>
<color name="dp">#800066</color>
<color name="dm">#AA0088</color>
<color name="vusb">#D400AA</color>
<color name="cs1">#000080</color>
<color name="pv3">#D7EEF4</color>
<color name="pv2">#AFDDE9</color>
<color name="pv1">#87CDDE</color>
<color name="pcs">#5FBCD3</color>
<color name="vol">#E5D5FF</color>
<color name="res">#CCAAFF</color>
<color name="cap">#B380FF</color>
<color name="fqy">#9955FF</color>
<color name="mic">#7F2AFF</color>
<color name="c3g">#6600FF</color>
<color name="la4">#55FF99</color>
<color name="la3">#80FFB3</color>
<color name="la2">#AAFFCC</color>
<color name="la1">#D5FFE6</color>
<color name="plus_5v">#2B0000</color>
<color name="si1">#F4D7EE</color>
<color name="si2">#E9AFDD</color>
<color name="sq1">#DE87CD</color>
<color name="sq2">#D35FBC</color>
<color name="sq3">#C837AB</color>
<color name="sq4">#A02C89</color>
</resources>
Loading