Added local hosts info textView
This commit is contained in:
parent
b7e5f23a7d
commit
d27b30776a
@ -11,6 +11,7 @@ import android.view.ViewGroup;
|
|||||||
import android.widget.ArrayAdapter;
|
import android.widget.ArrayAdapter;
|
||||||
import android.widget.Button;
|
import android.widget.Button;
|
||||||
import android.widget.Spinner;
|
import android.widget.Spinner;
|
||||||
|
import android.widget.TextView;
|
||||||
import org.itxtech.daedalus.Daedalus;
|
import org.itxtech.daedalus.Daedalus;
|
||||||
import org.itxtech.daedalus.R;
|
import org.itxtech.daedalus.R;
|
||||||
import org.itxtech.daedalus.util.HostsProvider;
|
import org.itxtech.daedalus.util.HostsProvider;
|
||||||
@ -18,6 +19,8 @@ import org.itxtech.daedalus.util.HostsProvider;
|
|||||||
import java.io.*;
|
import java.io.*;
|
||||||
import java.net.URL;
|
import java.net.URL;
|
||||||
import java.net.URLConnection;
|
import java.net.URLConnection;
|
||||||
|
import java.text.DecimalFormat;
|
||||||
|
import java.util.Date;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Daedalus Project
|
* Daedalus Project
|
||||||
@ -39,7 +42,7 @@ public class HostsFragment extends Fragment {
|
|||||||
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
|
||||||
view = inflater.inflate(R.layout.fragment_hosts, container, false);
|
view = inflater.inflate(R.layout.fragment_hosts, container, false);
|
||||||
|
|
||||||
mHandler = new HostsHandler().setView(view);
|
mHandler = new HostsHandler().setView(view).setHostsFragment(this);
|
||||||
|
|
||||||
final Spinner spinnerHosts = (Spinner) view.findViewById(R.id.spinner_hosts);
|
final Spinner spinnerHosts = (Spinner) view.findViewById(R.id.spinner_hosts);
|
||||||
ArrayAdapter spinnerArrayAdapter = new ArrayAdapter<>(Daedalus.getInstance(), android.R.layout.simple_list_item_1, HostsProvider.getHostsProviderNames());
|
ArrayAdapter spinnerArrayAdapter = new ArrayAdapter<>(Daedalus.getInstance(), android.R.layout.simple_list_item_1, HostsProvider.getHostsProviderNames());
|
||||||
@ -84,6 +87,27 @@ public class HostsFragment extends Fragment {
|
|||||||
return view;
|
return view;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void updateUserInterface() {
|
||||||
|
File file = new File(Daedalus.hostsPath);
|
||||||
|
TextView info = (TextView) view.findViewById(R.id.textView_hosts);
|
||||||
|
StringBuilder builder = new StringBuilder();
|
||||||
|
builder.append(getString(R.string.hosts_path)).append(" ").append(Daedalus.hostsPath).append("\n\n");
|
||||||
|
if (!file.exists()) {
|
||||||
|
builder.append(getString(R.string.hosts_not_found));
|
||||||
|
} else {
|
||||||
|
builder.append(getString(R.string.hosts_last_modified)).append(" ").append(new Date(file.lastModified()).toString()).append("\n\n")
|
||||||
|
.append(getString(R.string.hosts_size)).append(" ").append(new DecimalFormat("0.00").format(((float) file.length() / 1024))).append(" KB");
|
||||||
|
}
|
||||||
|
info.setText(builder.toString());
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onResume() {
|
||||||
|
super.onResume();
|
||||||
|
|
||||||
|
updateUserInterface();
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onDestroy() {
|
public void onDestroy() {
|
||||||
super.onDestroy();
|
super.onDestroy();
|
||||||
@ -105,14 +129,21 @@ public class HostsFragment extends Fragment {
|
|||||||
static final int MSG_DOWNLOADED = 0;
|
static final int MSG_DOWNLOADED = 0;
|
||||||
|
|
||||||
private View view = null;
|
private View view = null;
|
||||||
|
private HostsFragment mFragment = null;
|
||||||
|
|
||||||
HostsHandler setView(View view) {
|
HostsHandler setView(View view) {
|
||||||
this.view = view;
|
this.view = view;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HostsHandler setHostsFragment(HostsFragment fragment) {
|
||||||
|
mFragment = fragment;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
void shutdown() {
|
void shutdown() {
|
||||||
view = null;
|
view = null;
|
||||||
|
mFragment = null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
@ -133,6 +164,8 @@ public class HostsFragment extends Fragment {
|
|||||||
|
|
||||||
Snackbar.make(view, R.string.notice_downloaded, Snackbar.LENGTH_LONG)
|
Snackbar.make(view, R.string.notice_downloaded, Snackbar.LENGTH_LONG)
|
||||||
.setAction("Action", null).show();
|
.setAction("Action", null).show();
|
||||||
|
|
||||||
|
mFragment.updateUserInterface();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -27,5 +27,14 @@
|
|||||||
android:layout_alignParentEnd="true"
|
android:layout_alignParentEnd="true"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:layout_alignParentLeft="true"/>
|
android:layout_alignParentLeft="true"/>
|
||||||
|
<TextView
|
||||||
|
android:layout_width="match_parent"
|
||||||
|
android:layout_height="wrap_content"
|
||||||
|
android:id="@+id/textView_hosts"
|
||||||
|
android:layout_below="@+id/button_download_hosts"
|
||||||
|
android:layout_marginTop="10dp"
|
||||||
|
android:textSize="18sp"
|
||||||
|
android:layout_alignParentEnd="true"
|
||||||
|
android:layout_alignParentRight="true"/>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
@ -51,4 +51,8 @@
|
|||||||
<string name="notice_start_download">正在下载 hosts,请稍等 ……</string>
|
<string name="notice_start_download">正在下载 hosts,请稍等 ……</string>
|
||||||
<string name="notice_downloaded">已下载 hosts 。</string>
|
<string name="notice_downloaded">已下载 hosts 。</string>
|
||||||
<string name="notice_now_downloading">Daedalus 当前正在下载hosts,请稍等。</string>
|
<string name="notice_now_downloading">Daedalus 当前正在下载hosts,请稍等。</string>
|
||||||
|
<string name="hosts_not_found">找不到本地 hosts 文件。</string>
|
||||||
|
<string name="hosts_path">本地 hosts 路径:</string>
|
||||||
|
<string name="hosts_last_modified">最后修改:</string>
|
||||||
|
<string name="hosts_size">大小:</string>
|
||||||
</resources>
|
</resources>
|
@ -51,4 +51,8 @@
|
|||||||
<string name="notice_start_download">Downloading hosts, please wait …</string>
|
<string name="notice_start_download">Downloading hosts, please wait …</string>
|
||||||
<string name="notice_downloaded">Hosts has been downloaded.</string>
|
<string name="notice_downloaded">Hosts has been downloaded.</string>
|
||||||
<string name="notice_now_downloading">Daedalus is currently downloading hosts, please wait.</string>
|
<string name="notice_now_downloading">Daedalus is currently downloading hosts, please wait.</string>
|
||||||
|
<string name="hosts_not_found">Local hosts not found.</string>
|
||||||
|
<string name="hosts_path">Local hosts path:</string>
|
||||||
|
<string name="hosts_last_modified">Last modified:</string>
|
||||||
|
<string name="hosts_size">Size:</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
Loading…
x
Reference in New Issue
Block a user