@dsukmanova Сукманова Дарья

Singers/app/build.gradle

@@ -22,6 +22,12 @@ android {
 repositories {
     mavenCentral()
 }
+configurations.all {
+    resolutionStrategy.force 'com.android.support:support-annotations:22.1.0'
+}
+apply plugin: 'com.android.application'
+apply plugin: 'android-apt'
+
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
     testCompile 'junit:junit:4.12'
@@ -35,6 +41,10 @@ dependencies {
     compile 'com.nhaarman.listviewanimations:lib-core-slh:3.1.0@aar'
     compile 'com.nineoldandroids:library:2.4.0'
 
+    //butterknife
+    compile 'com.jakewharton:butterknife:8.2.1'
+    apt 'com.jakewharton:butterknife-compiler:8.2.1'
+
     androidTestCompile 'com.android.support.test:runner:0.4.1'
     androidTestCompile 'com.android.support.test:rules:0.4.1'
     // Optional -- Hamcrest library
@@ -43,4 +53,6 @@ dependencies {
     androidTestCompile 'com.android.support.test.espresso:espresso-core:2.2.1'
     // Optional -- UI testing with UI Automator
     androidTestCompile 'com.android.support.test.uiautomator:uiautomator-v18:2.1.1'
+
+
 }

Singers/app/src/main/AndroidManifest.xml

@@ -16,34 +16,22 @@
             android:resource="@xml/searchable" />
         <activity
             android:name=".MainActivity"
-            android:label="@string/app_name"
+            android:label="@string/title_activity_main"
             android:theme="@style/AppTheme.NoActionBar">
             <intent-filter>
                 <action android:name="android.intent.action.SEARCH" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
             <meta-data
                 android:name="android.app.searchable"
                 android:resource="@xml/searchable" />
         </activity>
-        <activity
-            android:name=".DetailsActivity"
-            android:parentActivityName=".MainActivity"
-            android:theme="@style/AppTheme.NoActionBar">
-        </activity>
 
         <application android:theme="@style/MyTheme"></application>
-
-        <activity
-            android:name=".HomeActivity"
-            android:label="@string/title_activity_home"
-            android:theme="@style/AppTheme.NoActionBar">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-
-        </activity>
     </application>
 
 </manifest>

Singers/app/src/main/java/ru/daria/singers/AboutProgramDialog.java

@@ -0,0 +1,28 @@
+package ru.daria.singers;
+
+import android.app.DialogFragment;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import butterknife.ButterKnife;
+
+/**
+ * Created by dsukmanova on 17.07.16.
+ */
+public class AboutProgramDialog extends DialogFragment {
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstance){
+        View view = inflater.inflate(R.layout.about_program, null);
+        ButterKnife.findById(view,R.id.okButton).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                getDialog().dismiss();
+            }
+        });
+        getDialog().setTitle(R.string.aboutTitle);
+        return view;
+    }
+
+}

Singers/app/src/main/java/ru/daria/singers/HomeActivity.java → Singers/app/src/main/java/ru/daria/singers/DataLoader.java

@@ -1,60 +1,88 @@
 package ru.daria.singers;
 
-import android.app.Activity;
-import android.content.Intent;
-import android.os.Bundle;
+import android.content.AsyncTaskLoader;
+import android.content.Context;
 import android.util.Log;
-import android.view.View;
-import android.widget.Button;
-import android.widget.TextView;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.Serializable;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.net.HttpURLConnection;
+import java.net.MalformedURLException;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 
 /**
- * Activity для отображения окна приветствия, загрузки списка исполнителей
+ * Created by dsukmanova on 17.07.16.
  */
