diff --git a/src/main/java/com/alterdekim/fridaapp/activity/MainActivity.java b/src/main/java/com/alterdekim/fridaapp/activity/MainActivity.java index f423d7d..5b4619d 100644 --- a/src/main/java/com/alterdekim/fridaapp/activity/MainActivity.java +++ b/src/main/java/com/alterdekim/fridaapp/activity/MainActivity.java @@ -78,6 +78,7 @@ public class MainActivity extends AppCompatActivity implements PopupMenu.OnMenuI ControllerManager.putController(new MainActivityController()); this.controller = (MainActivityController) ControllerManager.getController(ControllerId.MainActivityController); + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); diff --git a/src/main/java/com/alterdekim/fridaapp/activity/SingleConfigActivity.java b/src/main/java/com/alterdekim/fridaapp/activity/SingleConfigActivity.java index 78c7123..2fd7c71 100644 --- a/src/main/java/com/alterdekim/fridaapp/activity/SingleConfigActivity.java +++ b/src/main/java/com/alterdekim/fridaapp/activity/SingleConfigActivity.java @@ -9,18 +9,33 @@ import androidx.core.view.ViewCompat; import androidx.core.view.WindowInsetsCompat; import com.alterdekim.fridaapp.R; +import com.alterdekim.fridaapp.controller.ControllerId; +import com.alterdekim.fridaapp.controller.ControllerManager; +import com.alterdekim.fridaapp.controller.SingleConfigActivityController; public class SingleConfigActivity extends AppCompatActivity { + private static final String TAG = SingleConfigActivity.class.getSimpleName(); + + private SingleConfigActivityController controller; + + + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); EdgeToEdge.enable(this); setContentView(R.layout.activity_single_config); + + ControllerManager.putController(new SingleConfigActivityController()); + this.controller = (SingleConfigActivityController) ControllerManager.getController(ControllerId.SingleConfigActivityController); + ViewCompat.setOnApplyWindowInsetsListener(findViewById(R.id.main), (v, insets) -> { Insets systemBars = insets.getInsets(WindowInsetsCompat.Type.systemBars()); v.setPadding(systemBars.left, systemBars.top, systemBars.right, systemBars.bottom); return insets; }); + + } } \ No newline at end of file diff --git a/src/main/java/com/alterdekim/fridaapp/controller/ControllerId.java b/src/main/java/com/alterdekim/fridaapp/controller/ControllerId.java index 3701946..12c1f63 100644 --- a/src/main/java/com/alterdekim/fridaapp/controller/ControllerId.java +++ b/src/main/java/com/alterdekim/fridaapp/controller/ControllerId.java @@ -1,5 +1,6 @@ package com.alterdekim.fridaapp.controller; public enum ControllerId { - MainActivityController + MainActivityController, + SingleConfigActivityController } diff --git a/src/main/java/com/alterdekim/fridaapp/controller/MainActivityController.java b/src/main/java/com/alterdekim/fridaapp/controller/MainActivityController.java index a88b1a7..2dd1623 100644 --- a/src/main/java/com/alterdekim/fridaapp/controller/MainActivityController.java +++ b/src/main/java/com/alterdekim/fridaapp/controller/MainActivityController.java @@ -12,6 +12,7 @@ import androidx.room.Room; import com.alterdekim.fridaapp.R; import com.alterdekim.fridaapp.activity.MainActivity; +import com.alterdekim.fridaapp.activity.SingleConfigActivity; import com.alterdekim.fridaapp.room.AppDatabase; import com.alterdekim.fridaapp.room.Config; import com.alterdekim.fridaapp.service.FridaService; @@ -63,6 +64,10 @@ public class MainActivityController implements IController { view_switch.setUseMaterialThemeColors(true); view_switch.setOnCheckedChangeListener((compoundButton, b) -> toggleVpn(view_switch, config, b)); view_name.setText(config.getTitle()); + view_name.setOnClickListener(view -> { + Intent intent = new Intent(this.mainActivity, SingleConfigActivity.class); + this.mainActivity.startActivity(intent); + }); if( iter.hasNext() ) this.mainActivity.getCfg_list().addView(inflater.inflate(R.layout.single_divider, this.mainActivity.getCfg_list(), false)); } }) diff --git a/src/main/java/com/alterdekim/fridaapp/controller/SingleConfigActivityController.java b/src/main/java/com/alterdekim/fridaapp/controller/SingleConfigActivityController.java new file mode 100644 index 0000000..d54a6da --- /dev/null +++ b/src/main/java/com/alterdekim/fridaapp/controller/SingleConfigActivityController.java @@ -0,0 +1,18 @@ +package com.alterdekim.fridaapp.controller; + +import androidx.appcompat.app.AppCompatActivity; + +public class SingleConfigActivityController implements IController { + + private static final String TAG = SingleConfigActivityController.class.getSimpleName(); + + @Override + public ControllerId getControllerId() { + return ControllerId.SingleConfigActivityController; + } + + @Override + public void onCreateGUI(AppCompatActivity activity) { + + } +} diff --git a/src/main/res/layout/content_single.xml b/src/main/res/layout/content_single.xml index 8f37cc8..f0f8ba8 100644 --- a/src/main/res/layout/content_single.xml +++ b/src/main/res/layout/content_single.xml @@ -22,11 +22,13 @@ android:textColor="@color/grey" android:textSize="14sp" android:textStyle="normal" /> + + + + @@ -145,12 +155,14 @@ android:layout_weight="1">