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

Jump to bottom

#780-[ENHANCEMENT] Replace "findViewById" by "@BindView" #788

Closed
wants to merge 8 commits into from
Closed

#780-[ENHANCEMENT] Replace "findViewById" by "@BindView" #788

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
a11f4bd
changed most findviewbyid to butterknife bindings
hafiz703 Oct 28, 2019
d39e161
changed componensts findviewbyids which have no external dependencies
hafiz703 Oct 28, 2019
831047c
fixing merge conflict with utilities/WorldClockActivity.java
hafiz703 Oct 28, 2019
f2e8c1c
tested and changed most findviewbyid in activities
hafiz703 Oct 28, 2019
738374c
Update MainActivity - removed unused import
hafiz703 Oct 28, 2019
c0c2346
Removed unnecessary imports
hafiz703 Oct 28, 2019
227a631
removed empty last lines, unnecessary imports and renamed variable na…
hafiz703 Oct 28, 2019
cd5cf08
merging conflicts
hafiz703 Oct 28, 2019
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
33 changes: 20 additions & 13 deletions Android/app/src/main/java/io/github/project_travel_mate/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,9 @@
import java.io.IOException;
import java.util.Objects;

import butterknife.BindView;
import butterknife.ButterKnife;
import butterknife.Optional;
hafiz703 marked this conversation as resolved.
Show resolved Hide resolved
import io.github.project_travel_mate.destinations.CityFragment;
import io.github.project_travel_mate.favourite.FavouriteCitiesFragment;
import io.github.project_travel_mate.friend.FriendsProfileActivity;
Expand Down Expand Up @@ -87,21 +89,27 @@ public class MainActivity extends AppCompatActivity implements NavigationView.On

private SharedPreferences mSharedPreferences;
private String mToken;
private DrawerLayout mDrawer;

private Handler mHandler;
private NavigationView mNavigationView;
private int mPreviousMenuItemId;
private static final String travelShortcut = "io.github.project_travel_mate.TravelShortcut";
private static final String myTripsShortcut = "io.github.project_travel_mate.MyTripsShortcut";
private static final String utilitiesShortcut = "io.github.project_travel_mate.UtilitiesShortcut";
@BindView(R.id.toolbar)
Toolbar toolbar;
@BindView(R.id.drawer_layout)
DrawerLayout mDrawer;
hafiz703 marked this conversation as resolved.
Show resolved Hide resolved
@BindView(R.id.nav_view)
NavigationView mNavigationView;


@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
ButterKnife.bind(this);

Toolbar toolbar = findViewById(R.id.toolbar);

setSupportActionBar(toolbar);

mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
Expand Down Expand Up @@ -142,7 +150,7 @@ protected void onCreate(Bundle savedInstanceState) {
// Get runtime permissions for Android M
getRuntimePermissions();

mDrawer = findViewById(R.id.drawer_layout);

ActionBarDrawerToggle toggle = new ActionBarDrawerToggle(this,
mDrawer,
toolbar,
Expand Down Expand Up @@ -175,17 +183,17 @@ protected void onCreate(Bundle savedInstanceState) {


void defaultSelectedNavMenu(int resId) {
mNavigationView = findViewById(R.id.nav_view);

Menu menu = mNavigationView.getMenu();
MenuItem menuItem = menu.findItem(resId);
menuItem.setChecked(true);
}

@Override
public void onBackPressed() {
DrawerLayout drawer = findViewById(R.id.drawer_layout);
if (drawer != null && drawer.isDrawerOpen(GravityCompat.START)) {
drawer.closeDrawer(GravityCompat.START);
//DrawerLayout drawer = findViewById(R.id.drawer_layout);
hafiz703 marked this conversation as resolved.
Show resolved Hide resolved
if (mDrawer != null && mDrawer.isDrawerOpen(GravityCompat.START)) {
mDrawer.closeDrawer(GravityCompat.START);
} else {
super.onBackPressed();
}
Expand All @@ -196,8 +204,7 @@ public void onBackPressed() {
public boolean onNavigationItemSelected(@NonNull MenuItem item) {

if (item.getItemId() == mPreviousMenuItemId) {
DrawerLayout drawer = findViewById(R.id.drawer_layout);
drawer.closeDrawer(GravityCompat.START);
mDrawer.closeDrawer(GravityCompat.START);
return true;
}

Expand Down Expand Up @@ -315,11 +322,11 @@ public static Intent getStartIntent(Context context) {

private void fillNavigationView(String emailId, String imageURL) {

NavigationView navigationView = findViewById(R.id.nav_view);
navigationView.setNavigationItemSelectedListener(this);

mNavigationView.setNavigationItemSelectedListener(this);

// Get reference to the navigation view header and email textview
View navigationHeader = navigationView.getHeaderView(0);
View navigationHeader = mNavigationView.getHeaderView(0);
TextView emailTextView = navigationHeader.findViewById(R.id.email);
emailTextView.setText(emailId);

Expand Down
18 changes: 9 additions & 9 deletions Android/app/src/main/java/io/github/project_travel_mate/ProfileActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -347,7 +347,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
Uri croppedImage = result.getUri();
Picasso.with(this).load(croppedImage).into(displayImage);
mSharedPreferences.edit().putString(USER_IMAGE, croppedImage.toString()).apply();
TravelmateSnackbars.createSnackBar(findViewById(R.id.layout), R.string.profile_picture_updated,
TravelmateSnackbars.createSnackBar(layout, R.string.profile_picture_updated,
Snackbar.LENGTH_SHORT).show();
getUrlFromCloudinary(croppedImage);
}
Expand Down Expand Up @@ -452,12 +452,12 @@ public void onResponse(Call call, final Response response) throws IOException {
final String res = Objects.requireNonNull(response.body()).string();
mHandler.post(() -> {
if (response.isSuccessful()) {
TravelmateSnackbars.createSnackBar(findViewById(R.id.layout), res,
TravelmateSnackbars.createSnackBar(layout, res,
Snackbar.LENGTH_SHORT).show();
Picasso.with(ProfileActivity.this).load(R.drawable.default_user_icon)
.into(displayImage);
} else {
TravelmateSnackbars.createSnackBar(findViewById(R.id.layout), res,
TravelmateSnackbars.createSnackBar(layout, res,
Snackbar.LENGTH_LONG).show();
}
});
Expand Down Expand Up @@ -602,11 +602,11 @@ public void onResponse(Call call, Response response) throws IOException {
final String res = Objects.requireNonNull(response.body()).string();
mHandler.post(() -> {
if (response.isSuccessful()) {
TravelmateSnackbars.createSnackBar(findViewById(R.id.layout),
TravelmateSnackbars.createSnackBar(layout,
R.string.name_updated, Snackbar.LENGTH_SHORT).show();
mSharedPreferences.edit().putString(USER_NAME, fullName).apply();
} else {
TravelmateSnackbars.createSnackBar(findViewById(R.id.layout), res,
TravelmateSnackbars.createSnackBar(layout, res,
Snackbar.LENGTH_LONG).show();
networkError();
}
Expand Down Expand Up @@ -674,13 +674,13 @@ public void onResponse(Call call, Response response) throws IOException {
final String res = Objects.requireNonNull(response.body()).string();
mHandler.post(() -> {
if (response.isSuccessful()) {
TravelmateSnackbars.createSnackBar(findViewById(R.id.layout),
TravelmateSnackbars.createSnackBar(layout,
R.string.status_updated, Snackbar.LENGTH_SHORT).show();
mSharedPreferences.edit().putString(USER_STATUS, mUserStatus).apply();
displayStatus.setText(mUserStatus);

} else {
TravelmateSnackbars.createSnackBar(findViewById(R.id.layout), res,
TravelmateSnackbars.createSnackBar(layout, res,
Snackbar.LENGTH_LONG).show();
networkError();
}
Expand Down Expand Up @@ -830,7 +830,7 @@ public void onResponse(Call call, Response response) throws IOException {
if (response.isSuccessful()) {
Log.i(LOG_TAG, "Upload to server successful!");
} else {
TravelmateSnackbars.createSnackBar(findViewById(R.id.layout), res,
TravelmateSnackbars.createSnackBar(layout, res,
Snackbar.LENGTH_LONG).show();
}
});
Expand Down Expand Up @@ -952,7 +952,7 @@ private void shareProfile() {
try {
startActivity(Intent.createChooser(intent, getString(R.string.share_chooser)));
} catch (android.content.ActivityNotFoundException ex) {
TravelmateSnackbars.createSnackBar(findViewById(R.id.layout), R.string.snackbar_no_share_app,
TravelmateSnackbars.createSnackBar(layout, R.string.snackbar_no_share_app,
Snackbar.LENGTH_LONG).show();
}
}
Expand Down
2 changes: 2 additions & 0 deletions Android/app/src/main/java/io/github/project_travel_mate/SplashActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@

import com.eftimoff.androipathview.PathView;

import butterknife.BindView;
hafiz703 marked this conversation as resolved.
Show resolved Hide resolved
import io.github.project_travel_mate.login.LoginActivity;

import static utils.Constants.USER_TOKEN;
Expand All @@ -19,6 +20,7 @@ public class SplashActivity extends AppCompatActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {

Copy link
Member

Choose a reason for hiding this comment

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

I dont see any relevant change in this file. Please remove this from commit

super.onCreate(savedInstanceState);
setContentView(R.layout.activity_splash);

Expand Down
8 changes: 6 additions & 2 deletions Android/app/src/main/java/io/github/project_travel_mate/destinations/CityFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import android.view.animation.DecelerateInterpolator;
import android.view.inputmethod.InputMethodManager;
import android.widget.ArrayAdapter;
import android.widget.Button;
import android.widget.ListView;

import com.airbnb.lottie.LottieAnimationView;
Expand Down Expand Up @@ -72,8 +73,11 @@ public class CityFragment extends Fragment implements TravelmateSnackbars {
LottieAnimationView animationView;
@BindView(R.id.cities_list)
ListView lv;
@BindView(R.id.search_view)
MaterialSearchView mMaterialSearchView;
hafiz703 marked this conversation as resolved.
Show resolved Hide resolved

private MaterialSearchView mMaterialSearchView;

// private MaterialSearchView mMaterialSearchView;
hafiz703 marked this conversation as resolved.
Show resolved Hide resolved
private final int[] mColors = {R.color.sienna, R.color.saffron, R.color.green, R.color.pink,
R.color.orange, R.color.blue, R.color.grey, R.color.yellow, R.color.purple, R.color.peach};

Expand Down Expand Up @@ -127,7 +131,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
// make an target
mSpotView = inflater.inflate(R.layout.spotlight_target, null);

mMaterialSearchView = view.findViewById(R.id.search_view);

mMaterialSearchView.setOnQueryTextListener(new MaterialSearchView.OnQueryTextListener() {
@Override
public boolean onQueryTextSubmit(String query) {
Expand Down
3 changes: 2 additions & 1 deletion ...in/java/io/github/project_travel_mate/destinations/description/FinalCityInfoActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,8 @@ public class FinalCityInfoActivity extends AppCompatActivity
LinearLayout cityVisitedLayout;
@BindView(R.id.ll_city_map)
LinearLayout cityMap;
@BindView(R.id.toolbar)
Toolbar toolbar;

private int mDotsCount;
private ImageView[] mDots;
Expand Down Expand Up @@ -140,7 +142,6 @@ private void initUi() {
}

toggleFavouriteCityView();
Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
content.setVisibility(View.GONE);
cityVisitedLayout.setVisibility(View.GONE);
Expand Down
4 changes: 2 additions & 2 deletions ...main/java/io/github/project_travel_mate/destinations/description/PlacesOnMapActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,8 @@ public class PlacesOnMapActivity extends AppCompatActivity implements
BottomSheetBehavior sheetBehavior;
@BindView(R.id.bottom_sheet)
LinearLayout layoutBottomSheet;
private MapView mMap;
@BindView(R.id.map)
MapView mMap;
Copy link
Member

Choose a reason for hiding this comment

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

this change was intended for all places. Only Private variables start with m...

private IMapController mController;
private Drawable mMarker, mDefaultMarker;

Expand All @@ -106,7 +107,6 @@ protected void onCreate(Bundle savedInstanceState) {
SharedPreferences mSharedPreferences = PreferenceManager.getDefaultSharedPreferences(this);
mToken = mSharedPreferences.getString(USER_TOKEN, null);
sheetBehavior = BottomSheetBehavior.from(layoutBottomSheet);
mMap = findViewById(R.id.map);
setTitle(mCity.getNickname());
mMarker = this.getDrawable(R.drawable.ic_radio_button_checked_orange_24dp);
mDefaultMarker = this.getDrawable(R.drawable.marker_default);
Expand Down
5 changes: 2 additions & 3 deletions ...p/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunFactsActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,8 @@ public class FunFactsActivity extends AppCompatActivity implements FunFactsView
ViewPager viewPager;
@BindView(R.id.animation_view)
LottieAnimationView animationView;

@BindView(R.id.toolbar)
Toolbar toolbar;
private City mCity;
private String mToken;
private Handler mHandler;
Expand All @@ -55,8 +56,6 @@ public class FunFactsActivity extends AppCompatActivity implements FunFactsView
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_fun_facts);

Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
ActionBar supportActionBar = getSupportActionBar();
if (supportActionBar != null) {
Expand Down
17 changes: 10 additions & 7 deletions Android/app/src/main/java/io/github/project_travel_mate/mytrips/AddNewTripActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import android.os.Handler;
import android.os.Looper;
import android.preference.PreferenceManager;
import android.support.design.widget.CoordinatorLayout;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
Expand Down Expand Up @@ -71,6 +72,8 @@ public class AddNewTripActivity extends AppCompatActivity implements DatePickerD
LinearLayout mLinearLayout;
@BindView(R.id.animation_view)
LottieAnimationView animationView;
@BindView(R.id.activityAddNewTrip)
CoordinatorLayout activityAddNewTrip;
Copy link
Member

Choose a reason for hiding this comment

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

layoutAddNewTrip


private String mCityid;
private String mStartdate;
Expand Down Expand Up @@ -163,7 +166,7 @@ public void onResponse(Call call, final Response response) {
final int responseCode = response.code();
mHandler.post(() -> {
if (responseCode == HttpsURLConnection.HTTP_CREATED) {
TravelmateSnackbars.createSnackBar(findViewById(R.id.activityAddNewTrip),
TravelmateSnackbars.createSnackBar(activityAddNewTrip,
R.string.trip_added, Snackbar.LENGTH_LONG
).show();
//Call back to MytripsFragment
Expand All @@ -172,7 +175,7 @@ public void onResponse(Call call, final Response response) {
finish();

} else {
TravelmateSnackbars.createSnackBar(findViewById(R.id.activityAddNewTrip),
TravelmateSnackbars.createSnackBar(activityAddNewTrip,
res, Snackbar.LENGTH_LONG
).show();
}
Expand Down Expand Up @@ -261,15 +264,15 @@ public void onClick(View view) {
mTripname = tripName.getText().toString();

if (mTripname.trim().equals("")) {
TravelmateSnackbars.createSnackBar(findViewById(R.id.activityAddNewTrip),
TravelmateSnackbars.createSnackBar(activityAddNewTrip,
R.string.trip_name_blank, Snackbar.LENGTH_LONG
).show();
} else if (tripStartDate == null || tripStartDate.getText().toString().equals("")) {
TravelmateSnackbars.createSnackBar(findViewById(R.id.activityAddNewTrip),
TravelmateSnackbars.createSnackBar(activityAddNewTrip,
R.string.trip_date_blank, Snackbar.LENGTH_LONG
).show();
} else if (mCityid == null) {
TravelmateSnackbars.createSnackBar(findViewById(R.id.activityAddNewTrip),
TravelmateSnackbars.createSnackBar(activityAddNewTrip,
R.string.trip_city_blank, Snackbar.LENGTH_LONG
).show();
} else {
Expand Down Expand Up @@ -323,12 +326,12 @@ public void onDateSet(DatePicker view, int year, int month, int dayOfMonth) {
mStartdate = Long.toString(selectedDate.getTime() / 1000);
tripStartDate.setText(dayOfMonth + "/" + (month + 1) + "/" + year);
} else if (selectedDate.compareTo(currentDate) == 0) {
TravelmateSnackbars.createSnackBar(findViewById(R.id.activityAddNewTrip),
TravelmateSnackbars.createSnackBar(activityAddNewTrip,
R.string.wrong_date_alert, Snackbar.LENGTH_LONG
).show();
return;
} else {
TravelmateSnackbars.createSnackBar(findViewById(R.id.activityAddNewTrip),
TravelmateSnackbars.createSnackBar(activityAddNewTrip,
R.string.wrong_date_alert, Snackbar.LENGTH_LONG
).show();
return;
Expand Down
Loading