-public class HomeActivity extends Activity {
-    List<Singer> singers = new ArrayList<Singer>();
+public class DataLoader extends AsyncTaskLoader<DataLoaderResult<List<Singer>>> {
+    private final String URLSingers = "http://cache-default06g.cdn.yandex.net/download.cdn.yandex.net/mobilization-2016/artists.json";
+    private HttpURLConnection urlConnection = null;
+    private DataLoaderResult<List<Singer>> result;
+
+    public DataLoader(Context context) {
+        super(context);
+    }
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.splash);
-        Extractor ex = new Extractor(new Extractor.AsyncResponse() {
-            @Override
-            public void processFinish(String output) {
-                try {
-                    JSONArray dataJson = new JSONArray(output);
-                    singers = getSingersFromJson(dataJson);
-                    Intent i = new Intent(HomeActivity.this, MainActivity.class);
-                    i.putExtra("SINGERS", (Serializable) singers);
-                    startActivity(i);
-                    finish();
-                } catch (JSONException ex) {
-                    ex.printStackTrace();
-                    Button b = (Button) findViewById(R.id.tryAgainButton);
-                    b.setVisibility(View.VISIBLE);
-                    TextView v = (TextView) findViewById(R.id.splashText);
-                    v.setText("Невозможно загрузить список исполнителей.");
-                }
-            }
-        });
-        ex.execute();
+    protected void onStartLoading() {
+        super.onStartLoading();
+        if (result != null) {
+            deliverResult(result);
+        } else {
+            forceLoad();
+        }
+    }
+
+    @Override
+    public void deliverResult(DataLoaderResult<List<Singer>> result) {
+        this.result = result;
+        super.deliverResult(result);
     }
 
-    public void buttonOnClick(View view) {
-        Button b = (Button) findViewById(R.id.tryAgainButton);
-        b.setVisibility(View.INVISIBLE);
-        Intent i = new Intent(HomeActivity.this, HomeActivity.class);
-        startActivity(i);
+    @Override
+    public DataLoaderResult<List<Singer>> loadInBackground() {
+        DataLoaderResult<List<Singer>> result = new DataLoaderResult<List<Singer>>();
+        try {
+            URL url = new URL(URLSingers);
+            urlConnection = (HttpURLConnection) url.openConnection();
+            urlConnection.setRequestMethod("GET");
+            urlConnection.connect();
+
+            InputStream inputStream = urlConnection.getInputStream();
+            StringBuilder buffer = new StringBuilder();
+            BufferedReader reader = new BufferedReader(new InputStreamReader(inputStream));
+            String line;
+            while ((line = reader.readLine()) != null) {
+                buffer.append(line);
+            }
+            String resultJson = buffer.toString();
+            JSONArray dataJson = new JSONArray(resultJson);
+            List<Singer> singers = getSingersFromJson(dataJson);
+            result.setResult(singers);
+        } catch (MalformedURLException ex) {
+            Log.e("ERROR", "URL is not available");
+            result.setException(ex);
+        } catch (IOException ex) {
+            Log.e("ERROR", "Cannot open url connection.");
+            result.setException(ex);
+        } catch (JSONException ex) {
+            Log.e("ERROR", "Problems with JSON");
+            result.setException(ex);
+        } finally {
+            if (urlConnection != null) {
+                urlConnection.disconnect();
+            }
+        }
+        return result;
     }
 
     /**
@@ -109,5 +137,4 @@ public List<Singer> getSingersFromJson(JSONArray jSingers) {
         }
         return singers;
     }
-
 }

Singers/app/src/main/java/ru/daria/singers/DataLoaderResult.java

@@ -0,0 +1,27 @@
+package ru.daria.singers;
+
+/**
+ * Created by dsukmanova on 24.07.16.
+ */
+
+public class DataLoaderResult  <T>{
+    private Exception exception;
+    private T result;
+
+    public void setException(Exception exception) {
+        this.exception = exception;
+    }
+
+    public void setResult(T result) {
+        this.result = result;
+    }
+
+    public Exception getException() {
+
+        return exception;
+    }
+
+    public T getResult() {
+        return result;
+    }
+}

Singers/app/src/main/java/ru/daria/singers/DetailsActivity.java → Singers/app/src/main/java/ru/daria/singers/DetailsFragment.java

@@ -1,58 +1,70 @@
 package ru.daria.singers;
 
-import android.content.Intent;
+import android.app.Fragment;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.Toolbar;
-import android.view.Menu;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.nostra13.universalimageloader.core.DisplayImageOptions;
 import com.nostra13.universalimageloader.core.ImageLoader;
 import com.nostra13.universalimageloader.core.ImageLoaderConfiguration;
 
-public class DetailsActivity extends AppCompatActivity {
-    //настройка кэширования изображений
+import butterknife.BindView;
+import butterknife.ButterKnife;
+
+/**
+ * Created by dsukmanova on 16.07.16.
+ */
+public class DetailsFragment extends Fragment {
     private static DisplayImageOptions options = new DisplayImageOptions.Builder().
             cacheInMemory(true).cacheOnDisk(true).build();
-    private String albumsDescr;
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.details);
+        //ButterKnife.bind(this);
+    }
 
-        Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+    @Override
+    public View onCreateView(LayoutInflater inflater,
+                             ViewGroup container,
+                             Bundle savedInstanceState) {
+        View view = inflater.inflate(R.layout.details, container, false);
+        final MainActivity activity = (MainActivity) getActivity();
+
+        Toolbar toolbar = activity.getToolbar();
         toolbar.setNavigationIcon(R.drawable.abc_ic_ab_back_mtrl_am_alpha);
+        activity.showMenuVisible(toolbar.getMenu(), false);
         toolbar.setNavigationOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
                 //действие аналогично стандартной кнопке "Назад"
-                onBackPressed();
+                activity.onBackPressed();
             }
         });
 
