From 7913cd322e4babf3840cb2b7faf68cddda604b74 Mon Sep 17 00:00:00 2001 From: Torsten Grote Date: Mon, 17 May 2021 10:31:11 -0300 Subject: [PATCH] Rename tab fragments and remove redundant NonNull annotations --- .../briar/android/AndroidComponent.java | 8 ++++---- .../briar/android/hotspot/AbstractTabsFragment.java | 7 +++---- .../briar/android/hotspot/HotspotActivity.java | 3 +-- .../briar/android/hotspot/HotspotFragment.java | 8 +++----- ...nualFragment.java => ManualHotspotFragment.java} | 13 +++++++------ ...otspotQrFragment.java => QrHotspotFragment.java} | 13 +++++++------ .../briar/android/hotspot/WebsiteFragment.java | 8 +++----- .../src/main/res/drawable/ic_circle_small.xml | 4 ++-- 8 files changed, 30 insertions(+), 34 deletions(-) rename briar-android/src/main/java/org/briarproject/briar/android/hotspot/{HotspotManualFragment.java => ManualHotspotFragment.java} (84%) rename briar-android/src/main/java/org/briarproject/briar/android/hotspot/{HotspotQrFragment.java => QrHotspotFragment.java} (79%) diff --git a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java index c718f2e39..e7582b377 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/AndroidComponent.java @@ -37,8 +37,8 @@ import org.briarproject.briar.android.attachment.media.MediaModule; import org.briarproject.briar.android.conversation.glide.BriarModelLoader; import org.briarproject.briar.android.hotspot.AbstractTabsFragment; import org.briarproject.briar.android.hotspot.HotspotIntroFragment; -import org.briarproject.briar.android.hotspot.HotspotManualFragment; -import org.briarproject.briar.android.hotspot.HotspotQrFragment; +import org.briarproject.briar.android.hotspot.ManualHotspotFragment; +import org.briarproject.briar.android.hotspot.QrHotspotFragment; import org.briarproject.briar.android.logging.CachingLogHandler; import org.briarproject.briar.android.login.SignInReminderReceiver; import org.briarproject.briar.android.settings.ConnectionsFragment; @@ -219,7 +219,7 @@ public interface AndroidComponent void inject(AbstractTabsFragment abstractTabsFragment); - void inject(HotspotQrFragment hotspotQrFragment); + void inject(QrHotspotFragment qrHotspotFragment); - void inject(HotspotManualFragment hotspotManualFragment); + void inject(ManualHotspotFragment manualHotspotFragment); } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java index 2056f0002..17027c30f 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/AbstractTabsFragment.java @@ -20,7 +20,6 @@ import org.briarproject.briar.R; import javax.inject.Inject; import androidx.annotation.CallSuper; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; @@ -34,6 +33,8 @@ import static org.briarproject.briar.android.AppModule.getAndroidComponent; @ParametersNotNullByDefault public abstract class AbstractTabsFragment extends Fragment { + static String ARG_FOR_WIFI_CONNECT = "forWifiConnect"; + @Inject ViewModelProvider.Factory viewModelFactory; @@ -61,8 +62,7 @@ public abstract class AbstractTabsFragment extends Fragment { @Override @CallSuper - public void onViewCreated(@NonNull View view, - @Nullable Bundle savedInstanceState) { + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { TabAdapter tabAdapter = new TabAdapter(this); ViewPager2 viewPager = view.findViewById(R.id.pager); viewPager.setAdapter(tabAdapter); @@ -118,7 +118,6 @@ public abstract class AbstractTabsFragment extends Fragment { super(fragment); } - @NonNull @Override public Fragment createFragment(int position) { if (position == 0) return getFirstFragment(); diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java index cde183485..1d3076520 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotActivity.java @@ -13,7 +13,6 @@ import org.briarproject.briar.android.activity.BriarActivity; import javax.annotation.Nullable; import javax.inject.Inject; -import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBar; import androidx.lifecycle.ViewModelProvider; @@ -56,7 +55,7 @@ public class HotspotActivity extends BriarActivity { } @Override - public boolean onOptionsItemSelected(@NonNull MenuItem item) { + public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == android.R.id.home) { onBackPressed(); return true; diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotFragment.java index 2e6782abf..a85c4fbb2 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotFragment.java @@ -7,7 +7,6 @@ import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; import org.briarproject.briar.R; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; @@ -18,8 +17,7 @@ public class HotspotFragment extends AbstractTabsFragment { public final static String TAG = HotspotFragment.class.getName(); @Override - public void onViewCreated(@NonNull View view, - @Nullable Bundle savedInstanceState) { + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); // no need to call into the ViewModel here connectedButton.setOnClickListener(v -> { @@ -36,12 +34,12 @@ public class HotspotFragment extends AbstractTabsFragment { @Override protected Fragment getFirstFragment() { - return HotspotManualFragment.newInstance(true); + return ManualHotspotFragment.newInstance(true); } @Override protected Fragment getSecondFragment() { - return HotspotQrFragment.newInstance(true); + return QrHotspotFragment.newInstance(true); } } diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManualFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/ManualHotspotFragment.java similarity index 84% rename from briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManualFragment.java rename to briar-android/src/main/java/org/briarproject/briar/android/hotspot/ManualHotspotFragment.java index 0efca7768..d8ea980fd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotManualFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/ManualHotspotFragment.java @@ -19,22 +19,23 @@ import androidx.lifecycle.ViewModelProvider; import static android.view.View.GONE; import static org.briarproject.briar.android.AppModule.getAndroidComponent; +import static org.briarproject.briar.android.hotspot.AbstractTabsFragment.ARG_FOR_WIFI_CONNECT; @MethodsNotNullByDefault @ParametersNotNullByDefault -public class HotspotManualFragment extends Fragment { +public class ManualHotspotFragment extends Fragment { - public final static String TAG = HotspotManualFragment.class.getName(); + public final static String TAG = ManualHotspotFragment.class.getName(); @Inject ViewModelProvider.Factory viewModelFactory; private HotspotViewModel viewModel; - static HotspotManualFragment newInstance(boolean forWifiConnect) { - HotspotManualFragment f = new HotspotManualFragment(); + static ManualHotspotFragment newInstance(boolean forWifiConnect) { + ManualHotspotFragment f = new ManualHotspotFragment(); Bundle bundle = new Bundle(); - bundle.putBoolean("forWifiConnect", forWifiConnect); + bundle.putBoolean(ARG_FOR_WIFI_CONNECT, forWifiConnect); f.setArguments(bundle); return f; } @@ -65,7 +66,7 @@ public class HotspotManualFragment extends Fragment { TextView passwordView = v.findViewById(R.id.passwordView); TextView altView = v.findViewById(R.id.altView); - if (requireArguments().getBoolean("forWifiConnect")) { + if (requireArguments().getBoolean(ARG_FOR_WIFI_CONNECT)) { manualIntroView.setText(R.string.hotspot_manual_wifi); ssidLabelView.setText(R.string.hotspot_manual_wifi_ssid); // TODO observe state in ViewModel and get info from there instead diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotQrFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/QrHotspotFragment.java similarity index 79% rename from briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotQrFragment.java rename to briar-android/src/main/java/org/briarproject/briar/android/hotspot/QrHotspotFragment.java index edf5cf28d..84a56c8bd 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/HotspotQrFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/QrHotspotFragment.java @@ -19,22 +19,23 @@ import androidx.fragment.app.Fragment; import androidx.lifecycle.ViewModelProvider; import static org.briarproject.briar.android.AppModule.getAndroidComponent; +import static org.briarproject.briar.android.hotspot.AbstractTabsFragment.ARG_FOR_WIFI_CONNECT; @MethodsNotNullByDefault @ParametersNotNullByDefault -public class HotspotQrFragment extends Fragment { +public class QrHotspotFragment extends Fragment { - public final static String TAG = HotspotQrFragment.class.getName(); + public final static String TAG = QrHotspotFragment.class.getName(); @Inject ViewModelProvider.Factory viewModelFactory; private HotspotViewModel viewModel; - static HotspotQrFragment newInstance(boolean forWifiConnect) { - HotspotQrFragment f = new HotspotQrFragment(); + static QrHotspotFragment newInstance(boolean forWifiConnect) { + QrHotspotFragment f = new QrHotspotFragment(); Bundle bundle = new Bundle(); - bundle.putBoolean("forWifiConnect", forWifiConnect); + bundle.putBoolean(ARG_FOR_WIFI_CONNECT, forWifiConnect); f.setArguments(bundle); return f; } @@ -57,7 +58,7 @@ public class HotspotQrFragment extends Fragment { TextView qrIntroView = v.findViewById(R.id.qrIntroView); ImageView qrCodeView = v.findViewById(R.id.qrCodeView); - if (requireArguments().getBoolean("forWifiConnect")) { + if (requireArguments().getBoolean(ARG_FOR_WIFI_CONNECT)) { qrIntroView.setText(R.string.hotspot_qr_wifi); // TODO observe state in ViewModel and get QR code from there } else { diff --git a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java index 8ce56bac4..6ccf4d9a7 100644 --- a/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java +++ b/briar-android/src/main/java/org/briarproject/briar/android/hotspot/WebsiteFragment.java @@ -6,7 +6,6 @@ import android.view.View; import org.briarproject.bramble.api.nullsafety.MethodsNotNullByDefault; import org.briarproject.bramble.api.nullsafety.ParametersNotNullByDefault; -import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.fragment.app.Fragment; @@ -19,20 +18,19 @@ public class WebsiteFragment extends AbstractTabsFragment { public final static String TAG = WebsiteFragment.class.getName(); @Override - public void onViewCreated(@NonNull View view, - @Nullable Bundle savedInstanceState) { + public void onViewCreated(View view, @Nullable Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); connectedButton.setVisibility(GONE); } @Override protected Fragment getFirstFragment() { - return HotspotManualFragment.newInstance(false); + return ManualHotspotFragment.newInstance(false); } @Override protected Fragment getSecondFragment() { - return HotspotQrFragment.newInstance(false); + return QrHotspotFragment.newInstance(false); } } diff --git a/briar-android/src/main/res/drawable/ic_circle_small.xml b/briar-android/src/main/res/drawable/ic_circle_small.xml index 238f0d28f..97a7c4689 100644 --- a/briar-android/src/main/res/drawable/ic_circle_small.xml +++ b/briar-android/src/main/res/drawable/ic_circle_small.xml @@ -1,6 +1,6 @@