Skip to content

Commit 4a67e65

Browse files
committed
minor updates on UI layout and colors
1 parent 9bb2bbf commit 4a67e65

File tree

4 files changed

+18
-8
lines changed

4 files changed

+18
-8
lines changed

app/src/main/java/com/lcl/lclmeasurementtool/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ protected void onCreate(Bundle savedInstanceState) {
4444

4545

4646

47-
NetworkManager mNetworkManager = new NetworkManager(this);
47+
mNetworkManager = new NetworkManager(this);
4848
mCellularManager = CellularManager.getManager(this);
4949

5050
if (!mNetworkManager.isCellularConnected()) {

app/src/main/java/com/lcl/lclmeasurementtool/Managers/NetworkManager.java

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,14 +135,23 @@ public void removeAllNetworkChangeListeners() {
135135
* @return true if the current device is connected to the internet via cellular; false otherwise.
136136
*/
137137
public boolean isCellularConnected() {
138-
return capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
138+
return capabilities != null &&
139+
capabilities.hasTransport(NetworkCapabilities.TRANSPORT_CELLULAR);
139140
}
140141

141142
public int getLinkDownstreamBandwidthKbps() {
142-
return this.capabilities.getLinkDownstreamBandwidthKbps();
143+
if (capabilities != null) {
144+
return capabilities.getLinkDownstreamBandwidthKbps();
145+
}
146+
147+
return 0;
143148
}
144149

145150
public int getLinkUpstreamBandwidthKbps() {
146-
return this.capabilities.getLinkUpstreamBandwidthKbps();
151+
if (capabilities != null) {
152+
return this.capabilities.getLinkUpstreamBandwidthKbps();
153+
}
154+
155+
return 0;
147156
}
148157
}

app/src/main/res/layout/activity_main.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@
7474
android:text="Signal Strength"
7575
android:textAlignment="center"
7676
android:textColor="@color/white"
77-
android:textSize="16sp"
77+
android:textSize="14sp"
7878
android:typeface="monospace"
7979
app:layout_constraintBottom_toBottomOf="parent"
8080
app:layout_constraintStart_toEndOf="@+id/imageView"
@@ -84,7 +84,7 @@
8484
android:id="@+id/SignalStrengthValue"
8585
android:layout_width="wrap_content"
8686
android:layout_height="wrap_content"
87-
android:layout_marginStart="36dp"
87+
android:layout_marginStart="24dp"
8888
android:fontFamily="monospace"
8989
android:textColor="@color/white"
9090
android:textSize="16sp"
@@ -125,7 +125,7 @@
125125
android:layout_width="wrap_content"
126126
android:layout_height="wrap_content"
127127
android:layout_marginStart="2dp"
128-
android:layout_marginEnd="12dp"
128+
android:layout_marginEnd="8dp"
129129
app:layout_constraintBottom_toBottomOf="parent"
130130
app:layout_constraintEnd_toEndOf="parent"
131131
app:layout_constraintStart_toEndOf="@id/SignalStrengthStatus"

app/src/main/res/values/themes.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
<item name="colorSecondaryVariant">@color/teal_700</item>
1212
<item name="colorOnSecondary">@color/black</item>
1313
<!-- Status bar color. -->
14-
<item name="android:statusBarColor" tools:targetApi="l">?attr/statusBarBackground</item>
14+
<item name="android:statusBarColor" tools:targetApi="22">?attr/statusBarBackground</item>
15+
<item name="android:navigationBarColor" tools:targetApi="22">@color/dark_black</item>
1516
<!-- Customize your theme here. -->
1617
</style>
1718

0 commit comments

Comments
 (0)