Move hardcoded string to strings.xml

niranjan94 · niranjan94 · commit 6adc2cd804ee · 2015-12-02T13:26:12.000+05:30
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
@@ -48,7 +48,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:text="Version 2.0"
+                android:text="@string/space"
                 android:textAppearance="?android:attr/textAppearanceSmall"
                 android:textSize="15sp" />
 
@@ -57,7 +57,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:text="\@niranjan94"
+                android:text="@string/niranjan94"
                 android:textAppearance="?android:attr/textAppearanceMedium" />
 
         </LinearLayout>
@@ -79,7 +79,7 @@
             android:layout_alignLeft="@+id/divider"
             android:layout_below="@+id/divider"
             android:layout_marginTop="5dp"
-            android:text="3rd Party Softwares"
+            android:text="@string/third_party_title"
             android:textAppearance="?android:attr/textAppearanceLarge" />
 
         <ScrollView
@@ -100,7 +100,7 @@
                     android:id="@+id/ThirdPartySoftwaresList"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="• dex2jar\n• dexlib2\n• baksmali\n• smali\n• apache-commons-cli 1.3\n• apache-commons-io 2.4\n• guava 18.0\n• cfr 0.108\n• ANTLR 3.5.2\n• JSR-305 1.3.9"
+                    android:text="@string/third_party_list"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/activity_error.xml b/app/src/main/res/layout/activity_error.xml
@@ -27,30 +27,30 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="An error has occurred"
+            android:text="@string/an_error_occured"
             android:layout_marginTop="16dp"
             android:layout_gravity="center_horizontal"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Goto to Application settings"
+            android:text="@string/goto_app_settings"
             android:layout_marginTop="8dp"
             android:layout_gravity="center_horizontal"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Clear cache and data to fix"
+            android:text="@string/clear_cache_data"
             android:layout_marginTop="2dp"
             android:layout_gravity="center_horizontal"/>
 
         <android.support.v7.widget.AppCompatButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Open application settings"
+            android:text="@string/open_app_settings"
             android:layout_marginTop="12dp"
             android:onClick="openAppInfoPage"
             android:layout_gravity="center_horizontal"/>
diff --git a/app/src/main/res/layout/activity_landing.xml b/app/src/main/res/layout/activity_landing.xml
@@ -49,7 +49,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
-                    android:text="Welcome"
+                    android:text="@string/welcome"
                     android:textAppearance="?android:attr/textAppearanceLarge"
                     android:textColor="@color/grey_700"
                     android:textSize="35sp" />
@@ -59,7 +59,7 @@
                     android:layout_height="wrap_content"
                     android:layout_gravity="center_horizontal"
                     android:layout_marginBottom="7dp"
-                    android:text="tap the plus button to begin"
+                    android:text="@string/tap_plus"
                     android:textAppearance="?android:attr/textAppearanceMedium"
                     android:textColor="@color/grey_700" />
 
diff --git a/app/src/main/res/layout/activity_progress.xml b/app/src/main/res/layout/activity_progress.xml
@@ -19,7 +19,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:text="Waiting for App"
+            android:text="@string/waiting_for_app"
             android:textAppearance="?android:attr/textAppearanceLarge"
             android:textColor="@color/grey_400" />
 
@@ -28,7 +28,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:text="Processing"
+            android:text="@string/processing"
             android:textAllCaps="false"
             android:textAppearance="?android:attr/textAppearanceMedium"
             android:textColor="@color/grey_400" />
@@ -40,7 +40,7 @@
             android:layout_gravity="center_horizontal"
             android:ellipsize="none"
             android:singleLine="false"
-            android:text="Getting Ready"
+            android:text="@string/getting_ready"
             android:textAllCaps="false"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/grey_400" />
diff --git a/app/src/main/res/layout/activity_purchase.xml b/app/src/main/res/layout/activity_purchase.xml
@@ -38,30 +38,30 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceMedium"
-            android:text="Get Show Java Pro"
+            android:text="@string/get_pro"
             android:layout_marginTop="16dp"
             android:layout_gravity="center_horizontal"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="No Advertisements"
+            android:text="@string/no_ads"
             android:layout_marginTop="8dp"
             android:layout_gravity="center_horizontal"/>
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:text="Early access to new features"
+            android:text="@string/early_access"
             android:layout_marginTop="2dp"
             android:layout_gravity="center_horizontal"/>
 
         <android.support.v7.widget.AppCompatButton
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Buy Now via Google Play"
+            android:text="@string/buy_now"
             android:layout_marginTop="12dp"
             android:onClick="initiateBuy"
             android:layout_gravity="center_horizontal"/>
diff --git a/app/src/main/res/layout/history_header_view.xml b/app/src/main/res/layout/history_header_view.xml
@@ -11,6 +11,6 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="3dp"
         android:layout_marginTop="6dp"
-        android:text="Pick an app to explore"
+        android:text="@string/pick_app_to_explore"
         android:textAppearance="?android:attr/textAppearanceLarge" />
 </LinearLayout>
