Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 0 additions & 10 deletions app/src/main/java/com/ruuvi/station/addtag/ui/AddTagActivity.kt
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ import com.ruuvi.station.databinding.ActivityAddTagBinding
import com.ruuvi.station.nfc.NfcScanReciever
import com.ruuvi.station.tagdetails.ui.SensorCardActivity
import com.ruuvi.station.util.base.NfcActivity
import com.ruuvi.station.util.extensions.openUrl
import org.kodein.di.Kodein
import org.kodein.di.KodeinAware
import org.kodein.di.android.closestKodein
Expand Down Expand Up @@ -92,7 +91,6 @@ class AddTagActivity : NfcActivity(R.layout.activity_add_tag), KodeinAware {
tags.clear()
tags.addAll(ruuviTags)
binding.content.noSensorsLayout.isVisible = tags.isEmpty()
binding.content.buySensorsButton2.isVisible = tags.isNotEmpty()
adapter.notifyDataSetChanged()
}
}
Expand Down Expand Up @@ -132,14 +130,6 @@ class AddTagActivity : NfcActivity(R.layout.activity_add_tag), KodeinAware {
TagSettingsActivity.startAfterAddingNewSensor(this, tag.id)
}

binding.content.buySensorsButton.setOnClickListener {
openUrl(getString(R.string.buy_sensors_link))
}

binding.content.buySensorsButton2.setOnClickListener {
openUrl(getString(R.string.buy_sensors_link))
}

binding.content.nfcHintTextView.isVisible = viewModel.nfcSupported
}

Expand Down
5 changes: 0 additions & 5 deletions app/src/main/java/com/ruuvi/station/app/ui/MainMenu.kt
Original file line number Diff line number Diff line change
Expand Up @@ -93,10 +93,6 @@ fun DashboardMainMenu(
R.string.menu_what_to_measure,
stringResource(id = R.string.menu_what_to_measure)
),
MenuItem(
R.string.menu_buy_sensors,
stringResource(id = R.string.menu_buy_sensors)
),
if (signedIn) {
MenuItem(
R.string.my_ruuvi_account,
Expand All @@ -116,7 +112,6 @@ fun DashboardMainMenu(
R.string.menu_about_help -> AboutActivity.start(context)
R.string.menu_send_feedback -> context.sendFeedback()
R.string.menu_what_to_measure -> context.openUrl(context.getString(R.string.what_to_measure_link))
R.string.menu_buy_sensors -> context.openUrl(context.getString(R.string.buy_sensors_menu_link))
R.string.my_ruuvi_account -> MyAccountActivity.start(context)
R.string.sign_in -> SignInActivity.start(context)
}
Expand Down
20 changes: 0 additions & 20 deletions app/src/main/res/layout/content_add_tag.xml
Original file line number Diff line number Diff line change
Expand Up @@ -75,26 +75,6 @@
android:layout_height="wrap_content"
style="@style/Title"/>

<Button
android:id="@+id/buySensorsButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_buy_sensors"
android:layout_marginTop="@dimen/button_bottom_padding"
android:layout_gravity="center"
style="@style/RoundButton" />

</LinearLayout>

<Button
android:id="@+id/buySensorsButton2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/menu_buy_sensors"
android:layout_marginBottom="@dimen/button_bottom_padding"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
style="@style/RoundButton" />

</androidx.constraintlayout.widget.ConstraintLayout>
7 changes: 0 additions & 7 deletions app/src/main/res/menu/menu_main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,6 @@
android:id="@+id/whatTomeasureMenuItem"
android:title="@string/menu_what_to_measure" />
</group>
<group
android:id="@+id/getMoreSensorsGroup"
android:checkableBehavior="none">
<item
android:id="@+id/getMoreSensorsMenuItem"
android:title="@string/menu_buy_sensors" />
</group>
<group
android:id="@+id/getGatewayGroup"
android:checkableBehavior="none">
Expand Down
Loading