diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/AboutActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/AboutActivity.java index 742dae190..2375f2843 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/AboutActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/AboutActivity.java @@ -55,9 +55,9 @@ public void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_about); prefs = PreferenceManager.getDefaultSharedPreferences(this); - viewPager = (ViewPager) findViewById(R.id.activity_about_pager); + viewPager = findViewById(R.id.activity_about_pager); - tabs = (TabLayout) findViewById(R.id.tabs_toolbar); + tabs = findViewById(R.id.tabs_toolbar); Bundle bundle = this.getIntent().getExtras(); if (bundle != null) { diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/AppActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/AppActivity.java index 47f111238..63f6c63ac 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/AppActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/AppActivity.java @@ -61,7 +61,7 @@ public class AppActivity extends AppCompatActivity implements APIKeyRequestListe * @param activities: list of activities to show on the ScheduleReminders section */ public void drawReminders(List activities){ - ScheduleReminders reminders = (ScheduleReminders) findViewById(R.id.schedule_reminders); + ScheduleReminders reminders = findViewById(R.id.schedule_reminders); if (reminders != null){ reminders.initSheduleReminders(activities); } @@ -90,7 +90,7 @@ protected void onStart(boolean overrideTitle, boolean configureActionBar){ if (!configureActionBar) return; - Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); if (toolbar != null){ setSupportActionBar( toolbar ); } diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/CourseActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/CourseActivity.java index 99066fefc..43d7b0a21 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/CourseActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/CourseActivity.java @@ -90,7 +90,7 @@ public void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_course); ActionBar actionBar = getSupportActionBar(); prefs = PreferenceManager.getDefaultSharedPreferences(this); - viewPager = (ViewPager) findViewById(R.id.activity_widget_pager); + viewPager = findViewById(R.id.activity_widget_pager); Bundle bundle = this.getIntent().getExtras(); if (bundle != null) { @@ -111,7 +111,7 @@ public void onCreate(Bundle savedInstanceState) { actionBar.setDisplayShowTitleEnabled(true); } } - tabs = (TabLayout) findViewById(R.id.tabs_toolbar); + tabs = findViewById(R.id.tabs_toolbar); loadActivities(); } diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/CourseIndexActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/CourseIndexActivity.java index d3086ae96..d99612e30 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/CourseIndexActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/CourseIndexActivity.java @@ -239,7 +239,7 @@ public Boolean call() throws Exception { private void initializeCourseIndex(boolean animate){ - final ListView listView = (ListView) findViewById(R.id.section_list); + final ListView listView = findViewById(R.id.section_list); if (listView == null) return; ViewCompat.setNestedScrollingEnabled(listView, true); sla = new SectionListAdapter(CourseIndexActivity.this, course, sections, new SectionListAdapter.CourseClickListener() { diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/CourseMetaPageActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/CourseMetaPageActivity.java index 5f9e32bc4..3742bff01 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/CourseMetaPageActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/CourseMetaPageActivity.java @@ -56,18 +56,18 @@ public void onCreate(Bundle savedInstanceState) { cmp = course.getMetaPage(pageID); } - TextView titleTV = (TextView) findViewById(R.id.course_title); + TextView titleTV = findViewById(R.id.course_title); String title = cmp.getLang(prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage())).getContent(); titleTV.setText(title); - TextView versionTV = (TextView) findViewById(R.id.course_versionid); + TextView versionTV = findViewById(R.id.course_versionid); BigDecimal big = new BigDecimal(course.getVersionId()); versionTV.setText(big.toString()); - TextView shortnameTV = (TextView) findViewById(R.id.course_shortname); + TextView shortnameTV = findViewById(R.id.course_shortname); shortnameTV.setText(course.getShortname()); - WebView wv = (WebView) this.findViewById(R.id.metapage_webview); + WebView wv = this.findViewById(R.id.metapage_webview); String url = course.getLocation() + File.separator +cmp.getLang(prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage())).getLocation(); try { diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/DeviceListActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/DeviceListActivity.java index ead521282..e59d374fe 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/DeviceListActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/DeviceListActivity.java @@ -57,7 +57,7 @@ public class DeviceListActivity extends Activity { public static String EXTRA_DEVICE_ADDRESS = "device_address"; private static final List BLUETOOTH_PERMISSIONS = Arrays.asList( - //Remember to update this when the Manifest permisssions change! + //Remember to update this when the Manifest permissions change! Manifest.permission.ACCESS_COARSE_LOCATION, Manifest.permission.ACCESS_FINE_LOCATION ); @@ -81,7 +81,7 @@ protected void onCreate(Bundle savedInstanceState) { scanningMessage = findViewById(R.id.scanning_message); // Initialize the button to perform device discovery - scanButton = (Button) findViewById(R.id.button_scan); + scanButton = findViewById(R.id.button_scan); scanButton.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { @@ -125,12 +125,12 @@ public Boolean call() { mNewDevicesArrayAdapter = new ArrayAdapter<>(this, R.layout.device_row); // Find and set up the ListView for paired devices - ListView pairedListView = (ListView) findViewById(R.id.paired_devices); + ListView pairedListView = findViewById(R.id.paired_devices); pairedListView.setAdapter(pairedDevicesArrayAdapter); pairedListView.setOnItemClickListener(mDeviceClickListener); // Find and set up the ListView for newly discovered devices - ListView newDevicesListView = (ListView) findViewById(R.id.new_devices); + ListView newDevicesListView = findViewById(R.id.new_devices); newDevicesListView.setAdapter(mNewDevicesArrayAdapter); newDevicesListView.setOnItemClickListener(mDeviceClickListener); diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/DownloadActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/DownloadActivity.java index d2c625b68..7e24610ca 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/DownloadActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/DownloadActivity.java @@ -89,7 +89,7 @@ public void onCreate(Bundle savedInstanceState) { Tag t = (Tag) bundle.getSerializable(Tag.TAG); if (t != null){ this.url = MobileLearning.SERVER_TAG_PATH + String.valueOf(t.getId()) + File.separator; - Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); if (toolbar != null){ toolbar.setSubtitle(t.getName()); } @@ -103,7 +103,7 @@ public void onCreate(Bundle savedInstanceState) { courses = new ArrayList<>(); dla = new DownloadCourseListAdapter(this, courses); dla.setOnClickListener(new CourseListListener()); - ListView listView = (ListView) findViewById(R.id.tag_list); + ListView listView = findViewById(R.id.tag_list); if (listView != null) { listView.setAdapter(dla); } diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/DownloadMediaActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/DownloadMediaActivity.java index 185a89df3..fe83ab289 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/DownloadMediaActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/DownloadMediaActivity.java @@ -101,7 +101,7 @@ public void onCreate(Bundle savedInstanceState) { dmla = new DownloadMediaListAdapter(this, missingMedia); dmla.setOnClickListener(new DownloadMediaListener()); - mediaList = (ListView) findViewById(R.id.missing_media_list); + mediaList = findViewById(R.id.missing_media_list); mediaList.setAdapter(dmla); mediaList.setChoiceMode(ListView.CHOICE_MODE_MULTIPLE_MODAL); @@ -211,11 +211,11 @@ public void onDestroyActionMode(ActionMode mode) { }); missingMediaContainer = this.findViewById(R.id.home_messages); - downloadSelected = (TextView) this.findViewById(R.id.download_selected); - unselectAll = (TextView) this.findViewById(R.id.unselect_all); + downloadSelected = this.findViewById(R.id.download_selected); + unselectAll = this.findViewById(R.id.unselect_all); - downloadViaPCBtn = (Button) this.findViewById(R.id.download_media_via_pc_btn); + downloadViaPCBtn = this.findViewById(R.id.download_media_via_pc_btn); downloadViaPCBtn.setOnClickListener(new OnClickListener() { public void onClick(View v) { downloadViaPC(); @@ -224,7 +224,7 @@ public void onClick(View v) { Media.resetMediaScan(prefs); - emptyState = (TextView) findViewById(R.id.empty_state); + emptyState = findViewById(R.id.empty_state); } @Override diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/OppiaMobileActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/OppiaMobileActivity.java index 11743c249..2b89d7fba 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/OppiaMobileActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/OppiaMobileActivity.java @@ -121,12 +121,12 @@ public void onCreate(Bundle savedInstanceState) { } messageContainer = this.findViewById(R.id.home_messages); - messageText = (TextView) this.findViewById(R.id.home_message); - messageButton = (Button) this.findViewById(R.id.message_action_button); + messageText = this.findViewById(R.id.home_message); + messageButton = this.findViewById(R.id.message_action_button); courses = new ArrayList<>(); courseListAdapter = new CourseListAdapter(this, courses); - courseList = (ListView) findViewById(R.id.course_list); + courseList = findViewById(R.id.course_list); courseList.setAdapter(courseListAdapter); CourseContextMenuCustom courseMenu = new CourseContextMenuCustom(this); @@ -184,13 +184,13 @@ private void displayCourses() { courses.clear(); courses.addAll(coursesRepository.getCourses(this)); - LinearLayout llLoading = (LinearLayout) this.findViewById(R.id.loading_courses); + LinearLayout llLoading = this.findViewById(R.id.loading_courses); llLoading.setVisibility(View.GONE); if (courses.size() < MobileLearning.DOWNLOAD_COURSES_DISPLAY){ displayDownloadSection(); } else { - TextView tv = (TextView) this.findViewById(R.id.manage_courses_text); + TextView tv = this.findViewById(R.id.manage_courses_text); tv.setText(R.string.no_courses); noCoursesView.setVisibility(View.GONE); } @@ -209,7 +209,7 @@ private void updateReminders(){ this.drawReminders(activities); } else { - LinearLayout ll = (LinearLayout) findViewById(R.id.schedule_reminders); + LinearLayout ll = findViewById(R.id.schedule_reminders); ll.setVisibility(View.GONE); } } @@ -248,10 +248,10 @@ private void startPrefsActivity(){ private void displayDownloadSection(){ noCoursesView.setVisibility(View.VISIBLE); - TextView tv = (TextView) this.findViewById(R.id.manage_courses_text); + TextView tv = this.findViewById(R.id.manage_courses_text); tv.setText((!courses.isEmpty())? R.string.more_courses : R.string.no_courses); - Button manageBtn = (Button) this.findViewById(R.id.manage_courses_btn); + Button manageBtn = this.findViewById(R.id.manage_courses_btn); manageBtn.setOnClickListener(new View.OnClickListener() { public void onClick(View v) { AdminSecurityManager.checkAdminPermission(OppiaMobileActivity.this, R.id.menu_download, new AdminSecurityManager.AuthListener() { diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/ScorecardActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/ScorecardActivity.java index 2d93f0398..032b383e0 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/ScorecardActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/ScorecardActivity.java @@ -61,8 +61,8 @@ public void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_scorecard); - viewPager = (ViewPager) findViewById(R.id.activity_scorecard_pager); - tabs = (TabLayout) findViewById(R.id.tabs_toolbar); + viewPager = findViewById(R.id.activity_scorecard_pager); + tabs = findViewById(R.id.tabs_toolbar); prefs = PreferenceManager.getDefaultSharedPreferences(this); Bundle bundle = this.getIntent().getExtras(); diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/SearchActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/SearchActivity.java index 6991e5d36..6b8a7327d 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/SearchActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/SearchActivity.java @@ -75,7 +75,7 @@ public void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_search); prefs = PreferenceManager.getDefaultSharedPreferences(this); srla = new SearchResultsListAdapter(this, results); - resultsList = (ListView) findViewById(R.id.search_results_list); + resultsList = findViewById(R.id.search_results_list); if (resultsList != null) { resultsList.setAdapter(srla); resultsList.setOnItemClickListener(new OnItemClickListener() { @@ -106,7 +106,7 @@ public void onStart(){ DbHelper db = DbHelper.getInstance(this); userId = db.getUserId(prefs.getString("preUsername", "")); - searchText = (EditText) findViewById(R.id.search_string); + searchText = findViewById(R.id.search_string); searchText.setOnEditorActionListener(new TextView.OnEditorActionListener() { //@Override public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { @@ -115,9 +115,9 @@ public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { return false; } }); - summary = (TextView) findViewById(R.id.search_results_summary); - loadingSpinner = (ProgressBar) findViewById(R.id.progressBar); - searchButton = (ImageView) findViewById(R.id.searchbutton); + summary = findViewById(R.id.search_results_summary); + loadingSpinner = findViewById(R.id.progressBar); + searchButton = findViewById(R.id.searchbutton); if (searchButton != null) { searchButton.setClickable(true); searchButton.setOnClickListener(new View.OnClickListener() { diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/StartUpActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/StartUpActivity.java index 4cdb1450c..70be8267a 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/StartUpActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/StartUpActivity.java @@ -78,7 +78,7 @@ public void onErrorDialogClosed() { if (!isGooglePlayAvailable) return; } - tvProgress = (TextView) this.findViewById(R.id.start_up_progress); + tvProgress = this.findViewById(R.id.start_up_progress); prefs = PreferenceManager.getDefaultSharedPreferences(this); String username = SessionManager.getUsername(this); Mint.setUserIdentifier( username.equals("") ? "anon" : username); diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/SyncActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/SyncActivity.java index bca304d60..f97803df3 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/SyncActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/SyncActivity.java @@ -33,8 +33,8 @@ public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_sync); - viewPager = (ViewPager) findViewById(R.id.activity_sync_pager); - tabs = (TabLayout) findViewById(R.id.tabs_toolbar); + viewPager = findViewById(R.id.activity_sync_pager); + tabs = findViewById(R.id.tabs_toolbar); Bundle bundle = this.getIntent().getExtras(); if (bundle != null) { @@ -47,7 +47,7 @@ public void onStart() { super.onStart(); // Make the Toolbar back button call the back press (to close possible bluetooth connection) - Toolbar toolbar = (Toolbar)findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); if (toolbar != null){ toolbar.setNavigationOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/TagSelectActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/TagSelectActivity.java index a89a197d1..1000d72d2 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/TagSelectActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/TagSelectActivity.java @@ -66,7 +66,7 @@ public void onCreate(Bundle savedInstanceState) { tags = new ArrayList<>(); tla = new TagListAdapter(this, tags); - ListView listView = (ListView) findViewById(R.id.tag_list); + ListView listView = findViewById(R.id.tag_list); listView.setAdapter(tla); listView.setOnItemClickListener(new OnItemClickListener() { public void onItemClick(AdapterView parent, View view, int position, long id) { diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/ViewDigestActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/ViewDigestActivity.java index 2c3b6684c..a7f2da8c8 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/ViewDigestActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/ViewDigestActivity.java @@ -40,7 +40,7 @@ protected void onCreate(Bundle savedInstanceState) { final String digest = intent.getData().getQueryParameter(ACTIVITY_DIGEST_PARAM); activityDetail = findViewById(R.id.activity_detail); - errorText = (TextView) findViewById(R.id.error_text); + errorText = findViewById(R.id.error_text); boolean validDigest = validate(digest); if (validDigest){ diff --git a/app/src/main/java/org/digitalcampus/oppia/activity/WelcomeActivity.java b/app/src/main/java/org/digitalcampus/oppia/activity/WelcomeActivity.java index c95a56a6c..763e60b3e 100644 --- a/app/src/main/java/org/digitalcampus/oppia/activity/WelcomeActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/activity/WelcomeActivity.java @@ -52,14 +52,13 @@ public class WelcomeActivity extends AppActivity { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_welcome); - //tabs = (TabLayout) findViewById(R.id.tabs_toolbar); - viewPager = (ViewPager) findViewById(R.id.activity_welcome_pager); + viewPager = findViewById(R.id.activity_welcome_pager); } @Override public void onStart() { super.onStart(true, false); - Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); + Toolbar toolbar = findViewById(R.id.toolbar); toolbar.getMenu().clear(); toolbar.inflateMenu(R.menu.activity_welcome); toolbar.setOnMenuItemClickListener(new Toolbar.OnMenuItemClickListener() { diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/ActivityPagerAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/ActivityPagerAdapter.java index 0ad2b9a7b..5237b6c61 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/ActivityPagerAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/ActivityPagerAdapter.java @@ -75,7 +75,7 @@ public void updateTabViews(TabLayout tabs) { for (int i = 0; i < tabs.getTabCount(); i++) { View v = LayoutInflater.from(ctx).inflate(R.layout.tablayout_fixed_tab, null); - TextView tv = (TextView) v.findViewById(R.id.tabTitle); + TextView tv = v.findViewById(R.id.tabTitle); tv.setText(tabTitles.get(i)); TabLayout.Tab tab = tabs.getTabAt(i); diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/BadgesListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/BadgesListAdapter.java index 98804e1e0..c06c264c6 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/BadgesListAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/BadgesListAdapter.java @@ -57,8 +57,8 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.fragment_badges_list_row, parent, false); viewHolder = new BadgeViewHolder(); - viewHolder.badgeDescription = (TextView) convertView.findViewById(R.id.badges_description); - viewHolder.badgeDate = (TextView) convertView.findViewById(R.id.badges_date); + viewHolder.badgeDescription = convertView.findViewById(R.id.badges_description); + viewHolder.badgeDate = convertView.findViewById(R.id.badges_date); convertView.setTag(viewHolder); } else{ diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/CourseListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/CourseListAdapter.java index 39139d09b..aa9847110 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/CourseListAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/CourseListAdapter.java @@ -73,10 +73,10 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.course_list_row, parent, false); viewHolder = new CourseViewHolder(); - viewHolder.courseTitle = (TextView) convertView.findViewById(R.id.course_title); - viewHolder.courseDescription = (TextView) convertView.findViewById(R.id.course_description); - viewHolder.courseProgress = (ProgressBar) convertView.findViewById(R.id.course_progress_bar); - viewHolder.courseImage = (ImageView) convertView.findViewById(R.id.course_image); + viewHolder.courseTitle = convertView.findViewById(R.id.course_title); + viewHolder.courseDescription = convertView.findViewById(R.id.course_description); + viewHolder.courseProgress = convertView.findViewById(R.id.course_progress_bar); + viewHolder.courseImage = convertView.findViewById(R.id.course_image); viewHolder.barAnimator = new ProgressBarAnimator(viewHolder.courseProgress); convertView.setTag(viewHolder); } diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/CourseQuizzesGridAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/CourseQuizzesGridAdapter.java index 469f73bfc..634de3504 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/CourseQuizzesGridAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/CourseQuizzesGridAdapter.java @@ -59,7 +59,7 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.scorecard_quiz_item, parent, false); viewHolder = new QuizStatsViewHolder(); - viewHolder.percent = (TextView) convertView.findViewById(R.id.percent_label); + viewHolder.percent = convertView.findViewById(R.id.percent_label); viewHolder.baseView = convertView; convertView.setTag(viewHolder); } diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/DownloadCourseListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/DownloadCourseListAdapter.java index c31ba28f1..5a481bbd4 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/DownloadCourseListAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/DownloadCourseListAdapter.java @@ -84,13 +84,13 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.course_download_row, parent, false); viewHolder = new DownloadCourseViewHolder(); - viewHolder.courseTitle = (TextView) convertView.findViewById(R.id.course_title); - viewHolder.courseDraft = (TextView) convertView.findViewById(R.id.course_draft); - viewHolder.courseDescription = (TextView) convertView.findViewById(R.id.course_description); - viewHolder.actionBtn = (ImageButton) convertView.findViewById(R.id.download_course_btn); - viewHolder.actionProgress = (ProgressBar) convertView.findViewById(R.id.download_progress); - viewHolder.courseAuthor = (TextView) convertView.findViewById(R.id.course_author); - viewHolder.labelAuthor = (TextView) convertView.findViewById(R.id.label_author); + viewHolder.courseTitle = convertView.findViewById(R.id.course_title); + viewHolder.courseDraft = convertView.findViewById(R.id.course_draft); + viewHolder.courseDescription = convertView.findViewById(R.id.course_description); + viewHolder.actionBtn = convertView.findViewById(R.id.download_course_btn); + viewHolder.actionProgress = convertView.findViewById(R.id.download_progress); + viewHolder.courseAuthor = convertView.findViewById(R.id.course_author); + viewHolder.labelAuthor = convertView.findViewById(R.id.label_author); convertView.setTag(viewHolder); } diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/DownloadMediaListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/DownloadMediaListAdapter.java index 246916324..7647b5009 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/DownloadMediaListAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/DownloadMediaListAdapter.java @@ -74,12 +74,12 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.media_download_row, parent, false); viewHolder = new DownloadMediaViewHolder(); - viewHolder.mediaCourses = (TextView) convertView.findViewById(R.id.media_courses); - viewHolder.mediaTitle = (TextView) convertView.findViewById(R.id.media_title); - viewHolder.mediaPath = (TextView) convertView.findViewById(R.id.media_path); - viewHolder.mediaFileSize = (TextView) convertView.findViewById(R.id.media_file_size); - viewHolder.downloadBtn = (ImageButton) convertView.findViewById(R.id.action_btn); - viewHolder.downloadProgress = (ProgressBar) convertView.findViewById(R.id.download_progress); + viewHolder.mediaCourses = convertView.findViewById(R.id.media_courses); + viewHolder.mediaTitle = convertView.findViewById(R.id.media_title); + viewHolder.mediaPath = convertView.findViewById(R.id.media_path); + viewHolder.mediaFileSize = convertView.findViewById(R.id.media_file_size); + viewHolder.downloadBtn = convertView.findViewById(R.id.action_btn); + viewHolder.downloadProgress = convertView.findViewById(R.id.download_progress); convertView.setTag(viewHolder); } else{ diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/ExportedTrackersFileAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/ExportedTrackersFileAdapter.java index 7e75f1b62..2e5824f5f 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/ExportedTrackersFileAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/ExportedTrackersFileAdapter.java @@ -29,9 +29,9 @@ public static class EtfaViewHolder extends RecyclerView.ViewHolder { public EtfaViewHolder(View v) { super(v); - fileName = (TextView) v.findViewById(R.id.file_name); - fileSize = (TextView) v.findViewById(R.id.file_size); - btnShare = (ImageButton) v.findViewById(R.id.share_btn); + fileName = v.findViewById(R.id.file_name); + fileSize = v.findViewById(R.id.file_size); + btnShare = v.findViewById(R.id.share_btn); btnShare.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/LeaderboardAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/LeaderboardAdapter.java index 45617158a..84df796e0 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/LeaderboardAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/LeaderboardAdapter.java @@ -37,11 +37,11 @@ static class ViewHolder extends RecyclerView.ViewHolder { ViewHolder(View v) { super(v); - points = (TextView) v.findViewById(R.id.leaderboard_points); - pos = (TextView) v.findViewById(R.id.leaderboard_position); - username = (TextView) v.findViewById(R.id.leaderboard_username); - fullname = (TextView) v.findViewById(R.id.leaderboard_fullname); - userCard = (CardView) v.findViewById(R.id.user_card); + points = v.findViewById(R.id.leaderboard_points); + pos = v.findViewById(R.id.leaderboard_position); + username = v.findViewById(R.id.leaderboard_username); + fullname = v.findViewById(R.id.leaderboard_fullname); + userCard = v.findViewById(R.id.user_card); } } diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/PointsListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/PointsListAdapter.java index 2681366c2..24e84da5a 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/PointsListAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/PointsListAdapter.java @@ -61,10 +61,10 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.fragment_points_list_row, parent, false); viewHolder = new PointsViewHolder(); - viewHolder.pointsDescription = (TextView) convertView.findViewById(R.id.points_description); - viewHolder.pointsTime = (TextView) convertView.findViewById(R.id.points_time); - viewHolder.pointsDate = (TextView) convertView.findViewById(R.id.points_date); - viewHolder.pointsPoints = (TextView) convertView.findViewById(R.id.points_points); + viewHolder.pointsDescription = convertView.findViewById(R.id.points_description); + viewHolder.pointsTime = convertView.findViewById(R.id.points_time); + viewHolder.pointsDate = convertView.findViewById(R.id.points_date); + viewHolder.pointsPoints = convertView.findViewById(R.id.points_points); convertView.setTag(viewHolder); } else{ diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/QuizFeedbackAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/QuizFeedbackAdapter.java index ace0a4641..103e7cf61 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/QuizFeedbackAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/QuizFeedbackAdapter.java @@ -63,11 +63,11 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.widget_quiz_feedback_row, parent, false); viewHolder = new QuizFeedbackViewHolder(); - viewHolder.quizQuestion = (TextView) convertView.findViewById(R.id.quiz_question_text); - viewHolder.quizUserResponse = (TextView) convertView.findViewById(R.id.quiz_question_user_response_text); - viewHolder.quizFeedbackText = (TextView) convertView.findViewById(R.id.quiz_question_user_feedback_text); - viewHolder.quizFeedbackTitle = (TextView) convertView.findViewById(R.id.quiz_question_user_feedback_title); - viewHolder.quizFeedbackIcon = (ImageView) convertView.findViewById(R.id.quiz_question_feedback_image); + viewHolder.quizQuestion = convertView.findViewById(R.id.quiz_question_text); + viewHolder.quizUserResponse = convertView.findViewById(R.id.quiz_question_user_response_text); + viewHolder.quizFeedbackText = convertView.findViewById(R.id.quiz_question_user_feedback_text); + viewHolder.quizFeedbackTitle = convertView.findViewById(R.id.quiz_question_user_feedback_title); + viewHolder.quizFeedbackIcon = convertView.findViewById(R.id.quiz_question_feedback_image); convertView.setTag(viewHolder); } else{ diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/ScheduleReminderListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/ScheduleReminderListAdapter.java index 6cda7fca4..e6cb70e02 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/ScheduleReminderListAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/ScheduleReminderListAdapter.java @@ -63,7 +63,7 @@ public View getView(int position, View convertView, ViewGroup parent) { Course course = db.getCourse(a.getCourseId(), userId); String lang = prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage()); - TextView scheduleTitle = (TextView) rowView.findViewById(R.id.schedule_title); + TextView scheduleTitle = rowView.findViewById(R.id.schedule_title); scheduleTitle.setText(course.getMultiLangInfo().getTitle(lang) + ": " + a.getMultiLangInfo().getTitle(lang)); rowView.setTag(R.id.TAG_COURSE,course); rowView.setTag(R.id.TAG_ACTIVITY_DIGEST,a.getDigest()); diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/ScorecardListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/ScorecardListAdapter.java index 2ab195cd4..64723ef5c 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/ScorecardListAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/ScorecardListAdapter.java @@ -88,12 +88,12 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.scorecard_list_row, parent, false); viewHolder = new ScorecardViewHolder(); - viewHolder.courseTitle = (TextView) convertView.findViewById(R.id.course_title); - PieChart pie = (PieChart) convertView.findViewById(R.id.scorecard_pie_chart); + viewHolder.courseTitle = convertView.findViewById(R.id.course_title); + PieChart pie = convertView.findViewById(R.id.scorecard_pie_chart); viewHolder.pieChart = new ScorecardPieChart(ctx, pie, course); viewHolder.pieChart.configureChart(0, 0.79f, false); - viewHolder.activitiesCompleted = (TextView) convertView.findViewById(R.id.scorecard_activities_completed); - viewHolder.activitiesTotal = (TextView) convertView.findViewById(R.id.scorecard_activities_total); + viewHolder.activitiesCompleted = convertView.findViewById(R.id.scorecard_activities_completed); + viewHolder.activitiesTotal = convertView.findViewById(R.id.scorecard_activities_total); convertView.setTag(viewHolder); } else { diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/SearchResultsListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/SearchResultsListAdapter.java index d1902859e..08bd50447 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/SearchResultsListAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/SearchResultsListAdapter.java @@ -69,10 +69,10 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.search_results_row, parent, false); viewHolder = new SearchResultsViewHolder(); - viewHolder.activityTitle = (TextView) convertView.findViewById(R.id.activity_title); - viewHolder.sectionTitle = (TextView) convertView.findViewById(R.id.section_title); - viewHolder.courseTitle = (TextView) convertView.findViewById(R.id.course_title); - viewHolder.courseImage = (ImageView) convertView.findViewById(R.id.course_image); + viewHolder.activityTitle = convertView.findViewById(R.id.activity_title); + viewHolder.sectionTitle = convertView.findViewById(R.id.section_title); + viewHolder.courseTitle = convertView.findViewById(R.id.course_title); + viewHolder.courseImage = convertView.findViewById(R.id.course_image); convertView.setTag(viewHolder); } else{ diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/SectionListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/SectionListAdapter.java index feafe7b47..ef24a85b6 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/SectionListAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/SectionListAdapter.java @@ -95,8 +95,8 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.section_list_row, parent, false); viewHolder = new SectionViewHolder(); - viewHolder.sectionTitle = (TextView) convertView.findViewById(R.id.section_title); - viewHolder.sectionActivities = (TwoWayView) convertView.findViewById(R.id.section_activities); + viewHolder.sectionTitle = convertView.findViewById(R.id.section_title); + viewHolder.sectionActivities = convertView.findViewById(R.id.section_activities); innerListAdapter = new ActivityAdapter(locale, course.getLocation()); viewHolder.sectionActivities.setAdapter(innerListAdapter); @@ -182,8 +182,8 @@ public View getView(int position, View convertView, ViewGroup parent) { Context context = parent.getContext(); convertView = LayoutInflater.from(context).inflate(R.layout.section_horizonal_item, null); viewHolder.activityContainer = convertView.findViewById(R.id.activity_object); - viewHolder.activityTitle = (TextView) viewHolder.activityContainer.findViewById(R.id.activity_title); - viewHolder.activityImage = (ImageView) viewHolder.activityContainer.findViewById(R.id.activity_image); + viewHolder.activityTitle = viewHolder.activityContainer.findViewById(R.id.activity_title); + viewHolder.activityImage = viewHolder.activityContainer.findViewById(R.id.activity_image); viewHolder.completedBadge = convertView.findViewById(R.id.completed_badge); convertView.setTag(viewHolder); } else { diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/TagListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/TagListAdapter.java index 9c08097fb..e9186ce31 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/TagListAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/TagListAdapter.java @@ -62,9 +62,9 @@ public View getView(int position, View convertView, ViewGroup parent) { LayoutInflater inflater = (LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.tag_row, parent, false); viewHolder = new TagViewHolder(); - viewHolder.tagName = (TextView) convertView.findViewById(R.id.tag_name); - viewHolder.tagDescription = (TextView) convertView.findViewById(R.id.tag_description); - viewHolder.tagIcon = (ImageView) convertView.findViewById(R.id.tag_icon); + viewHolder.tagName = convertView.findViewById(R.id.tag_name); + viewHolder.tagDescription = convertView.findViewById(R.id.tag_description); + viewHolder.tagIcon = convertView.findViewById(R.id.tag_icon); convertView.setTag(viewHolder); } else { viewHolder = (TagViewHolder) convertView.getTag(); diff --git a/app/src/main/java/org/digitalcampus/oppia/adapter/TransferCourseListAdapter.java b/app/src/main/java/org/digitalcampus/oppia/adapter/TransferCourseListAdapter.java index f50d7f282..e155a2715 100644 --- a/app/src/main/java/org/digitalcampus/oppia/adapter/TransferCourseListAdapter.java +++ b/app/src/main/java/org/digitalcampus/oppia/adapter/TransferCourseListAdapter.java @@ -32,11 +32,11 @@ public static class TclaViewHolder extends RecyclerView.ViewHolder { public TclaViewHolder(View v) { super(v); - courseTitle = (TextView) v.findViewById(R.id.course_title); - courseFilesize = (TextView) v.findViewById(R.id.course_filesize); - courseDescription = (TextView) v.findViewById(R.id.course_description); - actionBtn = (ImageButton) v.findViewById(R.id.download_course_btn); - icon = (ImageView) v.findViewById(R.id.elem_icon); + courseTitle = v.findViewById(R.id.course_title); + courseFilesize = v.findViewById(R.id.course_filesize); + courseDescription = v.findViewById(R.id.course_description); + actionBtn = v.findViewById(R.id.download_course_btn); + icon = v.findViewById(R.id.elem_icon); actionBtn.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/org/digitalcampus/oppia/application/PermissionsManager.java b/app/src/main/java/org/digitalcampus/oppia/application/PermissionsManager.java index dd3f1aea3..d97e016fa 100644 --- a/app/src/main/java/org/digitalcampus/oppia/application/PermissionsManager.java +++ b/app/src/main/java/org/digitalcampus/oppia/application/PermissionsManager.java @@ -62,7 +62,7 @@ public static boolean CheckPermissionsAndInform(final Activity act){ final List permissionsToAsk = filterNotGrantedPermissions(act, PERMISSIONS_REQUIRED); - ViewGroup container = (ViewGroup) act.findViewById(R.id.permissions_explanation); + ViewGroup container = act.findViewById(R.id.permissions_explanation); if (!permissionsToAsk.isEmpty()){ //Show the permissions informative view LayoutInflater layoutInflater = (LayoutInflater)act.getSystemService(Context.LAYOUT_INFLATER_SERVICE); @@ -70,7 +70,7 @@ public static boolean CheckPermissionsAndInform(final Activity act){ View explanation = layoutInflater.inflate(R.layout.view_permissions_explanation, container); container.setVisibility(View.VISIBLE); - Button reqPermsBtn = (Button) explanation.findViewById(R.id.btn_permissions); + Button reqPermsBtn = explanation.findViewById(R.id.btn_permissions); View permsNotAskable = explanation.findViewById(R.id.not_askable_description); //Check the user has not selected the "Don't ask again" option for any permission yet if (canAskForAllPermissions(act, permissionsToAsk)){ diff --git a/app/src/main/java/org/digitalcampus/oppia/application/ScheduleReminders.java b/app/src/main/java/org/digitalcampus/oppia/application/ScheduleReminders.java index cde238ffe..9c6474da7 100644 --- a/app/src/main/java/org/digitalcampus/oppia/application/ScheduleReminders.java +++ b/app/src/main/java/org/digitalcampus/oppia/application/ScheduleReminders.java @@ -54,7 +54,7 @@ public ScheduleReminders(Context context, AttributeSet attrs) { public void initSheduleReminders(List activities) { setOrientation(VERTICAL); - LinearLayout ll = (LinearLayout) findViewById(R.id.schedule_reminders); + LinearLayout ll = findViewById(R.id.schedule_reminders); ll.removeAllViews(); LayoutInflater inflater = (LayoutInflater) getContext().getSystemService(Context.LAYOUT_INFLATER_SERVICE); inflater.inflate(R.layout.schedule_reminder, this); @@ -64,7 +64,7 @@ public void initSheduleReminders(List activities) { ScheduleReminders.this.setVisibility(GONE); } ScheduleReminderListAdapter srla = new ScheduleReminderListAdapter(ctx, activities); - ListView listView = (ListView) findViewById(R.id.schedule_reminder_list); + ListView listView = findViewById(R.id.schedule_reminder_list); listView.setAdapter(srla); listView.setOnItemClickListener(new OnItemClickListener() { diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/AboutFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/AboutFragment.java index 6a2aba005..ea01947c9 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/AboutFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/AboutFragment.java @@ -66,7 +66,7 @@ public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); prefs = PreferenceManager.getDefaultSharedPreferences(super.getActivity()); - webView = (WebView) super.getActivity().findViewById(R.id.about_webview); + webView = super.getActivity().findViewById(R.id.about_webview); String lang = prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage()); String url = Storage.getLocalizedFilePath(super.getActivity(), lang, "about.html"); @@ -75,7 +75,7 @@ public void onActivityCreated(Bundle savedInstanceState) { webView.loadUrl(url); - TextView versionNo = (TextView) super.getActivity().findViewById(R.id.about_versionno); + TextView versionNo = super.getActivity().findViewById(R.id.about_versionno); try { String no = super.getActivity().getPackageManager().getPackageInfo(super.getActivity().getPackageName(), 0).versionName; versionNo.setText(getString(R.string.version,no)); diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/BadgesFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/BadgesFragment.java index 4e3e50816..a32c45592 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/BadgesFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/BadgesFragment.java @@ -74,7 +74,7 @@ public void onActivityCreated(Bundle savedInstanceState) { initializeDagger(); badgesAdapter = new BadgesListAdapter(super.getActivity(), badges); - ListView listView = (ListView) this.getView().findViewById(R.id.badges_list); + ListView listView = this.getView().findViewById(R.id.badges_list); listView.setAdapter(badgesAdapter); getBadges(); @@ -96,7 +96,7 @@ private void refreshBadgesList() { badges.clear(); try { - TextView tv = (TextView) this.getView().findViewById(R.id.fragment_badges_title); + TextView tv = this.getView().findViewById(R.id.fragment_badges_title); if(json.getJSONArray("objects").length() == 0){ tv.setText(R.string.info_no_badges); return; @@ -133,7 +133,7 @@ public void apiRequestComplete(Payload response) { Log.d(TAG, "Error connecting to server: ", e); } } else { - TextView tv = (TextView) this.getView().findViewById(R.id.fragment_badges_title); + TextView tv = this.getView().findViewById(R.id.fragment_badges_title); tv.setVisibility(View.VISIBLE); tv.setText(R.string.error_connection_required); } diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/CourseScorecardFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/CourseScorecardFragment.java index 62e90a92a..5aabd1a1e 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/CourseScorecardFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/CourseScorecardFragment.java @@ -96,19 +96,19 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa long userId = db.getUserId(SessionManager.getUsername(getActivity())); this.course = db.getCourse(this.course.getCourseId(), userId); - quizzesGrid = (GridView) vv.findViewById(R.id.scorecard_grid_quizzes); - scorecardPieChart = (PieChart) vv.findViewById(R.id.scorecard_pie_chart); + quizzesGrid = vv.findViewById(R.id.scorecard_grid_quizzes); + scorecardPieChart = vv.findViewById(R.id.scorecard_pie_chart); - highlightPretest = (TextView) vv.findViewById(R.id.tv_ranking); - highlightAttempted = (TextView) vv.findViewById(R.id.highlight_attempted); - highlightPassed = (TextView) vv.findViewById(R.id.highlight_passed); - quizzesProgressBar = (ProgressBar) vv.findViewById(R.id.progress_quizzes); + highlightPretest = vv.findViewById(R.id.tv_ranking); + highlightAttempted = vv.findViewById(R.id.highlight_attempted); + highlightPassed = vv.findViewById(R.id.highlight_passed); + quizzesProgressBar = vv.findViewById(R.id.progress_quizzes); quizzesView = vv.findViewById(R.id.quizzes_view); quizzesContainer = vv.findViewById(R.id.scorecard_quizzes_container); - activitiesTotal = (TextView)vv.findViewById(R.id.scorecard_activities_total); - activitiesCompleted = (TextView) vv.findViewById(R.id.scorecard_activities_completed); + activitiesTotal = vv.findViewById(R.id.scorecard_activities_total); + activitiesCompleted = vv.findViewById(R.id.scorecard_activities_completed); - loadingSpinner = (ProgressBar) vv.findViewById(R.id.loading_spinner); + loadingSpinner = vv.findViewById(R.id.loading_spinner); loadingSpinner.setVisibility(View.VISIBLE); return vv; } diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/ExportActivityFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/ExportActivityFragment.java index 0848905a0..f11ade182 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/ExportActivityFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/ExportActivityFragment.java @@ -85,15 +85,15 @@ public ExportActivityFragment(){ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View vv = inflater.inflate(R.layout.fragment_export_activity, container, false); - exportedFilesRecyclerView = (RecyclerView) vv.findViewById(R.id.exported_files_list); - exportBtn = (Button) vv.findViewById(R.id.export_btn); - submitBtn = (Button) vv.findViewById(R.id.submit_btn); + exportedFilesRecyclerView = vv.findViewById(R.id.exported_files_list); + exportBtn = vv.findViewById(R.id.export_btn); + submitBtn = vv.findViewById(R.id.submit_btn); progressContainer = vv.findViewById(R.id.progress_container); actionsContainer = vv.findViewById(R.id.export_actions); - unsentTrackers = (TextView) vv.findViewById(R.id.highlight_to_submit); - unexportedTrackers = (TextView) vv.findViewById(R.id.highlight_to_export); - submittedTrackers = (TextView) vv.findViewById(R.id.highlight_submitted); + unsentTrackers = vv.findViewById(R.id.highlight_to_submit); + unexportedTrackers = vv.findViewById(R.id.highlight_to_export); + submittedTrackers = vv.findViewById(R.id.highlight_submitted); return vv; diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/GlobalScorecardFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/GlobalScorecardFragment.java index d9adf83af..14ee6432e 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/GlobalScorecardFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/GlobalScorecardFragment.java @@ -79,7 +79,7 @@ public void onActivityCreated(Bundle savedInstanceState) { List courses = coursesRepository.getCourses(getActivity()); - GridView scorecardList = (GridView) super.getActivity().findViewById(R.id.scorecards_list); + GridView scorecardList = super.getActivity().findViewById(R.id.scorecards_list); View emptyState = this.getActivity().findViewById(R.id.empty_state); if (courses.isEmpty()){ @@ -87,7 +87,7 @@ public void onActivityCreated(Bundle savedInstanceState) { scorecardList.setVisibility(View.GONE); emptyState.setVisibility(View.VISIBLE); - Button download = (Button) emptyState.findViewById(R.id.btn_download_courses); + Button download = emptyState.findViewById(R.id.btn_download_courses); download.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/LeaderboardFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/LeaderboardFragment.java index 39b6e1f64..a356769db 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/LeaderboardFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/LeaderboardFragment.java @@ -21,7 +21,6 @@ import org.digitalcampus.oppia.gamification.Leaderboard; import org.digitalcampus.oppia.listener.SubmitListener; import org.digitalcampus.oppia.model.LeaderboardPosition; -import org.digitalcampus.oppia.task.LoginTask; import org.digitalcampus.oppia.task.Payload; import org.digitalcampus.oppia.task.UpdateLeaderboardFromServerTask; @@ -49,11 +48,11 @@ public static LeaderboardFragment newInstance() { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View vv = inflater.inflate(R.layout.fragment_leaderboard, container, false); - leaderboard_view = (RecyclerView) vv.findViewById(R.id.list_leaderboard); - rankingPosition = (TextView) vv.findViewById(R.id.tv_ranking); - totalPoints= (TextView) vv.findViewById(R.id.tv_total_points); + leaderboard_view = vv.findViewById(R.id.list_leaderboard); + rankingPosition = vv.findViewById(R.id.tv_ranking); + totalPoints= vv.findViewById(R.id.tv_total_points); - loadingSpinner = (ProgressBar) vv.findViewById(R.id.loading_spinner); + loadingSpinner = vv.findViewById(R.id.loading_spinner); loadingSpinner.setVisibility(View.VISIBLE); return vv; diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/LoginFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/LoginFragment.java index e5bc6b316..103848930 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/LoginFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/LoginFragment.java @@ -21,24 +21,21 @@ import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; import android.widget.EditText; -import android.widget.LinearLayout.LayoutParams; import org.digitalcampus.mobile.learning.R; -import org.digitalcampus.oppia.activity.AppActivity; import org.digitalcampus.oppia.activity.OppiaMobileActivity; import org.digitalcampus.oppia.activity.WelcomeActivity; import org.digitalcampus.oppia.application.SessionManager; import org.digitalcampus.oppia.listener.SubmitListener; import org.digitalcampus.oppia.model.User; import org.digitalcampus.oppia.service.GCMRegistrationService; -import org.digitalcampus.oppia.task.LoginTask; import org.digitalcampus.oppia.task.Payload; +import org.digitalcampus.oppia.task.LoginTask; import org.digitalcampus.oppia.utils.UIUtils; import java.util.ArrayList; @@ -63,11 +60,11 @@ public static LoginFragment newInstance() { public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View v = inflater.inflate(R.layout.fragment_login, container, false); - usernameField = (EditText) v.findViewById(R.id.login_username_field); - passwordField = (EditText) v.findViewById(R.id.login_password_field); - loginBtn = (Button) v.findViewById(R.id.login_btn); - registerBtn = (Button) v.findViewById(R.id.register_btn); - resetPasswordBtn = (Button) v.findViewById(R.id.forgot_btn); + usernameField = v.findViewById(R.id.login_username_field); + passwordField = v.findViewById(R.id.login_password_field); + loginBtn = v.findViewById(R.id.login_btn); + registerBtn = v.findViewById(R.id.register_btn); + resetPasswordBtn = v.findViewById(R.id.forgot_btn); return v; } diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/OppiaWebViewFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/OppiaWebViewFragment.java index 4c2088d78..325520dd8 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/OppiaWebViewFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/OppiaWebViewFragment.java @@ -68,7 +68,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - webView = (WebView) super.getActivity().findViewById(this.id); + webView = super.getActivity().findViewById(this.id); webView.getSettings().setJavaScriptEnabled(true); int defaultFontSize = Integer.parseInt(prefs.getString(PrefsActivity.PREF_TEXT_SIZE, "16")); webView.getSettings().setDefaultFontSize(defaultFontSize); diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/PasswordDialogFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/PasswordDialogFragment.java index 0d4673cda..132efef00 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/PasswordDialogFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/PasswordDialogFragment.java @@ -57,7 +57,7 @@ public void onStart() { public void onClick(View v) { - EditText passwordField = (EditText) d.findViewById(R.id.admin_password_field); + EditText passwordField = d.findViewById(R.id.admin_password_field); View errorMessage = d.findViewById(R.id.admin_password_error); String password = passwordField.getText().toString(); diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/PointsFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/PointsFragment.java index 254f09272..bdfae211d 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/PointsFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/PointsFragment.java @@ -74,7 +74,7 @@ public void onActivityCreated(Bundle savedInstanceState) { getPoints(); pointsAdapter = new PointsListAdapter(super.getActivity(), points); - ListView listView = (ListView) getView().findViewById(R.id.points_list); + ListView listView = getView().findViewById(R.id.points_list); listView.setAdapter(pointsAdapter); } @@ -87,7 +87,7 @@ private void getPoints(){ DbHelper db = DbHelper.getInstance(super.getActivity()); long userId = db.getUserId(SessionManager.getUsername(super.getActivity())); points = db.getUserPoints(userId); - TextView tv = (TextView) super.getActivity().findViewById(R.id.fragment_points_title); + TextView tv = super.getActivity().findViewById(R.id.fragment_points_title); tv.setVisibility(View.GONE); } } diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/RegisterFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/RegisterFragment.java index 51b9f1356..bea4c796b 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/RegisterFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/RegisterFragment.java @@ -79,17 +79,17 @@ public RegisterFragment(){ @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View vv = inflater.inflate(R.layout.fragment_register, container, false); - usernameField = (ValidableTextInputLayout) vv.findViewById(R.id.register_form_username_field); - emailField = (ValidableTextInputLayout) vv.findViewById(R.id.register_form_email_field); - passwordField = (ValidableTextInputLayout) vv.findViewById(R.id.register_form_password_field); - passwordAgainField = (ValidableTextInputLayout) vv.findViewById(R.id.register_form_password_again_field); - firstnameField = (ValidableTextInputLayout) vv.findViewById(R.id.register_form_firstname_field); - lastnameField = (ValidableTextInputLayout) vv.findViewById(R.id.register_form_lastname_field); - jobTitleField = (ValidableTextInputLayout) vv.findViewById(R.id.register_form_jobtitle_field); - organisationField = (ValidableTextInputLayout) vv.findViewById(R.id.register_form_organisation_field); - phoneNoField = (ValidableTextInputLayout) vv.findViewById(R.id.register_form_phoneno_field); - registerButton = (Button) vv.findViewById(R.id.register_btn); - loginButton = (Button) vv.findViewById(R.id.login_btn); + usernameField = vv.findViewById(R.id.register_form_username_field); + emailField = vv.findViewById(R.id.register_form_email_field); + passwordField = vv.findViewById(R.id.register_form_password_field); + passwordAgainField = vv.findViewById(R.id.register_form_password_again_field); + firstnameField = vv.findViewById(R.id.register_form_firstname_field); + lastnameField = vv.findViewById(R.id.register_form_lastname_field); + jobTitleField = vv.findViewById(R.id.register_form_jobtitle_field); + organisationField = vv.findViewById(R.id.register_form_organisation_field); + phoneNoField = vv.findViewById(R.id.register_form_phoneno_field); + registerButton = vv.findViewById(R.id.register_btn); + loginButton = vv.findViewById(R.id.login_btn); fields = Arrays.asList(usernameField, emailField, passwordField, passwordAgainField, firstnameField, lastnameField, jobTitleField, organisationField, phoneNoField); diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/ResetFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/ResetFragment.java index e4c471ea4..b0737a5ca 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/ResetFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/ResetFragment.java @@ -56,8 +56,8 @@ public ResetFragment(){ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View v = inflater.inflate(R.layout.fragment_reset, container, false); - usernameField = (EditText) v.findViewById(R.id.reset_username_field); - resetButton = (Button) v.findViewById(R.id.reset_btn); + usernameField = v.findViewById(R.id.reset_username_field); + resetButton = v.findViewById(R.id.reset_btn); return v; } diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/TransferFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/TransferFragment.java index e68bbb8cd..ae43bd523 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/TransferFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/TransferFragment.java @@ -171,17 +171,17 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { // Inflate the layout for this fragment View vv = inflater.inflate(R.layout.fragment_transfer, container, false); - coursesRecyclerView = (RecyclerView) vv.findViewById(R.id.course_backups_list); - bluetoothBtn = (ImageButton) vv.findViewById(R.id.bluetooth_btn); - discoverBtn = (ImageButton) vv.findViewById(R.id.discover_btn); - statusTitle = (TextView) vv.findViewById(R.id.status_title); - statusSubtitle = (TextView) vv.findViewById(R.id.status_subtitle); + coursesRecyclerView = vv.findViewById(R.id.course_backups_list); + bluetoothBtn = vv.findViewById(R.id.bluetooth_btn); + discoverBtn = vv.findViewById(R.id.discover_btn); + statusTitle = vv.findViewById(R.id.status_title); + statusSubtitle = vv.findViewById(R.id.status_subtitle); notConnectedInfo = vv.findViewById(R.id.not_connected_info); pendingCoursesMessage = vv.findViewById(R.id.home_messages); - installCoursesBtn = (Button) vv.findViewById(R.id.message_action_button); - sendTransferProgress = (ProgressBar) vv.findViewById(R.id.send_transfer_progress); - pendingFiles = (TextView) vv.findViewById(R.id.transfer_pending_files); - pendingSize = (TextView) vv.findViewById(R.id.transfer_pending_size); + installCoursesBtn = vv.findViewById(R.id.message_action_button); + sendTransferProgress = vv.findViewById(R.id.send_transfer_progress); + pendingFiles = vv.findViewById(R.id.transfer_pending_files); + pendingSize = vv.findViewById(R.id.transfer_pending_size); receivingCover = vv.findViewById(R.id.receiving_progress); return vv; } diff --git a/app/src/main/java/org/digitalcampus/oppia/fragments/WelcomeFragment.java b/app/src/main/java/org/digitalcampus/oppia/fragments/WelcomeFragment.java index 533a7c7f5..431379c4e 100644 --- a/app/src/main/java/org/digitalcampus/oppia/fragments/WelcomeFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/fragments/WelcomeFragment.java @@ -46,8 +46,8 @@ public WelcomeFragment() { @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { View v = inflater.inflate(R.layout.fragment_welcome, container, false); - loginButton = (Button) v.findViewById(R.id.welcome_login); - registerButton = (Button) v.findViewById(R.id.welcome_register); + loginButton = v.findViewById(R.id.welcome_login); + registerButton = v.findViewById(R.id.welcome_register); return v; } diff --git a/app/src/main/java/org/digitalcampus/oppia/model/Activity.java b/app/src/main/java/org/digitalcampus/oppia/model/Activity.java index b52ade896..1c2814a67 100644 --- a/app/src/main/java/org/digitalcampus/oppia/model/Activity.java +++ b/app/src/main/java/org/digitalcampus/oppia/model/Activity.java @@ -182,7 +182,7 @@ public void setContentFromJSONString(String json){ for(int i=0; i iter = (Iterator) contentObj.keys(); + Iterator iter = contentObj.keys(); while(iter.hasNext()){ String key = iter.next().toString(); String content = contentObj.getString(key); diff --git a/app/src/main/java/org/digitalcampus/oppia/utils/UIUtils.java b/app/src/main/java/org/digitalcampus/oppia/utils/UIUtils.java index c1f58c68b..a7c9ea9aa 100644 --- a/app/src/main/java/org/digitalcampus/oppia/utils/UIUtils.java +++ b/app/src/main/java/org/digitalcampus/oppia/utils/UIUtils.java @@ -73,8 +73,8 @@ public static void showUserData(Menu menu, final Context ctx, final Course cours return; } - TextView points = (TextView) pointsItem.getActionView().findViewById(R.id.userpoints); - TextView badges = (TextView) pointsItem.getActionView().findViewById(R.id.userbadges); + TextView points = pointsItem.getActionView().findViewById(R.id.userpoints); + TextView badges = pointsItem.getActionView().findViewById(R.id.userbadges); if(points == null || badges == null){ return; diff --git a/app/src/main/java/org/digitalcampus/oppia/utils/mediaplayer/VideoControllerView.java b/app/src/main/java/org/digitalcampus/oppia/utils/mediaplayer/VideoControllerView.java index aa438aa68..06326b63c 100644 --- a/app/src/main/java/org/digitalcampus/oppia/utils/mediaplayer/VideoControllerView.java +++ b/app/src/main/java/org/digitalcampus/oppia/utils/mediaplayer/VideoControllerView.java @@ -171,19 +171,19 @@ protected View makeControllerView() { } private void initControllerView(View v) { - mPauseButton = (ImageButton) v.findViewById(R.id.pause); + mPauseButton = v.findViewById(R.id.pause); if (mPauseButton != null) { mPauseButton.requestFocus(); mPauseButton.setOnClickListener(mPauseListener); } - mFullscreenButton = (ImageButton) v.findViewById(R.id.fullscreen); + mFullscreenButton = v.findViewById(R.id.fullscreen); if (mFullscreenButton != null) { mFullscreenButton.requestFocus(); mFullscreenButton.setOnClickListener(mFullscreenListener); } - mFfwdButton = (ImageButton) v.findViewById(R.id.ffwd); + mFfwdButton = v.findViewById(R.id.ffwd); if (mFfwdButton != null) { mFfwdButton.setOnClickListener(mFfwdListener); if (!mFromXml) { @@ -191,7 +191,7 @@ private void initControllerView(View v) { } } - mRewButton = (ImageButton) v.findViewById(R.id.rew); + mRewButton = v.findViewById(R.id.rew); if (mRewButton != null) { mRewButton.setOnClickListener(mRewListener); if (!mFromXml) { @@ -200,16 +200,16 @@ private void initControllerView(View v) { } // By default these are hidden. They will be enabled when setPrevNextListeners() is called - mNextButton = (ImageButton) v.findViewById(R.id.next); + mNextButton = v.findViewById(R.id.next); if (mNextButton != null && !mFromXml && !mListenersSet) { mNextButton.setVisibility(View.GONE); } - mPrevButton = (ImageButton) v.findViewById(R.id.prev); + mPrevButton = v.findViewById(R.id.prev); if (mPrevButton != null && !mFromXml && !mListenersSet) { mPrevButton.setVisibility(View.GONE); } - mProgress = (SeekBar) v.findViewById(R.id.mediacontroller_progress); + mProgress = v.findViewById(R.id.mediacontroller_progress); if (mProgress != null) { if (mProgress instanceof SeekBar) { SeekBar seeker = (SeekBar) mProgress; @@ -218,8 +218,8 @@ private void initControllerView(View v) { mProgress.setMax(1000); } - mEndTime = (TextView) v.findViewById(R.id.time); - mCurrentTime = (TextView) v.findViewById(R.id.time_current); + mEndTime = v.findViewById(R.id.time); + mCurrentTime = v.findViewById(R.id.time_current); mFormatBuilder = new StringBuilder(); mFormatter = new Formatter(mFormatBuilder, Locale.getDefault()); diff --git a/app/src/main/java/org/digitalcampus/oppia/utils/mediaplayer/VideoPlayerActivity.java b/app/src/main/java/org/digitalcampus/oppia/utils/mediaplayer/VideoPlayerActivity.java index 21c6b3c36..879a780b4 100644 --- a/app/src/main/java/org/digitalcampus/oppia/utils/mediaplayer/VideoPlayerActivity.java +++ b/app/src/main/java/org/digitalcampus/oppia/utils/mediaplayer/VideoPlayerActivity.java @@ -104,10 +104,10 @@ protected void onCreate(Bundle savedInstanceState) { protected void onStart(){ super.onStart(); - videoSurface = (SurfaceView) findViewById(R.id.videoSurface); + videoSurface = findViewById(R.id.videoSurface); endContainer = findViewById(R.id.end_container); - replayBtn = (ImageButton) findViewById(R.id.replay_button); - continueBtn = (ImageButton) findViewById(R.id.continue_button); + replayBtn = findViewById(R.id.replay_button); + continueBtn = findViewById(R.id.continue_button); replayBtn.setOnClickListener(new View.OnClickListener() { @Override diff --git a/app/src/main/java/org/digitalcampus/oppia/utils/storage/GrantStorageAccessFragment.java b/app/src/main/java/org/digitalcampus/oppia/utils/storage/GrantStorageAccessFragment.java index 3b7b6b5f3..01d4f7ef1 100644 --- a/app/src/main/java/org/digitalcampus/oppia/utils/storage/GrantStorageAccessFragment.java +++ b/app/src/main/java/org/digitalcampus/oppia/utils/storage/GrantStorageAccessFragment.java @@ -113,7 +113,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa { getDialog().getWindow().requestFeature(Window.FEATURE_NO_TITLE); View view = inflater.inflate(R.layout.dialog_lollipop_storage_access, null); - Button acceptButton = (Button) view.findViewById(R.id.acceptBtn); + Button acceptButton = view.findViewById(R.id.acceptBtn); acceptButton.setOnClickListener(this); getDialog().setCanceledOnTouchOutside(true); diff --git a/app/src/main/java/org/digitalcampus/oppia/utils/ui/DrawerMenuManager.java b/app/src/main/java/org/digitalcampus/oppia/utils/ui/DrawerMenuManager.java index 34c166151..ae8ff05e1 100644 --- a/app/src/main/java/org/digitalcampus/oppia/utils/ui/DrawerMenuManager.java +++ b/app/src/main/java/org/digitalcampus/oppia/utils/ui/DrawerMenuManager.java @@ -67,9 +67,9 @@ public DrawerMenuManager(AppActivity act, boolean isRootActivity){ public void initializeDrawer(){ // Initializing Drawer Layout and ActionBarToggle - final Toolbar toolbar = (Toolbar) drawerAct.findViewById(R.id.toolbar); - final DrawerLayout drawerLayout = (DrawerLayout) drawerAct.findViewById(R.id.drawer); - navigationView = (NavigationView) drawerAct.findViewById(R.id.navigation_view); + final Toolbar toolbar = drawerAct.findViewById(R.id.toolbar); + final DrawerLayout drawerLayout = drawerAct.findViewById(R.id.drawer); + navigationView = drawerAct.findViewById(R.id.navigation_view); if (drawerLayout == null || navigationView == null) return; View headerView = navigationView.getHeaderView(0); diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/FeedbackWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/FeedbackWidget.java index 288512e1a..2a227a2a3 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/FeedbackWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/FeedbackWidget.java @@ -133,10 +133,10 @@ public void onSaveInstanceState(Bundle outState) { @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - prevBtn = (Button) getView().findViewById(R.id.mquiz_prev_btn); - nextBtn = (Button) getView().findViewById(R.id.mquiz_next_btn); - qText = (TextView) getView().findViewById(R.id.question_text); - questionImage = (LinearLayout) getView().findViewById(R.id.question_image); + prevBtn = getView().findViewById(R.id.mquiz_prev_btn); + nextBtn = getView().findViewById(R.id.mquiz_next_btn); + qText = getView().findViewById(R.id.question_text); + questionImage = getView().findViewById(R.id.question_image); loadFeedback(); } @@ -179,7 +179,7 @@ public void showQuestion() { String fileUrl = course.getLocation() + q.getProp("image"); Bitmap myBitmap = BitmapFactory.decodeFile(fileUrl); File file = new File(fileUrl); - ImageView iv = (ImageView) getView().findViewById(R.id.question_image_image); + ImageView iv = getView().findViewById(R.id.question_image_image); iv.setImageBitmap(myBitmap); iv.setTag(file); } @@ -289,7 +289,7 @@ public void showResults() { } private void setProgress() { - TextView progress = (TextView) getView().findViewById(R.id.quiz_progress); + TextView progress = getView().findViewById(R.id.quiz_progress); progress.setText(super.getActivity().getString(R.string.widget_quiz_progress, feedback.getCurrentQuestionNo(), this.feedback.getTotalNoQuestions())); } diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/PageWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/PageWidget.java index 3cbec9740..d009991e3 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/PageWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/PageWidget.java @@ -106,7 +106,7 @@ public void onSaveInstanceState(Bundle outState) { @Override public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - wv = (WebView) super.getActivity().findViewById(activity.getActId()); + wv = super.getActivity().findViewById(activity.getActId()); // get the location data String url = course.getLocation() + activity.getLocation(prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault() diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/QuizWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/QuizWidget.java index d18753ddd..618b8ff13 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/QuizWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/QuizWidget.java @@ -168,12 +168,12 @@ public void onActivityCreated(Bundle savedInstanceState) { } private void fetchViews(){ - this.prevBtn = (Button) getView().findViewById(R.id.mquiz_prev_btn); - this.nextBtn = (Button) getView().findViewById(R.id.mquiz_next_btn); - this.qText = (TextView) getView().findViewById(R.id.question_text); - this.questionImage = (LinearLayout) getView().findViewById(R.id.question_image); - this.playAudioBtn = (ImageView) getView().findViewById(R.id.playAudioBtn); - this.progressBar = (ProgressBar) getView().findViewById(R.id.progress_quiz); + this.prevBtn = getView().findViewById(R.id.mquiz_prev_btn); + this.nextBtn = getView().findViewById(R.id.mquiz_next_btn); + this.qText = getView().findViewById(R.id.question_text); + this.questionImage = getView().findViewById(R.id.question_image); + this.playAudioBtn = getView().findViewById(R.id.playAudioBtn); + this.progressBar = getView().findViewById(R.id.progress_quiz); this.barAnim = new ProgressBarAnimator(progressBar); this.barAnim.setAnimDuration(PROGRESS_ANIM_DURATION); this.questionImage.setVisibility(View.GONE); @@ -205,12 +205,12 @@ public void loadQuiz(){ else{ View localContainer = getView(); if (localContainer != null){ - ViewGroup vg = (ViewGroup) localContainer.findViewById(activity.getActId()); + ViewGroup vg = localContainer.findViewById(activity.getActId()); if (vg!=null){ vg.removeAllViews(); vg.addView(View.inflate(getView().getContext(), R.layout.widget_quiz_unavailable, null)); - TextView tv = (TextView) getView().findViewById(R.id.quiz_unavailable); + TextView tv = getView().findViewById(R.id.quiz_unavailable); tv.setText(result); } } @@ -280,17 +280,17 @@ public void showQuestion() { String fileUrl = course.getLocation() + q.getProp("image"); Bitmap myBitmap = BitmapFactory.decodeFile(fileUrl); File file = new File(fileUrl); - ImageView iv = (ImageView) getView().findViewById(R.id.question_image_image); + ImageView iv = getView().findViewById(R.id.question_image_image); iv.setImageBitmap(myBitmap); iv.setTag(file); if (q.getProp("media") == null){ OnImageClickListener oicl = new OnImageClickListener(super.getActivity()); iv.setOnClickListener(oicl); - TextView tv = (TextView) getView().findViewById(R.id.question_image_caption); + TextView tv = getView().findViewById(R.id.question_image_caption); tv.setText(R.string.widget_quiz_image_caption); questionImage.setVisibility(View.VISIBLE); } else { - TextView tv = (TextView) getView().findViewById(R.id.question_image_caption); + TextView tv = getView().findViewById(R.id.question_image_caption); tv.setText(R.string.widget_quiz_media_caption); OnMediaClickListener omcl = new OnMediaClickListener(q.getProp("media")); iv.setOnClickListener(omcl); @@ -420,7 +420,7 @@ public void onClick(View v) { } private void setProgress() { - TextView progress = (TextView) getView().findViewById(R.id.quiz_progress); + TextView progress = getView().findViewById(R.id.quiz_progress); int current = progressBar.getProgress(); progressBar.setMax(quiz.getTotalNoQuestions()); @@ -506,18 +506,18 @@ public void showResults() { parent.addView(C, index); } - TextView title = (TextView) getView().findViewById(R.id.quiz_results_score); + TextView title = getView().findViewById(R.id.quiz_results_score); title.setText(super.getActivity().getString(R.string.widget_quiz_results_score, this.getPercent())); if (this.isBaseline) { - TextView baselineExtro = (TextView) getView().findViewById(R.id.quiz_results_baseline); + TextView baselineExtro = getView().findViewById(R.id.quiz_results_baseline); baselineExtro.setVisibility(View.VISIBLE); baselineExtro.setText(super.getActivity().getString(R.string.widget_quiz_baseline_completed)); } // Show the detail of which questions were right/wrong if (quiz.getShowFeedback() == Quiz.SHOW_FEEDBACK_ALWAYS || quiz.getShowFeedback() == Quiz.SHOW_FEEDBACK_ATEND){ - ListView questionFeedbackLV = (ListView) getView().findViewById(R.id.quiz_results_feedback); + ListView questionFeedbackLV = getView().findViewById(R.id.quiz_results_feedback); ArrayList quizFeedback = new ArrayList(); List questions = this.quiz.getQuestions(); for(QuizQuestion q: questions){ @@ -535,13 +535,13 @@ public void showResults() { } // Show restart or continue button - Button restartBtn = (Button) getView().findViewById(R.id.quiz_results_button); + Button restartBtn = getView().findViewById(R.id.quiz_results_button); int quizAvailability = checkQuizAvailability(); boolean quizAvailable = quizAvailability == QUIZ_AVAILABLE; if (!quizAvailable){ - TextView availabilityMsg = (TextView) getView().findViewById(R.id.quiz_availability_message); + TextView availabilityMsg = getView().findViewById(R.id.quiz_availability_message); availabilityMsg.setText(quizAvailability); availabilityMsg.setVisibility(View.VISIBLE); } @@ -674,7 +674,6 @@ private class OnImageClickListener implements OnClickListener{ public OnImageClickListener(Context ctx){ this.ctx = ctx; - this.type = type; } public void onClick(View v) { diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/ResourceWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/ResourceWidget.java index 7064f675e..4e5893e26 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/ResourceWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/ResourceWidget.java @@ -116,12 +116,12 @@ public void onActivityCreated(Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); String lang = prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage()); - LinearLayout ll = (LinearLayout) getView().findViewById(R.id.widget_resource_object); + LinearLayout ll = getView().findViewById(R.id.widget_resource_object); String fileUrl = course.getLocation() + activity.getLocation(lang); // show description if any String desc = activity.getMultiLangInfo().getDescription(lang); - TextView descTV = (TextView) getView().findViewById(R.id.widget_resource_description); + TextView descTV = getView().findViewById(R.id.widget_resource_description); if ((desc != null) && desc.length() > 0){ descTV.setText(desc); } else { diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/UrlWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/UrlWidget.java index 871c40f7a..6462217f3 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/UrlWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/UrlWidget.java @@ -90,14 +90,14 @@ public void onActivityCreated(Bundle savedInstanceState) { String lang = prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage()); // show description if any String desc = activity.getMultiLangInfo().getDescription(lang); - TextView descTV = (TextView) getView().findViewById(R.id.widget_url_description); + TextView descTV = getView().findViewById(R.id.widget_url_description); if ((desc != null) && desc.length() > 0){ descTV.setText(desc); } else { descTV.setVisibility(View.GONE); } - WebView wv = (WebView) getView().findViewById(R.id.widget_url_webview); + WebView wv = getView().findViewById(R.id.widget_url_webview); int defaultFontSize = Integer.parseInt(prefs.getString(PrefsActivity.PREF_TEXT_SIZE, "16")); wv.getSettings().setDefaultFontSize(defaultFontSize); wv.getSettings().setJavaScriptEnabled(true); diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/DescriptionWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/DescriptionWidget.java index cb85af10c..141bcc4ba 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/DescriptionWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/DescriptionWidget.java @@ -33,7 +33,7 @@ public class DescriptionWidget extends QuestionWidget{ public static final String TAG = DescriptionWidget.class.getSimpleName(); public DescriptionWidget(View v) { - LinearLayout ll = (LinearLayout) v.findViewById(R.id.quiz_response_widget); + LinearLayout ll = v.findViewById(R.id.quiz_response_widget); ll.removeAllViews(); } diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/DragAndDropWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/DragAndDropWidget.java index bf5f4afd5..9b8a00e2f 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/DragAndDropWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/DragAndDropWidget.java @@ -45,11 +45,11 @@ public DragAndDropWidget(Activity activity, View v, ViewGroup container, QuizQue String fileUrl = courseLocation + dropzoneBackground; Bitmap background = BitmapFactory.decodeFile(fileUrl); backgroundWidth = background.getWidth(); - ImageView dropzone = (ImageView) view.findViewById(R.id.dropzone_bg); + ImageView dropzone = view.findViewById(R.id.dropzone_bg); dropzone.setImageBitmap(background); - draggablesContainer = (ViewGroup) view.findViewById(R.id.drags_container); - dropsContainer = (ViewGroup) view.findViewById(R.id.drops_container) ; + draggablesContainer = view.findViewById(R.id.drags_container); + dropsContainer = view.findViewById(R.id.drops_container) ; // set up an observer that will be called once the layout is ready, to position the elements android.view.ViewTreeObserver viewTreeObserver = view.getViewTreeObserver(); diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/EssayWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/EssayWidget.java index abf7fe92c..03afa3711 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/EssayWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/EssayWidget.java @@ -40,7 +40,7 @@ public EssayWidget(Activity activity, View v, ViewGroup container) { @Override public void setQuestionResponses(List responses, List currentAnswers) { - EditText et = (EditText) view.findViewById(R.id.responsetext); + EditText et = view.findViewById(R.id.responsetext); Iterator itr = currentAnswers.iterator(); while(itr.hasNext()) { String answer = itr.next(); @@ -50,7 +50,7 @@ public void setQuestionResponses(List responses, List currentA } public List getQuestionResponses(List responses){ - EditText et = (EditText) view.findViewById(R.id.responsetext); + EditText et = view.findViewById(R.id.responsetext); if(et.getText().toString().equals("")){ return new ArrayList<>(); } else { diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MatchingWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MatchingWidget.java index 540cca57e..34302c1e8 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MatchingWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MatchingWidget.java @@ -50,7 +50,7 @@ public MatchingWidget(Activity activity, View v, ViewGroup container) { @Override public void setQuestionResponses(List responses, List currentAnswer) { - responsesLL = (LinearLayout) view.findViewById(R.id.questionresponses); + responsesLL = view.findViewById(R.id.questionresponses); responsesLL.removeAllViews(); // this could be tidied up - to use ArrayAdapters/Lists diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MultiChoiceWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MultiChoiceWidget.java index 6bc9884b0..e6eaf22ae 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MultiChoiceWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MultiChoiceWidget.java @@ -44,7 +44,7 @@ public MultiChoiceWidget(Activity activity, View v, ViewGroup container, QuizQue } public void setQuestionResponses(List responses, List currentAnswer) { - LinearLayout responsesLL = (LinearLayout) view.findViewById(R.id.questionresponses); + LinearLayout responsesLL = view.findViewById(R.id.questionresponses); responsesLL.removeAllViews(); RadioGroup responsesRG = new RadioGroup(ctx); responsesRG.setId(R.id.multichoiceRadioGroup); @@ -74,7 +74,7 @@ public void setQuestionResponses(List responses, List currentA } public List getQuestionResponses(List responses){ - RadioGroup responsesRG = (RadioGroup) view.findViewById(R.id.multichoiceRadioGroup); + RadioGroup responsesRG = view.findViewById(R.id.multichoiceRadioGroup); int resp = responsesRG.getCheckedRadioButtonId(); View rb = responsesRG.findViewById(resp); int idx = responsesRG.indexOfChild(rb); diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MultiSelectWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MultiSelectWidget.java index 6ab88fa52..1154b5f5b 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MultiSelectWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/MultiSelectWidget.java @@ -45,7 +45,7 @@ public MultiSelectWidget(Activity activity, View v, ViewGroup container, QuizQue @Override public void setQuestionResponses(List responses, List currentAnswer) { - responsesLL = (LinearLayout) view.findViewById(R.id.questionresponses); + responsesLL = view.findViewById(R.id.questionresponses); responsesLL.removeAllViews(); String shuffle = question.getProp("shuffleanswers"); diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/NumericalWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/NumericalWidget.java index 724d37e0f..7c6fd1f0d 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/NumericalWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/NumericalWidget.java @@ -40,7 +40,7 @@ public NumericalWidget(Activity activity, View v, ViewGroup container) { @Override public void setQuestionResponses(List responses, List currentAnswers) { - EditText et = (EditText) view.findViewById(R.id.responsetext); + EditText et = view.findViewById(R.id.responsetext); Iterator itr = currentAnswers.iterator(); while(itr.hasNext()) { String answer = itr.next(); @@ -51,7 +51,7 @@ public void setQuestionResponses(List responses, List currentA } public List getQuestionResponses(List responses){ - EditText et = (EditText) view.findViewById(R.id.responsetext); + EditText et = view.findViewById(R.id.responsetext); if(et.getText().toString().trim().equals("")){ return new ArrayList<>(); } else { diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/QuestionWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/QuestionWidget.java index 2c04d97c5..7e281e8a4 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/QuestionWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/QuestionWidget.java @@ -54,7 +54,7 @@ protected QuestionWidget(Activity activity, View v, ViewGroup container, int lay currentUserLang = prefs.getString(PrefsActivity.PREF_LANGUAGE, Locale.getDefault().getLanguage()); view = v; - LinearLayout ll = (LinearLayout) v.findViewById(R.id.quiz_response_widget); + LinearLayout ll = v.findViewById(R.id.quiz_response_widget); ll.removeAllViews(); LayoutInflater localInflater = ((LayoutInflater) ctx.getSystemService(Context.LAYOUT_INFLATER_SERVICE)).cloneInContext(ctx); View vv = localInflater.inflate(layout, container, false); diff --git a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/ShortAnswerWidget.java b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/ShortAnswerWidget.java index b437e9b12..e3fce393d 100644 --- a/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/ShortAnswerWidget.java +++ b/app/src/main/java/org/digitalcampus/oppia/widgets/quiz/ShortAnswerWidget.java @@ -40,7 +40,7 @@ public ShortAnswerWidget(Activity activity, View v, ViewGroup container) { @Override public void setQuestionResponses(List responses, List currentAnswers) { - EditText et = (EditText) view.findViewById(R.id.responsetext); + EditText et = view.findViewById(R.id.responsetext); Iterator itr = currentAnswers.iterator(); while(itr.hasNext()) { String answer = itr.next(); @@ -50,7 +50,7 @@ public void setQuestionResponses(List responses, List currentA } public List getQuestionResponses(List responses){ - EditText et = (EditText) view.findViewById(R.id.responsetext); + EditText et = view.findViewById(R.id.responsetext); if(et.getText().toString().trim().equals("")){ return new ArrayList<>(); } else {