-        ImageView image = (ImageView) findViewById(R.id.image);
-        TextView description = (TextView) findViewById(R.id.descriprion);
-        TextView genres = (TextView) findViewById(R.id.genres);
-        TextView albums = (TextView) findViewById(R.id.albums);
+        ImageView image = ButterKnife.findById(view, R.id.image);
+        TextView description = ButterKnife.findById(view, R.id.descriprion);
+        TextView genres = ButterKnife.findById(view, R.id.genres);
+        TextView albums = ButterKnife.findById(view, R.id.albums);
         //получаем экземпляр Singer из MainActivity
-        Intent intent = getIntent();
-        Bundle b = intent.getExtras();
+        Bundle b = getArguments();
         Singer singer = (Singer) b.get("SINGER");
 
         toolbar.setTitle(singer.getName());
         //пока подгружается изображение показываем стандартное
         String uri = "@drawable/defaultimage";
-        int imageResource = getResources().getIdentifier(uri, null, getPackageName());
+        int imageResource = getResources().getIdentifier(uri, null, activity.getPackageName());
         Drawable res = getResources().getDrawable(imageResource);
         image.setImageDrawable(res);
 
         //Конфигурация для ImageLoader
-        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(this).build();
+        ImageLoaderConfiguration config = new ImageLoaderConfiguration.Builder(activity).build();
         final ImageLoader imageLoader = ImageLoader.getInstance();
         imageLoader.init(config);
 
@@ -63,20 +75,13 @@ public void onClick(View v) {
         description.setText(singer.getDescription());
         genres.setText(singer.genresToString());
         int albumsNum = singer.getAlbums();
-        String[] albumCases = {"альбом", "альбома", "альбомов"};
         int tracksNum = singer.getTracks();
-        String[] trackCases = {"песня", "песни", "песен"};
         //склоняем альбомы и песни
-        String albumsDescr = "%d %s • %d %s";
-        albumsDescr = String.format(albumsDescr, albumsNum, singer.getEnding(albumsNum, albumCases),
-                tracksNum, singer.getEnding(tracksNum, trackCases));
+        String albumsDescr = "%s • %s";
+        albumsDescr = String.format(albumsDescr,
+                getResources().getQuantityString(R.plurals.songs, albumsNum, albumsNum),
+                getResources().getQuantityString(R.plurals.tracks, tracksNum, tracksNum));
         albums.setText(albumsDescr);
-
+        return view;
     }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        return super.onCreateOptionsMenu(menu);
-    }
-
 }