AndyScherzinger 6 жил өмнө
parent
commit
0c5b0202aa

+ 7 - 7
src/main/java/com/owncloud/android/ui/activity/FirstRunActivity.java

@@ -55,7 +55,7 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
     public static final String EXTRA_ALLOW_CLOSE = "ALLOW_CLOSE";
     public static final int FIRST_RUN_RESULT_CODE = 199;
 
-    private ProgressIndicator mProgress;
+    private ProgressIndicator progressIndicator;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -100,8 +100,8 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
         hostOwnServerTextView.setTextColor(getResources().getColor(R.color.login_text_color));
         hostOwnServerTextView.setVisibility(isProviderOrOwnInstallationVisible ? View.VISIBLE : View.GONE);
 
-        mProgress = findViewById(R.id.progressIndicator);
-        ViewPager mPager = findViewById(R.id.contentPanel);
+        progressIndicator = findViewById(R.id.progressIndicator);
+        ViewPager viewPager = findViewById(R.id.contentPanel);
 
         // Sometimes, accounts are not deleted when you uninstall the application so we'll do it now
         if (isFirstRun(this)) {
@@ -115,10 +115,10 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
 
         FeaturesViewAdapter featuresViewAdapter = new FeaturesViewAdapter(getSupportFragmentManager(),
                 getFirstRun());
-        mProgress.setNumberOfSteps(featuresViewAdapter.getCount());
-        mPager.setAdapter(featuresViewAdapter);
+        progressIndicator.setNumberOfSteps(featuresViewAdapter.getCount());
+        viewPager.setAdapter(featuresViewAdapter);
 
-        mPager.addOnPageChangeListener(this);
+        viewPager.addOnPageChangeListener(this);
     }
 
     private void setSlideshowSize(boolean isLandscape) {
@@ -187,7 +187,7 @@ public class FirstRunActivity extends BaseActivity implements ViewPager.OnPageCh
 
     @Override
     public void onPageSelected(int position) {
-        mProgress.animateToStep(position + 1);
+        progressIndicator.animateToStep(position + 1);
     }
 
     @Override

+ 21 - 21
src/main/java/com/owncloud/android/ui/fragment/FeatureFragment.java

@@ -21,7 +21,7 @@ import com.owncloud.android.features.FeatureItem;
 
 
 public class FeatureFragment extends Fragment {
-    private FeatureItem mItem;
+    private FeatureItem item;
 
     static public FeatureFragment newInstance(FeatureItem item) {
         FeatureFragment f = new FeatureFragment();
@@ -34,44 +34,44 @@ public class FeatureFragment extends Fragment {
     @Override
     public void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        mItem = getArguments() != null ? (FeatureItem) getArguments().getParcelable("feature") : null;
+        item = getArguments() != null ? (FeatureItem) getArguments().getParcelable("feature") : null;
     }
 
     @Nullable
     @Override
     public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container,
                              @Nullable Bundle savedInstanceState) {
-        View v = inflater.inflate(R.layout.whats_new_element, container, false);
+        View view = inflater.inflate(R.layout.whats_new_element, container, false);
         int fontColor = getResources().getColor(R.color.login_text_color);
 
-        ImageView iv = v.findViewById(R.id.whatsNewImage);
-        if (mItem.shouldShowImage()) {
-            iv.setImageResource(mItem.getImage());
+        ImageView whatsNewImage = view.findViewById(R.id.whatsNewImage);
+        if (item.shouldShowImage()) {
+            whatsNewImage.setImageResource(item.getImage());
         }
 
-        TextView titleTextView = v.findViewById(R.id.whatsNewTitle);
-        if (mItem.shouldShowTitleText()) {
-            titleTextView.setText(mItem.getTitleText());
-            titleTextView.setTextColor(fontColor);
-            titleTextView.setVisibility(View.VISIBLE);
+        TextView whatsNewTitle = view.findViewById(R.id.whatsNewTitle);
+        if (item.shouldShowTitleText()) {
+            whatsNewTitle.setText(item.getTitleText());
+            whatsNewTitle.setTextColor(fontColor);
+            whatsNewTitle.setVisibility(View.VISIBLE);
         } else {
-            titleTextView.setVisibility(View.GONE);
+            whatsNewTitle.setVisibility(View.GONE);
         }
 
-        LinearLayout linearLayout = v.findViewById(R.id.whatsNewTextLayout);
-        if (mItem.shouldShowContentText()) {
-            if (mItem.shouldShowBulletPointList()) {
-                String[] texts = getText(mItem.getContentText()).toString().split("\n");
+        LinearLayout linearLayout = view.findViewById(R.id.whatsNewTextLayout);
+        if (item.shouldShowContentText()) {
+            if (item.shouldShowBulletPointList()) {
+                String[] texts = getText(item.getContentText()).toString().split("\n");
 
                 for (String text : texts) {
                     TextView textView = generateTextView(text, getContext(),
-                            mItem.shouldContentCentered(), fontColor, true);
+                            item.shouldContentCentered(), fontColor, true);
 
                     linearLayout.addView(textView);
                 }
             } else {
-                TextView textView = generateTextView(getText(mItem.getContentText()).toString(),
-                        getContext(), mItem.shouldContentCentered(), fontColor, false);
+                TextView textView = generateTextView(getText(item.getContentText()).toString(),
+                        getContext(), item.shouldContentCentered(), fontColor, false);
 
                 linearLayout.addView(textView);
             }
@@ -79,7 +79,7 @@ public class FeatureFragment extends Fragment {
             linearLayout.setVisibility(View.GONE);
         }
 
-        return v;
+        return view;
     }
 
     private TextView generateTextView(String text, Context context,
@@ -116,4 +116,4 @@ public class FeatureFragment extends Fragment {
 
         return textView;
     }
-}
+}