kiwix/kiwix-android
1
0
Fork 0
mirror of https://github.com/kiwix/kiwix-android.git synced 2025-09-24 21:45:14 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename StartServer to ZimHostActivity

Browse Source
This commit is contained in:
Adeel Zafar 2019-08-06 20:20:39 +05:00
parent 35f3d786a0
commit da0b2f3b72
5 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/AndroidManifest.xml
View File

@ -36,7 +36,7 @@
android:networkSecurityConfig="@xml/network_security_config"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".webserver.StartServer">
<activity android:name=".webserver.ZimHostActivity">
</activity>
<activity
android:name=".splash.SplashActivity"

4
app/src/main/java/org/kiwix/kiwixmobile/main/MainActivity.java
View File

@ -111,7 +111,7 @@ import org.kiwix.kiwixmobile.utils.LanguageUtils;
import org.kiwix.kiwixmobile.utils.NetworkUtils;
import org.kiwix.kiwixmobile.utils.StyleUtils;
import org.kiwix.kiwixmobile.utils.files.FileUtils;
import org.kiwix.kiwixmobile.webserver.StartServer;
import org.kiwix.kiwixmobile.webserver.ZimHostActivity;
import org.kiwix.kiwixmobile.zim_manager.ZimManageActivity;
import org.kiwix.kiwixmobile.zim_manager.fileselect_view.StorageObserver;
import org.kiwix.kiwixmobile.zim_manager.fileselect_view.adapter.BookOnDiskDelegate;
@ -923,7 +923,7 @@ public class MainActivity extends BaseActivity implements WebViewCallback,
break;
case R.id.menu_host_books:
Intent intent = new Intent(MainActivity.this, StartServer.class);
Intent intent = new Intent(MainActivity.this, ZimHostActivity.class);
startActivity(intent);
break;

10
app/src/main/java/org/kiwix/kiwixmobile/webserver/StartServer.java → app/src/main/java/org/kiwix/kiwixmobile/webserver/ZimHostActivity.java
View File

@ -13,10 +13,8 @@ import android.os.Build;
import android.os.Handler;
import android.util.Log;
import android.view.KeyEvent;
import android.view.Menu;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@ -29,7 +27,6 @@ import androidx.core.app.ActivityCompat;
import androidx.core.content.ContextCompat;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;
import butterknife.BindView;
import com.google.android.gms.common.api.ApiException;
import com.google.android.gms.common.api.ResolvableApiException;
import com.google.android.gms.location.LocationRequest;
@ -41,7 +38,6 @@ import com.google.android.gms.location.LocationSettingsStatusCodes;
import com.google.android.gms.tasks.Task;
import java.lang.reflect.Method;
import org.kiwix.kiwixmobile.R;
import org.kiwix.kiwixmobile.main.MainActivity;
import org.kiwix.kiwixmobile.wifi_hotspot.HotspotService;
import org.kiwix.kiwixmobile.zim_manager.fileselect_view.ZimFileSelectFragment;
@ -50,7 +46,7 @@ import static org.kiwix.kiwixmobile.webserver.WebServerHelper.isStarted;
import static org.kiwix.kiwixmobile.webserver.WebServerHelper.stopAndroidWebServer;
import static org.kiwix.kiwixmobile.wifi_hotspot.HotspotService.checkHotspotState;
public class StartServer extends AppCompatActivity implements
public class ZimHostActivity extends AppCompatActivity implements
ZimFileSelectFragment.OnHostActionButtonClickedListener {
Button startServerButton;
@ -64,7 +60,7 @@ public class StartServer extends AppCompatActivity implements
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_start_server);
setContentView(R.layout.activity_zim_host);
setUpToolbar();
@ -262,7 +258,7 @@ public class StartServer extends AppCompatActivity implements
// Show the dialog by calling startResolutionForResult(),
// and check the result in onActivityResult().
resolvable.startResolutionForResult(
StartServer.this,
ZimHostActivity.this,
101);
} catch (IntentSender.SendIntentException e) {
// Ignore the error.

4
app/src/main/java/org/kiwix/kiwixmobile/wifi_hotspot/HotspotService.java
View File

@ -19,8 +19,8 @@ import org.kiwix.kiwixmobile.R;
import org.kiwix.kiwixmobile.main.MainActivity;
import org.kiwix.kiwixmobile.utils.Constants;
import static org.kiwix.kiwixmobile.webserver.StartServer.ACTION_TURN_OFF_AFTER_O;
import static org.kiwix.kiwixmobile.webserver.StartServer.ACTION_TURN_ON_AFTER_O;
import static org.kiwix.kiwixmobile.webserver.ZimHostActivity.ACTION_TURN_OFF_AFTER_O;
import static org.kiwix.kiwixmobile.webserver.ZimHostActivity.ACTION_TURN_ON_AFTER_O;
import static org.kiwix.kiwixmobile.webserver.WebServerHelper.stopAndroidWebServer;
/**

2
app/src/main/res/layout/activity_start_server.xml → app/src/main/res/layout/activity_zim_host.xml
View File

@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true"
tools:context=".webserver.StartServer"
tools:context=".webserver.ZimHostActivity"
>
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/appBarLayout2"