diff --git a/app/src/main/res/layout/history_list_item.xml b/app/src/main/res/layout/history_list_item.xml
@@ -38,14 +38,14 @@
                     android:id="@+id/history_item_label"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Large Text"
+                    android:text="@string/space"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
                 <TextView
                     android:id="@+id/history_item_package"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:text="Subtext"
+                    android:text="@string/space"
                     android:textAppearance="?android:attr/textAppearanceSmall" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/java_explorer_list_item.xml b/app/src/main/res/layout/java_explorer_list_item.xml
@@ -30,7 +30,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:singleLine="true"
-            android:text="Name"
+            android:text="@string/space"
             android:textSize="17sp"
             android:textStyle="bold" />
 
@@ -39,7 +39,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="5dp"
-            android:text="123 kb" />
+            android:text="@string/space" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/package_list_item.xml b/app/src/main/res/layout/package_list_item.xml
@@ -15,14 +15,14 @@
         android:id="@+id/pkg_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text=" "
+        android:text="@string/space"
         android:visibility="gone" />
 
     <TextView
         android:id="@+id/pkg_dir"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text=" "
+        android:text="@string/space"
         android:visibility="gone" />
 
 
@@ -39,15 +39,15 @@
             android:id="@+id/pkg_name"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:text="Amrita Info Desk v2"
+            android:text="@string/space"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
         <TextView
             android:id="@+id/pkg_version"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
             android:paddingTop="2dp"
-            android:text="Version 1.2b"
+            android:text="@string/space"
             android:textAppearance="?android:attr/textAppearanceSmall" />
 
     </LinearLayout>
diff --git a/app/src/main/res/menu/explorer.xml b/app/src/main/res/menu/explorer.xml
@@ -5,14 +5,14 @@
         android:id="@+id/action_share"
         android:icon="@drawable/ic_action_share"
         android:orderInCategory="0"
-        android:title="Zip and share"
+        android:title="@string/zip_and_share"
         app:showAsAction="always" />
 
     <item
         android:id="@+id/action_delete"
         android:icon="@drawable/ic_action_delete"
         android:orderInCategory="1"
-        android:title="Delete Source"
+        android:title="@string/delete_source"
         app:showAsAction="always" />
 
 </menu>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     
-    <string name="action_settings">Settings</string>
     <string name="title_activity_app_process">Decompile with Show Java</string>
     <string name="title_activity_java_explorer">Java Explorer</string>
     <string name="title_activity_source_viewer">Source Viewer</string>
     <string name="title_activity_landing">@string/app_name</string>
-    <string name="title_activity_about">About</string>
-    <string name="title_activity_settings">Settings</string>
+    <string name="title_activity_about">@string/about</string>
+    <string name="title_activity_settings">@string/settings</string>
     <string name="title_activity_image_resource_viewer">Image Resource Viewer</string>
 
     <string name="decompiler_initialise_error">There was an error initialising the decompiler with the app you selected.</string>
@@ -25,7 +24,30 @@
     <string name="error_exiting">Exiting with error.</string>
     <string name="title_activity_error">Integrity Check Failed</string>
     <string name="title_activity_purchase">Get Show java Pro</string>
-    <!-- Just some title ... Donno what to say :P_-->
+    <string name="report_a_bug">Report a Bug</string>
+    <string name="about">About</string>
+    <string name="settings">Settings</string>
+    <string name="invert_background_color">Invert Background Color</string>
+    <string name="zip_and_share">Zip and share</string>
+    <string name="delete_source">Delete Source</string>
+    <string name="pick_app_to_explore">Pick an app to explore</string>
+    <string name="space"> </string>
+    <string name="waiting_for_app">Waiting for App</string>
+    <string name="processing">Processing</string>
+    <string name="getting_ready">Getting Ready</string>
+    <string name="an_error_occured">An error has occurred</string>
+    <string name="goto_app_settings">Goto to Application settings</string>
+    <string name="clear_cache_data">Clear cache and data to fix</string>
+    <string name="open_app_settings">Open application settings</string>
+    <string name="get_pro">Get Show Java Pro</string>
+    <string name="no_ads">No Advertisements</string>
+    <string name="early_access">Early access to new features</string>
+    <string name="buy_now">Buy Now via Google Play</string>
+    <string name="niranjan94">\@niranjan94</string>
+    <string name="welcome">Welcome</string>
+    <string name="tap_plus">tap the plus button to begin</string>
+    <string name="third_party_title">3rd Party Softwares</string>
+    <string name="third_party_list">• dex2jar\n• dexlib2\n• baksmali\n• smali\n• apache-commons-cli 1.3\n• apache-commons-io 2.4\n• guava 18.0\n• cfr 0.110\n• ANTLR 3.5.2\n• JSR-305 1.3.9\n• JaDX 0.6.1</string>
 
     <string-array name="decompilers">
         <item>CFR 0.110</item>
