Remove uneeded assets

markwinter · Sep 3, 2014 · dd63399 · dd63399
1 parent dc6df21
commit dd63399
Show file tree

Hide file tree

Showing 5 changed files with 0 additions and 39 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -26,7 +26,6 @@ android {
         absolutePaths false
         lintConfig file("lint.xml")
     }
-    sourceSets { main { assets.srcDirs = ['src/main/assets', 'src/main/assets/fonts'] } }
 }
 
 dependencies {

diff --git a/app/src/main/java/im/tox/antox/adapters/ChatMessagesAdapter.java b/app/src/main/java/im/tox/antox/adapters/ChatMessagesAdapter.java
@@ -102,10 +102,6 @@ public void bindView(View view, final Context context, Cursor cursor) {
         holder.accept = (View) view.findViewById(R.id.file_accept_button);
         holder.reject = (View) view.findViewById(R.id.file_reject_button);
 
-        Typeface robotoBold = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-Bold.ttf");
-        Typeface robotoThin = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-Thin.ttf");
-        Typeface robotoRegular = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-Regular.ttf");
-
         holder.message.setTextSize(16);
         holder.message.setVisibility(View.GONE);
         holder.time.setVisibility(View.GONE);
@@ -154,7 +150,6 @@ public void bindView(View view, final Context context, Cursor cursor) {
 
                 holder.title.setVisibility(View.VISIBLE);
                 holder.title.setText(R.string.chat_file_transfer);
-                holder.title.setTypeface(robotoBold);
 
                 if (msg.received) {
                     holder.progressText.setText("Finished");
@@ -275,8 +270,6 @@ public void onClick(View v) {
         }
 
         holder.time.setText(PrettyTimestamp.prettyTimestamp(msg.time, true));
-        holder.message.setTypeface(robotoRegular);
-        holder.time.setTypeface(robotoRegular);
         holder.time.setVisibility(View.VISIBLE);
 
         if (!animatedIds.contains(id)) {

diff --git a/app/src/main/java/im/tox/antox/adapters/LeftPaneAdapter.java b/app/src/main/java/im/tox/antox/adapters/LeftPaneAdapter.java
@@ -123,24 +123,10 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder.icon.setBackgroundColor(IconColor.iconColorAsColor(item.isOnline,item.status));
         }
 
-        Typeface robotoBold = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-Bold.ttf");
-        Typeface robotoThin = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-Thin.ttf");
-        Typeface robotoRegular = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-Regular.ttf");
-
-        if(holder.firstText != null)
-            holder.firstText.setTypeface(robotoRegular);
-
-        if(holder.secondText != null)
-            holder.secondText.setTypeface(robotoRegular);
-
         if(holder.timeText != null) {
-            holder.timeText.setTypeface(robotoRegular);
             holder.timeText.setTextColor(context.getResources().getColor(R.color.gray_darker));
         }
 
-        if(holder.countText != null)
-            holder.countText.setTypeface(robotoRegular);
-
         return convertView;
     }
 

diff --git a/app/src/main/java/im/tox/antox/adapters/RecentAdapter.java b/app/src/main/java/im/tox/antox/adapters/RecentAdapter.java
@@ -62,16 +62,6 @@ public void bindView(View view, final Context context, Cursor cursor) {
             holder.unreadCount.setVisibility(View.VISIBLE);
         }
 
-        Typeface robotoBold = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-Bold.ttf");
-        Typeface robotoThin = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-Thin.ttf");
-        Typeface robotoRegular = Typeface.createFromAsset(context.getAssets(), "fonts/Roboto-Regular.ttf");
-
-        holder.friendName.setTypeface(robotoRegular);
-        holder.friendStatus.setTypeface(robotoRegular);
-        holder.timestamp.setTypeface(robotoRegular);
-        holder.timestamp.setTextColor(context.getResources().getColor(R.color.gray_darker));
-        holder.unreadCount.setTypeface(robotoRegular);
-
         view.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View view) {

diff --git a/app/src/main/java/im/tox/antox/fragments/ChatFragment.java b/app/src/main/java/im/tox/antox/fragments/ChatFragment.java
@@ -148,10 +148,6 @@ public void call(Tuple<ArrayList<FriendInfo>, Tuple<String,Boolean>> tup) {
                         }
                     }
 
-                    Typeface robotoBold = Typeface.createFromAsset(getActivity().getAssets(), "fonts/Roboto-Bold.ttf");
-                    Typeface robotoThin = Typeface.createFromAsset(getActivity().getAssets(), "fonts/Roboto-Thin.ttf");
-                    Typeface robotoRegular = Typeface.createFromAsset(getActivity().getAssets(), "fonts/Roboto-Regular.ttf");
-
                     TextView chatName = (TextView) getActivity().findViewById(R.id.chatActiveName);
                     if (!friendAlias.equals(""))
                         chatName.setText(friendAlias);
@@ -163,9 +159,6 @@ public void call(Tuple<ArrayList<FriendInfo>, Tuple<String,Boolean>> tup) {
 
                     TextView statusIcon = (TextView) getActivity().findViewById(R.id.chat_friend_status_icon);
                     statusIcon.setBackgroundColor(IconColor.iconColorAsColor(friendIsOnline,friendStatus));
-
-                    chatName.setTypeface(robotoBold);
-                    statusText.setTypeface(robotoRegular);
                 }
             }
         });